diff --git a/Assets/general.png b/Assets/general.png
index 267081f..84129a1 100644
Binary files a/Assets/general.png and b/Assets/general.png differ
diff --git a/Assets/waybar.png b/Assets/waybar.png
index ce01f9f..99e2745 100644
Binary files a/Assets/waybar.png and b/Assets/waybar.png differ
diff --git a/Configs/.config/waybar/config.jsonc b/Configs/.config/waybar/config.jsonc
index 1a17dfd..f16dd7f 100644
--- a/Configs/.config/waybar/config.jsonc
+++ b/Configs/.config/waybar/config.jsonc
@@ -193,7 +193,7 @@
   "tray": {
     "icon-size": 18,
     "rotate": 0,
-    "spacing": 5
+    "spacing": 8
   },
 
   "privacy": {
diff --git a/Configs/.config/waybar/styles.css b/Configs/.config/waybar/styles.css
index e032e94..c4d07d9 100644
--- a/Configs/.config/waybar/styles.css
+++ b/Configs/.config/waybar/styles.css
@@ -1,6 +1,5 @@
 @import "./theme.css";
 
-
 /* -- Global Styling -- */
 * {
   border: none;
@@ -15,11 +14,10 @@ window#waybar {
   background: @background;
 }
 
-window#waybar>box {
+window#waybar > box {
   margin-top: 4px;
 }
 
-
 /* -- Tooltip Styling -- */
 tooltip {
   color: @foreground;
@@ -30,7 +28,6 @@ tooltip {
   border-color: @foreground;
 }
 
-
 /* -- General Module Styling -- */
 #idle_inhibitor,
 #workspaces,
@@ -49,15 +46,13 @@ tooltip {
 #battery,
 #custom-power {
   opacity: 1;
-  padding: 3px 3px;
+  padding: 3px 6px;
   margin: 0 3px;
   border-radius: 10px;
   text-shadow: 0px 0px 2px rgba(22, 22, 22, 0.8);
 }
 
-
 /* -- Left Modules -- */
-
 /* Idle Inhibitor */
 #idle_inhibitor {
   background: @logo;
@@ -109,12 +104,25 @@ tooltip {
   padding-left: 10px;
 }
 
-
 /* -- Central Modules --  */
+#custom-cpu,
+#custom-cpuinfo,
+#memory,
+#clock.time,
+#clock.date {
+  margin-left: 0;
+  margin-right: 0;
+  border-radius: 0;
+  padding: 3px 3px;
+}
 
 /* CPU */
 #custom-cpu {
   background: @cpu;
+  border-top-left-radius: 10px;
+  border-bottom-left-radius: 10px;
+  margin-left: 6px;
+  padding-left: 6px;
 }
 
 /* CPU Temperature */
@@ -135,16 +143,12 @@ tooltip {
 /* Date */
 #clock.date {
   background: @date;
-}
-
-/* Wifi */
-#custom-wifi {
-  background: @wifi;
+  border-top-right-radius: 10px;
+  border-bottom-right-radius: 10px;
+  margin-right: 6px;
   padding-right: 6px;
-  padding-left: 4px;
 }
 
-
 /* -- Right Modules -- */
 
 /* Network */
@@ -153,7 +157,7 @@ tooltip {
   padding-right: 8px;
   padding-left: 8px;
   font-size: 13px;
-} 
+}
 
 /* Tray */
 #tray {
@@ -187,9 +191,24 @@ tooltip {
   padding-left: 8px;
 }
 
+/* Right modules group */
+#language,
+#pulseaudio,
+#custom-backlight,
+#battery {
+  margin-left: 0;
+  margin-right: 0;
+  border-radius: 0;
+  padding: 3px 2px;
+}
+
 /* Language */
 #language {
   background: @language;
+  border-top-left-radius: 10px;
+  border-bottom-left-radius: 10px;
+  margin-left: 3px;
+  padding-left: 6px;
 }
 
 /* PulseAudio */
@@ -205,8 +224,10 @@ tooltip {
 /* Battery */
 #battery {
   background: @battery;
+  border-top-right-radius: 10px;
+  border-bottom-right-radius: 10px;
+  margin-right: 3px;
   padding-right: 6px;
-  padding-left: 6px;
 }
 
 #battery.warning {