diff --git a/desktopenvs/hyprlua/eww-touch/eww.scss b/desktopenvs/hyprlua/eww-touch/eww.scss
index 667c982..da979e2 100644
--- a/desktopenvs/hyprlua/eww-touch/eww.scss
+++ b/desktopenvs/hyprlua/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: 17pt;
+  font-size: 14pt;
 }
 
 tooltip {
@@ -9,7 +9,7 @@ tooltip {
     border-width: 3px;
     background: #1a1a1a;
     color: #5018dd;
-    border-radius: 35px;
+    border-radius: 25px;
 }
 
 
diff --git a/desktopenvs/hyprlua/eww-touch/eww.yuck b/desktopenvs/hyprlua/eww-touch/eww.yuck
index 0a041e0..46c445a 100644
--- a/desktopenvs/hyprlua/eww-touch/eww.yuck
+++ b/desktopenvs/hyprlua/eww-touch/eww.yuck
@@ -6,82 +6,46 @@
   :geometry (geometry :x "0%"
                       :y "1%"
                       :width "99%"
-                      :height "5%"
+                      :height "20px"
                       :anchor "top center")
                       :exclusive true
   (bar :monitor_ monitor))
 
 (defpoll battery :interval "2s"
-  "~/.config/scripts/batteryperc")
+  "~/Dotfiles/desktopenvs/hyprland/scripts/batteryperc")
 
 
 
 (defwidget bar [monitor_]
   (centerbox :orientation "h"
-    (winsworks :monitor monitor_)
-    (screenrotate )
+	(winsworks :monitor monitor_)
+    (music)
     (sidestuff)))
 
 (defwidget winsworks [monitor]
 	(box :orientation "h" :space-evenly false :halign "start"
-		(osk)
 		(box :class "music" {"${battery}"})
-		(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\")'")
-
+		(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"
+    (box :class "music" {"󰛳 ${IP}"}) 
+    (metric :label "󰓃"
+            :value volume
+            :onchange "pactl set-sink-volume @DEFAULT_SINK@ {}%"
+	    :onclick "killall pavucontrol || hyprctl dispatch exec \[tag +mixer\] pavucontrol")
+   (box 
+	:tooltip {disks}
+	(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/workspacefocus/focusleft.sh"
-       {""}
-    )
-
-    (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 'hl.dsp.window.close()'"
-       {""}
-    )
-    (button :class "music"
-       :orientation "h"
-       :space-evenly false
-       :halign "center"
-       :onclick "~/.config/scripts/screenrotationwcw.sh"
-       {"󱞫"}
-    )
-
-    (button :class "music"
-       :orientation "h"
-       :space-evenly false
-       :halign "center"
-       :onclick "~/.config/scripts/workspacefocus/focusright.sh"
-       {""}
-    )
-
 ))
 
 (defwidget music []
@@ -92,15 +56,6 @@
        :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"
@@ -116,14 +71,14 @@
 (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}"})))))
 
@@ -156,6 +111,9 @@
 	)
 )
 
-
 (defpoll calender :interval "600s"
-    "~/Dotfiles/desktopenvs/hyprland/scripts/calender-fix.sh") 
+    "~/Dotfiles/desktopenvs/hyprland/scripts/calender-fix.sh")
+
+(defpoll disks :interval "600s"
+    "~/Dotfiles/desktopenvs/hyprland/scripts/dysk-phydisks.sh")
+