diff --git a/html_resources/tagmap.json b/html_resources/tagmap.json
index 0a99fd4..b516f57 100644
--- a/html_resources/tagmap.json
+++ b/html_resources/tagmap.json
@@ -8,26 +8,28 @@
 "autohide_sidebar.css":["autohide","sidebar"],
 "autohide_tabstoolbar.css":["autohide","tabs","toolbars"],
 "autohide_toolbox.css":["autohide","toolbars","fullscreen"],
-"blank_page_background.css":["dark-mode","flash","blank","background"],
+"blank_page_background.css":["dark-mode"],
 "bookmarksbar_on_new_tabs_only.css":["legacy"],
 "button_effect_icon_glow.css":["buttons","effect","minimal"],
 "button_effect_scale_onclick.css":["buttons","effect","minimal"],
 "button_effect_scale_onhover.css":["buttons","effect","minimal"],
-"classic_grid_main_menu_popup.css":["classic","grid","menu","popup"],
+"classic_grid_main_menu_popup.css":["classic","menu","popup"],
 "click_selected_tab_to_focus_urlbar.css":["hack","tabs","urlbar"],
-"color_variable_template.css":["theme","color","variables"],
+"color_variable_template.css":["colors"],
 "combined_favicon_and_tab_close_button.css":["tab","icon","close"],
 "combined_tabs_and_main_toolbars.css":["minimal","tabs","toolbars"],
 "compact_urlbar_megabar.css":["urlbar","minimal"],
 "dark_additional_windows.css":["windows","dark-mode"],
-"dark_checkboxes_and_radios.css":["widgets","dark-mode"],
-"dark_context_menus.css":["dark-mode","menus"],
+"dark_checkboxes_and_radios.css":["dark-mode"],
+"dark_context_menus.css":["dark-mode","menu","popup"],
 "dark_theme_aware_statuspanel.css":["staus","dark-mode"],
-"disable_newtab_on_middle_click.css":["hack","newtab","tab"],
+"disable_newtab_on_middle_click.css":["hack","tabs"],
+"fake_statusbar_w_bookmarksbar.css":["hack","status","toolbars","bookmarks"],
+"fake_urlbar_dropmarker.css":["urlbar","hack"],
 "fake_statusbar_w_menubar.css":["hack","status","toolbars","menubar"],
-"floating_findbar_on_top.css":["findbar","overlay"],
-"full_width_urlbar_popup.css":["ulrbar","popup"],
-"google_style_urlbar_popup.css":["urlbar","popup"],
+"floating_findbar_on_top.css":["findbar"],
+"full_width_urlbar_popup.css":["legacy"],
+"google_style_urlbar_popup.css":["legacy"],
 "grid_overflow_menu.css":["popup","menu"],
 "hide_statuspanel_when_fullscreen.css":["status","fullscreen","hiding"],
 "hide_tabs_toolbar.css":["hiding","tabs","toolbars"],
@@ -39,7 +41,7 @@
 "menubar_in_toolbar.css":["toolbars","minimal"],
 "menubar_in_toolbar_oneliner_compatible.css":["toolbars","minimal"],
 "minimal_in-UI_scrollbars.css":["minimal","scrollbar"],
-"minimal_text_fields.css":["minimal","urlbar","searchbar"],
+"minimal_text_fields.css":["minimal","urlbar"],
 "minimal_toolbarbuttons.css":["minimal","buttons"],
 "minimal_toolbarbuttons_v2.css":["minimal","buttons"],
 "minimal_toolbarbuttons_v3.css":["minimal","buttons"],
@@ -47,7 +49,7 @@
 "multi-row_bookmarks.css":["multi-row","bookmarks"],
 "multi-row_oneliner_combo_patch.css":["multi-row","patch","1-line","minimal"],
 "multi-row_tabs.css":["tabs","multi-row","toolbars"],
-"multi-row_tabs_Fx66%2B.css":["legacy"],
+"multi-row_tabs_Fx66+.css":["legacy"],
 "multi-row_tabs_below_content.css":["multi-row","tabs","toolbars"],
 "multi-row_tabs_below_content_legacy.css":["legacy"],
 "multi-row_tabs_legacy.css":["legacy"],
@@ -69,8 +71,8 @@
 "show_window_title_in_menubar.css":["windows","menubar"],
 "status_inside_urlbar.css":["status","urlbar","hack"],
 "tab_close_button_always_on_hover.css":["tab","close"],
-"tab_loading_progress_throbber.css":["tab","icon","animation"],
-"tabs_animated_gradient_border.css":["hack","animation"],
+"tab_loading_progress_throbber.css":["tab","icon","effect"],
+"tabs_animated_gradient_border.css":["hack","effect","tabs"],
 "tabs_below_content.css":["toolbars","tabs"],
 "tabs_fill_available_width.css":["tab","tabs"],
 "textual_context_navigation.css":["navigation","popup","menu"],
@@ -81,7 +83,7 @@
 "theme_toolbars.css":["legacy"],
 "toggle_bookmarksbar_with_alt.css":["legacy"],
 "toggle_tabs_toolbar_with_alt.css":["hack","tabs","menubar"],
-"toolbarbuttons_icon%2Blabel.css":["buttons","icon"],
+"toolbarbuttons_icon+label.css":["buttons","icon"],
 "toolbars_below_content.css":["tabs","toolbars"],
 "urlbar_and_popup_equal_width.css":["legacy"],
 "urlbar_centered_text.css":["urlbar"],
@@ -91,7 +93,5 @@
 "vertical_context_navigation.css":["navigation","menu","popup"],
 "vertical_context_navigation_v2.css":["navigation","menu","popup"],
 "vertical_menubar.css":["menubar","hack"],
