diff --git a/eww-laptop/.config/eww/eww.scss b/eww-laptop/.config/eww/eww.scss
index 171a7a0..90c765f 100644
--- a/eww-laptop/.config/eww/eww.scss
+++ b/eww-laptop/.config/eww/eww.scss
@@ -9,5 +9,10 @@
   margin-right: 10px;
   font-family: "CozetteVector";
   font-size: 12px;
+
+  .current  {
+    color: #8ec07c;
+  }
+  
 }
 
diff --git a/eww-laptop/.config/eww/eww.yuck b/eww-laptop/.config/eww/eww.yuck
index 75323a8..63e8881 100644
--- a/eww-laptop/.config/eww/eww.yuck
+++ b/eww-laptop/.config/eww/eww.yuck
@@ -1,5 +1,5 @@
-(deflisten workspaces :initial "[]" "bash ~/.config/eww/scripts/get-workspaces")
-(deflisten current_workspace :initial "1" "bash ~/.config/eww/scripts/get-active-workspace")
+(deflisten workspaces :initial "[]" "bash ./scripts/get-workspaces")
+(deflisten current_workspace :initial "1" "bash ./scripts/get-active-workspace")
 (defpoll time :interval "1s" "date '+%d.%m.%Y - %H:%M'")
 
 (defwidget workspaces []
@@ -9,8 +9,8 @@
     (box :space-evenly true
       (for workspace in workspaces
         (eventbox :onclick "hyprctl dispatch workspace ${workspace.id}"
-          (box :class "workspace-entry ${workspace.id == current_workspace ? "current" : ""} ${workspace.windows > 0 ? "occupied" : "empty"}"
-            (label :text " ${workspace.id == current_workspace ? "◆" : "◇"} ")))))))
+          (label :class {workspace.id == current_workspace ? "current" : ""}
+                 :text " ${workspace.windows > 0 ? "◆" : "◇"} "))))))
             
 (defwidget bar []
   (centerbox :class "bar"
diff --git a/hyprland/.config/hypr/hyprland.conf b/hyprland/.config/hypr/hyprland.conf
index 39ddef8..080daeb 100644
--- a/hyprland/.config/hypr/hyprland.conf
+++ b/hyprland/.config/hypr/hyprland.conf
@@ -82,18 +82,17 @@ device:epic mouse V1 {
 }
 
 
-$mainMod = SUPER
 
-bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy 
-bind = $mainMod SHIFT, Return, exec, foot
-bind = $mainMod SHIFT, B, exec, google-chrome-stable --enable-features=TouchpadOverscrollHistoryNavigation
-bind = $mainMod, Q, killactive, 
-bind = $mainMod, M, exit, 
-bind = $mainMod, g, togglefloating, 
-bind = $mainMod SHIFT, P, exec, rofi -show drun
-bind = $mainMod, P, pseudo, # dwindle
-bind = $mainMod, v, togglesplit, # dwindle
-bind = $mainMod, f, fullscreen, # dwindle
+bind = SUPER SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy 
+bind = SUPER, Return, exec, foot
+bind = SUPER SHIFT, B, exec, google-chrome-stable --enable-features=TouchpadOverscrollHistoryNavigation
+bind = SUPER, Q, killactive, 
+bind = SUPER, M, exit, 
+bind = SUPER, g, togglefloating, 
+bind = SUPER SHIFT, P, exec, rofi -show drun
+bind = SUPER, P, pseudo, # dwindle
+bind = SUPER, v, togglesplit, # dwindle
+bind = SUPER, f, fullscreen, # dwindle
 
 bind = ,XF86AudioRaiseVolume, exec, pamixer -ui 2 && pamixer --get-volume > $WOBSOCK
 bind = ,XF86AudioLowerVolume, exec, pamixer -ud 2 && pamixer --get-volume > $WOBSOCK
@@ -102,44 +101,44 @@ bind = ,XF86MonBrightnessDown, exec, brightnessctl set 5%- | sed -En 's/.*\(([0-
 bind = ,XF86MonBrightnessUp, exec, brightnessctl set +5% | sed -En 's/.*\(([0-9]+)%\).*/\1/p' | tee /tmp/brightness > $WOBSOCK
 
 
-bind = $mainMod, h, movefocus, l
-bind = $mainMod, l, movefocus, r
-bind = $mainMod, k, movefocus, u
-bind = $mainMod, j, movefocus, d
+bind = SUPER, h, movefocus, l
+bind = SUPER, l, movefocus, r
+bind = SUPER, k, movefocus, u
+bind = SUPER, j, movefocus, d
 
-bind = $mainMod SHIFT, h, movewindow, l
-bind = $mainMod SHIFT, l, movewindow, r
-bind = $mainMod SHIFT, k, movewindow, u
-bind = $mainMod SHIFT, j, movewindow, d
+bind = SUPER SHIFT, h, movewindow, l
+bind = SUPER SHIFT, l, movewindow, r
+bind = SUPER SHIFT, k, movewindow, u
+bind = SUPER SHIFT, j, movewindow, d
 
-# Switch workspaces with mainMod + [0-9]
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
+# SwitcSUPERaces with mainMod + [0-9]
+bind = SUPER, 1, workspace, 1
+bind = SUPER, 2, workspace, 2
+bind = SUPER, 3, workspace, 3
+bind = SUPER, 4, workspace, 4
+bind = SUPER, 5, workspace, 5
+bind = SUPER, 6, workspace, 6
+bind = SUPER, 7, workspace, 7
+bind = SUPER, 8, workspace, 8
+bind = SUPER, 9, workspace, 9
+bind = SUPER, 0, workspace, 10
 
-# Move active window to a workspace with mainMod + SHIFT + [0-9]
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
+# Move SUPERindow to a workspace with mainMod + SHIFT + [0-9]
+bind = SUPER SHIFT, 1, movetoworkspace, 1
+bind = SUPER SHIFT, 2, movetoworkspace, 2
+bind = SUPER SHIFT, 3, movetoworkspace, 3
+bind = SUPER SHIFT, 4, movetoworkspace, 4
+bind = SUPER SHIFT, 5, movetoworkspace, 5
+bind = SUPER SHIFT, 6, movetoworkspace, 6
+bind = SUPER SHIFT, 7, movetoworkspace, 7
+bind = SUPER SHIFT, 8, movetoworkspace, 8
+bind = SUPER SHIFT, 9, movetoworkspace, 9
+bind = SUPER SHIFT, 0, movetoworkspace, 10
 
-# Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
+# ScrolSUPERh existing workspaces with mainMod + scroll
+bind = SUPER, mouse_down, workspace, e+1
+bind = SUPER, mouse_up, workspace, e-1
 
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
+# Move/SUPERindows with mainMod + LMB/RMB and dragging
+bindm = SUPER, mouse:272, movewindow
+bindm = SUPER, mouse:273, resizewindow