diff --git a/desktopenvs/hyprland/eww-touch/eww.scss b/desktopenvs/hyprland/eww-touch/eww.scss
index da979e2..90b6e66 100644
--- a/desktopenvs/hyprland/eww-touch/eww.scss
+++ b/desktopenvs/hyprland/eww-touch/eww.scss
@@ -1,7 +1,7 @@
 * {
   all: unset; // Unsets everything so you can style everything from scratch
   font-family: Agave Nerd Font Mono, sans-serif;
-  font-size: 14pt;
+  font-size: 27pt;
 }
 
 tooltip {
@@ -9,7 +9,7 @@ tooltip {
     border-width: 3px;
     background: #1a1a1a;
     color: #5018dd;
-    border-radius: 25px;
+    border-radius: 35px;
 }
 
 
diff --git a/desktopenvs/hyprland/eww-touch/eww.yuck b/desktopenvs/hyprland/eww-touch/eww.yuck
index 52c90a1..ebb0cef 100644
--- a/desktopenvs/hyprland/eww-touch/eww.yuck
+++ b/desktopenvs/hyprland/eww-touch/eww.yuck
@@ -6,13 +6,13 @@
   :geometry (geometry :x "0%"
                       :y "1%"
                       :width "99%"
-                      :height "20px"
+                      :height "5%"
                       :anchor "top center")
                       :exclusive true
   (bar :monitor_ monitor))
 
 (defpoll battery :interval "2s"
-  "~/Dotfiles/desktopenvs/hyprland/scripts/batteryperc")
+  "~/.config/scripts/batteryperc")
 
 
 
@@ -26,21 +26,17 @@
 	(box :orientation "h" :space-evenly false :halign "start"
 		(osk)
 		(box :class "music" {"${battery}"})
-		(workspaceWidget :monitor monitor)
-		(button :onclick "~/Dotfiles/desktopenvs/hyprland/scripts/drawer.sh" :class "music" {" ${activewindow}"})
+		(button :onclick "~/Dotfiles/desktopenvs/hyprland/scripts/drawer.sh" :class "music" {""})
+		(metric :label "󰓃 "
+		:value volume
+		:onchange "pactl set-sink-volume @DEFAULT_SINK@ {}%"
+		:onclick "killall pavucontrol || hyprctl dispatch exec \[tag +mixer\] pavucontrol")
+
         	)
 )
 
 (defwidget sidestuff []
   (box :class "sidestuff" :orientation "h" :space-evenly false :halign "end"
-    (metric :label "󰓃"
-            :value volume
-	    :onchange "pactl set-sink-volume @DEFAULT_SINK@ {}%"
-    	    :onclick "killall pavucontrol || hyprctl dispatch exec \[tag +mixer\] pavucontrol")
-    (metric :label ""
-            :value {round((1 - (EWW_DISK["/"].free / EWW_DISK["/"].total)) * 100, 0)}
-            :onchange ""
- 	    :onclick "")
     (clock)
     (systray :class "music" :orientation "h" :spacing 2 :space-evenly true)
     ))
@@ -52,11 +48,17 @@
        :orientation "h"
        :space-evenly false
        :halign "center"
-       :onclick "~/Dotfiles/desktopenvs/hyprland/scripts/screenrotationacw.sh"
+       :onclick "hyprctl dispatch workspace -1"
+       {""}
+    )
+
+    (button :class "music"
+       :orientation "h"
+       :space-evenly false
+       :halign "center"
+       :onclick "~/.config/scripts/screenrotationacw.sh"
        {"󱞧"}
     )
-    
-    
     (button :class "music"
        :orientation "h"
        :space-evenly false
@@ -68,9 +70,18 @@
        :orientation "h"
        :space-evenly false
        :halign "center"
-       :onclick "~/Dotfiles/desktopenvs/hyprland/scripts/screenrotationwcw.sh"
+       :onclick "~/.config/scripts/screenrotationwcw.sh"
        {"󱞫"}
     )
+
+    (button :class "music"
+       :orientation "h"
+       :space-evenly false
+       :halign "center"
+       :onclick "hyprctl dispatch workspace +1"
+       {""}
+    )
+
 ))
 
 (defwidget music []
@@ -86,7 +97,7 @@
        :orientation "h"
        :space-evenly false
        :halign "center"
-       :onclick "~/Dotfiles/desktopenvs/hyprland/scripts/onscreenkb.sh"
+       :onclick "~/.config/scripts/onscreenkb.sh"
        {" 󰌌"}
     )
 )
