diff --git a/de/home/.config/eww/eww.yuck b/de/home/.config/eww/eww.yuck
index 29816f2..9aee74f 100644
--- a/de/home/.config/eww/eww.yuck
+++ b/de/home/.config/eww/eww.yuck
@@ -1,41 +1,25 @@
 (include "modules/bar.yuck")
 
-;(include "modules/bar/workspaces.yuck")
-
-;(include "modules/bar/profile.yuck")
-
-;(include "modules/bar/window_name.yuck")
-
-(include "modules/bar/clock.yuck")
-
-(include "modules/bar/idle_inhibit.yuck")
-
-;(include "modules/bar/powermenu.yuck")
-
-(include "modules/bar/network.yuck")
-
-(include "modules/bar/bluetooth.yuck")
-
-(include "modules/bar/volume.yuck")
-
-(include "modules/bar/battery.yuck")
-
-(include "modules/bar/tray.yuck")
-
-(include "modules/bar/vpn.yuck")
-
-(include "modules/bar/sysmem.yuck")
-
-(include "modules/bar/sysdisk.yuck")
-
-(include "modules/bar/music.yuck")
-
-(include "modules/bar.yuck")
+(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/widgets.yuck")
 
-(include "modules/widgets/rat.yuck")
-
-(include "modules/widgets/weather.yuck")
-
-(include "windows.yuck")
+(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/de/home/.config/eww/modules/bar.yuck b/de/home/.config/eww/modules/bar.yuck
index 1f5e4b5..68478b6 100644
--- a/de/home/.config/eww/modules/bar.yuck
+++ b/de/home/.config/eww/modules/bar.yuck
@@ -35,7 +35,22 @@
     (tray)))
 
 ;leftgroup
-;(include "modules/bar/powermenu.yuck")
+(include "modules/bar/powermenu.yuck")
 (include "modules/bar/profile.yuck")
 (include "modules/bar/workspaces.yuck")
 (include "modules/bar/window_name.yuck")
+
+;centergroup
+(include "modules/bar/music.yuck")
+
+;rightgroup
+(include "modules/bar/idle_inhibit.yuck")
+(include "modules/bar/volume.yuck")
+(include "modules/bar/network.yuck")
+(include "modules/bar/vpn.yuck")
+(include "modules/bar/bluetooth.yuck")
+(include "modules/bar/battery.yuck")
+(include "modules/bar/sysdisk.yuck")
+(include "modules/bar/sysmem.yuck")
+(include "modules/bar/clock.yuck")
+(include "modules/bar/tray.yuck")
diff --git a/de/home/.config/eww/modules/widgets.yuck b/de/home/.config/eww/modules/widgets.yuck
index 3acce1a..3963476 100644
--- a/de/home/.config/eww/modules/widgets.yuck
+++ b/de/home/.config/eww/modules/widgets.yuck
@@ -6,3 +6,7 @@
        :space-evenly false
        (rat)
        (weather :json weather_status)))
+
+;widgets
+(include "modules/widgets/rat.yuck")
+(include "modules/widgets/weather.yuck")
diff --git a/de/home/.config/eww/windows.yuck b/de/home/.config/eww/windows.yuck
deleted file mode 100644
index 62a6189..0000000
--- a/de/home/.config/eww/windows.yuck
+++ /dev/null
@@ -1,25 +0,0 @@
-;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))