diff --git a/ags/styles/components/_bar.scss b/ags/styles/components/_bar.scss
index aaf91df..1f3c2f7 100644
--- a/ags/styles/components/_bar.scss
+++ b/ags/styles/components/_bar.scss
@@ -10,17 +10,17 @@ window.bar {
     >.inner {
         border-bottom-left-radius: 0;
         border-bottom-right-radius: 0;
-        background: $base0B;
+        background: $base00;
         padding: 0.25rem 1rem;
         margin: 0;
 
-        * { color: $base00; }
+        * { color: $base0B; }
     }
 
     .tray .item {
         padding: 0;
         margin: 0;
-        background: $base0B;
+        background: $base00;
 
         image {
             padding: 0;
diff --git a/ags/styles/components/_battery_info.scss b/ags/styles/components/_battery_info.scss
index dfa446a..b71d3c1 100644
--- a/ags/styles/components/_battery_info.scss
+++ b/ags/styles/components/_battery_info.scss
@@ -4,7 +4,7 @@ window.battery_info {
     font-weight: bold;
 
     >box {
-        border: 1px solid $base00;
+        border: 1px solid $base01;
         border-radius: 10px;
         margin: 8px;
     }
@@ -12,7 +12,7 @@ window.battery_info {
     >.inner {
         border-bottom-left-radius: 0;
         border-bottom-right-radius: 0;
-        background: $base0B;
+        background: $base00;
         padding: 0.75rem 3rem;
         margin: 0;
 
@@ -22,7 +22,7 @@ window.battery_info {
 
         * { 
             transition: all 0.2s ease-in-out;
-            color: $base00;
+            color: $base0B;
         }
     }
 
@@ -33,12 +33,12 @@ window.battery_info {
 
 window.battery_info button {
     transition: all 0.2s ease-in-out;
-    background: $base0B;
-    border: 2px solid $base00;
+    background: $base00;
+    border: 2px solid $base01;
     margin: 5px;
 
     &:hover {
-        background: $base00;
+        background: $base01;
 
         * {
             color: $base0B;
@@ -46,8 +46,8 @@ window.battery_info button {
     }
 
     &.active {
-        background: $base00;
-        border: 0.5px solid $base0B;
+        background: $base01;
+        border: 2px solid $base00;
 
         * {
             color: $base0B;
diff --git a/ags/styles/components/_clipboard.scss b/ags/styles/components/_clipboard.scss
index 87cc45d..0e170d2 100644
--- a/ags/styles/components/_clipboard.scss
+++ b/ags/styles/components/_clipboard.scss
@@ -2,50 +2,45 @@
 
 .clipboard {
     entry {
-        background: $base0B;
-        color: $base00;
+        background: $base00;
+        color: $base0B;
         padding: 8px 12px;
         border: none;
 
         margin-bottom: 6px;
 
         &:focus {
-            outline: 2px solid $base00;
+            outline: 2px solid $base01;
         }
     }
 
     .entry.primary {
-        background: $base0C;
+        background: $base01;
 
-        &:hover>.content {
-            color: $base0C;
+        &:focus {
+            background: $base00;
         }
     }
 
     .entry {
         padding: 10px;
-        background: $base0B;
+        background: $base00;
         border-radius: 8px;
         transition: background 0.2s ease;
 
-        &:hover {
-            background: $base00;
-
-            >.content {
-                color: $base0B;
-            }
-        }
+        &:hover { background: $base01; }
 
         .content {
-            color: $base00;
+            color: $base0B;
             font-size: 14px;
             font-weight: 600;
         }
     }
 
     .not-found {
-        background: $base0B;
-        color: $base00;
+        border: 1px solid $base07;
+        background: $base01;
+        color: $base0B;
         font-size: 14px;
         padding: 10px;
         border-radius: 8px;
diff --git a/ags/styles/components/_launcher.scss b/ags/styles/components/_launcher.scss
index b36eaf9..938eb23 100644
--- a/ags/styles/components/_launcher.scss
+++ b/ags/styles/components/_launcher.scss
@@ -2,31 +2,26 @@
 
 .launcher {
     entry {
-        background: $base0B;
-        color: $base00;
+        background: $base00;
+        color: $base0B;
         padding: 8px 12px;
         border: none;
 
         margin-bottom: 6px;
 
         &:focus {
-            outline: 2px solid $base00;
+            outline: 2px solid $base01;
         }
     }
 
     .application {
         padding: 10px;
-        background: $base0B;
+        background: $base00;
         border-radius: 8px;
         transition: background 0.2s ease;
 
         &:hover {
-            background: $base00;
-
-            box>.name,
-            box>.description {
-                color: $base0B;
-            }
+            background: $base01;
         }
 
         image {
@@ -34,20 +29,20 @@
         }
 
         .name {
-            color: $base00;
+            color: $base0B;
             font-size: 14px;
             font-weight: 600;
         }
 
         .description {
-            color: $base00;
+            color: $base0B;
             font-size: 12px;
         }
     }
 
     .not-found {
-        background: $base0B;
-        color: $base00;
+        background: $base01;
+        color: $base0B;
         font-size: 14px;
         padding: 10px;
         border-radius: 8px;
diff --git a/ags/styles/components/_quick_settings.scss b/ags/styles/components/_quick_settings.scss
index c7e4834..1b93c39 100644
--- a/ags/styles/components/_quick_settings.scss
+++ b/ags/styles/components/_quick_settings.scss
@@ -4,7 +4,7 @@ window.quick_settings {
     font-weight: bold;
 
     >box {
-        border: 1px solid $base00;
+        border: 1px solid $base01;
         border-radius: 10px;
         margin: 8px;
     }
@@ -12,13 +12,13 @@ window.quick_settings {
     >.inner {
         border-bottom-left-radius: 0;
         border-bottom-right-radius: 0;
-        background: $base0B;
+        background: $base00;
         padding: 0.75rem 3rem;
         margin: 0;
 
         * { 
             transition: all 0.2s ease-in-out;
-            color: $base00;
+            color: $base0B;
         }
     }
 
@@ -29,11 +29,11 @@ window.quick_settings {
 
 window.qs_bluetooth {
     >.inner {
-        background: $base0B;
+        background: $base00;
         padding: 0.75rem 3rem;
         border-radius: 10px;
     
-        * { color: $base00; }
+        * { color: $base0B; }
     }
 
     .device {
@@ -47,24 +47,16 @@ window.qs_bluetooth {
 
 window.quick_settings button, window.qs_bluetooth button {
     transition: all 0.2s ease-in-out;
-    background: $base0B;
-    border: 2px solid $base00;
+    background: $base00;
+    border: 2px solid $base01;
     margin: 5px;
 
     &:hover {
-        background: $base00;
-
-        * {
-            color: $base0B;
-        }
+        background: $base01;
     }
 
     &.active {
-        background: $base00;
-        border: 0.5px solid $base0B;
-
-        * {
-            color: $base0B;
-        }
+        background: $base01;
+        border: 0.5px solid $base00;
     }
 }
diff --git a/ags/styles/components/_shortcuts.scss b/ags/styles/components/_shortcuts.scss
index 5ef345d..7b5bff6 100644
--- a/ags/styles/components/_shortcuts.scss
+++ b/ags/styles/components/_shortcuts.scss
@@ -3,25 +3,20 @@
 .shortcuts {
     .entry {
         padding: 10px;
-        background: $base0B;
+        background: $base00;
         border-radius: 8px;
         transition: background 0.2s ease;
 
         &:hover {
-            background: $base00;
-
-            >label {
-                color: $base0B;
-            }
+            background: $base01;
 
             >.kbd {
-                background: $base0B;
-                color: $base00;
+                background: $base00;
             }
         }
 
         label {
-            color: $base00;
+            color: $base0B;
             font-size: 14px;
             font-weight: 600;
         }
@@ -33,14 +28,14 @@
             border-radius: 4px;
             margin: 0 2px;
 
-            background: $base00;
+            background: $base01;
             color: $base0B;
         }
     }
 
     .not-found {
-        background: $base0B;
-        color: $base00;
+        background: $base01;
+        color: $base0B;
         font-size: 14px;
         padding: 10px;
         border-radius: 8px;
@@ -49,4 +44,4 @@
             margin-bottom: 8px;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/ags/styles/style.scss b/ags/styles/style.scss
index 6e7bb1b..1807570 100644
--- a/ags/styles/style.scss
+++ b/ags/styles/style.scss
@@ -10,11 +10,11 @@
 }
 
 separator {
-    background: $base00;
+    background: $base01;
 }
 
 popover>contents, calendar {
-    background: $base0B;
+    background: $base00;
 }
 
 button, button:hover {
@@ -22,7 +22,7 @@ button, button:hover {
 }
 
 popover modelbutton {
-    &:hover, &:focus { background: $base0C; }
+    &:hover, &:focus { background: $base01; }
 }
 
 image {