diff --git a/desktopenvs/hyprland/eww-touch/eww.yuck.old b/desktopenvs/hyprland/eww-touch/eww.yuck.old
new file mode 100644
index 0000000..80642d6
--- /dev/null
+++ b/desktopenvs/hyprland/eww-touch/eww.yuck.old
@@ -0,0 +1,150 @@
+
+(defwindow bar [monitor]
+  :monitor monitor
+  :class "ewwbar"
+  :windowtype "dock"
+  :geometry (geometry :x "0%"
+                      :y "1%"
+                      :width "99%"
+                      :height "5%"
+                      :anchor "top center")
+                      :exclusive true
+  (bar :monitor_ monitor))
+
+(defpoll battery :interval "2s"
+  "~/.config/scripts/batteryperc")
+
+
+
+(defwidget bar [monitor_]
+  (centerbox :orientation "h"
+    (winsworks :monitor monitor_)
+    (screenrotate )
+    (sidestuff)))
+
+(defwidget winsworks [monitor]
+	(box :orientation "h" :space-evenly false :halign "start"
+		(osk)
+		(box :class "music" {"${battery}"})
+		(workspaceWidget :monitor monitor)
+		(button :onclick "~/Dotfiles/desktopenvs/hyprland/scripts/drawer.sh" :class "music" {" ${activewindow}"})
+        	)
+)
+
+(defwidget sidestuff []
+  (box :class "sidestuff" :orientation "h" :space-evenly false :halign "end"
+    (metric :label "󰓃 "
+            :value volume
+	    :onchange "pactl set-sink-volume @DEFAULT_SINK@ {}%"
+	    :onclick "hyprctl dispatch exec \[tag +mixer\] hyprpwcenter")
+    (metric :label " "
+            :value {round((1 - (EWW_DISK["/"].free / EWW_DISK["/"].total)) * 100, 0)}
+            :onchange ""
+ 	    :onclick "")
+    (clock)
+    (systray :class "music" :orientation "h" :spacing 2 :space-evenly true)
+    ))
+
+
+(defwidget screenrotate []
+(box :orientation "h" :space-evenly false :halign "center"
+    (button :class "music"
+       :orientation "h"
+       :space-evenly false
+       :halign "center"
+       :onclick "~/.config/scripts/screenrotationacw.sh"
+       {"󱞧"}
+    )
+    
+    
+    (button :class "music"
+       :orientation "h"
+       :space-evenly false
+       :halign "center"
+       :onclick "hyprctl dispatch killactive"
+       {""}
+    )
+    (button :class "music"
+       :orientation "h"
+       :space-evenly false
+       :halign "center"
+       :onclick "~/.config/scripts/screenrotationwcw.sh"
+       {"󱞫"}
+    )
+))
+
+(defwidget music []
+  (button :class "music"
+       :orientation "h"
+       :space-evenly false
+       :halign "center"
+       :onclick "~/Dotfiles/desktopenvs/hyprland/scripts/playpause.sh"
+    {music != "" ? " ${music}" : " None"}))
+
+(defwidget osk []
+    (button :class "music"
+       :orientation "h"
+       :space-evenly false
+       :halign "center"
+       :onclick "~/.config/scripts/onscreenkb.sh"
+       {" 󰌌"}
+    )
+)
+
+(defwidget metric [label value onchange onclick]
+  (box :orientation "h"
+       :class "metric"
+       :space-evenly false
+    (button :class "label" :onclick onclick label)
+    (scale :min 0
+           :max 101
+           :active {onchange != ""}
+           :value value
+           :onchange onchange)))
+
+(deflisten workspaces "hyprland-workspaces _")
+
+(defwidget workspaceWidget [monitor]
+  (eventbox :onscroll "hyprctl dispatch workspace `echo {} | sed 's/up/+/\' | sed 's/down/-/'`1"
+    (box :class "workspaces"
+         :space-evenly false
+         :width 20
+      (for i in {workspaces[monitor].workspaces}
+        (button
+          :width 20
+          :onclick "hyprctl dispatch workspace ${i.id}"
+          :class "${i.class}"
+          {i.name == "special:magic" ? "󱂬" : "󱂬${i.name}"})))))
+
+
+(deflisten workspace-old "~/Dotfiles/desktopenvs/hyprland/scripts/workspace")
+(defwidget workspaces-old []
+(literal :content workspace-old))
+
+(defpoll music :interval "0.5s"
+  "~/Dotfiles/desktopenvs/hyprland/scripts/playerget")
+
+
+(defpoll activewindow :interval "0.5s"
+  "~/Dotfiles/desktopenvs/hyprland/scripts/activewindow")
+
+
+(defpoll IP :interval "5s"
+  "~/Dotfiles/desktopenvs/hyprland/scripts/ip")
+
+(defpoll volume :interval "0.5s"
+  "~/Dotfiles/desktopenvs/hyprland/scripts/getvol")
+
+(defpoll time :interval "1s"
+  "date '+%H:%M:%S|%d.%m.%Y'")
+
+(defwidget clock []
+	(box	:class "clock"
+		:tooltip {calender}
+		(label	:text {"${time}"})
+	)
+)
+
+
+(defpoll calender :interval "600s"
+    "~/Dotfiles/desktopenvs/hyprland/scripts/calender-fix.sh") 
diff --git a/desktopenvs/hyprland/hypr-usr/binds.conf b/desktopenvs/hyprland/hypr-usr/binds.conf
index ea2bd62..cbf66c2 100644
--- a/desktopenvs/hyprland/hypr-usr/binds.conf
+++ b/desktopenvs/hyprland/hypr-usr/binds.conf
@@ -36,8 +36,8 @@ gesture = 4, right, dispatcher, movetoworkspace, r-1
 ### KEYBINDINGSS ###
 ####################
 
