diff --git a/Configs/waybar/config.jsonc b/Configs/waybar/config.jsonc
index a045b2c..d1aa093 100644
--- a/Configs/waybar/config.jsonc
+++ b/Configs/waybar/config.jsonc
@@ -2,7 +2,7 @@
   "layer": "top",
   "position": "top",
   "mode": "dock",
-  "height": 28, // uncomment to set fixed height
+  // "height": 28, // uncomment to set fixed height
   "exclusive": true,
   "passthrough": false,
   "gtk-layer-shell": true,
@@ -10,65 +10,46 @@
 
   // Positions
   "modules-left": [
-    "custom/ws", // window icon
-    "custom/left1",
+    "custom/ws", // logo
 
     "hyprland/workspaces", // workspaces
-    "custom/right1",
 
-    "custom/paddw",
     "hyprland/window" // window title
   ],
 
   "modules-center": [
-    "custom/paddc",
-    "custom/left2",
     "custom/cpuinfo", // temperature
 
-    "custom/left3",
     "memory", // memory
 
-    "custom/left4",
     "custom/cpu", // cpu
-    "custom/leftin1",
 
-    "custom/left5",
-    "idle_inhibitor", // arch logo
-    "custom/right2",
+    "idle_inhibitor",
 
-    "custom/rightin1",
     "clock#time", // time
-    "custom/right3",
 
     "clock#date", // date
-    "custom/right4",
 
-    "custom/wifi", // connection
-    "custom/right5"
+    "custom/wifi" // connection
   ],
 
   "modules-right": [
     "tray", // tray
 
-    "custom/left6",
     "hyprland/language", // language
 
-    "custom/left7",
     "pulseaudio", // output device
 
-    "custom/left8",
     "custom/backlight", // brightness
 
-    "custom/left9",
     "battery", // battery
 
-    "custom/leftin2",
     "custom/power" // power button
   ],
 
   // Modules
   "custom/ws": {
-    "format": "  ",
+    "format": " ",
     "tooltip": false,
     "min-length": 3,
     "max-length": 4
@@ -95,16 +76,16 @@
     "format": "{}",
     "separate-outputs": true,
     "rewrite": {
-      // desktop
-      "": "<span foreground='#89b4fa'> </span> Hyprland",
+      // Desktop
+      "": "󰢤 No window",
 
-      // terminal
-      "sejjy@archlinux:(.*)": "  $1",
-      "(.*)sejjy@archlinux:~": "  sejjy@archlinux",
+      // Terminal
+      "rzx@arch:(.*)": "  $1",
+      "(.*)rzx@arch:~": "  rzx@arch",
 
-      // Firefox
-      "(.*) — Mozilla Firefox": "<span foreground='#f38ba8'>󰈹 </span> $1",
-      "(.*)Mozilla Firefox": "<span foreground='#f38ba8'>󰈹 </span> Firefox",
+      // Brave
+      "(.*) - Brave": "<span foreground='#e07f00'> </span> $1",
+      "(.*)Brave-browser": "<span foreground='#e07f00'> </span> Brave",
 
       // VSCode
       "(.*) - Visual Studio Code": "<span foreground='#89b4fa'>󰨞 </span> $1",
@@ -129,11 +110,6 @@
       // GIMP
       "GNU Image Manipulation Program": "<span foreground='#a6adc8'> </span> GNU Image Manipulation Program",
 
-      // Godot
-      "Godot": "<span foreground='#89b4fa'> </span> Godot Engine",
-      "Godot Engine - (.*)": "<span foreground='#89b4fa'> </span> $1",
-      "(.*) - Godot Engine": "<span foreground='#89b4fa'> </span> $1",
-
       // OnlyOffice
       "ONLYOFFICE Desktop Editors": "<span foreground='#f38ba8'> </span> OnlyOffice Desktop",
       "(.*).docx": "<span foreground='#89b4fa'> </span> $1.docx",
@@ -295,94 +271,6 @@
     "on-click": "~/.config/waybar/scripts/logoutlaunch.sh 2",
     "on-click-right": "~/.config/waybar/scripts/logoutlaunch.sh 1",
     "interval": 86400
-  },
-
-  // Padding
-  "custom/paddw": {
-    "format": " ",
-    "tooltip": false
-  },
-
-  // adjust padding in style.css if you have a long network name
-  // so that the modules remain centered.
-  "custom/paddc": {
-    "format": " ",
-    "tooltip": false
-  },
-
-  // Left Arrows
-  "custom/left1": {
-    "format": "",
-    "tooltip": false
-  },
-  "custom/left2": {
-    "format": "",
-    "tooltip": false
-  },
-  "custom/left3": {
-    "format": "",
-    "tooltip": false
-  },
-  "custom/left4": {
-    "format": "",
-    "tooltip": false
-  },
-  "custom/left5": {
-    "format": "",
-    "tooltip": false
-  },
-  "custom/left6": {
-    "format": "",
-    "tooltip": false
-  },
-  "custom/left7": {
-    "format": "",
-    "tooltip": false
-  },
-  "custom/left8": {
-    "format": "",
-    "tooltip": false
-  },
-  "custom/left9": {
-    "format": "",
-    "tooltip": false
-  },
-
-  // Right Arrows
-  "custom/right1": {
-    "format": "",
-    "tooltip": false
-  },
-  "custom/right2": {
-    "format": "",
-    "tooltip": false
-  },
-  "custom/right3": {
-    "format": "",
-    "tooltip": false
-  },
-  "custom/right4": {
-    "format": "",
-    "tooltip": false
-  },
-  "custom/right5": {
-    "format": "",
-    "tooltip": false
-  },
-
-  // Left Inverse
-  "custom/leftin1": {
-    "format": "",
-    "tooltip": false
-  },
-  "custom/leftin2": {
-    "format": "",
-    "tooltip": false
-  },
-
-  // Right Inverse
-  "custom/rightin1": {
-    "format": "",
-    "tooltip": false
   }
+
 }
