diff --git a/de/home/.config/eww/modules/bar.yuck b/de/home/.config/eww/modules/bar.yuck
index d34d8bf..7a5dcdf 100644
--- a/de/home/.config/eww/modules/bar.yuck
+++ b/de/home/.config/eww/modules/bar.yuck
@@ -45,7 +45,8 @@
 ;       )))
 
 (defwidget centergroup []
-  (box :visible {nowplaying != ""}
+;  (box :visible {nowplaying != ""}
+  (box :visible false
        :class "centergroup" :orientation "h" :space-evenly false :halign "start"))
 ;       (music)))
 
diff --git a/de/home/.config/eww/modules/bar/idle_inhibit.yuck b/de/home/.config/eww/modules/bar/idle_inhibit.yuck
index 28f8254..822b937 100644
--- a/de/home/.config/eww/modules/bar/idle_inhibit.yuck
+++ b/de/home/.config/eww/modules/bar/idle_inhibit.yuck
@@ -2,5 +2,5 @@
 
 (defwidget idleinhibit []
   (button :onclick {inhibit_active ? 'killall eww-idle-inhibit;eww update inhibit_active=false' : 'systemd-inhibit --what="idle" --mode="block" scripts/bar/eww-idle-inhibit & eww update inhibit_active=true'}
-    :class {inhibit_active ? "active" : "inactive"}
+    :class "idle-inhibitor ${inhibit_active ? 'active' : 'inactive'}"
     {inhibit_active ? "" : ""}))
