diff --git a/chrome/blank_page_background.css b/chrome/deprecated/blank_page_background.css
similarity index 100%
rename from chrome/blank_page_background.css
rename to chrome/deprecated/blank_page_background.css
diff --git a/chrome/bookmarks_toolbar_on_newtabs_only.css b/chrome/deprecated/bookmarks_toolbar_on_newtabs_only.css
similarity index 100%
rename from chrome/bookmarks_toolbar_on_newtabs_only.css
rename to chrome/deprecated/bookmarks_toolbar_on_newtabs_only.css
diff --git a/chrome/dark_additional_windows.css b/chrome/deprecated/dark_additional_windows.css
similarity index 100%
rename from chrome/dark_additional_windows.css
rename to chrome/deprecated/dark_additional_windows.css
diff --git a/chrome/dark_context_menus.css b/chrome/deprecated/dark_context_menus.css
similarity index 100%
rename from chrome/dark_context_menus.css
rename to chrome/deprecated/dark_context_menus.css
diff --git a/chrome/dark_date_picker_panel.css b/chrome/deprecated/dark_date_picker_panel.css
similarity index 100%
rename from chrome/dark_date_picker_panel.css
rename to chrome/deprecated/dark_date_picker_panel.css
diff --git a/chrome/dark_theme_aware_statuspanel.css b/chrome/deprecated/dark_theme_aware_statuspanel.css
similarity index 100%
rename from chrome/dark_theme_aware_statuspanel.css
rename to chrome/deprecated/dark_theme_aware_statuspanel.css
diff --git a/chrome/overlay_scrollbars.as.css b/chrome/deprecated/overlay_scrollbars.as.css
similarity index 100%
rename from chrome/overlay_scrollbars.as.css
rename to chrome/deprecated/overlay_scrollbars.as.css
diff --git a/chrome/passive_tab_audio_label.css b/chrome/deprecated/passive_tab_audio_label.css
similarity index 100%
rename from chrome/passive_tab_audio_label.css
rename to chrome/deprecated/passive_tab_audio_label.css
diff --git a/html_resources/tagmap.json b/html_resources/tagmap.json
index 6089b4b..55bbbb9 100644
--- a/html_resources/tagmap.json
+++ b/html_resources/tagmap.json
@@ -8,13 +8,14 @@
 "autohide_sidebar.css":["autohide","sidebar"],
 "autohide_tabstoolbar.css":["autohide","tabs","toolbars"],
 "autohide_toolbox.css":["autohide","toolbars","fullscreen"],
-"blank_page_background.css":["dark-mode"],
+"deprecated/blank_page_background.css":["legacy"],
 "deprecated/bookmarksbar_on_new_tabs_only.css":["legacy"],
-"bookmarks_toolbar_on_newtabs_only.css":["bookmarks","toolbars","autohide","hiding"],
+"deprecated/bookmarks_toolbar_on_newtabs_only.css":["legacy"],
 "button_effect_icon_glow.css":["buttons","effect"],
 "button_effect_scale_onclick.css":["buttons","effect"],
 "button_effect_scale_onhover.css":["buttons","effect"],
 "buttonlike_toolbarbuttons.css":["buttons"],
+"centered_statuspanel.css":["status"],
 "centered_tab_content.css":["tab","icon"],
 "centered_tab_label.css":["tab"],
 "centered_top_statuspanel.css":["legacy"],
@@ -25,16 +26,17 @@
 "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_extensions_panel.css":["popup","menu","minimal"],
 "compact_proton.css":["menu","popup","tabs","proton"],
 "compact_urlbar_megabar.css":["urlbar","minimal"],
 "curved_tabs.css":["tabs","tab"],
 "custom_default_tab_favicons.css":["tab","icon"],
 "custom_menupopup_check_icons.css":["icon","menu","minimal","popup"],
-"dark_additional_windows.css":["windows","dark-mode"],
+"deprecated/dark_additional_windows.css":["legacy"],
 "dark_checkboxes_and_radios.css":["dark-mode"],