\ No newline at end of file
diff --git a/Configs/waybar/scripts/image.png b/Configs/waybar/scripts/image.png
deleted file mode 100644
index c2ba29c..0000000
Binary files a/Configs/waybar/scripts/image.png and /dev/null differ
diff --git a/Configs/waybar/styles.css b/Configs/waybar/styles.css
index fe1d419..8ca7adc 100644
--- a/Configs/waybar/styles.css
+++ b/Configs/waybar/styles.css
@@ -5,31 +5,24 @@
   font-weight: bold;
   font-size: 14px;
   min-height: 14px;
-  color: rgba(200, 200, 200, 1.0);
+  color: @foreground;
 }
 
 @import "./theme.css";
 
 /* Main Background */
 window#waybar {
-  background: @background;
-}
-
-/* [new] Drop Shadow */
-window#waybar > box {
-  background-color: transparent;
-  box-shadow: 0px 0px 2px 1px rgba(0, 0, 0, 1);
-  margin: 2px 2px 2px 2px;
+  background: transparent;
 }
 
 /* Tooltip Styling */
 tooltip {
   color: @foreground;
-  background: @background;
+  background: @tooltip;
   border: solid;
   border-width: 1.5px;
   border-radius: 7px;
-  border-color: white;
+  border-color: @foreground;
 }
 
 /* Workspace Button */
@@ -51,8 +44,8 @@ tooltip {
 #workspaces button.active {
   color: @active-fg;
   background: @active-bg;
-  text-shadow: 0px 0px 2px rgba(0, 0, 0, 0.6);
-  box-shadow: 0px 0px 2px 1px rgba(0, 0, 0, 1);
+  text-shadow: 0px 0px 2px rgba(22, 22, 22, 0.6);
+  box-shadow: 0px 0px 2px 1px rgba(22, 22, 22, 1);
   margin-right: 2px;
   margin-left: 2px;
   padding-right: 6px;
@@ -87,190 +80,115 @@ tooltip {
   margin-bottom: 0px;
   padding-right: 4px;
   padding-left: 4px;
-  text-shadow: 0px 0px 2px rgba(0, 0, 0, 1);
+  text-shadow: 0px 0px 2px rgba(22, 22, 22, 0.8);
 }
 
-/* General Left Arrow Styling */
-#custom-left1,
-#custom-left2,
-#custom-left3,
-#custom-left4,
-#custom-left5,
-#custom-left6,
-#custom-left7,
-#custom-left8,
-#custom-left9 {
-  font-size: 11pt;
-  text-shadow: -1px 0px 2px rgba(0, 0, 0, 1);
-}
-
-/* General Right Arrow Styling */
-#custom-right1,
-#custom-right2,
-#custom-right3,
-#custom-right4,
-#custom-right5 {
-  font-size: 11pt;
-  padding-right: 3px;
-  text-shadow: 1px 0px 2px rgba(0, 0, 0, 1);
-}
-
-/* Color Definitions */
-@define-color workspaces        #181825;
-@define-color cpuinfo           #181825;
-@define-color memory            #1e1e2e;
-@define-color cpu               #313244;
-@define-color arch              #9399b2;
-@define-color time              #313244;
-@define-color date              #1e1e2e;
-@define-color wifi              #181825;
-@define-color language          #161621;
-@define-color pulseaudio        #181825;
-@define-color backlight         #1e1e2e;
-@define-color battery           #313244;
-@define-color power             #9399b2;
-
-/* Window Icon */
+/* Logo */
 #custom-ws {
