diff --git a/desktopenvs/hyprlua/eww-touch/eww.yuck b/desktopenvs/hyprlua/eww-touch/eww.yuck
index 8ed4918..f023a65 100644
--- a/desktopenvs/hyprlua/eww-touch/eww.yuck
+++ b/desktopenvs/hyprlua/eww-touch/eww.yuck
@@ -23,14 +23,14 @@
     (sidestuff)))
 
 (defwidget winsworks [monitor]
-	(box :orientation "h" :space-evenly false :hexpand true
+	(box :orientation "h" :space-evenly false :halign "start"
 		(osk)
 		(box :class "music" {"${battery}"})
-		(button :onclick "~/Dotfiles/desktopenvs/hyprland/scripts/drawer.sh" :class "music round" {""})
+		(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 eval 'hl.dsp.exec_cmd(\"[tag +mixer] pavucontrol\")'")
+		:onclick "killall pavucontrol || hyprctl dispatch exec \[tag +mixer\] pavucontrol")
 
         	)
 )
@@ -44,29 +44,29 @@
 
 (defwidget screenrotate []
 (box :orientation "h" :space-evenly false :halign "center"
-    (button :class "music round"
+    (button :class "music"
        :orientation "h"
        :space-evenly false
        :halign "center"
-       :onclick "~/.config/scripts/workspacefocus/focusleft.sh"
-       {""}
+       :onclick "~/.config/scripts/workspacefocus/focusright.sh"
+       {""}
     )
 
-    (button :class "music round"
+    (button :class "music"
        :orientation "h"
        :space-evenly false
        :halign "center"
        :onclick "~/.config/scripts/screenrotationacw.sh"
        {"󱞧"}
     )
-    (button :class "music round"
+    (button :class "music"
        :orientation "h"
        :space-evenly false
        :halign "center"
        :onclick "hyprctl dispatch killactive"
-       {""}
+       {""}
     )
-    (button :class "music round"
+    (button :class "music"
        :orientation "h"
        :space-evenly false
        :halign "center"
@@ -74,12 +74,12 @@
        {"󱞫"}
     )
 
-    (button :class "music round"
+    (button :class "music"
        :orientation "h"
        :space-evenly false
        :halign "center"
        :onclick "~/.config/scripts/workspacefocus/focusright.sh"
-       {""}
+       {""}
     )
 
 ))
@@ -90,15 +90,15 @@
        :space-evenly false
        :halign "center"
        :onclick "~/Dotfiles/desktopenvs/hyprland/scripts/playpause.sh"
-    {music != "" ? " ${music}" : " None"}))
+    {music != "" ? " ${music}" : " None"}))
 
 (defwidget osk []
-    (button :class "music round"
+    (button :class "music"
        :orientation "h"
        :space-evenly false
        :halign "center"
        :onclick "~/.config/scripts/onscreenkb.sh"
-       {"󰌌"}
+       {" 󰌌"}
     )
 )
 
@@ -106,28 +106,26 @@
   (box :orientation "h"
        :class "metric"
        :space-evenly false
-       :hexpand true
     (button :class "label" :onclick onclick label)
     (scale :min 0
            :max 101
            :active {onchange != ""}
            :value value
-           :onchange onchange
-           :hexpand true)))
+           :onchange onchange)))
 
 (deflisten workspaces "hyprland-workspaces _")
 
 (defwidget workspaceWidget [monitor]
-  (eventbox :onscroll "hyprctl eval \"hl.dsp.focus({workspace='$(echo {} | sed 's/up/r+/;s/down/r-/')1'})\""
+  (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 eval 'hl.dsp.focus({workspace=${i.id}})'"
+          :onclick "hyprctl dispatch workspace ${i.id}"
           :class "${i.class}"
-          {i.name == "special:magic" ? "󱂬" : "󱂬${i.name}"})))))
+          {i.name == "special:magic" ? "󱂬" : "󱂬${i.name}"})))))
 
 
 (deflisten workspace-old "~/Dotfiles/desktopenvs/hyprland/scripts/workspace")
@@ -154,13 +152,10 @@
 (defwidget clock []
 	(box	:class "clock"
 		:tooltip {calender}
-		:space-evenly false
-		:orientation "h"
-		(label :text "󰥔 ")
-		(label :text {time})
+		(label	:text {"${time}"})
 	)
 )
 
 
 (defpoll calender :interval "600s"
-    "~/Dotfiles/desktopenvs/hyprland/scripts/calender-fix.sh")
+    "~/Dotfiles/desktopenvs/hyprland/scripts/calender-fix.sh")