diff --git a/chrome/hide_tabs_toolbar_w_alltabs_button.css b/chrome/hide_tabs_toolbar_w_alltabs_button.css
new file mode 100644
index 0000000..3dc7a9e
--- /dev/null
+++ b/chrome/hide_tabs_toolbar_w_alltabs_button.css
@@ -0,0 +1,20 @@
+/* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/hide_tabs_toolbar_w_with_alltabs_button.css made available under Mozilla Public License v. 2.0
+See the above repository for updates as well as full license text. */
+
+/* This is less flexible than hide_tabs_toolbar.css, but this method aims to preserve the alltabs button and show it and window controls next to the main menu button */
+
+/* Load window_control_placeholder_support.css before this stylesheet */
+
+#tabbrowser-tabs{ visibility: collapse }
+#TabsToolbar-customization-target{ -moz-box-pack: end; }
+#alltabs-button{ position: relative; z-index: 1 }
+#TabsToolbar > .titlebar-spacer{ display: none }
+#TabsToolbar{ margin-bottom: calc(-18px - 2 * (var(--toolbarbutton-inner-padding)))}
+
+:root{ --uc-titlebar-padding: 0px; --uc-window-control-width: 40px }
+:root[tabsintitlebar]{ --uc-window-control-width: 160px }
+:root[inFullscreen]{ --uc-window-control-width: 0px }
+@media  (-moz-os-version: windows-win7),(-moz-os-version: windows-win10){
+  :root[sizemode="maximized"][tabsintitlebar]{ --uc-titlebar-padding: 8px }
+}
+#titlebar{ -moz-appearance: none !important; margin-top: var(--uc-titlebar-padding) }
diff --git a/html_resources/tagmap.json b/html_resources/tagmap.json
index edaae56..eb9acf3 100644
--- a/html_resources/tagmap.json
+++ b/html_resources/tagmap.json
@@ -2,6 +2,7 @@
 "auto_devtools_theme_for_rdm.css":["devtools","colors"],
 "autohide_bookmarks_and_main_toolbars.css":["autohide","bookmarks","toolbars","nav-bar"],
 "autohide_bookmarks_toolbar.css":["autohide","bookmarks","toolbars"],
+"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"],
@@ -25,6 +26,7 @@
 "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"],
 "dark_checkboxes_and_radios.css":["dark-mode"],
@@ -42,10 +44,12 @@
 "hide_tabs_scrollbuttons.css":["tabs","hiding","buttons","minimal"],
 "hide_tabs_toolbar.css":["hiding","tabs","toolbars"],
 "hide_tabs_toolbar_osx.css":["tabs","toolbars","hiding","minimal"],
+"hide_tabs_toolbar_w_alltabs_button.css":["tabs","hiding","toolbars"],
 "hide_tabs_with_one_tab.css":["hiding","tabs","toolbars"],
 "hide_tabs_with_one_tab_w_window_controls.css":["hiding","tabs","toolbars"],
 "hide_toolbox_top_bottom_borders.css":["toolbars","hiding"],
 "hide_urlbar_first_row.css":["urlbar","popup","hiding"],
+"icon_only_tabs.css":["tab","icon"],
 "iconized_main_menu.css":["icon","popup","menu","proton"],
 "iconized_menubar_items.css":["menubar","menu","icon"],
 "inline_tab_audio_icons.css":["tab","icon","proton"],
@@ -74,18 +78,23 @@
 "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"],
 "navigation_buttons_inside_urlbar.css":["navigation","buttons","urlbar"],
+"non_floating_sharp_tabs.css":["tab","proton","buttons"],
 "numbered_tabs.css":["tabs"],
 "overlay_menubar.css":["menubar"],
 "overlay_scrollbars.as.css":["scrollbar"],
+"overlay_tab_audio_icons.css":["icon","tab"],
 "page_action_buttons_on_hover.css":["urlbar","minimal","effect"],
 "passive_tab_audio_label.css":["tab","proton"],
 "pinned_tabs_on_right.css":["tabs"],
 "privatemode_indicator_as_menu_button.css":["icon","buttons"],
+"proton_dark_light_notifications.css":["popup","proton"],
 "round_caption_buttons.css":["buttons","icon","window-control"],
 "round_ui_items.css":["buttons","icon","menu","tabs","toolbars","bookmarks"],
 "rounded_menupopups.css":["menu","popup","urlbar"],
 "scrollable_menupopups.css":["scrollbar","popup","menu"],
 "scrollable_urlbar_popup.css":["scrollbar","popup","urlbar"],
+"selected_tab_as_urlbar.css":["hack"],
+"sharp_menupopup_corners.css":["popup","menu","proton"],
 "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"],