diff --git a/de/home/.config/eww/modules/bar/sysdisk.yuck b/de/home/.config/eww/modules/bar/sysdisk.yuck
index eb7abb9..fddf249 100644
--- a/de/home/.config/eww/modules/bar/sysdisk.yuck
+++ b/de/home/.config/eww/modules/bar/sysdisk.yuck
@@ -1,7 +1,7 @@
 (defvar reveal_sysdisk false)
 (defwidget sysdisk []
   (revealer-on-hover
-    :class "${reveal_sysdisk}"
+    :class "${reveal_sysdisk} sysdisk"
     :revealvar reveal_sysdisk
     :revealvar-name "reveal_sysdisk"
     (metric :label "󰟒 "
diff --git a/de/home/.config/eww/modules/bar/sysmem.yuck b/de/home/.config/eww/modules/bar/sysmem.yuck
index bcd6ce6..510ec6d 100644
--- a/de/home/.config/eww/modules/bar/sysmem.yuck
+++ b/de/home/.config/eww/modules/bar/sysmem.yuck
@@ -1,7 +1,7 @@
 (defvar reveal_sysmem false)
 (defwidget sysmem []
   (revealer-on-hover
-    :class "${reveal_sysmem}"
+    :class "${reveal_sysmem} sysmem"
     :revealvar reveal_sysmem
     :revealvar-name "reveal_sysmem"
     (metric :label " "
diff --git a/de/home/.config/eww/modules/bar/volume.yuck b/de/home/.config/eww/modules/bar/volume.yuck
index 00aefcf..d22953b 100644
--- a/de/home/.config/eww/modules/bar/volume.yuck
+++ b/de/home/.config/eww/modules/bar/volume.yuck
@@ -1,7 +1,7 @@
 (defvar reveal_volume false)
 (defwidget volume []
   (revealer-on-hover
-    :class "${reveal_volume}"
+    :class "volume ${reveal_volume}"
     :revealvar reveal_volume
     :revealvar-name "reveal_volume"
     (button :onclick 'pavucontrol-qt --tab 3'
diff --git a/de/home/.config/eww/style/bar.scss b/de/home/.config/eww/style/bar.scss
index 9c4cfc4..17b07fa 100644
--- a/de/home/.config/eww/style/bar.scss
+++ b/de/home/.config/eww/style/bar.scss
@@ -7,21 +7,9 @@ $bar-reveal-children-bg-color: rgba($color0, 0.2);
   background-color: rgba($bar-bg-color, 0.2);
   border-radius: $bar-module-border-radius;
 
-/*  background: none;*/
   .leftgroup,
   .centergroup,
   .rightgroup {
-/*    margin: 10px 0px 10px;*/
-/*    background-color: $bar-bg-color;
-    & .profile-work {
-      background-color: mix($color5, $color12);
-    }
-    background-color: lighter($bar-bg-color);
-    background-color: darker(mix(#d68787, #add4fb, 50%));*/
-/*    border-radius: $bar-module-border-radius;
-    border: 3px solid $bar-module-fg-color;*/
-//    box-shadow: 0px 0px 9px 0px $bar-module-fg-color;
-
     .revealer-on-hover {
       border: 2px solid $bar-bg-color;
       border-radius: $bar-module-border-radius;
@@ -33,15 +21,12 @@ $bar-reveal-children-bg-color: rgba($color0, 0.2);
       background-color: $bar-bg-color;
       border-radius: $bar-module-border-radius - 4;
       &:hover {
-//        background-color: red;
-//        border-radius: $bar-module-border-radius 0px 0px $bar-module-border-radius;
       }
     }
     .reveal_children {
       &>*,
       widget>image {
         &:not(:last-child) {
-//          border-radius: $bar-module-border-radius;
           border-right: 2px solid $bar-bg-color;
         }
         color: $bar-bg-color;
@@ -49,9 +34,7 @@ $bar-reveal-children-bg-color: rgba($color0, 0.2);
     }
 
     .revealer-on-hover.true {
-//      background-color: $bar-reveal-children-bg-color;
       border-radius: $bar-module-border-radius;
-//      box-shadow: 3px 0 3px -2px $bar-module-fg-color;
       &>widget>box>box>* {
         background-color: $bar-bg-color;
       }
@@ -160,13 +143,13 @@ $bar-reveal-children-bg-color: rgba($color0, 0.2);
     }
   }
 
-  .active_window {
+/*  .active_window {
     border: 2px solid $bar-bg-color;
     color: $bar-bg-color;
     padding: 0px 10px;
     border-radius: $bar-module-border-radius;
     margin-left: 10px;
-  }
+  }*/
 
   .scratchpad {
     margin-left: 10px;
@@ -187,10 +170,6 @@ $bar-reveal-children-bg-color: rgba($color0, 0.2);
     background-color: $color2;
     border-radius: 4px;
     min-height: 10px;
-/*    transition: box-shadow 0.3s;
-    &:hover{
-      box-shadow: 0px 0px 0px 2px $color2;
-    }*/
   }
   circular-progress {
     color: $color9;
@@ -212,7 +191,6 @@ $bar-reveal-children-bg-color: rgba($color0, 0.2);
     }
   }
   .tray>widget>image {
-//  .scratchpad>button>image {
     padding: 3px 10px;
     min-width: $bar-module-width;
   }
@@ -227,12 +205,12 @@ $bar-reveal-children-bg-color: rgba($color0, 0.2);
       opacity: 1;
     }
   }
-  .datetime {
-    font-weight: bold;
-  }
+
+  @import "./bar/window_title.scss";
+  @import "./bar/clock.scss";
+
   .chevron box {
     border: 2px solid transparent;
-//    box-shadow: 8px -8px 10px -8px black;
   }
   .inactive {
     opacity: 0.5;
@@ -240,11 +218,9 @@ $bar-reveal-children-bg-color: rgba($color0, 0.2);
 
   // HOTFIXES
 
-//  .scratchpad>widget>box>box,
   .scratchpad .reveal_children>*:last-child,
   .tray_tab>widget>box>box,
   .tray_tab .reveal_children>widget:last-child>image {
     margin-right: -5px;
-//    box-shadow: 0px 0px 0px 0px transparent;
   }
 }
diff --git a/de/home/.config/eww/style/bar/bluetooth.scss b/de/home/.config/eww/style/bar/bluetooth.scss
new file mode 100644
index 0000000..e69de29
diff --git a/de/home/.config/eww/style/bar/charts.scss b/de/home/.config/eww/style/bar/charts.scss
new file mode 100644
index 0000000..e69de29
diff --git a/de/home/.config/eww/style/bar/clock.scss b/de/home/.config/eww/style/bar/clock.scss
new file mode 100644
index 0000000..3970f38
--- /dev/null
+++ b/de/home/.config/eww/style/bar/clock.scss
@@ -0,0 +1,7 @@
+.datetime {
+  font-weight: bold;
+  color: $bar-bg-color;
+  padding: 0px 10px;
+  border-radius: $bar-module-border-radius;
+//  margin-left: 10px;
+}
diff --git a/de/home/.config/eww/style/bar/disk.scss b/de/home/.config/eww/style/bar/disk.scss
new file mode 100644
index 0000000..e69de29
diff --git a/de/home/.config/eww/style/bar/idle-inhibitor.scss b/de/home/.config/eww/style/bar/idle-inhibitor.scss
new file mode 100644
index 0000000..e69de29
diff --git a/de/home/.config/eww/style/bar/memory.scss b/de/home/.config/eww/style/bar/memory.scss
new file mode 100644
index 0000000..e69de29
diff --git a/de/home/.config/eww/style/bar/networking.scss b/de/home/.config/eww/style/bar/networking.scss
new file mode 100644
index 0000000..e69de29
diff --git a/de/home/.config/eww/style/bar/power.scss b/de/home/.config/eww/style/bar/power.scss
new file mode 100644
index 0000000..e69de29
diff --git a/de/home/.config/eww/style/bar/revealer.scss b/de/home/.config/eww/style/bar/revealer.scss
new file mode 100644
index 0000000..e69de29
diff --git a/de/home/.config/eww/style/bar/scratchpad.scss b/de/home/.config/eww/style/bar/scratchpad.scss
new file mode 100644
index 0000000..e69de29
diff --git a/de/home/.config/eww/style/bar/tray.scss b/de/home/.config/eww/style/bar/tray.scss
new file mode 100644
index 0000000..e69de29
diff --git a/de/home/.config/eww/style/bar/volume.scss b/de/home/.config/eww/style/bar/volume.scss
new file mode 100644
index 0000000..e69de29
diff --git a/de/home/.config/eww/style/bar/window_title.scss b/de/home/.config/eww/style/bar/window_title.scss
new file mode 100644
index 0000000..aa56d54
--- /dev/null
+++ b/de/home/.config/eww/style/bar/window_title.scss
@@ -0,0 +1,8 @@
+.active_window {
+//  border: 2px solid $bar-bg-color;
+  font-weight: bold;
+  color: $bar-bg-color;
+  padding: 0px 10px;
+  border-radius: $bar-module-border-radius;
+//  margin-left: 10px;
+}
diff --git a/de/home/.config/eww/style/bar/workspaces.scss b/de/home/.config/eww/style/bar/workspaces.scss
new file mode 100644
index 0000000..e69de29