diff --git a/CONFIG/gtk-3.0/settings.ini b/CONFIG/gtk-3.0/settings.ini
index 8f78031..c6585b3 100644
--- a/CONFIG/gtk-3.0/settings.ini
+++ b/CONFIG/gtk-3.0/settings.ini
@@ -1,5 +1,5 @@
 [Settings]
-gtk-theme-name=Arc-Dark
+gtk-theme-name=Adwaita-dark
 gtk-icon-theme-name=Qogir-dark
 gtk-font-name=Noto Sans 10
 gtk-cursor-theme-name=Qogir-dark
diff --git a/CONFIG/gtklock/config.ini b/CONFIG/gtklock/config.ini
index c6bd5e8..5768321 100644
--- a/CONFIG/gtklock/config.ini
+++ b/CONFIG/gtklock/config.ini
@@ -1,5 +1,5 @@
 [main]
-gtk-theme=Arc-Dark
+gtk-theme-name=Adwaita-dark
 time-format=%H:%M
 start-hidden=1
 modules=powerbar-module
diff --git a/CONFIG/gtklock/style.css b/CONFIG/gtklock/style.css
index 7711399..2be932d 100644
--- a/CONFIG/gtklock/style.css
+++ b/CONFIG/gtklock/style.css
@@ -1,43 +1,45 @@
 * {
   border: none;
-  text-shadow: 1px 1px 3px rgba(0, 0, 0, 0.8)
+  text-shadow: 1px 1px 3px rgba(0, 0, 0, 0.9);
+  border-radius: 0px;
 }
 window {
   background-image: url("EndeavourOS_Astronaut_SpaceWalk.png");
   background-size: cover;
   background-repeat: no-repeat;
   background-position: center;
-  background-color: black;
+  background-color: #0a0a0a;
 }
 #clock-label {
   font-family: JetBrainsMono;
-  font-size: 64.0px;
+  font-size: 64px;
+  color: #00e5ff;
 }
 #unlock-button {
-  background: none;
-  background-color: rgba(127, 63, 191, 0.4);
-  border: 2px solid rgba(127, 63, 191, 0.5);
+  background-color: rgba(10, 10, 10, 0.8);
+  border: 2px solid #333333;
   padding: 4px;
+  color: #ffffff;
 }
 #unlock-button:hover {
-  background-color: rgba(127, 63, 191, 0.9);
+  border-color: #00e5ff;
+  background-color: #000000;
 }
 #input-field {
-  border-radius: 10px;
-  background-color: rgba(127, 127, 255, 0.1);
-  border: 2px solid rgba(127, 63, 191, 0.5);
+  background-color: rgba(0, 0, 0, 0.8);
+  border: 2px solid #00e5ff;
   padding-top: 5px;
   padding-bottom: 5px;
+  color: #ffffff;
 }
 #powerbar-box button {
-  background: none;
-  background-color: rgba(127, 63, 191, 0.4);
-  border: 2px solid rgba(127, 63, 191, 0.5);
-  border-radius: 10px;
-  padding: 4px;
+  background-color: rgba(10, 10, 10, 0.8);
+  border: 2px solid #333333;
+  padding: 6px;
 }
 #powerbar-box button:hover {
-  background-color: rgba(127, 63, 191, 0.9);
+  border-color: #00e5ff;
+  color: #00e5ff;
 }
 #input-label {
   font-size: 0px;
diff --git a/CONFIG/nwg-drawer/drawer.css b/CONFIG/nwg-drawer/drawer.css
index b388382..59577fc 100644
--- a/CONFIG/nwg-drawer/drawer.css
+++ b/CONFIG/nwg-drawer/drawer.css
@@ -1,38 +1,43 @@
 window {
-    background-color: rgba (38, 18, 57, 0.9);
-    color: #eceff4;
-    border-radius: 30px
+  background-color: rgba(10, 10, 10, 0.95);
+  color: #ffffff;
+  border-radius: 0px;
+  border-right: 2px solid #00e5ff;
 }
 
 /* search entry */
 entry {
-    box-shadow: 0 0 6px 5px #2e3440;
-    background-color: rgba (0, 0, 0, 0.5)
+  box-shadow: none;
+  border: 1px solid #00e5ff;
+  background-color: #000000;
+  color: #00e5ff;
+  padding: 5px;
 }
 
-button, image {
-    background-color: #3b4252;
-    background: none;
-    border: none;
-    margin: 10px
+button,
+image {
+  background-color: transparent;
+  background: none;
+  border: 1px solid transparent;
+  margin: 5px;
 }
 
 button:hover {
-    background-color: rgba (127, 63, 191, .4);
-    box-shadow: 0 0 6px 5px #190C26
+  background-color: #111111;
+  border: 1px solid #00e5ff;
+  box-shadow: none;
 }
 
-/* in case you wanted to give category buttons a different look */
 #category-button {
-    margin: 0 0px 0 0px
+  margin: 0;
 }
 
 #pinned-box {
-    padding-bottom: 1px;
-    border-bottom: 1px solid gray
+  padding-bottom: 5px;
+  border-bottom: 2px solid #333333;
 }
 
 #files-box {
-    padding: 1px;
-    border: 1px solid gray
+  padding: 5px;
+  border: 1px solid #333333;
 }