-"dark_context_menus.css":["dark-mode","menu","popup"],
-"dark_date_picker_panel.css":["popup","dark-mode"],
-"dark_theme_aware_statuspanel.css":["status","dark-mode"],
+"deprecated/dark_context_menus.css":["dark-mode","legacy"],
+"deprecated/dark_date_picker_panel.css":["legacy"],
+"deprecated/dark_theme_aware_statuspanel.css":["legacy"],
 "disable_newtab_on_middle_click.css":["hack","tabs"],
 "drag_window_from_urlbar.css":["urlbar","windows"],
 "fake_statusbar_w_bookmarksbar.css":["hack","status","toolbars","bookmarks"],
@@ -94,11 +96,12 @@
 "non_floating_sharp_tabs.css":["tab","proton","buttons"],
 "numbered_tabs.css":["tabs"],
 "overlay_menubar.css":["menubar"],
-"overlay_scrollbars.as.css":["scrollbar"],
+"deprecated/overlay_scrollbars.as.css":["legacy"],
+"overlay_sidebar_header.css":["sidebar","hack"],
 "overlay_tab_audio_icons.css":["icon","tab"],
 "page_action_buttons_on_hover.css":["urlbar","minimal","effect"],
 "page_action_buttons_on_urlbar_hover.css":["urlbar","icon","minimal","autohide"],
-"passive_tab_audio_label.css":["tab","proton"],
+"deprecated/passive_tab_audio_label.css":["legacy"],
 "pinned_tabs_on_right.css":["tabs"],
 "privatemode_indicator_as_menu_button.css":["icon","buttons"],
 "proton_dark_light_notifications.css":["popup","proton"],
@@ -115,9 +118,12 @@
 "show_toolbars_in_popup_windows.css":["toolbars","popup"],
 "show_window_title_in_menubar.css":["windows","menubar"],
 "shrinking_pinned_tabs.css":["tab"],
+"status_inside_menubar.css":["menubar","status","hack"],
 "status_inside_urlbar.css":["status","urlbar","hack"],
 "status_inside_urlbar_v2.css":["status","urlbar","status","effect","hack"],
+"tab_animated_active_border.css":["tab","effect","colors"],
 "tab_close_button_always_on_hover.css":["tab","close"],
+"tab_closing_animation.css":["tab","effect"],
 "tab_effect_scale_onclick.css":["tab","effect"],
 "tab_line_loading_indicator.css":["tab","icon","effect"],
 "tab_loading_progress_bar.css":["tab","effect"],
@@ -139,6 +145,7 @@
 "deprecated/toggle_bookmarksbar_with_alt.css":["legacy"],
 "toggle_tabs_toolbar_with_alt.css":["hack","tabs","menubar"],
 "toolbarbuttons_icon+label.css":["buttons","icon"],
+"toolbarbuttons_in_tabs_periphery.css":["tabs","hack","buttons"],
 "toolbars_below_content.css":["tabs","toolbars"],
 "deprecated/urlbar_and_popup_equal_width.css":["legacy"],
 "urlbar_centered_text.css":["urlbar"],
@@ -154,15 +161,8 @@
 "vertical_context_navigation_v2.css":["navigation","menu","popup"],
 "vertical_menubar.css":["menubar","hack"],
 "vertical_popup_menubar.css":["menubar","menu","toolbars","popup"],
+"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"],
-"vertical_urlbar_one-off_items.css":["urlbar"],
-"overlay_sidebar_header.css":["sidebar","hack"],
-"compact_extensions_panel.css":["popup","menu","minimal"],
-"tab_animated_active_border.css":["tab","effect","colors"],
-"status_inside_menubar.css":["menubar","status","hack"],
-"centered_statuspanel.css":["status"],
-"tab_closing_animation.css":["tab","effect"],
-"toolbarbuttons_in_tabs_periphery.css":["tabs","hack","buttons"]
+"window_control_placeholder_support.css":["window-control","patch"]
 }
diff --git a/tags.csv b/tags.csv
index 5931e94..5cdfb04 100644
--- a/tags.csv
+++ b/tags.csv
@@ -7,13 +7,14 @@ 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
+deprecated/blank_page_background.css,legacy
 deprecated/bookmarksbar_on_new_tabs_only.css,legacy
-bookmarks_toolbar_on_newtabs_only.css,bookmarks,toolbars,autohide,hiding
+deprecated/bookmarks_toolbar_on_newtabs_only.css,legacy
 button_effect_icon_glow.css,buttons,effect
 button_effect_scale_onclick.css,buttons,effect
 button_effect_scale_onhover.css,buttons,effect
 buttonlike_toolbarbuttons.css,buttons
