diff --git a/chrome/multi-row_tabs.css b/chrome/multi-row_tabs.css
index e17ebb6..82471e1 100644
--- a/chrome/multi-row_tabs.css
+++ b/chrome/multi-row_tabs.css
@@ -1,27 +1,21 @@
 /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/multi-row_tabs.css made available under Mozilla Public License v. 2.0
 See the above repository for updates as well as full license text. */
 
-/* Makes tabs to appear on multiple lines */
-/* Tab reordering will not work and can't be made to work */
-/* You can use multi-row_tabs_window_control_patch.css to move window controls to nav-bar*/
+/* Makes tabs to appear on multiple lines
+ * Tab reordering will not work and can't be made to work
+ * You can use multi-row_tabs_window_control_patch.css to move window controls to nav-bar
+ * You might want to move tabs-new-tab-button outside tabs toolbar for smoother behavior */
 
-/* You might want to move tabs-new-tab-button outside tabs toolbar for smoother behavior */
-
-/* Change the --multirow-n-rows to change maximum number of rows before the rows will start to scroll  */
+/* SETTINGS (you need to create and set these prefs to true in about:config)
+ * userchrome.multirowtabs.full-width-tabs.enabled  - make tabs grow horizontally to fill all available space
+ * userchrome.multirowtabs.scrollbar-handle.enabled - make scrollbar in tabs box respond to mouse, makes it imposiible to drag window from empty space in tabs box */
 
 :root{
-    --multirow-n-rows: 3;
-    --multirow-tab-min-width: 100px;
-    --multirow-tab-dynamic-width: 1; /* Change to 0 for fixed-width tabs using the above width. */
+  --multirow-n-rows: 3; /* change maximum number of rows before the rows will start to scroll */
+  --multirow-tab-min-width: 100px;
+  --multirow-tab-dynamic-width: 1; /* Change to 0 for fixed-width tabs using the above width. */
 }
 
-/* Scrollbar can't be clicked but the rows can be scrolled with mouse wheel */
-/* Uncomment the next line if you want to be able to use the scrollbar with mouse clicks */
-
-/* #tabbrowser-arrowscrollbox{ -moz-window-dragging: no-drag } */
-
-/* Uncommenting the above makes you unable to drag the window from empty space in the tab strip but normal draggable spaces will continue to work */
-
 #tabbrowser-tabs{
   min-height: unset !important;
   padding-inline-start: 0px !important
@@ -61,11 +55,6 @@ See the above repository for updates as well as full license text. */
 .tabbrowser-tab[fadein]:not([pinned]){
   min-width: var(--multirow-tab-min-width) !important;
   flex-grow: var(--multirow-tab-dynamic-width) !important;
-  /*
-  Uncomment to enable full-width tabs, also makes tab dragging a tiny bit more sensible
-  Don't set to none or you'll see errors in console when closing tabs
-  */
-  /*max-width: 100vw !important;*/
 }
 
 .tabbrowser-tab > stack{ width: 100%; height: 100% }
@@ -81,3 +70,10 @@ See the above repository for updates as well as full license text. */
 :root:not([customizing]) #TabsToolbar #new-tab-button,
 #tabbrowser-arrowscrollbox > spacer,
 .tabbrowser-tab::after{ display: none !important }
+
+@media (-moz-bool-pref: "userchrome.multirowtabs.full-width-tabs.enabled"){
+  .tabbrowser-tab[fadein]:not([pinned]){ max-width: 100vw !important; }
+}
+@media (-moz-bool-pref: "userchrome.multirowtabs.scrollbar-handle.enabled"){
+  #tabbrowser-arrowscrollbox{ -moz-window-dragging: no-drag }
+}
\ No newline at end of file
diff --git a/chrome/multi-row_tabs_below_content.css b/chrome/multi-row_tabs_below_content.css
index b42a800..a6aa72e 100644
--- a/chrome/multi-row_tabs_below_content.css
+++ b/chrome/multi-row_tabs_below_content.css
@@ -3,25 +3,20 @@ See the above repository for updates as well as full license text. */
 
 /* Makes tabs to appear on multiple lines below the web content
  * Tab reordering will not work and can't be made to work
- * 
  * Make menubar enabled for getting window controls in correct place.
  * Menubar options will be shown as overlay when mouse is at top-left corner
- * To enable static menubar, create a new boolean pref
- * userchrome.multirowtabs.static-menubar.enabled
- *
- * It's recommended to move tabs new-tab-button outside tabs toolbar
- * 
- * Change the --multirow-n-rows to change maximum number of rows
- * before the rows will start to scroll.
- * Scrollbar can't be clicked but the rows can be scrolled with mouse.
- */
+ * It's recommended to move tabs new-tab-button outside tabs toolbar */
+
+/* SETTINGS (you need to create and set these prefs to true in about:config)
+ * userchrome.multirowtabs.full-width-tabs.enabled - make tabs grow horizontally to fill all available space
+ * userchrome.multirowtabs.static-menubar.enabled  - always show menubar */
 
 @-moz-document url(chrome://browser/content/browser.xhtml){
   
   :root{
     --multirow-toolbar-height: 40px;
     --multirow-top-padding: 0px;
-    --multirow-n-rows: 3;
+    --multirow-n-rows: 3; /* change maximum number of rows */
     --multirow-tab-min-width: 100px;
     --multirow-tab-dynamic-width: 1; /* Change to 0 for fixed-width tabs using the above width. */
     --uc-window-drag-space-width: 30px;
@@ -193,6 +188,7 @@ See the above repository for updates as well as full license text. */
     display: inline;
     --scrollbutton-display-model: none;
     --uc-scrollbox-max-height: calc((var(--tab-min-height) + 2 * var(--tab-block-margin,0px)) * var(--multirow-n-rows));
+    -moz-window-dragging: no-drag;
   }
   
   :root[inFullscreen] .scrollbox-clip[orient="horizontal"]:not(:hover),
@@ -211,11 +207,6 @@ See the above repository for updates as well as full license text. */
   .tabbrowser-tab[fadein]:not([pinned]){
     min-width: var(--multirow-tab-min-width) !important;
     flex-grow: var(--multirow-tab-dynamic-width) !important;
-    /*
-    Uncomment to enable full-width tabs, also makes tab dragging a tiny bit more sensible
-    Don't set to none or you'll see errors in console when closing tabs
-    */
-    /*max-width: 100vw !important;*/
   }
 
   .tabbrowser-tab > stack{ width: 100%; height: 100%; }
@@ -275,4 +266,7 @@ See the above repository for updates as well as full license text. */
       top: calc(var(--multirow-toolbar-height) + var(--multirow-top-padding) + var(--multirow-menubar-height));
     }
   }
+  @media (-moz-bool-pref: "userchrome.multi-row-tabs.full-width-tabs.enabled"){
+    .tabbrowser-tab[fadein]:not([pinned]){ max-width: 100vw !important; }
+  }
 }