diff --git a/gtk-4.0/_drawing.scss b/gtk-4.0/_drawing.scss
index 81a6a74..ebf9253 100755
--- a/gtk-4.0/_drawing.scss
+++ b/gtk-4.0/_drawing.scss
@@ -597,7 +597,7 @@ box-shadow: none;
 }
 
 @mixin scale-highlight($dir) {
-  background: linear-gradient(to $dir, #00f17d, #00f7d2);
+  background: linear-gradient(to $dir, #fed349, #ff7800);
 }
 
 @mixin selected-tab($dir) {
@@ -605,7 +605,7 @@ box-shadow: none;
   linear-gradient(to $dir, $selected-tab-gradient-start, $selected-tab-gradient-end)
   left 
   bottom
-  lighten(mix($base_color, $headerbar_color, 30%), 2%)
+  lighten(mix($base_color, darken($bg_color, 8%), 30%), 4%)
   no-repeat; 
   @if $dir==right { background-size: 100% 2px; }
   @else if $dir==bottom { background-size: 2px 100%; } 
diff --git a/gtk-4.0/gtk-dark.css b/gtk-4.0/gtk-dark.css
index 2004ab4..a034498 100755
--- a/gtk-4.0/gtk-dark.css
+++ b/gtk-4.0/gtk-dark.css
@@ -2848,7 +2848,7 @@ notebook > header {
       notebook > header.top > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.top > tabs > tab:checked {
-        background: linear-gradient(to right, #fed349, #ff7800) left bottom #10121a no-repeat;
+        background: linear-gradient(to right, #fed349, #ff7800) left bottom #141721 no-repeat;
         background-size: 100% 2px;
         border: 0; }
   notebook > header.bottom {
@@ -2858,7 +2858,7 @@ notebook > header {
       notebook > header.bottom > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.bottom > tabs > tab:checked {
-        background: linear-gradient(to right, #fed349, #ff7800) left bottom #10121a no-repeat;
+        background: linear-gradient(to right, #fed349, #ff7800) left bottom #141721 no-repeat;
         background-size: 100% 2px;
         border: 0; }
   notebook > header.left {
@@ -2868,7 +2868,7 @@ notebook > header {
       notebook > header.left > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.left > tabs > tab:checked {
-        background: linear-gradient(to bottom, #fed349, #ff7800) left bottom #10121a no-repeat;
+        background: linear-gradient(to bottom, #fed349, #ff7800) left bottom #141721 no-repeat;
         background-size: 2px 100%;
         border: 0; }
   notebook > header.right {
@@ -2878,7 +2878,7 @@ notebook > header {
       notebook > header.right > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.right > tabs > tab:checked {
-        background: linear-gradient(to bottom, #fed349, #ff7800) left bottom #10121a no-repeat;
+        background: linear-gradient(to bottom, #fed349, #ff7800) left bottom #141721 no-repeat;
         background-size: 2px 100%;
         border: 0; }
   notebook > header.top > tabs > arrow {
@@ -3137,7 +3137,7 @@ progressbar {
     margin: 0; }
   progressbar.vertical progress {
     margin: 0;
-    background: linear-gradient(to bottom, #00f17d, #00f7d2); }
+    background: linear-gradient(to bottom, #fed349, #ff7800); }
   progressbar:backdrop {
     box-shadow: none;
     transition: 200ms ease-out; }
@@ -3172,7 +3172,7 @@ progressbar trough, scale trough, scale fill {
 
 progressbar progress, scale highlight {
   border: none;
-  background: linear-gradient(to right, #00f17d, #00f7d2);
+  background: linear-gradient(to right, #fed349, #ff7800);
   border-radius: 3px;
   margin: 0; }
   progressbar progress:disabled, scale highlight:disabled {
@@ -3195,7 +3195,7 @@ scale {
   scale.vertical progress {
     min-width: 6px; }
   scale.vertical highlight {
-    background: linear-gradient(to bottom, #00f17d, #00f7d2); }
+    background: linear-gradient(to bottom, #fed349, #ff7800); }
   scale slider {
     min-height: 15px;
     min-width: 15px;
@@ -3239,7 +3239,7 @@ scale {
       background-color: transparent; }
   scale slider {
     border-color: #181b28;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 12px;
     background-color: #292f45; }
     scale slider:active {
@@ -3346,7 +3346,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3356,7 +3356,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3366,7 +3366,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3376,7 +3376,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3386,7 +3386,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3396,7 +3396,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3406,7 +3406,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3416,7 +3416,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3426,7 +3426,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3436,7 +3436,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3446,7 +3446,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3456,7 +3456,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3466,7 +3466,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3476,7 +3476,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3486,7 +3486,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3496,7 +3496,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3506,7 +3506,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3516,7 +3516,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3526,7 +3526,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3536,7 +3536,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3546,7 +3546,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3556,7 +3556,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3566,7 +3566,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -3576,7 +3576,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #292f45;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
@@ -4113,11 +4113,12 @@ switch {
   font-weight: bold;
   outline-offset: -4px;
   transition: all 200ms ease-in;
-  border: 1px solid rgba(12, 14, 21, 0.8);
+  border: none;
   border-radius: 14px;
   color: transparent;
   padding: 2.3px 0px;
-  background: linear-gradient(to right, #1E2233, #1E2233); }
+  background: linear-gradient(to right, #859398, #859398);
+  box-shadow: 0px 2px 3px rgba(138, 138, 138, 0.753); }
   switch:disabled {
     background-color: #171a26; }
   switch:backdrop {
@@ -4126,11 +4127,11 @@ switch {
     switch:backdrop:disabled {
       background-color: #171a26; }
   switch:active, switch:checked {
-    background: linear-gradient(to right, #f7005a, #fadd00); }
+    background: linear-gradient(to right, #56CCF2, #2F80ED); }
     switch:active slider, switch:checked slider {
       background: #fff; }
     switch:active:backdrop, switch:checked:backdrop {
-      background: linear-gradient(to right, #de0051, #e1c600); }
+      background: linear-gradient(to right, #3ec5f0, #1872eb); }
       switch:active:backdrop slider:backdrop, switch:checked:backdrop slider:backdrop {
         box-shadow: none;
         background-color: rgba(24, 27, 40, 0.9);
@@ -4142,7 +4143,7 @@ switch {
     min-height: 12px;
     border-radius: 100%;
     transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-    background-color: #151723; }
+    background-color: #bcc4c7; }
     switch slider:backdrop {
       padding: 2px;
       box-shadow: none;
@@ -5751,7 +5752,7 @@ LibraryWindow .the-button-in-the-combobox {
 .source-list.view.level-bar.fill-block, iconview.source-list.level-bar.fill-block {
   border: none; }
   .source-list.view.level-bar.fill-block, iconview.source-list.level-bar.fill-block, .source-list.view.level-bar.fill-block:hover, iconview.source-list.level-bar.fill-block:hover, .source-list.view.level-bar.fill-block:selected, iconview.source-list.level-bar.fill-block:selected, .source-list.view.level-bar.fill-block:selected:focus, iconview.source-list.level-bar.fill-block:selected:focus {
-    background: linear-gradient(to right, #00f17d, #00f7d2); }
+    background: linear-gradient(to right, #fed349, #ff7800); }
 
 /**************************
  * Colors in context menu *
diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css
index 1176693..1401881 100755
--- a/gtk-4.0/gtk.css
+++ b/gtk-4.0/gtk.css
@@ -2841,7 +2841,7 @@ notebook > header {
   padding: 1px;
   border-color: transparent;
   border-width: 1px;
-  background-color: #525357; }
+  background-color: #dadbdd; }
   notebook > header:backdrop {
     border-color: rgba(141, 141, 141, 0.217);
     background-color: #e6e6e6; }
@@ -2854,7 +2854,7 @@ notebook > header {
       notebook > header.top > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.top > tabs > tab:checked {
-        background: linear-gradient(to right, #fed349, #ff7800) left bottom #57585c no-repeat;
+        background: linear-gradient(to right, #fed349, #ff7800) left bottom #e5e5e7 no-repeat;
         background-size: 100% 2px;
         border: 0; }
   notebook > header.bottom {
@@ -2864,7 +2864,7 @@ notebook > header {
       notebook > header.bottom > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.bottom > tabs > tab:checked {
-        background: linear-gradient(to right, #fed349, #ff7800) left bottom #57585c no-repeat;
+        background: linear-gradient(to right, #fed349, #ff7800) left bottom #e5e5e7 no-repeat;
         background-size: 100% 2px;
         border: 0; }
   notebook > header.left {
@@ -2874,7 +2874,7 @@ notebook > header {
       notebook > header.left > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.left > tabs > tab:checked {
-        background: linear-gradient(to bottom, #fed349, #ff7800) left bottom #57585c no-repeat;
+        background: linear-gradient(to bottom, #fed349, #ff7800) left bottom #e5e5e7 no-repeat;
         background-size: 2px 100%;
         border: 0; }
   notebook > header.right {
@@ -2884,7 +2884,7 @@ notebook > header {
       notebook > header.right > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.right > tabs > tab:checked {
-        background: linear-gradient(to bottom, #fed349, #ff7800) left bottom #57585c no-repeat;
+        background: linear-gradient(to bottom, #fed349, #ff7800) left bottom #e5e5e7 no-repeat;
         background-size: 2px 100%;
         border: 0; }
   notebook > header.top > tabs > arrow {
@@ -3143,7 +3143,7 @@ progressbar {
     margin: 0; }
   progressbar.vertical progress {
     margin: 0;
-    background: linear-gradient(to bottom, #00f17d, #00f7d2); }
+    background: linear-gradient(to bottom, #fed349, #ff7800); }
   progressbar:backdrop {
     box-shadow: none;
     transition: 200ms ease-out; }
@@ -3178,7 +3178,7 @@ progressbar trough, scale trough, scale fill {
 
 progressbar progress, scale highlight {
   border: none;
-  background: linear-gradient(to right, #00f17d, #00f7d2);
+  background: linear-gradient(to right, #fed349, #ff7800);
   border-radius: 3px;
   margin: 0; }
   progressbar progress:disabled, scale highlight:disabled {
@@ -3201,7 +3201,7 @@ scale {
   scale.vertical progress {
     min-width: 6px; }
   scale.vertical highlight {
-    background: linear-gradient(to bottom, #00f17d, #00f7d2); }
+    background: linear-gradient(to bottom, #fed349, #ff7800); }
   scale slider {
     min-height: 15px;
     min-width: 15px;
@@ -3245,7 +3245,7 @@ scale {
       background-color: transparent; }
   scale slider {
     border-color: #ebf0f5;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 12px;
     background-color: #fff; }
     scale slider:active {
@@ -3352,7 +3352,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3362,7 +3362,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3372,7 +3372,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3382,7 +3382,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3392,7 +3392,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3402,7 +3402,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3412,7 +3412,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3422,7 +3422,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3432,7 +3432,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3442,7 +3442,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3452,7 +3452,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3462,7 +3462,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3472,7 +3472,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3482,7 +3482,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3492,7 +3492,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3502,7 +3502,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3512,7 +3512,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3522,7 +3522,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3532,7 +3532,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3542,7 +3542,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3552,7 +3552,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3562,7 +3562,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3572,7 +3572,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -3582,7 +3582,7 @@ scale {
     min-height: 15px;
     min-width: 15px;
     margin: -7px;
-    border: 2px solid #00f17d;
+    border: 2px solid #f7b922;
     border-radius: 50%;
     background-color: #fff;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); }
@@ -4119,11 +4119,12 @@ switch {
   font-weight: bold;
   outline-offset: -4px;
   transition: all 200ms ease-in;
-  border: 1px solid rgba(0, 0, 0, 0.13);
+  border: none;
   border-radius: 14px;
   color: transparent;
   padding: 2.3px 0px;
-  background: linear-gradient(to right, #1E2233, #1E2233); }
+  background: linear-gradient(to right, #859398, #859398);
+  box-shadow: 0px 2px 3px rgba(138, 138, 138, 0.753); }
   switch:disabled {
     background-color: #e8eaec; }
   switch:backdrop {
@@ -4132,11 +4133,11 @@ switch {
     switch:backdrop:disabled {
       background-color: #e8eaec; }
   switch:active, switch:checked {
-    background: linear-gradient(to right, #f7005a, #fadd00); }
+    background: linear-gradient(to right, #56CCF2, #2F80ED); }
     switch:active slider, switch:checked slider {
       background: #fff; }
     switch:active:backdrop, switch:checked:backdrop {
-      background: linear-gradient(to right, #de0051, #e1c600); }
+      background: linear-gradient(to right, #3ec5f0, #1872eb); }
       switch:active:backdrop slider:backdrop, switch:checked:backdrop slider:backdrop {
         box-shadow: none;
         background-color: rgba(235, 240, 245, 0.9);
@@ -4148,7 +4149,7 @@ switch {
     min-height: 12px;
     border-radius: 100%;
     transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-    background-color: #151723; }
+    background-color: #bcc4c7; }
     switch slider:backdrop {
       padding: 2px;
       box-shadow: none;
@@ -5775,7 +5776,7 @@ LibraryWindow .the-button-in-the-combobox {
 .source-list.view.level-bar.fill-block, iconview.source-list.level-bar.fill-block {
   border: none; }
   .source-list.view.level-bar.fill-block, iconview.source-list.level-bar.fill-block, .source-list.view.level-bar.fill-block:hover, iconview.source-list.level-bar.fill-block:hover, .source-list.view.level-bar.fill-block:selected, iconview.source-list.level-bar.fill-block:selected, .source-list.view.level-bar.fill-block:selected:focus, iconview.source-list.level-bar.fill-block:selected:focus {
-    background: linear-gradient(to right, #00f17d, #00f7d2); }
+    background: linear-gradient(to right, #fed349, #ff7800); }
 
 /**************************
  * Colors in context menu *
diff --git a/gtk-4.0/widgets/_notebooks.scss b/gtk-4.0/widgets/_notebooks.scss
index 2c5a679..cc17044 100644
--- a/gtk-4.0/widgets/_notebooks.scss
+++ b/gtk-4.0/widgets/_notebooks.scss
@@ -1,12 +1,12 @@
 /*************
  * Notebooks *
  *************/
-notebook {
+ notebook {
   > header {
     padding: 1px;
     border-color: transparent;
     border-width: 1px;
-    background-color: mix($base_color, $headerbar_color, 30%);
+    background-color: mix($base_color, darken($bg_color, 8%), 30%);
 
     &:backdrop {
       border-color: $backdrop_borders_color;
diff --git a/gtk-4.0/widgets/_scales.scss b/gtk-4.0/widgets/_scales.scss
index 7cf1b24..889505d 100644
--- a/gtk-4.0/widgets/_scales.scss
+++ b/gtk-4.0/widgets/_scales.scss
@@ -150,7 +150,7 @@ scale {
   $_scale_disabled_bg: darken($_scale_bg, 15%);
   slider {
     border-color: $base_color;
-    border: 2px solid #00f17d;
+    border: 2px solid $selected_bg_color;
     border-radius: 12px;
 
     background-color: $_scale_bg;
@@ -282,7 +282,7 @@ scale {
               min-height: 15px;
               min-width: 15px;
               margin: -7px;
-              border: 2px solid #00f17d;
+              border: 2px solid $selected_bg_color;
               border-radius: 50%;
 
               background-color: $_scale_bg;
diff --git a/gtk-4.0/widgets/_switches.scss b/gtk-4.0/widgets/_switches.scss
index 882e123..2397c49 100644
--- a/gtk-4.0/widgets/_switches.scss
+++ b/gtk-4.0/widgets/_switches.scss
@@ -1,18 +1,20 @@
 /**********
  * Switch *
  **********/
-switch {
+ switch {
   font-size: 1px;
   font-weight: bold;
   outline-offset: -4px;
   transition: all 200ms ease-in;
 
-  border: 1px solid $borders_color;
+  border: none;
   border-radius: 14px;
   color: transparent;
   padding: 2.3px 0px;
-  background:  linear-gradient(to right, #1E2233, #1E2233);
+
+  background:  linear-gradient(to right, #859398, #859398);
  // border: 1px solid rgba(170, 170, 170, 0.4);
+  box-shadow: 0px 2px 3px rgba(138, 138, 138, 0.753);
   &:disabled {
     background-color: $insensitive_bg_color;
   }
@@ -27,12 +29,14 @@ switch {
 
   &:active,
   &:checked {
-   background:  linear-gradient(to right, #f7005a, #fadd00);
+   // border: 1px solid $teal;
+   background:  linear-gradient(to right, #56CCF2, #2F80ED);
     slider{
       background: #fff;
     }
     &:backdrop {
-      background:  linear-gradient(to right, darken(#f7005a, 5%), darken(#fadd00, 5%));
+      //border: 1px solid $teal;
+      background:  linear-gradient(to right, darken(#56CCF2, 5%), darken(#2F80ED, 5%));
       slider {
         &:backdrop {
           box-shadow:none;
@@ -45,14 +49,14 @@ switch {
 
   // Handle
   slider {
-    padding: 2px;
+    padding:2px;
     margin: 0 2.3px;
     min-width: 12px;
     min-height: 12px;
 
     border-radius: 100%;
     transition: $button_transition;
-    background-color: darken(#1E2233, 5%);
+    background-color: lighten(#859398, 20%);
 
     &:backdrop {
       padding:2px;