-  background: @background;
+  background: @logo;
+  border-radius: 8px;
+  padding: 1px 0 0 3px;
+  margin: 0px;
+  margin-right: 2px;
 }
 
 /* Workspaces */
-#custom-left1 {
-  color: @workspaces;
-  background: @background;
-  padding-left: 2px;
-}
-
 #workspaces {
   background: @workspaces;
+  margin-right: 2px;
+  margin-left: 2px;
+  border-radius: 8px;
 }
 
-#custom-right1 {
-  color: @workspaces;
-  background: @background;
+/* Window Title */
+#window {
+  background: @window;
+  margin-left: 2px;
+  padding-right: 10px;
+  padding-left: 10px;
+  border-radius: 8px;
 }
 
 /* Temperature */
-#custom-paddc {
-  padding-right: 22px;
-}
-
-#custom-left2 {
-  color: @cpuinfo;
-  background: @background;
-  border-radius: 10px;
-  padding-left: 3px;
-}
-
 #custom-cpuinfo {
   background: @cpuinfo;
   padding-left: 1px;
   padding-right: 0px;
+  margin-right: 2px;
+  margin-left: 2px;
+  border-radius: 8px;
 }
 
 /* Memory */
-#custom-left3 {
-  color: @memory;
-  background: @cpuinfo;
-  padding-left: 3px;
-}
-
 #memory {
   background: @memory;
   padding-left: 1px;
   padding-right: 0px;
+  margin-right: 2px;
+  margin-left: 2px;
+  border-radius: 8px;
 }
 
 /* CPU */
-#custom-left4 {
-  color: @cpu;
-  background: @memory;
-  padding-left: 3px;
-}
-
 #custom-cpu {
   background: @cpu;
+  margin-right: 2px;
+  margin-left: 2px;
+  border-radius: 8px;
 }
 
-#custom-leftin1 {
-  color: @cpu;
-  font-size: 14.5pt;
-  margin-bottom: -2px;
-}
-
-/* Arch Logo */
-#custom-left5 {
-  color: @arch;
-  background: @background;
-  text-shadow: -1px 0px 2px rgba(0, 0, 0, 0.6);
-  padding-left: 3px;
-}
-
+/* Idle Inhibitor */
 #idle_inhibitor {
-  color: black;
-  background: @arch;
+  color: @foreground;
+  background: @idle_inhibitor;
   font-size: 11pt;
-  margin-right: -1px;
-  margin-bottom: -2px;
+  margin-right: 2px;
+  margin-left: 2px;
+  border-radius: 8px;
   padding-right: 5px;
   padding-left: 5px;
-  text-shadow: 0px 0px 1.5px rgba(0, 0, 0, 1);
-}
-
-#custom-right2 {
-  color: @arch;
-  background: @background;
+  text-shadow: 0px 0px 1.5px rgba(22, 22, 22, 1);
 }
 
 /* Time */
-#custom-rightin1 {
-  color: @time;
-  font-size: 14.5pt;
-  margin-bottom: -2px;
-}
-
 #clock.time {
   background: @time;
-}
-
-#custom-right3 {
-  color: @time;
-  background: @date;
+  margin-right: 2px;
+  margin-left: 2px;
+  border-radius: 8px;
 }
 
 /* Date */
 #clock.date {
   background: @date;
-}
-
-#custom-right4 {
-  color: @date;
-  background: @wifi;
+  margin-right: 2px;
+  margin-left: 2px;
+  border-radius: 8px;
 }
 
 #custom-wifi {
   background: @wifi;
   padding-right: 6px;
   padding-left: 4px;
-}
-
-#custom-right5 {
-  color: @wifi;
-  background: @background;
+  margin-right: 2px;
+  margin-left: 2px;
+  border-radius: 8px;
 }
 
 /* Tray */
 #tray {
-  background: @background;
-  padding-right: 8px;
-  padding-left: 8px;
+  padding-right: 6px;
+  padding-left: 6px;
+  background: @tray;
+  margin-right: 2px;
+  margin-left: 2px;
+  border-radius: 8px;
 }
 
 #tray menu {
-  background: @background;
   color: @foreground;
   border-radius: 13px;
+  background: @tooltip;
 }
 
 #tray menu separator {
@@ -286,47 +204,35 @@ tooltip {
 }
 
 /* Language */
-#custom-left6 {
-  color: @language;
-  background: @background;
-  padding-left: 3px;
-}
-
 #language {
   background: @language;
+  margin-right: 2px;
+  margin-left: 2px;
+  border-radius: 8px;
 }
 
 /* PulseAudio */
-#custom-left7 {
-  color: @pulseaudio;
-  background: @language;
-  padding-left: 3px;
-}
-
 #pulseaudio {
   background: @pulseaudio;
+  margin-right: 2px;
+  margin-left: 2px;
+  border-radius: 8px;
 }
 
 /* Brightness */
