diff --git a/.config/sway/config b/.config/sway/config
index 7d77320..89acb2a 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -3,13 +3,13 @@ set $mod Mod4
 
 # Configure displays
 
-
 # swaymsg -t get_outputs
 set $primary DP-2
 set $secondary DVI-D-1
 set $laptop eDP-1
 
 # output $laptop pos 1920 135 scale 2
+# output $laptop scale 1.4
 output $primary pos 1080 135 
 output $secondary pos 0 0 transform 90
 
@@ -22,8 +22,11 @@ output $secondary pos 0 0 transform 90
 
 bindsym $mod+Shift+s exec ~/.bin/toggle-display $primary
 
+# localectl list-x11-keymap-layouts - gives you layouts (~100 on modern systems)
+# localectl list-x11-keymap-variants de - gives you variants for this layout
 input type:keyboard {
-    xkb_layout de,de
+    xkb_layout de
+    xkb_variant e2
     xkb_options ctrl:nocaps
 }
 
@@ -219,8 +222,8 @@ bindsym Ctrl+Shift+L exec $lock
 for_window [title=".* - mpv$"] floating enable, sticky enable
 
 # Autostart applications
-exec waybar --config ~/.config/waybar/x230.config
-# exec waybar --config ~/.config/waybar/$(hostname).config
+# exec waybar --config ~/.config/waybar/x230.config
+exec waybar --config ~/.config/waybar/$(hostname).config
 exec mako --border-radius=2 --font="Iosevka ss08 10" --max-visible=5 --outer-margin=5 --margin=3 --background="#1c1f26" --border-color="#89AAEB" --border-size=1 --default-timeout=7000
 exec nm-applet --indicator
 exec udiskie -t
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 1809ad2..914c037 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -2,19 +2,20 @@
   border: none;
   border-radius: 0;
   font-family: Iosevka ss08;
-  font-size: 13px;
+  font-size: 20px;
   box-shadow: none;
   text-shadow: none;
   transition-duration: 0s;
 }
 
 window.eDP-1 * {
-  font-size: 11px;
+  font-size: 16px;
 }
 
 window {
-  color: #ffffff;
-  background: rgba(35, 38, 53, 0.8);
+    color: #efefff;
+    background: rgba(35, 38, 53, 0.8);
+    margin: 0px 2px 0px 22px;
 }
 
 #workspaces {
@@ -43,6 +44,13 @@ window {
   color: rgba(238, 46, 36, 1);
 }
 
+#window {
+    color: #afbfff;
+    background: rgba(15, 18, 43, 0.3);
+    margin: 0px 2px 0px 22px;
+    padding: 4px;
+}
+
 #mode,
 #battery,
 #cpu,
@@ -51,12 +59,23 @@ window {
 #pulseaudio,
 #idle_inhibitor,
 #backlight,
+#wireplumber,
 #custom-storage,
 #custom-spotify,
 #custom-weather,
 #custom-mail {
-  margin: 0px 6px 0px 10px;
-  min-width: 25px;
+    margin: 0px 6px 0px 10px;
+    min-width: 25px;
+}
+
+
+#wireplumber.muted {
+    color: rgba(255, 210, 4, 1);
+}
+
+#mode {
+    color: rgba(180, 100, 100, 0.20);
+    margin: 0px 2px 0px 22px;
 }
 
 #clock {
diff --git a/.config/waybar/fedora.fritz.box.config b/.config/waybar/x13-fedora.config
similarity index 76%
rename from .config/waybar/fedora.fritz.box.config
rename to .config/waybar/x13-fedora.config
index 4043445..338abed 100644
--- a/.config/waybar/fedora.fritz.box.config
+++ b/.config/waybar/x13-fedora.config
@@ -1,7 +1,7 @@
 {
     "layer": "bottom",
     "position": "bottom",
-    "height": 24,
+    "height": 32,
 
     // maybe take another look at e.g. https://gitlab.com/wef/dotfiles/-/blob/master/.config/waybar/config
     // https://github.com/Alexays/Waybar/wiki/Configuration
@@ -9,7 +9,7 @@
 
     "modules-left": ["sway/workspaces", "sway/mode", "sway/window" ],
     "modules-center": [ "custom/disk_root", "network"],
-    "modules-right": [ "custom/mail", "battery", "tray", "clock" ],
+    "modules-right": [ "wireplumber", "custom/mail", "cpu", "battery", "tray", "clock" ],
     "sway/mode": {
         "format": " {}"
     },
@@ -17,12 +17,15 @@
         "format": "{name}",
         "disable-scroll": true
     },
+    "sway/window": {
+       "icon": true
+    },
     "clock": {
         "format": "{:%b %d %H:%M KW%U}",
         "tooltip": false
     },
     "battery": {
-        "format": " {time} {icon}",
+        "format": " {time} ({capacity}%) {icon}",
         "format-alt": "{capacity}% {icon}",
         "format-icons": ["", "", "", "", ""],
         "format-charging": "{capacity}% ",
@@ -33,13 +36,6 @@
         },
         "tooltip": false
     },
-    "custom/disk_home": {
-	"format": "🏠 {} ",
-	"interval": 30,
-	"exec": "df -h --output=avail $HOME | tail -1 | tr -d ' '",
-        "tooltip": true ,
-        "tooltip-format": "{path} ({percentage_used}% of {total})"
-    },
     "custom/disk_root": {
 	"format": "💽/{} ",
 	"interval": 30,
@@ -48,16 +44,6 @@
         "tooltip-format": "{path} ({percentage_used}% of {total})"
     },
 
-    "custom/disk_store": {
-	"format": "store💽{} ",
-	"interval": 30,
-	"exec": "df -h --output=avail /media/store | tail -1 | tr -d ' '"
-    },
-    "custom/disk_docs": {
-	"format": "docs💽{} ",
-	"interval": 30,
-	"exec": "df -h --output=avail /media/docs | tail -1 | tr -d ' '"
-    },
     "temperature": {
 	// "thermal-zone": 2,
 	// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
@@ -80,13 +66,21 @@
     },
     "network": {
 	// "family": "ipv6",
-	"format-wifi": "<span color='#589df6'></span> <span color='gray'>{essid}</span> {frequency} <span color='#589df6'>{signaldBm} dB</span> <span color='#589df6'>⇵</span> {bandwidthUpBits}/{bandwidthDownBits}",
+	"format-wifi": "<span color='#589df6'></span> <span color='gray'>{essid}</span> <span color='#589df6'>⇵</span> {bandwidthUpBits}/{bandwidthDownBits}",
+	"tooltip-format-wifi": "Freq: {frequency} <span color='#589df6'>{signaldBm} dB</span>",
 	"format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
 	"format-linked": "{ifname} (No IP) ",
 	"format-disconnected": "Disconnected ⚠",
 	"format-alt": "{ifname}: {ipaddr}/{cidr}",
 	"interval": 5
     },
+    "wireplumber": {
+        "format": "{icon}{volume}%",
+        "format-muted": "MUTED",
+        "on-click": "helvum",
+        "on-click-right": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
+        "format-icons": ["", "", ""]
+    },
     //"timer": {
     //    "interval": 1,
     //    "exec": "~/.config/waybar/timer.sh",
@@ -102,7 +96,7 @@
         "tooltip": false
     },
     "tray": {
-        "icon-size": 20,
+        "icon-size": 24,
         "show-passive-items": true
     },
     "cpu": {