-bindl=,switch:on:Lid Switch, exec, hyprctl dispatch dpms off && hyprctl dispatch exec hyprlock
-bindl=,switch:off:Lid Switch, exec, hyprctl dispatch dpms on
+bindl=,switch:on:Lid Switch, exec, systemctl suspend &
+bindl=,switch:off:Lid Switch, exec, hyprctl dispatch exec hyprlock 
 
 # See https://wiki.hyprland.org/Configuring/Keywords/
 $mainMod = SUPER # Sets "Windows" key as main modifier
@@ -236,7 +236,7 @@ bind = $mainMod SHIFT, D, exec, killall nwg-dock-hyprland && nwg-dock-hyprland -
 
 bindr = $mainMod, D, exec, nwg-dock-hyprland
 bind = $mainMod SHIFT, A, exec, ~/.config/scripts/drawer.sh
-bind = $mainMod, W, exec, ~/.config/scripts/menu.sh
+bind = $mainMod, W, exec, [tag +centered-L] kitty -e WallRizz -d ~/Pictures
 #GROUPS
 
 bind = $mainMod ALT, C, togglegroup, 
@@ -266,16 +266,16 @@ bind = $mainMod, P, exec, ~/.config/scripts/screenshot.sh
 bind = $mainMod SHIFT, P, exec, hyprpicker | wl-copy
 
 #audio controls
-bindle =, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%+
+binde =, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%+
 
-bindle =, XF86AudioLowerVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%-
+binde =, XF86AudioLowerVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%-
 
-bindl =, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle 
+bind =, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle 
 
 bind =, XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle 
 
-bindle=, XF86MonBrightnessUp, exec, hyprctl hyprsunset gamma +10
-bindle=, XF86MonBrightnessDown, exec, hyprctl hyprsunset gamma -10
+bindle=, XF86MonBrightnessUp, exec, bri --up
+bindle=, XF86MonBrightnessDown, exec, bri --down
 
 bindl=, XF86AudioPlay, exec, playerctl play-pause -p spotify, vlc
 
diff --git a/setup/modules/Desktop-Enviroments/hyprland-new.sh b/setup/modules/Desktop-Enviroments/hyprland-new.sh
index b36a75b..597bf6b 100755
--- a/setup/modules/Desktop-Enviroments/hyprland-new.sh
+++ b/setup/modules/Desktop-Enviroments/hyprland-new.sh
@@ -27,7 +27,7 @@ sudo systemctl enable udisks2.service
 # 4. Install AUR packages (from hyprland.sh)
 echo "Installing AUR packages..."
 rustup default stable
-yay -Syu --answerdiff None --answerclean All hyprland-workspaces vicinae-bin bluetuith wvkbd kew iwmenu bzmenu pinta localsend udiskie rust rustup
+yay -Syu --answerdiff None --answerclean All hyprland-workspaces vicinae-bin bluetuith wvkbd kew iwmenu bzmenu pinta localsend udiskie rust rustup WallRizz
 
 # 5. EWW bar selection and compilation (from hyprland.sh)
 echo "Setting up EWW bar..."