diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index ca573350e5..1dc91578f9 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1834,15 +1834,17 @@ notebook {
  **************/
 
 scrollbar {
-  -GtkRange-slider-width: 13;
-  -GtkRange-trough-border: 0;
-  -GtkScrollbar-has-backward-stepper: false;
-  -GtkScrollbar-has-forward-stepper: false;
-  -GtkScrollbar-min-slider-length: 42; // minimum size for the slider.
-                                       // sadly can't be in '.slider'
-                                       // where it belongs
-  -GtkRange-stepper-spacing: 0;
-  -GtkRange-trough-under-steppers: 1;
+  @at-root * {
+    -GtkRange-slider-width: 13;
+    -GtkRange-trough-border: 0;
+    -GtkScrollbar-has-backward-stepper: false;
+    -GtkScrollbar-has-forward-stepper: false;
+    -GtkScrollbar-min-slider-length: 42; // minimum size for the slider.
+                                         // sadly can't be in '.slider'
+                                         // where it belongs
+    -GtkRange-stepper-spacing: 0;
+    -GtkRange-trough-under-steppers: 1;
+  }
 
   $_slider_margin: 3px;
   $_slider_fine_tune_margin: 4px;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index f8d3a6562d..5fb49ef1db 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2458,7 +2458,7 @@ notebook {
 /**************
  * Scrollbars *
  **************/
-scrollbar {
+* {
   -GtkRange-slider-width: 13;
   -GtkRange-trough-border: 0;
   -GtkScrollbar-has-backward-stepper: false;
@@ -2466,71 +2466,71 @@ scrollbar {
   -GtkScrollbar-min-slider-length: 42;
   -GtkRange-stepper-spacing: 0;
   -GtkRange-trough-under-steppers: 1; }
-  scrollbar button, scrollbar headerbar button.titlebutton, headerbar scrollbar button.titlebutton,
-  scrollbar .titlebar button.titlebutton,
-  .titlebar scrollbar button.titlebutton {
-    border: none; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
-    opacity: 0.4;
-    -GtkRange-slider-width: 5px; }
-    scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
-      margin: 0;
-      background-color: #eeeeec;
-      border: 1px solid black;
-      background-clip: padding-box; }
-    scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough {
-      border-style: none;
-      background-color: transparent; }
-    scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
-      margin-top: 2px;
-      margin-bottom: 2px; }
-    scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
-      margin-left: 2px;
-      margin-right: 2px; }
-  scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering {
-    opacity: 0.7; }
-  scrollbar trough {
-    background-color: #282c2c;
-    border: 1px none #1c1f1f; }
-    scrollbar trough:backdrop {
-      background-color: #323737;
-      border-color: #1f2222; }
-  scrollbar slider {
-    background-color: #a6a8a7; }
-    scrollbar slider:hover {
-      background-color: #cacbc9; }
-    scrollbar slider:prelight:active {
-      background-color: #2a76c6; }
-    scrollbar slider:backdrop {
-      background-color: #5d6262; }
-    scrollbar slider:insensitive {
-      background-color: transparent; }
-  scrollbar slider {
-    border-radius: 100px;
-    margin: 3px; }
-  scrollbar.fine-tune slider {
-    margin: 4px; }
-  scrollbar.vertical slider {
-    margin-left: 4px; }
-    scrollbar.vertical slider:dir(rtl) {
-      margin-left: 3px;
-      margin-right: 4px; }
-  scrollbar.vertical.fine-tune slider {
-    margin-left: 5px; }
-    scrollbar.vertical.fine-tune slider:dir(rtl) {
-      margin-left: 4px;
-      margin-right: 5px; }
-  scrollbar.vertical trough {
-    border-left-style: solid; }
-    scrollbar.vertical trough:dir(rtl) {
-      border-left-style: none;
-      border-right-style: solid; }
-  scrollbar.horizontal slider {
-    margin-top: 4px; }
-  scrollbar.horizontal.fine-tune slider {
-    margin-top: 5px; }
-  scrollbar.horizontal trough {
-    border-top-style: solid; }
+scrollbar button, scrollbar headerbar button.titlebutton, headerbar scrollbar button.titlebutton,
+scrollbar .titlebar button.titlebutton,
+.titlebar scrollbar button.titlebutton {
+  border: none; }
+scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
+  opacity: 0.4;
+  -GtkRange-slider-width: 5px; }
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+    margin: 0;
+    background-color: #eeeeec;
+    border: 1px solid black;
+    background-clip: padding-box; }
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough {
+    border-style: none;
+    background-color: transparent; }
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
+    margin-top: 2px;
+    margin-bottom: 2px; }
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
+    margin-left: 2px;
+    margin-right: 2px; }
+scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering {
+  opacity: 0.7; }
+scrollbar trough {
+  background-color: #282c2c;
+  border: 1px none #1c1f1f; }
+  scrollbar trough:backdrop {
+    background-color: #323737;
+    border-color: #1f2222; }
+scrollbar slider {
+  background-color: #a6a8a7; }
+  scrollbar slider:hover {
+    background-color: #cacbc9; }
+  scrollbar slider:prelight:active {
+    background-color: #2a76c6; }
+  scrollbar slider:backdrop {
+    background-color: #5d6262; }
+  scrollbar slider:insensitive {
+    background-color: transparent; }
+scrollbar slider {
+  border-radius: 100px;
+  margin: 3px; }
+scrollbar.fine-tune slider {
+  margin: 4px; }
+scrollbar.vertical slider {
+  margin-left: 4px; }
+  scrollbar.vertical slider:dir(rtl) {
+    margin-left: 3px;
+    margin-right: 4px; }
+scrollbar.vertical.fine-tune slider {
+  margin-left: 5px; }
+  scrollbar.vertical.fine-tune slider:dir(rtl) {
+    margin-left: 4px;
+    margin-right: 5px; }
+scrollbar.vertical trough {
+  border-left-style: solid; }
+  scrollbar.vertical trough:dir(rtl) {
+    border-left-style: none;
+    border-right-style: solid; }
+scrollbar.horizontal slider {
+  margin-top: 4px; }
+scrollbar.horizontal.fine-tune slider {
+  margin-top: 5px; }
+scrollbar.horizontal trough {
+  border-top-style: solid; }
 
 /**********
  * Switch *
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index f62563e8a0..665b31d354 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2464,7 +2464,7 @@ notebook {
 /**************
  * Scrollbars *
  **************/
-scrollbar {
+* {
   -GtkRange-slider-width: 13;
   -GtkRange-trough-border: 0;
   -GtkScrollbar-has-backward-stepper: false;
@@ -2472,71 +2472,71 @@ scrollbar {
   -GtkScrollbar-min-slider-length: 42;
   -GtkRange-stepper-spacing: 0;
   -GtkRange-trough-under-steppers: 1; }
-  scrollbar button, scrollbar headerbar button.titlebutton, headerbar scrollbar button.titlebutton,
-  scrollbar .titlebar button.titlebutton,
-  .titlebar scrollbar button.titlebutton {
-    border: none; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
-    opacity: 0.4;
-    -GtkRange-slider-width: 5px; }
-    scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
-      margin: 0;
-      background-color: #2e3436;
-      border: 1px solid white;
-      background-clip: padding-box; }
-    scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough {
-      border-style: none;
-      background-color: transparent; }
-    scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
-      margin-top: 2px;
-      margin-bottom: 2px; }
-    scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
-      margin-left: 2px;
-      margin-right: 2px; }
-  scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering {
-    opacity: 0.7; }
-  scrollbar trough {
-    background-color: #d7d7d5;
-    border: 1px none #9d9d99; }
-    scrollbar trough:backdrop {
-      background-color: #e1e1df;
-      border-color: #a5a5a1; }
-  scrollbar slider {
-    background-color: #787c7d; }
-    scrollbar slider:hover {
-      background-color: #535859; }
-    scrollbar slider:prelight:active {
-      background-color: #2a76c6; }
-    scrollbar slider:backdrop {
-      background-color: #c3c4c4; }
-    scrollbar slider:insensitive {
-      background-color: transparent; }
-  scrollbar slider {
-    border-radius: 100px;
-    margin: 3px; }
-  scrollbar.fine-tune slider {
-    margin: 4px; }
-  scrollbar.vertical slider {
-    margin-left: 4px; }
-    scrollbar.vertical slider:dir(rtl) {
-      margin-left: 3px;
-      margin-right: 4px; }
-  scrollbar.vertical.fine-tune slider {
-    margin-left: 5px; }
-    scrollbar.vertical.fine-tune slider:dir(rtl) {
-      margin-left: 4px;
-      margin-right: 5px; }
-  scrollbar.vertical trough {
-    border-left-style: solid; }
-    scrollbar.vertical trough:dir(rtl) {
-      border-left-style: none;
-      border-right-style: solid; }
-  scrollbar.horizontal slider {
-    margin-top: 4px; }
-  scrollbar.horizontal.fine-tune slider {
-    margin-top: 5px; }
-  scrollbar.horizontal trough {
-    border-top-style: solid; }
+scrollbar button, scrollbar headerbar button.titlebutton, headerbar scrollbar button.titlebutton,
+scrollbar .titlebar button.titlebutton,
+.titlebar scrollbar button.titlebutton {
+  border: none; }
+scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
+  opacity: 0.4;
+  -GtkRange-slider-width: 5px; }
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+    margin: 0;
+    background-color: #2e3436;
+    border: 1px solid white;
+    background-clip: padding-box; }
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough {
+    border-style: none;
+    background-color: transparent; }
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
+    margin-top: 2px;
+    margin-bottom: 2px; }
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
+    margin-left: 2px;
+    margin-right: 2px; }
+scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering {
+  opacity: 0.7; }
+scrollbar trough {
+  background-color: #d7d7d5;
+  border: 1px none #9d9d99; }
+  scrollbar trough:backdrop {
+    background-color: #e1e1df;
+    border-color: #a5a5a1; }
+scrollbar slider {
+  background-color: #787c7d; }
+  scrollbar slider:hover {
+    background-color: #535859; }
+  scrollbar slider:prelight:active {
+    background-color: #2a76c6; }
+  scrollbar slider:backdrop {
+    background-color: #c3c4c4; }
+  scrollbar slider:insensitive {
+    background-color: transparent; }
+scrollbar slider {
+  border-radius: 100px;
+  margin: 3px; }
+scrollbar.fine-tune slider {
+  margin: 4px; }
+scrollbar.vertical slider {
+  margin-left: 4px; }
+  scrollbar.vertical slider:dir(rtl) {
+    margin-left: 3px;
+    margin-right: 4px; }
+scrollbar.vertical.fine-tune slider {
+  margin-left: 5px; }
+  scrollbar.vertical.fine-tune slider:dir(rtl) {
+    margin-left: 4px;
+    margin-right: 5px; }
+scrollbar.vertical trough {
+  border-left-style: solid; }
+  scrollbar.vertical trough:dir(rtl) {
+    border-left-style: none;
+    border-right-style: solid; }
+scrollbar.horizontal slider {
+  margin-top: 4px; }
+scrollbar.horizontal.fine-tune slider {
+  margin-top: 5px; }
+scrollbar.horizontal trough {
+  border-top-style: solid; }
 
 /**********
  * Switch *