diff --git a/de/home/.config/eww/eww.yuck b/de/home/.config/eww/eww.yuck
index 4d9efa5..1db824a 100644
--- a/de/home/.config/eww/eww.yuck
+++ b/de/home/.config/eww/eww.yuck
@@ -31,184 +31,21 @@
 
 (include "modules/bar/network.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/bluetooth.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/volume.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/battery.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/tray.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/vpn.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)))
+(include "modules/bar/sysmem.yuck")
 
-(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")))
+(include "modules/bar/sysdisk.yuck")
 
-(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"
@@ -223,14 +60,8 @@
            :clockwise true
            :onchange onchange)))
 
-(deflisten music :initial ""
-  "playerctl --follow metadata --format '{{ artist }} - {{ title }}' || true")
-
-(defpoll volume :interval "1s"
-  "scripts/getvol")
-
-(defpoll time :interval "10s"
-  "date '+%H:%M %b %d, %Y'")
+;(defpoll time :interval "10s"
+;  "date '+%H:%M %b %d, %Y'")
 
 (include "modules/bar.yuck")
 
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/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/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 ? "" : ""})))