diff --git a/html_resources/tagmap.json b/html_resources/tagmap.json
index e38c8d5..8f335a4 100644
--- a/html_resources/tagmap.json
+++ b/html_resources/tagmap.json
@@ -6,7 +6,8 @@
"autohide_menubar.css":["autohide","menubar","toolbars"],
"autohide_navigation_button.css":["autohide","minimal","navigation","buttons"],
"autohide_sidebar.css":["autohide","sidebar"],
-"autohide_tabstoolbar.css":["autohide","tabs","toolbars"],
+"autohide_tabstoolbar_v2.css":["autohide","tabs","toolbars"],
+"deprecated/autohide_tabstoolbar.css":["legacy"],
"autohide_toolbox.css":["autohide","toolbars","fullscreen"],
"deprecated/blank_page_background.css":["legacy"],
"deprecated/bookmarksbar_on_new_tabs_only.css":["legacy"],
@@ -20,7 +21,7 @@
"centered_statuspanel.css":["status"],
"centered_tab_content.css":["tab","icon"],
"centered_tab_label.css":["tab"],
-"centered_top_statuspanel.css":["legacy"],
+"deprecated/centered_top_statuspanel.css":["legacy"],
"context_menus_more_proton.css":["proton","menu"],
"classic_firefox_menu_button.css":["classic","menu"],
"classic_grid_main_menu_popup.css":["classic","menu","popup"],
@@ -52,12 +53,12 @@
"grid_overflow_menu.css":["popup","menu"],
"hide_statuspanel_when_fullscreen.css":["status","fullscreen","hiding"],
"hide_tabs_scrollbuttons.css":["tabs","hiding","buttons","minimal"],
-"hide_tabs_toolbar.css":["hiding","tabs","toolbars"],
+"deprecated/hide_tabs_toolbar.css":["legacy"],
"hide_tabs_toolbar_v2.css":["hiding","tabs","toolbars"],
-"hide_tabs_toolbar_osx.css":["tabs","toolbars","hiding","minimal"],
-"hide_tabs_toolbar_w_alltabs_button.css":["tabs","hiding","toolbars"],
+"deprecated/hide_tabs_toolbar_osx.css":["legacy"],
+"deprecated/hide_tabs_toolbar_w_alltabs_button.css":["legacy"],
"hide_tabs_with_one_tab.css":["hiding","tabs","toolbars"],
-"hide_tabs_with_one_tab_w_window_controls.css":["hiding","tabs","toolbars"],
+"deprecated/hide_tabs_with_one_tab_w_window_controls.css":["legacy"],
"hide_toolbox_top_bottom_borders.css":["toolbars","hiding"],
"hide_urlbar_first_row.css":["urlbar","popup","hiding"],
"icon_only_tabs.css":["tab","icon"],
@@ -82,20 +83,20 @@
"minimal_toolbarbuttons_v3.css":["minimal","buttons"],
"more_visible_tab_icon.css":["tab","icon"],
"multi-row_bookmarks.css":["multi-row","bookmarks","toolbars"],
-"multi-row_main_toolbar.css":["urlbar","toolbars","multi-row","hack"],
+"deprecated/multi-row_main_toolbar.css":["legacy"],
"multi-row_oneliner_combo_patch.css":["multi-row","patch","one-line","minimal"],
"multi-row_tabs.css":["tabs","multi-row","toolbars"],
"deprecated/multi-row_tabs_Fx66+.css":["legacy"],
-"multi-row_tabs_below_content.css":["multi-row","tabs","toolbars"],
+"deprecated/multi-row_tabs_below_content.css":["legacy"],
"deprecated/multi-row_tabs_below_content_legacy.css":["legacy"],
"deprecated/multi-row_tabs_legacy.css":["legacy"],
"multi-row_tabs_separate_pinned_row_patch.css":["tabs","multi-row","patch"],
"multi-row_tabs_window_control_patch.css":["patch","multi-row","window-control"],
"navbar_below_content.css":["nav-bar","toolbars"],
-"navbar_tabs_oneliner.css":["one-line","minimal","tabs","nav-bar","toolbars"],
-"navbar_tabs_oneliner_menu_buttons_on_right.css":["one-line","minimal","tabs","nav-bar","toolbars","patch","menubar"],
-"navbar_tabs_oneliner_tabs_on_left.css":["one-line","minimal","tabs","nav-bar","toolbars"],
-"navbar_tabs_responsive_oneliner.css":["one-line","minimal","tabs","nav-bar","toolbars"],
+"deprecated/navbar_tabs_oneliner.css":["legacy"],
+"deprecated/navbar_tabs_oneliner_menu_buttons_on_right.css":["legacy"],
+"deprecated/navbar_tabs_oneliner_tabs_on_left.css":["legacy"],
+"deprecated/navbar_tabs_responsive_oneliner.css":["legacy"],
"navigation_buttons_inside_urlbar.css":["navigation","buttons","urlbar"],
"newtab_button_always_on_hover.css":["tabs","hiding"],
"non_floating_sharp_tabs.css":["tab","proton","buttons"],
@@ -138,11 +139,11 @@
"tab_loading_progress_throbber.css":["tab","icon","effect"],
"tab_separator_lines.css":["tab","proton"],
"tabs_animated_gradient_border.css":["hack","effect","tabs"],
-"tabs_below_content.css":["toolbars","tabs"],
+"deprecated/tabs_below_content.css":["legacy"],
"tabs_below_content_v2.css":["toolbars","tabs"],
"tabs_fill_available_width.css":["tab","tabs"],
-"tabs_on_bottom.css":["tabs","toolbars","classic"],
-"tabs_on_bottom_menubar_on_top_patch.css":["tabs","menubar","toolbars","classic","patch"],
+"deprecated/tabs_on_bottom.css":["legacy"],
+"deprecated/tabs_on_bottom_menubar_on_top_patch.css":["legacy"],
"textual_context_navigation.css":["navigation","popup","menu"],
"textual_searchbar_one-offs.css":["popup","menu"],
"deprecated/theme_additional_windows.css":["legacy"],
@@ -152,7 +153,7 @@
"deprecated/theme_sidebar.css":["legacy"],
"deprecated/theme_toolbars.css":["legacy"],
"deprecated/toggle_bookmarksbar_with_alt.css":["legacy"],
-"toggle_tabs_toolbar_with_alt.css":["hack","tabs","menubar"],
+"deprecated/toggle_tabs_toolbar_with_alt.css":["legacy"],
"toolbarbuttons_icon+label.css":["buttons","icon"],
"toolbarbuttons_in_tabs_periphery.css":["tabs","hack","buttons"],
"toolbars_below_content.css":["tabs","toolbars"],
@@ -173,8 +174,8 @@
"vertical_tabs.css":["tabs","hack"],
"vertical_urlbar_one-off_items.css":["urlbar"],
"window_control_fallback_for_custom_windows_theme.css":["window-control","buttons","colors","patch"],
-"window_control_force_linux_system_style.css":["window-control","buttons","icon"],
-"window_control_placeholder_support.css":["window-control","patch"],
+"deprecated/window_control_force_linux_system_style.css":["legacy"],
+"deprecated/window_control_placeholder_support.css":["legacy"],
"iconized_places_context_menu.css":["menu","icon"],
"iconized_tabs_context_menu.css":["menu","icon"],
"iconized_textbox_context_menu.css":["menu","icon"],
diff --git a/tags.csv b/tags.csv
index f9c37f2..81618db 100644
--- a/tags.csv
+++ b/tags.csv
@@ -5,7 +5,8 @@ autohide_main_toolbar.css,toolbars,autohide,nav-bar
autohide_menubar.css,autohide,menubar,toolbars
autohide_navigation_button.css,autohide,minimal,navigation,buttons
autohide_sidebar.css,autohide,sidebar
-autohide_tabstoolbar.css,autohide,tabs,toolbars
+autohide_tabstoolbar_v2.css,autohide,tabs,toolbars
+deprecated/autohide_tabstoolbar.css,legacy
autohide_toolbox.css,autohide,toolbars,fullscreen
deprecated/blank_page_background.css,legacy
deprecated/bookmarksbar_on_new_tabs_only.css,legacy
@@ -19,7 +20,7 @@ buttonlike_toolbarbuttons.css,buttons
centered_statuspanel.css,status
centered_tab_content.css,tab,icon
centered_tab_label.css,tab
-centered_top_statuspanel.css,legacy
+deprecated/centered_top_statuspanel.css,legacy
context_menus_more_proton.css,proton,menu
classic_firefox_menu_button.css,classic,menu
classic_grid_main_menu_popup.css,classic,menu,popup
@@ -51,12 +52,12 @@ deprecated/google_style_urlbar_popup.css,legacy
grid_overflow_menu.css,popup,menu
hide_statuspanel_when_fullscreen.css,status,fullscreen,hiding
hide_tabs_scrollbuttons.css,tabs,hiding,buttons,minimal
-hide_tabs_toolbar.css,hiding,tabs,toolbars
+deprecated/hide_tabs_toolbar.css,legacy
hide_tabs_toolbar_v2.css,hiding,tabs,toolbars
-hide_tabs_toolbar_osx.css,tabs,toolbars,hiding,minimal
-hide_tabs_toolbar_w_alltabs_button.css,tabs,hiding,toolbars
+deprecated/hide_tabs_toolbar_osx.css,legacy
+deprecated/hide_tabs_toolbar_w_alltabs_button.css,legacy
hide_tabs_with_one_tab.css,hiding,tabs,toolbars
-hide_tabs_with_one_tab_w_window_controls.css,hiding,tabs,toolbars
+deprecated/hide_tabs_with_one_tab_w_window_controls.css,legacy
hide_toolbox_top_bottom_borders.css,toolbars,hiding
hide_urlbar_first_row.css,urlbar,popup,hiding
icon_only_tabs.css,tab,icon
@@ -81,20 +82,20 @@ minimal_toolbarbuttons_v2.css,minimal,buttons
minimal_toolbarbuttons_v3.css,minimal,buttons
more_visible_tab_icon.css,tab,icon
multi-row_bookmarks.css,multi-row,bookmarks,toolbars
-multi-row_main_toolbar.css,urlbar,toolbars,multi-row,hack
+deprecated/multi-row_main_toolbar.css,legacy
multi-row_oneliner_combo_patch.css,multi-row,patch,one-line,minimal
multi-row_tabs.css,tabs,multi-row,toolbars
deprecated/multi-row_tabs_Fx66+.css,legacy
-multi-row_tabs_below_content.css,multi-row,tabs,toolbars
+deprecated/multi-row_tabs_below_content.css,legacy
deprecated/multi-row_tabs_below_content_legacy.css,legacy
deprecated/multi-row_tabs_legacy.css,legacy
multi-row_tabs_separate_pinned_row_patch.css,tabs,multi-row,patch
multi-row_tabs_window_control_patch.css,patch,multi-row,window-control
navbar_below_content.css,nav-bar,toolbars
-navbar_tabs_oneliner.css,one-line,minimal,tabs,nav-bar,toolbars
-navbar_tabs_oneliner_menu_buttons_on_right.css,one-line,minimal,tabs,nav-bar,toolbars,patch,menubar
-navbar_tabs_oneliner_tabs_on_left.css,one-line,minimal,tabs,nav-bar,toolbars
-navbar_tabs_responsive_oneliner.css,one-line,minimal,tabs,nav-bar,toolbars
+deprecated/navbar_tabs_oneliner.css,legacy
+deprecated/navbar_tabs_oneliner_menu_buttons_on_right.css,legacy
+deprecated/navbar_tabs_oneliner_tabs_on_left.css,legacy
+deprecated/navbar_tabs_responsive_oneliner.css,legacy
navigation_buttons_inside_urlbar.css,navigation,buttons,urlbar
newtab_button_always_on_hover.css,tabs,hiding
non_floating_sharp_tabs.css,tab,proton,buttons
@@ -137,11 +138,11 @@ tab_loading_progress_bar.css,tab,effect
tab_loading_progress_throbber.css,tab,icon,effect
tab_separator_lines.css,tab,proton
tabs_animated_gradient_border.css,hack,effect,tabs
-tabs_below_content.css,toolbars,tabs
+deprecated/tabs_below_content.css,legacy
tabs_below_content_v2.css,toolbars,tabs
tabs_fill_available_width.css,tab,tabs
-tabs_on_bottom.css,tabs,toolbars,classic
-tabs_on_bottom_menubar_on_top_patch.css,tabs,menubar,toolbars,classic,patch
+deprecated/tabs_on_bottom.css,legacy
+deprecated/tabs_on_bottom_menubar_on_top_patch.css,legacy
textual_context_navigation.css,navigation,popup,menu
textual_searchbar_one-offs.css,popup,menu
deprecated/theme_additional_windows.css,legacy
@@ -151,7 +152,7 @@ deprecated/theme_popups_and_menus.css,legacy
deprecated/theme_sidebar.css,legacy
deprecated/theme_toolbars.css,legacy
deprecated/toggle_bookmarksbar_with_alt.css,legacy
-toggle_tabs_toolbar_with_alt.css,hack,tabs,menubar
+deprecated/toggle_tabs_toolbar_with_alt.css,legacy
toolbarbuttons_icon+label.css,buttons,icon
toolbarbuttons_in_tabs_periphery.css,tabs,hack,buttons
toolbars_below_content.css,tabs,toolbars
@@ -172,8 +173,8 @@ vertical_popup_menubar.css,menubar,menu,toolbars,popup
vertical_tabs.css,tabs,hack
vertical_urlbar_one-off_items.css,urlbar
window_control_fallback_for_custom_windows_theme.css,window-control,buttons,colors,patch
-window_control_force_linux_system_style.css,window-control,buttons,icon
-window_control_placeholder_support.css,window-control,patch
+deprecated/window_control_force_linux_system_style.css,legacy
+deprecated/window_control_placeholder_support.css,legacy
iconized_places_context_menu.css,menu,icon
iconized_tabs_context_menu.css,menu,icon
iconized_textbox_context_menu.css,menu,icon