diff --git a/CONFIG/waybar/style.css b/CONFIG/waybar/style.css
index 679b896..f1833f3 100644
--- a/CONFIG/waybar/style.css
+++ b/CONFIG/waybar/style.css
@@ -1,60 +1,50 @@
-/* =============================================================================
- *
- * Waybar configuration
- *
- * Configuration reference: https://github.com/Alexays/Waybar/wiki/Configuration
- *
- * =========================================================================== */
-
 /* -----------------------------------------------------------------------------
- * Keyframes
+ * Keyframes & Colors
  * -------------------------------------------------------------------------- */
-
-@define-color highlight #685878 ;
-@define-color base1  #19191e ;
+@define-color highlight #00E5FF;
+@define-color base1     #0A0A0A;
+@define-color text      #FFFFFF;
+@define-color urgent    #FF0033;
+@define-color dim       #333333;
 
 @keyframes blink-warning {
-    70% {
-        color: white;
-    }
-
-    to {
-        color: white;
-        background-color: orange;
-    }
+  70% {
+    color: @text;
+  }
+  to {
+    color: @text;
+    background-color: orange;
+  }
 }
 
 @keyframes blink-critical {
-    70% {
-      color: white;
-    }
-
-    to {
-        color: white;
-        background-color: red;
-    }
+  70% {
+    color: @text;
+  }
+  to {
+    color: @text;
+    background-color: @urgent;
+  }
 }
 
 /* -----------------------------------------------------------------------------
  * Base styles
  * -------------------------------------------------------------------------- */
-
-/* Reset all styles */
 * {
-    border: none;
-    border-radius: 0;
-    min-height: 0;
-    margin: 1px;
-    padding: 0;
+  border: none;
+  border-radius: 0;
+  min-height: 0;
+  margin: 1px;
+  padding: 0;
 }
 
-/* The whole bar */
 #waybar {
-    background: transparent;
-    color: #e3e3ea;
-    background-color: @base1;
-    font-family: JetBrainsMono;
-    font-size: 13px;
+  background: transparent;
+  color: @text;
+  background-color: @base1;
+  font-family: JetBrainsMono;
+  font-size: 13px;
+  border-bottom: 2px solid @dim;
 }
 
 /* Every modules */
@@ -69,80 +59,72 @@
 #battery,
 #clock,
 #tray {
-    padding:0.5rem 0.6rem;
-    margin: 1px 0px;
+  padding: 0.5rem 0.6rem;
+  margin: 1px 0px;
 }
 
 /* -----------------------------------------------------------------------------
  * Module styles
  * -------------------------------------------------------------------------- */
-
-#custom-launcher {
-    margin-left:15px;
-    margin-right:10px;
-}
-
-#workspaces {
-    font-size:13px;
-}
-
 #workspaces button {
-    border-radius: 5px;
-    color: #eceff4;
-    padding: 1px 6px;
-    margin-right: 2px;
-    margin-left: 2px;
+  border-radius: 0px;
+  color: @text;
+  padding: 1px 6px;
+  margin-right: 2px;
+  margin-left: 2px;
+  border-bottom: 2px solid transparent;
 }
 
 #workspaces button.focused {
-    border: 1px solid #d8dee9;
+  border-bottom: 2px solid @highlight;
+  color: @highlight;
 }
 
 #workspaces button.urgent {
-    border-color: #c9545d;
-    color: #c9545d;
+  border-color: @urgent;
+  color: @urgent;
 }
 
 #mode {
-    background: @highlight;
-    border-bottom: 3px transparent;
-    color:white;
-    margin-left: 5px;
-    padding: 7px;
+  background: @highlight;
+  color: #000000;
+  font-weight: bold;
+  margin-left: 5px;
+  padding: 7px;
 }
 
 #window {
-    font-weight: bold;
+  font-weight: bold;
 }
 
 #network.disconnected {
-    color: orange;
+  color: orange;
 }
 
 #cpu.warning {
-    color: orange;
+  color: orange;
 }
 
 #cpu.critical {
-    color: red;
+  color: red;
 }
 
 #memory {
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+  animation-timing-function: linear;
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
 }
 
 #memory.warning {
-    color: orange;
- }
+  color: orange;
+}
 
 #memory.critical {
-    color: red;
-    animation-name: blink-critical;
-    animation-duration: 2s;
-    padding-left:5px;
-    padding-right:5px;
+  color: red;
+  animation-name: blink-critical;
+  animation-duration: 2s;
+  padding-left: 5px;
+  padding-right: 5px;
 }
 
 #backlight.icon {
@@ -152,35 +134,35 @@
 }
 
 #pulseaudio.muted {
-    color: @highlight;
+  color: @highlight;
 }
 
 #battery {
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+  animation-timing-function: linear;
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
 }
 
 #battery.warning {
-    color: orange;
+  color: orange;
 }
 
 #battery.critical {
-    color: red;
+  color: red;
 }
 
 #battery.warning.discharging {
-    animation-name: blink-warning;
-    animation-duration: 3s;
+  animation-name: blink-warning;
+  animation-duration: 3s;
 }
 
 #battery.critical.discharging {
-    animation-name: blink-critical;
-    animation-duration: 2s;
+  animation-name: blink-critical;
+  animation-duration: 2s;
 }
 
 #custom-power {
-    margin-left:15px;
-    margin-right:15px;
-    font-size:15px;
+  margin-left: 15px;
+  margin-right: 15px;
+  font-size: 15px;
 }