@@ -124,13 +133,5 @@
 "vertical_menubar.css":["menubar","hack"],
 "vertical_popup_menubar.css":["menubar","menu","toolbars","popup"],
 "window_control_fallback_for_custom_windows_theme.css":["window-control","buttons","colors","patch"],
-"window_control_placeholder_support.css":["window-control","patch"],
-"non_floating_sharp_tabs.css":["tab","proton","buttons"],
-"autohide_main_toolbar.css":["toolbars","autohide","nav-bar"],
-"sharp_menupopup_corners.css":["popup","menu","proton"],
-"overlay_tab_audio_icons.css":["icon","tab"],
-"custom_default_tab_favicons.css":["tab","icon"],
-"selected_tab_as_urlbar.css":["hack"],
-"icon_only_tabs.css":["tab","icon"],
-"proton_dark_light_notifications.css":["popup","proton"]
+"window_control_placeholder_support.css":["window-control","patch"]
 }
diff --git a/tags.csv b/tags.csv
index 3034202..86a4a54 100644
--- a/tags.csv
+++ b/tags.csv
@@ -1,6 +1,7 @@
 auto_devtools_theme_for_rdm.css,devtools,colors
 autohide_bookmarks_and_main_toolbars.css,autohide,bookmarks,toolbars,nav-bar
 autohide_bookmarks_toolbar.css,autohide,bookmarks,toolbars
+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
@@ -24,6 +25,7 @@ combined_tabs_and_main_toolbars.css,minimal,tabs,toolbars
 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
 dark_checkboxes_and_radios.css,dark-mode
@@ -41,10 +43,12 @@ hide_statuspanel_when_fullscreen.css,status,fullscreen,hiding
 hide_tabs_scrollbuttons.css,tabs,hiding,buttons,minimal
 hide_tabs_toolbar.css,hiding,tabs,toolbars
 hide_tabs_toolbar_osx.css,tabs,toolbars,hiding,minimal
+hide_tabs_toolbar_w_alltabs_button.css,tabs,hiding,toolbars
 hide_tabs_with_one_tab.css,hiding,tabs,toolbars
 hide_tabs_with_one_tab_w_window_controls.css,hiding,tabs,toolbars
 hide_toolbox_top_bottom_borders.css,toolbars,hiding
 hide_urlbar_first_row.css,urlbar,popup,hiding
+icon_only_tabs.css,tab,icon
 iconized_main_menu.css,icon,popup,menu,proton
 iconized_menubar_items.css,menubar,menu,icon
 inline_tab_audio_icons.css,tab,icon,proton
@@ -73,18 +77,23 @@ navbar_tabs_oneliner_menu_buttons_on_right.css,one-line,minimal,tabs,nav-bar,too
 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
 navigation_buttons_inside_urlbar.css,navigation,buttons,urlbar
+non_floating_sharp_tabs.css,tab,proton,buttons
 numbered_tabs.css,tabs
 overlay_menubar.css,menubar
 overlay_scrollbars.as.css,scrollbar
+overlay_tab_audio_icons.css,icon,tab
 page_action_buttons_on_hover.css,urlbar,minimal,effect
 passive_tab_audio_label.css,tab,proton
 pinned_tabs_on_right.css,tabs
 privatemode_indicator_as_menu_button.css,icon,buttons
+proton_dark_light_notifications.css,popup,proton
 round_caption_buttons.css,buttons,icon,window-control
 round_ui_items.css,buttons,icon,menu,tabs,toolbars,bookmarks
 rounded_menupopups.css,menu,popup,urlbar
 scrollable_menupopups.css,scrollbar,popup,menu
 scrollable_urlbar_popup.css,scrollbar,popup,urlbar
+selected_tab_as_urlbar.css,hack
+sharp_menupopup_corners.css,popup,menu,proton
 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
@@ -124,11 +133,3 @@ vertical_menubar.css,menubar,hack
 vertical_popup_menubar.css,menubar,menu,toolbars,popup
 window_control_fallback_for_custom_windows_theme.css,window-control,buttons,colors,patch
 window_control_placeholder_support.css,window-control,patch
-non_floating_sharp_tabs.css,tab,proton,buttons
-autohide_main_toolbar.css,toolbars,autohide,nav-bar
-sharp_menupopup_corners.css,popup,menu,proton
-overlay_tab_audio_icons.css,icon,tab
-custom_default_tab_favicons.css,tab,icon
-selected_tab_as_urlbar.css,hack
-icon_only_tabs.css,tab,icon
-proton_dark_light_notifications.css,popup,proton