-#custom-left8 {
-  color: @backlight;
-  background: @pulseaudio;
-  padding-left: 3px;
-}
-
 #custom-backlight {
   background: @backlight;
+  margin-right: 2px;
+  margin-left: 2px;
+  border-radius: 8px;
 }
 
 /* Battery */
-#custom-left9 {
-  color: @battery;
-  background: @backlight;
-  padding-left: 3px;
-}
-
 #battery {
   background: @battery;
+  margin-right: 2px;
+  margin-left: 2px;
+  border-radius: 8px;
 }
 
 #battery.warning {
@@ -338,29 +244,19 @@ tooltip {
 }
 
 /* Power Button */
-#custom-leftin2 {
-  color: @battery;
-  background: @background;
-  font-size: 14.5pt;
-  margin-bottom: -2px;
-}
-
 #custom-power {
-  color: @background;
   background: @power;
-  text-shadow: 0px 0px 2px rgba(0, 0, 0, 0.6);
-  box-shadow: 0px 0px 2px 1px rgba(0, 0, 0, 1);
-  border-radius: 20px;
-  margin-top: 2px;
+  color: @foreground;
+  border-radius: 10px;
   margin-right: 4px;
-  margin-bottom: 2px;
+  margin-left: 2px;
   padding-right: 6px;
   padding-left: 9px;
 }
 
 #custom-power:hover {
   color: @hover-fg;
-  background: @hover-bg;
+  background: @power-hv;
   box-shadow: none;
   transition: all 0.3s cubic-bezier(0.55, -0.68, 0.48, 1.682);
 }
\ No newline at end of file
diff --git a/Configs/waybar/theme.css b/Configs/waybar/theme.css
index 9f35ff9..58e4f75 100644
--- a/Configs/waybar/theme.css
+++ b/Configs/waybar/theme.css
@@ -1,26 +1,38 @@
-/* 
-bg - background
-fg - foreground
-act - active
-hvr - hover
-*/
+/* General */
+@define-color background        #0f0f0f;
+@define-color foreground        rgba(200, 200, 200, 1.0);
+@define-color hover             rgba(200, 200, 200, 0.2);
 
-/* Main Colors */
-@define-color background        #11111b;
-@define-color foreground        #cdd6f4;
-@define-color hover             #2b2b45;
 
-/* Workspace Button Colors */
-@define-color active-bg         #9399b2;
-@define-color active-fg         #11111b;
-@define-color hover-bg          #45475a;
-@define-color hover-fg          #cdd6f4;
+/* Waybar */
+/* Workspace */
+@define-color active-bg         rgba(150, 150, 150, 0.3);
+@define-color active-fg         #0f0f0f;
+@define-color hover-bg          rgba(220, 220, 220, 0.2);
+@define-color hover-fg          rgba(200, 200, 200, 1.0);
 
-/* Wlogout Colors */
-@define-color bar-bg            #11111b;
-@define-color main-bg           #11111b;
-@define-color main-fg           #cdd6f4;
-@define-color wb-act-bg         #9399b2;
-@define-color wb-act-fg         #11111b;
-@define-color wb-hvr-bg         #6c7086;
-@define-color wb-hvr-fg         #11111b;
\ No newline at end of file
+/* Module */
+@define-color tooltip           rgba(30, 30, 30, 0.9);
+@define-color logo              rgba(30, 30, 30, 0.8);
+@define-color workspaces        rgba(30, 30, 30, 0.8);
+@define-color window            rgba(30, 30, 30, 0.8);
+@define-color cpuinfo           rgba(30, 30, 30, 0.8);
+@define-color memory            rgba(50, 50, 50, 0.8);
+@define-color cpu               rgba(70, 70, 70, 0.8);
+@define-color idle_inhibitor    rgba(80, 80, 80, 0.8);
+@define-color time              rgba(70, 70, 70, 0.8);
+@define-color date              rgba(50, 50, 50, 0.8);
+@define-color wifi              rgba(30, 30, 30, 0.8);
+@define-color tray              rgba(40, 40, 40, 0.8);
+@define-color language          rgba(45, 45, 45, 0.8);
+@define-color pulseaudio        rgba(50, 50, 50, 0.8);
+@define-color backlight         rgba(50, 50, 50, 0.8);
+@define-color battery           rgba(70, 70, 70, 0.8);
+@define-color power             rgba(70, 70, 70, 0.8);
+@define-color power-hv          rgba(50, 50, 50, 0.8);
+
+
+/* Wlogout */
+@define-color wl-bg             rgba(10, 10, 10, 0.3);
+@define-color wl-button-bg      rgba(50, 50, 50, 0.9);
+@define-color wl-button-fg      rgba(200, 200, 200, 1.0);
\ No newline at end of file