+centered_statuspanel.css,status
 centered_tab_content.css,tab,icon
 centered_tab_label.css,tab
 centered_top_statuspanel.css,legacy
@@ -24,16 +25,17 @@ click_selected_tab_to_focus_urlbar.css,hack,tabs,urlbar
 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_extensions_panel.css,popup,menu,minimal
 compact_proton.css,menu,popup,tabs,proton
 compact_urlbar_megabar.css,urlbar,minimal
 curved_tabs.css,tabs,tab
 custom_default_tab_favicons.css,tab,icon
 custom_menupopup_check_icons.css,icon,menu,minimal,popup
-dark_additional_windows.css,windows,dark-mode
+deprecated/dark_additional_windows.css,legacy
 dark_checkboxes_and_radios.css,dark-mode
-dark_context_menus.css,dark-mode,menu,popup
-dark_date_picker_panel.css,popup,dark-mode
-dark_theme_aware_statuspanel.css,status,dark-mode
+deprecated/dark_context_menus.css,dark-mode,legacy
+deprecated/dark_date_picker_panel.css,legacy
+deprecated/dark_theme_aware_statuspanel.css,legacy
 disable_newtab_on_middle_click.css,hack,tabs
 drag_window_from_urlbar.css,urlbar,windows
 fake_statusbar_w_bookmarksbar.css,hack,status,toolbars,bookmarks
@@ -93,11 +95,12 @@ newtab_button_always_on_hover.css,tabs,hiding
 non_floating_sharp_tabs.css,tab,proton,buttons
 numbered_tabs.css,tabs
 overlay_menubar.css,menubar
-overlay_scrollbars.as.css,scrollbar
+deprecated/overlay_scrollbars.as.css,legacy
+overlay_sidebar_header.css,sidebar,hack
 overlay_tab_audio_icons.css,icon,tab
 page_action_buttons_on_hover.css,urlbar,minimal,effect
 page_action_buttons_on_urlbar_hover.css,urlbar,icon,minimal,autohide
-passive_tab_audio_label.css,tab,proton
+deprecated/passive_tab_audio_label.css,legacy
 pinned_tabs_on_right.css,tabs
 privatemode_indicator_as_menu_button.css,icon,buttons
 proton_dark_light_notifications.css,popup,proton
@@ -114,9 +117,12 @@ show_navbar_on_focus_only.css,urlbar,nav-bar,toolbars,hiding
 show_toolbars_in_popup_windows.css,toolbars,popup
 show_window_title_in_menubar.css,windows,menubar
 shrinking_pinned_tabs.css,tab,
+status_inside_menubar.css,menubar,status,hack
 status_inside_urlbar.css,status,urlbar,hack
 status_inside_urlbar_v2.css,status,urlbar,status,effect,hack
+tab_animated_active_border.css,tab,effect,colors
 tab_close_button_always_on_hover.css,tab,close
+tab_closing_animation.css,tab,effect
 tab_effect_scale_onclick.css,tab,effect
 tab_line_loading_indicator.css,tab,icon,effect
 tab_loading_progress_bar.css,tab,effect
@@ -138,6 +144,7 @@ deprecated/theme_toolbars.css,legacy
 deprecated/toggle_bookmarksbar_with_alt.css,legacy
 toggle_tabs_toolbar_with_alt.css,hack,tabs,menubar
 toolbarbuttons_icon+label.css,buttons,icon
+toolbarbuttons_in_tabs_periphery.css,tabs,hack,buttons
 toolbars_below_content.css,tabs,toolbars
 deprecated/urlbar_and_popup_equal_width.css,legacy
 urlbar_centered_text.css,urlbar
@@ -153,14 +160,7 @@ vertical_context_navigation.css,navigation,menu,popup
 vertical_context_navigation_v2.css,navigation,menu,popup
 vertical_menubar.css,menubar,hack
 vertical_popup_menubar.css,menubar,menu,toolbars,popup
+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
-vertical_urlbar_one-off_items.css,urlbar
-overlay_sidebar_header.css,sidebar,hack
-compact_extensions_panel.css,popup,menu,minimal
-tab_animated_active_border.css,tab,effect,colors
-status_inside_menubar.css,menubar,status,hack
-centered_statuspanel.css,status
-tab_closing_animation.css,tab,effect
-toolbarbuttons_in_tabs_periphery.css,tabs,hack,buttons