diff --git a/.config/waybar/config b/.config/waybar/config
index 8ed19aa..0f23eb1 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -7,136 +7,6 @@
     "modules-center": ["sway/window"],
     //"modules-right": ["tray", "custom/spotify", "custom/weather", "custom/mail", "custom/storage", "backlight", "pulseaudio", "network", "idle_inhibitor", "battery", "clock"],
     "modules-right": ["pulseaudio", "backlight", "idle_inhibitor", "network", "battery", "clock", "tray"],
-    "sway/mode": {
-        "format": " {}"
-    },
-    "sway/workspaces": {
-        "format": "{name}",
-        "disable-scroll": true
-    },
-    "sway/window": {
-        "max-length": 80,
-        "tooltip": false
-    },
-    "clock": {
-        "format": "{:%a %d %b %H:%M:%S}",
-        "interval": 1,
-        "tooltip": false
-    },
-    "battery": {
-        "format": "{icon} {capacity}%",
-        //"format-alt": "{icon} {timeTo}",
 
-        "format-icons": ["", "", "", "", ""],
-        //"format-icons": ["", "", "", "", "", "", "", "", "", "", ""],
-
-        "format-charging": " {capacity}%",
-        "format-full": " {capacity}%",
-
-        "interval": 10,
-
-        "states": {
-            "warning": 25,
-            "critical": 10
-        },
-
-        //"format-discharging-critical": " {capacity}%",
-
-        "tooltip": true,
-        "tooltip-format": "Capacity: {capacity}%\n{timeTo}",
-    },
-    "network": {
-        "format": "{icon}",
-
-        "format-alt": "{icon} {signalStrength}%",
-        "format-alt-click": "click-right",
-
-        "format-icons": {
-            "wifi": [""],
-            "ethernet": [""],
-            "disconnected": [""]
-        },
-
-        "interval": 10,
-
-        "on-click": "swaymsg 'set $PROP floating; exec alacritty -e nmtui'",
-
-        "tooltip": true,
-        "tooltip-format": "Connected via {ifname}\nIP: {ipaddr}/{cidr}\nBandwidth: {bandwidthDownBits} | {bandwidthUpBits}",
-        "tooltip-format-wifi": "Connected to {essid} on {ifname}\nSignal Strength: {signalStrength}% ({signaldBm}dBm)\nIP: {ipaddr}/{cidr}\nBandwidth: {bandwidthDownBits} | {bandwidthUpBits}",
-        "tooltip-format-disconnected": "Disconnected",
-    },
-    "pulseaudio": {
-        "format": "{icon}  {volume}%",
-        "format-alt": "{icon}",
-        "format-alt-click": "click-right",
-        "format-muted": "ﱝ",
-        "format-icons": {
-            //"phone": [" ", " ", " ", " "],
-            "default": ["奄", "奔", "墳"]
-        },
-        "scroll-step": 5,
-        "on-click": "swaymsg 'set $PROP floating; exec pavucontrol-qt'",
-        "tooltip": false
-    },
-    "custom/spotify": {
-        "interval": 1,
-        "return-type": "json",
-        "exec": "~/.config/waybar/modules/spotify.sh",
-        "exec-if": "pgrep spotify",
-        "escape": true
-    },
-    "custom/storage": {
-        "format": "{} ",
-        "format-alt": "{percentage}% ",
-        "format-alt-click": "click-right",
-        "return-type": "json",
-        "interval": 60,
-        "exec": "~/.config/waybar/modules/storage.sh"
-    },
-    "backlight": {
-        "format": "{icon}",
-        "format-alt": "{percent}% {icon}",
-        "format-alt-click": "click-right",
-        "format-icons": ["", "", ""],
-        "on-scroll-down": "light -U 1",
-        "on-scroll-up": "light -A 1"
-    },
-    "custom/weather": {
-        "format": "{}",
-        "format-alt": "{alt}: {}",
-        "format-alt-click": "click-right",
-        "interval": 1800,
-        "return-type": "json",
-        "exec": "~/.config/waybar/modules/weather.sh",
-        "exec-if": "ping wttr.in -c1"
-    },
-    "idle_inhibitor": {
-        "format": "{icon}",
-        "format-icons": {
-            //"activated": "鬒",
-            "activated": "",
-            //"deactivated": ""
-            "deactivated": "﯈"
-        },
-        "tooltip": false
-    },
-    "custom/mail": {
-        "format": "",
-        "format-alt": "{alt} ",
-        "format-alt-click": "click-right",
-        "interval": 60,
-        "return-type": "json",
-        "exec": "~/.config/waybar/modules/mail.py",
-        "tooltip": false
-    },
-    "custom/test": {
-        "format": "{}",
-        "exec": "/tmp/test blub",
-        "param": "blah",
-        "interval": 5
-    },
-    "tray": {
-        "icon-size": 16
-    }
+    "include": "~/.config/waybar/modules",
 }