-"window_control_placeholder_support.css":["window-control","patch"],
-"fake_statusbar_w_bookmarksbar.css":["hack","status","toolbars","bookmarks"],
-"fake_urlbar_dropmarker.css":["urlbar","hack"]
+"window_control_placeholder_support.css":["window-control","patch"]
 }
diff --git a/tags.csv b/tags.csv
index 240979b..c03daea 100644
--- a/tags.csv
+++ b/tags.csv
@@ -7,26 +7,28 @@ autohide_navigation_button.css,autohide,minimal,navigation,buttons
 autohide_sidebar.css,autohide,sidebar
 autohide_tabstoolbar.css,autohide,tabs,toolbars
 autohide_toolbox.css,autohide,toolbars,fullscreen
-blank_page_background.css,dark-mode,flash,blank,background
+blank_page_background.css,dark-mode
 bookmarksbar_on_new_tabs_only.css,legacy
 button_effect_icon_glow.css,buttons,effect,minimal
 button_effect_scale_onclick.css,buttons,effect,minimal
 button_effect_scale_onhover.css,buttons,effect,minimal
-classic_grid_main_menu_popup.css,classic,grid,menu,popup
+classic_grid_main_menu_popup.css,classic,menu,popup
 click_selected_tab_to_focus_urlbar.css,hack,tabs,urlbar
-color_variable_template.css,theme,color,variables
+color_variable_template.css,colors
 combined_favicon_and_tab_close_button.css,tab,icon,close
 combined_tabs_and_main_toolbars.css,minimal,tabs,toolbars
 compact_urlbar_megabar.css,urlbar,minimal
 dark_additional_windows.css,windows,dark-mode
-dark_checkboxes_and_radios.css,widgets,dark-mode
-dark_context_menus.css,dark-mode,menus
+dark_checkboxes_and_radios.css,dark-mode
+dark_context_menus.css,dark-mode,menu,popup
 dark_theme_aware_statuspanel.css,staus,dark-mode
-disable_newtab_on_middle_click.css,hack,newtab,tab
+disable_newtab_on_middle_click.css,hack,tabs
+fake_statusbar_w_bookmarksbar.css,hack,status,toolbars,bookmarks
+fake_urlbar_dropmarker.css,urlbar,hack
 fake_statusbar_w_menubar.css,hack,status,toolbars,menubar
-floating_findbar_on_top.css,findbar,overlay
-full_width_urlbar_popup.css,ulrbar,popup
-google_style_urlbar_popup.css,urlbar,popup
+floating_findbar_on_top.css,findbar
+full_width_urlbar_popup.css,legacy
+google_style_urlbar_popup.css,legacy
 grid_overflow_menu.css,popup,menu
 hide_statuspanel_when_fullscreen.css,status,fullscreen,hiding
 hide_tabs_toolbar.css,hiding,tabs,toolbars
@@ -38,7 +40,7 @@ linux_gtk_window_control_patch.css,patch,window-control
 menubar_in_toolbar.css,toolbars,minimal
 menubar_in_toolbar_oneliner_compatible.css,toolbars,minimal
 minimal_in-UI_scrollbars.css,minimal,scrollbar
-minimal_text_fields.css,minimal,urlbar,searchbar
+minimal_text_fields.css,minimal,urlbar
 minimal_toolbarbuttons.css,minimal,buttons
 minimal_toolbarbuttons_v2.css,minimal,buttons
 minimal_toolbarbuttons_v3.css,minimal,buttons
@@ -46,7 +48,7 @@ more_visible_tab_icon.css,tab,icon
 multi-row_bookmarks.css,multi-row,bookmarks
 multi-row_oneliner_combo_patch.css,multi-row,patch,1-line,minimal
 multi-row_tabs.css,tabs,multi-row,toolbars
-multi-row_tabs_Fx66%2B.css,legacy
+multi-row_tabs_Fx66+.css,legacy
 multi-row_tabs_below_content.css,multi-row,tabs,toolbars
 multi-row_tabs_below_content_legacy.css,legacy
 multi-row_tabs_legacy.css,legacy
@@ -68,8 +70,8 @@ show_navbar_on_focus_only.css,urlbar,nav-bar,toolbars,hiding
 show_window_title_in_menubar.css,windows,menubar
 status_inside_urlbar.css,status,urlbar,hack
 tab_close_button_always_on_hover.css,tab,close
-tab_loading_progress_throbber.css,tab,icon,animation
-tabs_animated_gradient_border.css,hack,animation
+tab_loading_progress_throbber.css,tab,icon,effect
+tabs_animated_gradient_border.css,hack,effect,tabs
 tabs_below_content.css,toolbars,tabs
 tabs_fill_available_width.css,tab,tabs
 textual_context_navigation.css,navigation,popup,menu
@@ -80,7 +82,7 @@ theme_sidebar.css,legacy
 theme_toolbars.css,legacy
 toggle_bookmarksbar_with_alt.css,legacy
 toggle_tabs_toolbar_with_alt.css,hack,tabs,menubar
-toolbarbuttons_icon%2Blabel.css,buttons,icon
+toolbarbuttons_icon+label.css,buttons,icon
 toolbars_below_content.css,tabs,toolbars
 urlbar_and_popup_equal_width.css,legacy
 urlbar_centered_text.css,urlbar
@@ -91,5 +93,3 @@ vertical_context_navigation.css,navigation,menu,popup
 vertical_context_navigation_v2.css,navigation,menu,popup
 vertical_menubar.css,menubar,hack
 window_control_placeholder_support.css,window-control,patch
-fake_statusbar_w_bookmarksbar.css,hack,status,toolbars,bookmarks
-fake_urlbar_dropmarker.css,urlbar,hack