diff --git a/hypr-configs/hyprland/eww/assets/scss/widgets/revealer.scss b/hypr-configs/hyprland/eww/assets/scss/_components.scss
similarity index 100%
rename from hypr-configs/hyprland/eww/assets/scss/widgets/revealer.scss
rename to hypr-configs/hyprland/eww/assets/scss/_components.scss
diff --git a/hypr-configs/hyprland/eww/assets/scss/_mixin.scss b/hypr-configs/hyprland/eww/assets/scss/_mixin.scss
index c9d70fa..b689340 100644
--- a/hypr-configs/hyprland/eww/assets/scss/_mixin.scss
+++ b/hypr-configs/hyprland/eww/assets/scss/_mixin.scss
@@ -1,5 +1,5 @@
 @mixin widget() {
-  padding: 6px;
+  padding: 0.6em;
   margin: 4px 2px;
   border-radius: 8px;
   background-color: $surface0;
@@ -9,14 +9,13 @@
   @include widget;
 }
 
-.controlpanel-widget {
+.panel-widget {
   @include widget;
   margin: 6px;
 }
 
 @mixin icon() {
   font-size: 20px;
-  padding: 2px 0px;
   font-family: "Symbols Nerd Font";
 }
 
diff --git a/hypr-configs/hyprland/eww/assets/scss/_modules.scss b/hypr-configs/hyprland/eww/assets/scss/_modules.scss
index 3800166..60eaf2b 100644
--- a/hypr-configs/hyprland/eww/assets/scss/_modules.scss
+++ b/hypr-configs/hyprland/eww/assets/scss/_modules.scss
@@ -32,8 +32,8 @@
   }
 
   .workspace {
-    margin: 4px 8px;
     border-radius: 4px;
+    margin: 0px 6px;
   }
 
   .workspacething {
diff --git a/hypr-configs/hyprland/eww/assets/scss/widgets/clock.scss b/hypr-configs/hyprland/eww/assets/scss/widgets/clock.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/hypr-configs/hyprland/eww/assets/scss/windows/panel.scss b/hypr-configs/hyprland/eww/assets/scss/windows/_control-panel.scss
similarity index 97%
rename from hypr-configs/hyprland/eww/assets/scss/windows/panel.scss
rename to hypr-configs/hyprland/eww/assets/scss/windows/_control-panel.scss
index e719324..c1c6075 100644
--- a/hypr-configs/hyprland/eww/assets/scss/windows/panel.scss
+++ b/hypr-configs/hyprland/eww/assets/scss/windows/_control-panel.scss
@@ -1,6 +1,6 @@
-.controlpanelwindow {
+.control-panel {
+  padding: 0.4em;
   background-color: $base;
-  padding: 5px;
 }
 
 .userinfo label {
@@ -10,7 +10,6 @@
 
 .titlesel {
   font-size: 20px;
-  // font-weight: bold;
   margin: 5px;
   padding: 5px;
   color: $base;
diff --git a/hypr-configs/hyprland/eww/assets/scss/windows/vbar.scss b/hypr-configs/hyprland/eww/assets/scss/windows/_vertical-bar.scss
similarity index 100%
rename from hypr-configs/hyprland/eww/assets/scss/windows/vbar.scss
rename to hypr-configs/hyprland/eww/assets/scss/windows/_vertical-bar.scss
diff --git a/hypr-configs/hyprland/eww/eww.scss b/hypr-configs/hyprland/eww/eww.scss
index 97b07de..434d383 100644
--- a/hypr-configs/hyprland/eww/eww.scss
+++ b/hypr-configs/hyprland/eww/eww.scss
@@ -3,11 +3,11 @@
 @import "./assets/scss/native";
 @import "./assets/scss/global";
 @import "./assets/scss/modules";
+@import "./assets/scss/components";
 
-@import "./assets/scss/widgets/revealer.scss";
+@import "./assets/scss/windows/control-panel";
+@import "./assets/scss/windows/vertical-bar";
 
-@import "./assets/scss/windows/vbar.scss";
-@import "./assets/scss/windows/panel.scss";
 @import "./src/dashboard/styles.scss";
 @import "./src/dock/styles.scss";
 @import "./src/desktop/styles.scss";
diff --git a/hypr-configs/hyprland/eww/eww.yuck b/hypr-configs/hyprland/eww/eww.yuck
index e7aaea8..8097c27 100644
--- a/hypr-configs/hyprland/eww/eww.yuck
+++ b/hypr-configs/hyprland/eww/eww.yuck
@@ -8,7 +8,7 @@
 (include "./src/-modules/_media.yuck")
 
 (include "./src/windows/_vertical-bar.yuck")
-(include "./src/windows/panel/main.yuck")
+(include "./src/windows/_control-panel.yuck")
 
 (include "./setups.yuck")
 
diff --git a/hypr-configs/hyprland/eww/setups.yuck b/hypr-configs/hyprland/eww/setups.yuck
index 970d927..0201997 100644
--- a/hypr-configs/hyprland/eww/setups.yuck
+++ b/hypr-configs/hyprland/eww/setups.yuck
@@ -9,7 +9,7 @@
   :stacking "overlay"
   :monitor 0
 
-  (control_widget))
+  (ControlPanel))
 
 (defwindow bar
   :geometry
diff --git a/hypr-configs/hyprland/eww/src/-modules/_workspaces.yuck b/hypr-configs/hyprland/eww/src/-modules/_workspaces.yuck
index faae7e7..2796858 100644
--- a/hypr-configs/hyprland/eww/src/-modules/_workspaces.yuck
+++ b/hypr-configs/hyprland/eww/src/-modules/_workspaces.yuck
@@ -9,6 +9,7 @@
       :class "workspaces"
       :space-evenly false
       :orientation "v"
+      :spacing 6
 
       (for workspace in {workspacesJson}
         (button
diff --git a/hypr-configs/hyprland/eww/src/windows/panel/main.yuck b/hypr-configs/hyprland/eww/src/windows/_control-panel.yuck
similarity index 97%
rename from hypr-configs/hyprland/eww/src/windows/panel/main.yuck
rename to hypr-configs/hyprland/eww/src/windows/_control-panel.yuck
index 0eb81a3..4143a8d 100644
--- a/hypr-configs/hyprland/eww/src/windows/panel/main.yuck
+++ b/hypr-configs/hyprland/eww/src/windows/_control-panel.yuck
@@ -1,10 +1,11 @@
-(defwidget control_widget []
+(defwidget ControlPanel []
   (box
-    :class "controlpanelwindow"
+    :class "control-panel"
     :space-evenly false
     :orientation "v"
     :valign "fill"
     :vexpand true
+
     (user)
     (chooser)
     ; (weather)
@@ -46,7 +47,7 @@
     :orientation "v"
     :halign "fill"
     :height 60
-    :class "controlpanel-widget"
+    :class "panel-widget"
     :space-evenly false
     (box
       :orientation "h"
@@ -205,7 +206,7 @@
       :space-evenly false
       :height 140
       :width 320
-      :class "controlpanel-widget"
+      :class "panel-widget"
       :valign "start"
       :halign "fill"
       :hexpand true
@@ -229,7 +230,7 @@
     :halign "fill"
     :valign "fill"
     :vexpand true
-    :class "controlpanel-widget"
+    :class "panel-widget"
     :space-evenly false
 
     (box
@@ -342,7 +343,7 @@
 (defwidget timer[]
   (box
     :orientation "v"
-    :class "controlpanel-widget"
+    :class "panel-widget"
     :space-evenly false
     :width 180
     :valign "fill"
@@ -359,7 +360,7 @@
   (box
     :valign "fill"
     :halign "fill"
-    :class "controlpanel-widget"
+    :class "panel-widget"
     :hexpand true
     :space-evenly true
     (bigvol)
@@ -465,7 +466,7 @@
 
 (defwidget quote []
   (box
-    :class "quotewid controlpanel-widget"
+    :class "quotewid panel-widget"
     :halign "fill"
     :valign "fill"
     :vexpand true
@@ -487,7 +488,7 @@
       :orientation "v"
       :halign "fill"
       :height h
-      :class { pcover != "" ? "mpdcover" : "controlpanel-widget"}
+      :class { pcover != "" ? "mpdcover" : "panel-widget"}
       :style "background-image: url('${pcover}')"
       :visible {permashow ? true : pcover != "" })
     (box
diff --git a/hypr-configs/hyprland/eww/src/windows/_vertical-bar.yuck b/hypr-configs/hyprland/eww/src/windows/_vertical-bar.yuck
index 5c30c73..fcd9ce4 100644
--- a/hypr-configs/hyprland/eww/src/windows/_vertical-bar.yuck
+++ b/hypr-configs/hyprland/eww/src/windows/_vertical-bar.yuck
@@ -7,7 +7,7 @@
     (revealer
       :transition "slideleft"
       :reveal revealControlpanel
-      (control_widget))
+      (ControlPanel))
 
     (centerbox
       :class "vbar"
@@ -26,7 +26,7 @@
 
     (Logo)
     (Workspaces)
-    (hiddenctl)
+    ;; (hiddenctl)
     ))
 
 (defwidget Middle []
@@ -47,7 +47,7 @@
 
     ;; (systemtray)
     (Language)
-    (sliders)
+    (Sliders)
     (Clock)
     ;; (battery)
     ))
@@ -76,7 +76,7 @@
     :space-evenly false
     :class "widget"
     (overlay
-      (scale 
+      (scale
         :class "${EWW_BATTERY.BAT0.status == 'Charging' ? 'charging': bat0 < 16 ? 'dying': 'normal'} bat_scale"
         :value "${bat0}"
         :orientation "v"
@@ -84,14 +84,14 @@
         :min 0
         :active false
         :flipped true)
-      (label 
+      (label
         :class "lightning"
         :visible {EWW_BATTERY.BAT0.status == "Charging"}
         :text "󱐋"))
     (label :text "${EWW_BATTERY.BAT0.capacity}%" :limit-width 3 :show-truncated false)))
 
 (defwidget hiddenctl []
-  (eventbox 
+  (eventbox
     :cursor "pointer"
     :onclick {reveal3 ? "${EWW_CMD} update reveal3=false" : "${EWW_CMD} update reveal3=true"}
     (box
@@ -106,11 +106,11 @@
           :class "touch"
           :orientation "v"
           :spacing 5
-          (button :onclick "swaymsg kill" 
+          (button :onclick "swaymsg kill"
             (label :class "icon" :text "󰅙"))
           (button :onclick "wofi --show=drun -i -I"
             (label :class "icon" :text "󰀻"))
-          (button :onclick "./scripts/touchkey.sh" 
+          (button :onclick "./scripts/touchkey.sh"
             (label :class "icon" :text "󰌌"))))
       (label :angle {reveal3 ? 90 : 270} :class "revealtouch" :tooltip "touch control" :text "")
       (revealer
@@ -118,12 +118,12 @@
         :transition "slidedown"
         ))))
 
-(defwidget sliders []
+(defwidget Sliders []
   (box
     :class "widget"
     :orientation "v"
     :space-evenly false
-    :spacing 5
+    :spacing 8
     :valign "end"
 
     (button :onclick "alacritty -e nmtui" :tooltip wifi_essid