diff --git a/.config/waybar/modules b/.config/waybar/modules
new file mode 100644
index 0000000..b2cdef6
--- /dev/null
+++ b/.config/waybar/modules
@@ -0,0 +1,161 @@
+ {
+    "sway/mode": {
+        "format": " {}"
+    },
+
+    "sway/workspaces": {
+        "format": "{name}",
+        "disable-scroll": true
+    },
+
+    "sway/window": {
+        "max-length": 80,
+        "tooltip": false
+    },
+
+    "clock": {
+        "format": "{:%a %d %b %H:%M:%S}",
+        "format-alt": "{:%H:%M:%S}",
+        "format-alt-click": "click-right",
+
+        "interval": 1,
+        "tooltip": false
+    },
+
+    "clock#compact": {
+        "format": "{:%H:%M:%S}",
+        "format-alt": "{:%a %d %b %H:%M:%S}",
+        "format-alt-click": "click-right",
+
+        "interval": 1,
+        "tooltip": false
+    },
+
+    "battery": {
+        "format": "{icon} {capacity}%",
+        //"format-alt": "{icon} {timeTo}",
+
+        "format-icons": ["", "", "", "", ""],
+        //"format-icons": ["", "", "", "", "", "", "", "", "", "", ""],
+
+        "format-charging": " {capacity}%",
+        "format-full": " {capacity}%",
+
+        "interval": 2,
+
+        "states": {
+            "warning": 25,
+            "critical": 10
+        },
+
+        //"format-discharging-critical": " {capacity}%",
+
+        "tooltip": true,
+        "tooltip-format": "Capacity: {capacity}%\n{timeTo}",
+    },
+
+    "network": {
+        "format": "{icon}",
+
+        "format-alt": "{icon} {signalStrength}%",
+        "format-alt-click": "click-right",
+
+        "format-icons": {
+            "wifi": [""],
+            "ethernet": [""],
+            "disconnected": [""],
+            "linked": [""]
+        },
+
+        "interval": 10,
+
+        "on-click": "swaymsg 'set $PROP floating; exec alacritty -e nmtui'",
+
+        "tooltip": true,
+        "tooltip-format": "Connected via {ifname}\nIP: {ipaddr}/{cidr}\nBandwidth: {bandwidthDownBits} | {bandwidthUpBits}",
+        "tooltip-format-wifi": "Connected to {essid} on {ifname}\nSignal Strength: {signalStrength}% ({signaldBm}dBm)\nIP: {ipaddr}/{cidr}\nBandwidth: {bandwidthDownBits} | {bandwidthUpBits}",
+        "tooltip-format-disconnected": "Disconnected",
+    },
+
+    "pulseaudio": {
+        "format": "{icon}  {volume}%",
+        "format-alt": "{icon}",
+        "format-alt-click": "click-right",
+        "format-muted": "ﱝ",
+        "format-icons": {
+            //"phone": [" ", " ", " ", " "],
+            "default": ["奄", "奔", "墳"]
+        },
+        "scroll-step": 5,
+        "on-click": "swaymsg 'set $PROP floating; exec pavucontrol-qt'",
+        "tooltip": false
+    },
+
+    "custom/spotify": {
+        "interval": 1,
+        "return-type": "json",
+        "exec": "~/.config/waybar/modules/spotify.sh",
+        "exec-if": "pgrep spotify",
+        "escape": true
+    },
+
+    "custom/storage": {
+        "format": "{} ",
+        "format-alt": "{percentage}% ",
+        "format-alt-click": "click-right",
+        "return-type": "json",
+        "interval": 60,
+        "exec": "~/.config/waybar/modules/storage.sh"
+    },
+
+    "backlight": {
+        "format": "{icon}",
+        "format-alt": "{percent}% {icon}",
+        "format-alt-click": "click-right",
+        "format-icons": ["", "", ""],
+        "on-scroll-down": "light -U 1",
+        "on-scroll-up": "light -A 1"
+    },
+
+    "custom/weather": {
+        "format": "{}",
+        "format-alt": "{alt}: {}",
+        "format-alt-click": "click-right",
+        "interval": 1800,
+        "return-type": "json",
+        "exec": "~/.config/waybar/modules/weather.sh",
+        "exec-if": "ping wttr.in -c1"
+    },
+
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            //"activated": "鬒",
+            "activated": "",
+            //"deactivated": ""
+            "deactivated": "﯈"
+        },
+        "tooltip": false
+    },
+
+    "custom/mail": {
+        "format": "",
+        "format-alt": "{alt} ",
+        "format-alt-click": "click-right",
+        "interval": 60,
+        "return-type": "json",
+        "exec": "~/.config/waybar/modules/mail.py",
+        "tooltip": false
+    },
+
+    "custom/test": {
+        "format": "{}",
+        "exec": "/tmp/test blub",
+        "param": "blah",
+        "interval": 5
+    },
+
+    "tray": {
+        "icon-size": 16
+    }
+}