diff --git a/de/home/.config/eww/eww.scss b/de/home/.config/eww/eww.scss
index cac8aff..10cdf92 100644
--- a/de/home/.config/eww/eww.scss
+++ b/de/home/.config/eww/eww.scss
@@ -45,7 +45,7 @@ circular-progress {
 .revealer-on-hover {
   background-color: rgba($color8,0.5);
   border: 2px solid rgba($color0,0.5);
-  color: $color7;
+  color: $color0;
   border-radius: 8px;
 //  margin: 10px 0px;
 }
@@ -68,7 +68,7 @@ circular-progress {
 .active_window {
   background-color: rgba($color8,0.5);
   border: 2px solid rgba($color0,0.5);
-  color: $color7;
+  color: $color0;
   padding: 2px;
   border-radius: 8px;
 //  margin: 10px 0px;
@@ -85,7 +85,7 @@ label {
 .workspaces button {
   background-color: rgba($color8,0.5);
   border: 2px solid rgba($color0,0.5);
-  color: $color7;
+  color: $color0;
 //  margin: 10px 0px;
   padding: 5px;
   min-width: 25px;
diff --git a/de/home/.config/eww/eww.yuck b/de/home/.config/eww/eww.yuck
index c444925..1db824a 100644
--- a/de/home/.config/eww/eww.yuck
+++ b/de/home/.config/eww/eww.yuck
@@ -1,75 +1,14 @@
-(defwidget bar []
-  (centerbox :orientation "h"
-    (leftgroup)
-    (centergroup)
-    (rightgroup)))
+(include "modules/bar.yuck")
 
-(defwidget leftgroup []
-  (box :class "leftgroup" :orientation "h" :space-evenly false :halign "start"
-    (powermenu)
-    (profile)
-    (workspaces :array workspacesArray)
-    (windowtitle)))
+(include "modules/bar/workspaces.yuck")
 
-(defwidget centergroup []
-  (box :class "centergroup" :orientation "h" :space-evenly false :halign "start"
-    (music)))
+(include "modules/bar/profile.yuck")
 
-(defwidget rightgroup []
-  (box :class "rightgroup" :orientation "h" :space-evenly false :halign "end"
-    (idleinhibit)
-    (volume)
-    (network)
-    (vpn)
-    (bluetooth)
-    (battery)
-    (sysdisk)
-    (sysmem)
-    (clock)
-    (tray)))
+(include "modules/bar/window_name.yuck")
 
-(deflisten workspacesArray :initial "${[1]}"
-  `~/.config/eww/scripts/getWorkspaces.sh`)
-
-(defwidget workspaces [array]
-(box   :class "workspaces"
-       :orientation "h"
-       :space-evenly true
-       :halign "start"
-
- (for entry in array
-  (button :onclick `swaymsg workspace "${entry.name}"`
-        :class {entry.focused ? "focused" : ""}
-   `${replace(entry.name,".*:","")}`))))
-
-(defpoll active_profile :initial false
-                        :interval "1s"
-  "sp-profile-icon")
-(defwidget profile []
-  (button :onclick "sp-profiles next"
-          :class "profile"
-    {active_profile}))
-
-(deflisten active_window_name :initial ""
-                              :interval "1s"
-  "scripts/activewindow")
-(defwidget windowtitle []
-  (box :class {active_window_name != "" ? "active_window" : ""}
-    {active_window_name}))
-
-(defwidget clock []
-  (button :onclick 'notify-send "test"'
-    {formattime(EWW_TIME,"%b %d, %Y  |  %H:%M")}))
-
-(defpoll inhibit_active :initial false
-                    :interval "1s"
-  "scripts/inhibit-status")
-
-(defwidget idleinhibit []
-  (button :onclick {inhibit_active ? 'killall eww-idle-inhibit' : 'systemd-inhibit --what="idle" --mode="block" scripts/eww-idle-inhibit'}
-    :class {inhibit_active ? "active" : ""}
-    {inhibit_active ? "" : ""}))
+(include "modules/bar/clock.yuck")
 
+(include "modules/bar/idle_inhibit.yuck")
 
 (defwidget revealer-on-hover [revealvar revealvar-name ?class ?duration ?transition]
   (box 
@@ -88,235 +27,25 @@
           :duration {duration ?: "500ms"}
           (children :nth 1))))))
 
-(defvar reveal_powermenu false)
-(defwidget powermenu []
-  (revealer-on-hover
-    :revealvar reveal_powermenu
-    :revealvar-name "reveal_powermenu"
-    (button :onclick 'sp-powermenu'
-      "")
-    (powermenu_children)))
+(include "modules/bar/powermenu.yuck")
 
-(defwidget powermenu_children []
-  (box :class "reveal_children"
-    :orientation "h"
-    :space-evenly false
-    :halign "center"
-    (button :onclick 'sp-powermenu'
-      "")
-    (button :onclick 'sp-powermenu'
-      "")
-    (button :onclick 'sp-powermenu'
-      "")
-    (button :onclick 'sp-powermenu'
-      "")))
+(include "modules/bar/network.yuck")
 
-(defpoll wireless_active :initial false
-                        :interval "1s"
-  "scripts/network-status wireless")
-(defpoll wired_active :initial false
-                        :interval "1s"
-  "scripts/network-status wired")
-(defvar reveal_network false)
-(defwidget network []
-  (revealer-on-hover
-    :revealvar reveal_network
-    :revealvar-name "reveal_network"
-    (button :onclick 'nm-connection-editor'
-            :class {wireless_active || wired_active ? "active" : ""}
-      "")
-    (network_children)))
+(include "modules/bar/bluetooth.yuck")
 
-(defwidget network_children []
-  (box :class "reveal_children"
-    :orientation "h"
-    :space-evenly false
-    :halign "center"
-    (button :onclick {wireless_active ? 'scripts/network-updown wifi down' : 'scripts/network-updown wifi up'}
-            :class {wireless_active ? "active" : ""}
-      "")
-    (button :onclick {wired_active ? 'scripts/network-updown ethernet down' : 'scripts/network-updown ethernet up'}
-            :class {wired_active ? "active" : ""}
-      "🖧")))
+(include "modules/bar/volume.yuck")
 
-(defvar reveal_bluetooth false)
-(defpoll bluetooth_active :initial true
-                          :interval "5s"
-  'scripts/bt-status')
-(defwidget bluetooth []
-  (revealer-on-hover
-    :revealvar reveal_bluetooth
-    :revealvar-name "reveal_bluetooth"
-    (button :onclick 'blueman-manager'
-            :class {bluetooth_active ? "active" : ""}
-      "")
-    (bluetooth_children :array btDeviceArray)))
+(include "modules/bar/battery.yuck")
 
-(defpoll btDeviceArray :initial "${[1]}"
-                       :interval "5s"
-  'scripts/bt-devices')
-(defwidget bluetooth_children [array]
-(box   :class "reveal_children"
-       :orientation "h"
-       :space-evenly true
-       :halign "start"
+(include "modules/bar/tray.yuck")
 
- (for device in array
-  (button :onclick {(device.connected == "yes") ? 'bluetoothctl disconnect "${device.address}"' : 'bluetoothctl connect "${device.address}"'}
-          :class {(device.connected == "yes") ? "active" : ""}
-    "${device.icon}"))))
+(include "modules/bar/vpn.yuck")
 
-(defvar reveal_volume false)
-(defwidget volume []
-  (revealer-on-hover
-    :revealvar reveal_volume
-    :revealvar-name "reveal_volume"
-    (button :onclick 'pavucontrol-qt --tab 3'
-      {(volume_level == 0) ? "" : ((volume_level > 50) ? "" : "")})
-    (volume_children)))
+(include "modules/bar/sysmem.yuck")
 
-(defpoll volume_level :initial 0
-                    :interval "1s"
-  "scripts/volume-status")
-(defwidget volume_children []
-  (box :class "reveal_children"
-    :orientation "h"
-    :space-evenly false
-    :halign "center"
-    (scale
-      :min 0
-      :max 100
-      :value {volume_level}
-      :orientation "h"
-      :onchange "wpctl set-volume @DEFAULT_AUDIO_SINK@ {}%;paplay 'volume.ogg'")))
+(include "modules/bar/sysdisk.yuck")
 
-(defvar reveal_battery false)
-(defwidget battery []
-  (revealer-on-hover
-    :revealvar reveal_battery
-    :revealvar-name "reveal_battery"
-    (button :onclick 'pavucontrol-qt --tab 3'
-      {(EWW_BATTERY.BAT0.status == "Charging") ? " ${EWW_BATTERY.BAT0.capacity}%" : " ${EWW_BATTERY.BAT0.capacity}%"})
-    (battery_children)))
-
-(defpoll battery_level :initial 0
-                    :interval "1s"
-  "scripts/battery-status")
-(defwidget battery_children []
-  (box :class "reveal_children"
-    :orientation "h"
-    :space-evenly false
-    :halign "center"
-    (progress
-      :height 10
-      :valign "center"
-      :value {EWW_BATTERY.BAT0.capacity}
-      :orientation "h")))
-
-(defvar reveal_tray false)
-(defwidget tray []
-  (revealer-on-hover
-    :revealvar reveal_tray
-    :revealvar-name "reveal_tray"
-    {reveal_tray ? "" : ""}
-    (tray_children)))
-
-
-(defwidget tray_children []
-  (box :class "tray_children"
-    :orientation "h"
-    :space-evenly false
-    :halign "center"
-      (systray
-        :orientation "h"
-        :space-evenly true
-        :spacing 10
-        :prepend-new true)))
-
-(defpoll vpn_active :initial false
-                    :interval "5s"
-  "scripts/vpn-status")
-
-(defvar reveal_vpn false)
-(defwidget vpn []
-  (revealer-on-hover
-    :revealvar reveal_vpn
-    :revealvar-name "reveal_vpn"
-    (button :onclick 'notify-send "test"'
-            :class {vpn_active ? "active" : ""}
-      {vpn_active ? "" : ""})
-    (vpn_children)))
-
-(defpoll home_vpn_active :initial false
-                    :interval "5s"
-  "scripts/vpn-status Home")
-
-(defpoll proton_vpn_active :initial false
-                    :interval "5s"
-  "scripts/vpn-status Proton")
-
-(defwidget vpn_children []
-  (box :class "reveal_children"
-    :orientation "h"
-    :space-evenly false
-    :halign "center"
-    (button :onclick 'scripts/nmcli-vpn "HomeVPN"'
-            :class {home_vpn_active ? "active" : ""}
-      {home_vpn_active ? "" : ""})
-    (button :onclick 'scripts/nmcli-vpn "Proton SE-NL"'
-            :class {proton_vpn_active ? "active" : ""}
-      {proton_vpn_active ? "" : ""})))
-
-(defvar reveal_sysmem false)
-(defwidget sysmem []
-  (revealer-on-hover
-    :revealvar reveal_sysmem
-    :revealvar-name "reveal_sysmem"
-    (metric :label " "
-            :value {EWW_RAM.used_mem_perc}
-            :onchange "")
-    (sysmem_children)))
-
-(defwidget sysmem_children []
-  (box :class "reveal_children"
-    :orientation "h"
-    :space-evenly false
-    :halign "center"
-    (metric :label " "
-            :value {round((EWW_RAM.total_mem - EWW_RAM.free_mem) / EWW_RAM.total_mem,2) * 100}
-            :onchange "")
-    (metric :label " "
-            :value {round((EWW_RAM.total_swap - EWW_RAM.free_swap) / EWW_RAM.total_swap,2) * 100}
-            :onchange "")))
-
-(defvar reveal_sysdisk false)
-(defwidget sysdisk []
-  (revealer-on-hover
-    :revealvar reveal_sysdisk
-    :revealvar-name "reveal_sysdisk"
-    (metric :label "/home "
-            :value {EWW_DISK["/home"].used_perc}
-            :onchange "")
-    (sysdisk_children)))
-
-(defwidget sysdisk_children []
-  (box :class "reveal_children"
-    :orientation "h"
-    :space-evenly false
-    :halign "center"
-    (metric :label "/ "
-            :value {EWW_DISK["/"].used_perc}
-            :onchange "")
-    (metric :label "/boot "
-            :value {EWW_DISK["/boot"].used_perc}
-            :onchange "")))
-
-(defwidget music []
-  (box :class {music != "" ? "music" : "hidden"}
-       :orientation "h"
-       :space-evenly false
-       :halign "center"
-    {music != "" ? "🎵${music}" : ""}))
+(include "modules/bar/music.yuck")
 
 (defwidget metric [label value onchange]
   (box :orientation "h"
@@ -331,25 +60,10 @@
            :clockwise true
            :onchange onchange)))
 
-(deflisten music :initial ""
-  "playerctl --follow metadata --format '{{ artist }} - {{ title }}' || true")
+;(defpoll time :interval "10s"
+;  "date '+%H:%M %b %d, %Y'")
 
-(defpoll volume :interval "1s"
-  "scripts/getvol")
-
-(defpoll time :interval "10s"
-  "date '+%H:%M %b %d, %Y'")
-
-(defwindow bar
-  :windowtype "dock"
-  :exclusive true
-  :geometry (geometry :x "0%"
-    :y "0%"
-    :width "100%"
-    :height "30px"
-    :anchor "top center")
-  :reserve (struts :side "top" :distance "4%")
-  (bar))
+(include "modules/bar.yuck")
 
 (defwidget widgets []
   (box :class "widgets"
@@ -371,7 +85,7 @@
     :height 300
     :style "background-image: url('${rat_image}');"))
 
-(defpoll weather_status :interval "600s"
+(defpoll weather_status :interval "3600s"
   'curl wttr.in/Eugene?format=j1')
 (defwidget weather [json]
   (box
@@ -380,19 +94,9 @@
     :width 300
     :height 125
     :space-evenly true
-;    :spacing 20
     "Eugene, OR  |  ${json.current_condition[0].weatherDesc[0].value}"
-    "${json.weather[0].mintempF}°F / ${json.weather[0].maxtempF}°F"
     "${json.current_condition[0].temp_F}°F (feels like ${json.current_condition[0].FeelsLikeF}°F)"
+    "${json.weather[0].mintempF}°F / ${json.weather[0].maxtempF}°F"
     "${json.current_condition[0].humidity}% humidity"))
 
-(defwindow widgets
-  :windowtype "normal"
-  :exclusive false
-  :geometry (geometry :x "10px"
-    :y "10px"
-    :width "10px"
-    :height "10px"
-    :anchor "top left")
-  :stacking "bg"
-  (widgets))
+(include "windows.yuck")
diff --git a/de/home/.config/eww/modules/bar.yuck b/de/home/.config/eww/modules/bar.yuck
new file mode 100644
index 0000000..7f90842
--- /dev/null
+++ b/de/home/.config/eww/modules/bar.yuck
@@ -0,0 +1,29 @@
+(defwidget bar []
+  (centerbox :orientation "h"
+    (leftgroup)
+    (centergroup)
+    (rightgroup)))
+
+(defwidget leftgroup []
+  (box :class "leftgroup" :orientation "h" :space-evenly false :halign "start"
+    (powermenu)
+    (profile)
+    (workspaces :array workspacesArray)
+    (windowtitle)))
+
+(defwidget centergroup []
+  (box :class "centergroup" :orientation "h" :space-evenly false :halign "start"
+    (music)))
+
+(defwidget rightgroup []
+  (box :class "rightgroup" :orientation "h" :space-evenly false :halign "end"
+    (idleinhibit)
+    (volume)
+    (network)
+    (vpn)
+    (bluetooth)
+    (battery)
+    (sysdisk)
+    (sysmem)
+    (clock)
+    (tray)))
diff --git a/de/home/.config/eww/modules/bar/battery.yuck b/de/home/.config/eww/modules/bar/battery.yuck
new file mode 100644
index 0000000..c5da3bc
--- /dev/null
+++ b/de/home/.config/eww/modules/bar/battery.yuck
@@ -0,0 +1,22 @@
+(defvar reveal_battery false)
+(defwidget battery []
+  (revealer-on-hover
+    :revealvar reveal_battery
+    :revealvar-name "reveal_battery"
+    (button :onclick 'pavucontrol-qt --tab 3'
+      {(EWW_BATTERY.BAT0.status == "Charging") ? " ${EWW_BATTERY.BAT0.capacity}%" : " ${EWW_BATTERY.BAT0.capacity}%"})
+    (battery_children)))
+
+(defpoll battery_level :initial 0
+                    :interval "1s"
+  "scripts/battery-status")
+(defwidget battery_children []
+  (box :class "reveal_children"
+    :orientation "h"
+    :space-evenly false
+    :halign "center"
+    (progress
+      :height 10
+      :valign "center"
+      :value {EWW_BATTERY.BAT0.capacity}
+      :orientation "h")))
diff --git a/de/home/.config/eww/modules/bar/bluetooth.yuck b/de/home/.config/eww/modules/bar/bluetooth.yuck
new file mode 100644
index 0000000..69c5921
--- /dev/null
+++ b/de/home/.config/eww/modules/bar/bluetooth.yuck
@@ -0,0 +1,26 @@
+(defvar reveal_bluetooth false)
+(defpoll bluetooth_active :initial true
+                          :interval "5s"
+  'scripts/bt-status')
+(defwidget bluetooth []
+  (revealer-on-hover
+    :revealvar reveal_bluetooth
+    :revealvar-name "reveal_bluetooth"
+    (button :onclick 'blueman-manager'
+            :class {bluetooth_active ? "active" : ""}
+      "")
+    (bluetooth_children :array btDeviceArray)))
+
+(defpoll btDeviceArray :initial "${[1]}"
+                       :interval "5s"
+  'scripts/bt-devices')
+(defwidget bluetooth_children [array]
+(box   :class "reveal_children"
+       :orientation "h"
+       :space-evenly true
+       :halign "start"
+
+ (for device in array
+  (button :onclick {(device.connected == "yes") ? 'bluetoothctl disconnect "${device.address}"' : 'bluetoothctl connect "${device.address}"'}
+          :class {(device.connected == "yes") ? "active" : ""}
+    "${device.icon}"))))
diff --git a/de/home/.config/eww/modules/bar/clock.yuck b/de/home/.config/eww/modules/bar/clock.yuck
new file mode 100644
index 0000000..60ce91b
--- /dev/null
+++ b/de/home/.config/eww/modules/bar/clock.yuck
@@ -0,0 +1,3 @@
+(defwidget clock []
+  (button :onclick 'notify-send "test"'
+    {formattime(EWW_TIME,"%b %d, %Y  |  %H:%M")}))
diff --git a/de/home/.config/eww/modules/bar/idle_inhibit.yuck b/de/home/.config/eww/modules/bar/idle_inhibit.yuck
new file mode 100644
index 0000000..3a7233e
--- /dev/null
+++ b/de/home/.config/eww/modules/bar/idle_inhibit.yuck
@@ -0,0 +1,8 @@
+(defpoll inhibit_active :initial false
+                    :interval "1s"
+  "scripts/inhibit-status")
+
+(defwidget idleinhibit []
+  (button :onclick {inhibit_active ? 'killall eww-idle-inhibit' : 'systemd-inhibit --what="idle" --mode="block" scripts/eww-idle-inhibit'}
+    :class {inhibit_active ? "active" : ""}
+    {inhibit_active ? "" : ""}))
diff --git a/de/home/.config/eww/modules/bar/music.yuck b/de/home/.config/eww/modules/bar/music.yuck
new file mode 100644
index 0000000..eac1292
--- /dev/null
+++ b/de/home/.config/eww/modules/bar/music.yuck
@@ -0,0 +1,9 @@
+(deflisten music :initial ""
+  "playerctl --follow metadata --format '{{ artist }} - {{ title }}' || true")
+
+(defwidget music []
+  (box :class {music != "" ? "music" : "hidden"}
+       :orientation "h"
+       :space-evenly false
+       :halign "center"
+    {music != "" ? "🎵${music}" : ""}))
diff --git a/de/home/.config/eww/modules/bar/network.yuck b/de/home/.config/eww/modules/bar/network.yuck
new file mode 100644
index 0000000..855c3bf
--- /dev/null
+++ b/de/home/.config/eww/modules/bar/network.yuck
@@ -0,0 +1,27 @@
+(defpoll wireless_active :initial false
+                        :interval "1s"
+  "scripts/network-status wireless")
+(defpoll wired_active :initial false
+                        :interval "1s"
+  "scripts/network-status wired")
+(defvar reveal_network false)
+(defwidget network []
+  (revealer-on-hover
+    :revealvar reveal_network
+    :revealvar-name "reveal_network"
+    (button :onclick 'nm-connection-editor'
+            :class {wireless_active || wired_active ? "active" : ""}
+      "")
+    (network_children)))
+
+(defwidget network_children []
+  (box :class "reveal_children"
+    :orientation "h"
+    :space-evenly false
+    :halign "center"
+    (button :onclick {wireless_active ? 'scripts/network-updown wifi down' : 'scripts/network-updown wifi up'}
+            :class {wireless_active ? "active" : ""}
+      "")
+    (button :onclick {wired_active ? 'scripts/network-updown ethernet down' : 'scripts/network-updown ethernet up'}
+            :class {wired_active ? "active" : ""}
+      "🖧")))
diff --git a/de/home/.config/eww/modules/bar/powermenu.yuck b/de/home/.config/eww/modules/bar/powermenu.yuck
new file mode 100644
index 0000000..cf5df1b
--- /dev/null
+++ b/de/home/.config/eww/modules/bar/powermenu.yuck
@@ -0,0 +1,22 @@
+(defvar reveal_powermenu false)
+(defwidget powermenu []
+  (revealer-on-hover
+    :revealvar reveal_powermenu
+    :revealvar-name "reveal_powermenu"
+    (button :onclick 'sp-powermenu'
+      "")
+    (powermenu_children)))
+
+(defwidget powermenu_children []
+  (box :class "reveal_children"
+    :orientation "h"
+    :space-evenly false
+    :halign "center"
+    (button :onclick 'sp-powermenu'
+      "")
+    (button :onclick 'sp-powermenu'
+      "")
+    (button :onclick 'sp-powermenu'
+      "")
+    (button :onclick 'sp-powermenu'
+      "")))
diff --git a/de/home/.config/eww/modules/bar/profile.yuck b/de/home/.config/eww/modules/bar/profile.yuck
new file mode 100644
index 0000000..9131186
--- /dev/null
+++ b/de/home/.config/eww/modules/bar/profile.yuck
@@ -0,0 +1,7 @@
+(defpoll active_profile :initial false
+                        :interval "1s"
+  "sp-profile-icon")
+(defwidget profile []
+  (button :onclick "sp-profiles next"
+          :class "profile"
+    {active_profile}))
diff --git a/de/home/.config/eww/modules/bar/sysdisk.yuck b/de/home/.config/eww/modules/bar/sysdisk.yuck
new file mode 100644
index 0000000..7155875
--- /dev/null
+++ b/de/home/.config/eww/modules/bar/sysdisk.yuck
@@ -0,0 +1,21 @@
+(defvar reveal_sysdisk false)
+(defwidget sysdisk []
+  (revealer-on-hover
+    :revealvar reveal_sysdisk
+    :revealvar-name "reveal_sysdisk"
+    (metric :label "/home "
+            :value {EWW_DISK["/home"].used_perc}
+            :onchange "")
+    (sysdisk_children)))
+
+(defwidget sysdisk_children []
+  (box :class "reveal_children"
+    :orientation "h"
+    :space-evenly false
+    :halign "center"
+    (metric :label "/ "
+            :value {EWW_DISK["/"].used_perc}
+            :onchange "")
+    (metric :label "/boot "
+            :value {EWW_DISK["/boot"].used_perc}
+            :onchange "")))
diff --git a/de/home/.config/eww/modules/bar/sysmem.yuck b/de/home/.config/eww/modules/bar/sysmem.yuck
new file mode 100644
index 0000000..146b06e
--- /dev/null
+++ b/de/home/.config/eww/modules/bar/sysmem.yuck
@@ -0,0 +1,21 @@
+(defvar reveal_sysmem false)
+(defwidget sysmem []
+  (revealer-on-hover
+    :revealvar reveal_sysmem
+    :revealvar-name "reveal_sysmem"
+    (metric :label " "
+            :value {EWW_RAM.used_mem_perc}
+            :onchange "")
+    (sysmem_children)))
+
+(defwidget sysmem_children []
+  (box :class "reveal_children"
+    :orientation "h"
+    :space-evenly false
+    :halign "center"
+    (metric :label " "
+            :value {round((EWW_RAM.total_mem - EWW_RAM.free_mem) / EWW_RAM.total_mem,2) * 100}
+            :onchange "")
+    (metric :label " "
+            :value {round((EWW_RAM.total_swap - EWW_RAM.free_swap) / EWW_RAM.total_swap,2) * 100}
+            :onchange "")))
diff --git a/de/home/.config/eww/modules/bar/tray.yuck b/de/home/.config/eww/modules/bar/tray.yuck
new file mode 100644
index 0000000..4373118
--- /dev/null
+++ b/de/home/.config/eww/modules/bar/tray.yuck
@@ -0,0 +1,19 @@
+(defvar reveal_tray false)
+(defwidget tray []
+  (revealer-on-hover
+    :revealvar reveal_tray
+    :revealvar-name "reveal_tray"
+    {reveal_tray ? "" : ""}
+    (tray_children)))
+
+
+(defwidget tray_children []
+  (box :class "tray_children"
+    :orientation "h"
+    :space-evenly false
+    :halign "center"
+      (systray
+        :orientation "h"
+        :space-evenly true
+        :spacing 10
+        :prepend-new true)))
diff --git a/de/home/.config/eww/modules/bar/volume.yuck b/de/home/.config/eww/modules/bar/volume.yuck
new file mode 100644
index 0000000..2d6cf72
--- /dev/null
+++ b/de/home/.config/eww/modules/bar/volume.yuck
@@ -0,0 +1,23 @@
+(defvar reveal_volume false)
+(defwidget volume []
+  (revealer-on-hover
+    :revealvar reveal_volume
+    :revealvar-name "reveal_volume"
+    (button :onclick 'pavucontrol-qt --tab 3'
+      {(volume == 0) ? "" : ((volume > 50) ? "" : "")})
+    (volume_children)))
+
+(defpoll volume :initial 0
+                    :interval "1s"
+  "scripts/volume-status")
+(defwidget volume_children []
+  (box :class "reveal_children"
+    :orientation "h"
+    :space-evenly false
+    :halign "center"
+    (scale
+      :min 0
+      :max 100
+      :value {volume}
+      :orientation "h"
+      :onchange "wpctl set-volume @DEFAULT_AUDIO_SINK@ {}%;paplay 'volume.ogg'")))
diff --git a/de/home/.config/eww/modules/bar/vpn.yuck b/de/home/.config/eww/modules/bar/vpn.yuck
new file mode 100644
index 0000000..28c3e21
--- /dev/null
+++ b/de/home/.config/eww/modules/bar/vpn.yuck
@@ -0,0 +1,33 @@
+(defpoll vpn_active :initial false
+                    :interval "5s"
+  "scripts/vpn-status")
+
+(defvar reveal_vpn false)
+(defwidget vpn []
+  (revealer-on-hover
+    :revealvar reveal_vpn
+    :revealvar-name "reveal_vpn"
+    (button :onclick 'notify-send "test"'
+            :class {vpn_active ? "active" : ""}
+      {vpn_active ? "" : ""})
+    (vpn_children)))
+
+(defpoll home_vpn_active :initial false
+                    :interval "5s"
+  "scripts/vpn-status Home")
+
+(defpoll proton_vpn_active :initial false
+                    :interval "5s"
+  "scripts/vpn-status Proton")
+
+(defwidget vpn_children []
+  (box :class "reveal_children"
+    :orientation "h"
+    :space-evenly false
+    :halign "center"
+    (button :onclick 'scripts/nmcli-vpn "HomeVPN"'
+            :class {home_vpn_active ? "active" : ""}
+      {home_vpn_active ? "" : ""})
+    (button :onclick 'scripts/nmcli-vpn "Proton SE-NL"'
+            :class {proton_vpn_active ? "active" : ""}
+      {proton_vpn_active ? "" : ""})))
diff --git a/de/home/.config/eww/modules/bar/window_name.yuck b/de/home/.config/eww/modules/bar/window_name.yuck
new file mode 100644
index 0000000..d496ef9
--- /dev/null
+++ b/de/home/.config/eww/modules/bar/window_name.yuck
@@ -0,0 +1,6 @@
+(deflisten active_window_name :initial ""
+                              :interval "1s"
+  "scripts/activewindow")
+(defwidget windowtitle []
+  (box :class {active_window_name != "" ? "active_window" : ""}
+    {active_window_name}))
diff --git a/de/home/.config/eww/modules/bar/workspaces.yuck b/de/home/.config/eww/modules/bar/workspaces.yuck
new file mode 100644
index 0000000..5ba8ce7
--- /dev/null
+++ b/de/home/.config/eww/modules/bar/workspaces.yuck
@@ -0,0 +1,13 @@
+(deflisten workspacesArray :initial "${[1]}"
+  `~/.config/eww/scripts/getWorkspaces.sh`)
+
+(defwidget workspaces [array]
+(box   :class "workspaces"
+       :orientation "h"
+       :space-evenly true
+       :halign "start"
+
+ (for entry in array
+  (button :onclick `swaymsg workspace "${entry.name}"`
+        :class {entry.focused ? "focused" : ""}
+   '${replace(entry.name,".*:","")}'))))
diff --git a/de/home/.config/eww/scripts/randomrat b/de/home/.config/eww/scripts/randomrat
index 6a706eb..f59626b 100755
--- a/de/home/.config/eww/scripts/randomrat
+++ b/de/home/.config/eww/scripts/randomrat
@@ -3,5 +3,6 @@
 img_dir="${HOME}/Pictures/Phone/Albums/Rattos/"
 img_list=$( find "${img_dir}" -iname '*.jpg' -or -iname '*.png' -or -iname '*.heic')
 img=$( shuf -n 1 <<< ${img_list} )
-convert "${img}" -resize x400\> ./rat.jpg
-echo "./rat.jpg"
+mkdir -p "${HOME}/.cache/eww/"
+convert "${img}" -resize x400\> "${HOME}/.cache/eww/rat.jpg"
+echo "${HOME}/.cache/eww/rat.jpg"
diff --git a/de/home/.config/eww/windows.yuck b/de/home/.config/eww/windows.yuck
new file mode 100644
index 0000000..62a6189
--- /dev/null
+++ b/de/home/.config/eww/windows.yuck
@@ -0,0 +1,25 @@
+;status bar
+
+(defwindow bar
+  :windowtype "dock"
+  :exclusive true
+  :geometry (geometry :x "0%"
+    :y "0%"
+    :width "100%"
+    :height "30px"
+    :anchor "top center")
+  :reserve (struts :side "top" :distance "4%")
+  (bar))
+
+;desktop widgets
+
+(defwindow widgets
+  :windowtype "normal"
+  :exclusive false
+  :geometry (geometry :x "10px"
+    :y "10px"
+    :width "10px"
+    :height "10px"
+    :anchor "top left")
+  :stacking "bottom"
+  (widgets))
diff --git a/default/home/.sapphrc/default b/default/home/.sapphrc/default
index 97b9ac6..02eb011 100755
--- a/default/home/.sapphrc/default
+++ b/default/home/.sapphrc/default
@@ -45,6 +45,10 @@ devpod(){
   podman container start debian-sid-dev
   podman exec --env POD_PATH=$(pwd | sed "s|${HOME}|/root|") -it debian-sid-dev /bin/bash
 }
+devpod-arm(){
+  podman container start debian-sid-arm-dev
+  podman exec --env POD_PATH=$(pwd | sed "s|${HOME}|/root|") -it debian-sid-arm-dev /bin/bash
+}
 simplewebserver(){
   screen python3 -m http.server
 }
@@ -85,7 +89,7 @@ alias pm-update="sudo apt update;apt list --upgradable"
 alias pm-upgrade="sudo apt update;sudo apt upgrade"
 
 #User Env Vars
-export DEBEMAIL="penelope@pogmom.me"
+export DEBEMAIL="support@pogmom.me"
 export DEBFULLNAME="Penelope Gwen"
 
 #SSH Personal Machines
diff --git a/t16g2/home/.config/sway/config.d/display.d/t16g2 b/t16g2/home/.config/sway/config.d/display.d/t16g2
index 0fec7b3..069214b 100644
--- a/t16g2/home/.config/sway/config.d/display.d/t16g2
+++ b/t16g2/home/.config/sway/config.d/display.d/t16g2
@@ -5,8 +5,8 @@ output eDP-1 {
   position 0 0
 #  bg $HOME/.config/sway/assets/wallpaper/eDP-1/_default.jpg fill
 }
-exec_always eww open --screen "0x0A31" bar
-exec_always eww open --screen "0x0A31" widgets
+exec_always sleep 1;eww open --screen "0x0A31" bar
+exec_always sleep 1;eww open --screen "0x0A31" widgets
 
 output DP-7 {
   scale 1