diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index bff269d1..594c6f72 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -1,5 +1,8 @@
 {
-    "height": 26,
+		"include": [
+			"~/.config/waybar/modules.jsonc"
+		],
+    "height": 20,
     "margin": "3 6",
     "reload_style_on_change": true,
     "position": "top",
@@ -19,80 +22,5 @@
         "cpu",
         "custom/swaync",
         "clock"
-    ],
-    "custom/logo": {
-        "format": ""
-    },
-    "mpris": {
-        "format": "{status_icon} {title} - {artist}",
-        "title-len": 50,
-        "artist-len": 20,
-        "status-icons": {
-            "playing": "",
-            "paused": ""
-        }
-    },
-    "network": {
-        "format": "󰤭",
-        "format-ethernet": "󰈀",
-        "format-wifi": "{icon}",
-        "format-icons": [
-            "󰤟",
-            "󰤢",
-            "󰤥",
-            "󰤨"
-        ],
-        "format-alt": "{ipaddr} / {gwaddr}",
-        "tooltip-format": "{ifname} - {essid}"
-    },
-    "bluetooth": {
-        "format": "󰂲",
-        "format-connected": "󰂱",
-        "tooltip-format": "{status} - {device_alias}",
-        "on-click": "blueman-manager"
-    },
-    "custom/notifs": {
-        "format": "",
-        "on-click": "swaync-client --open-panel"
-    },
-    "battery": {
-        "format": "{icon} {capacity}%",
-        "format-plugged": "󰂄 {capacity}%",
-        "format-charging": "󰂄 {capacity}%",
-        "states": {
-            "warning": 30,
-            "critical": 15
-        },
-        "format-icons": [
-            "",
-            "",
-            "",
-            ""
-        ]
-    },
-    "memory": {
-        "format": " {percentage}%",
-        "tooltip-format": "{used:0.1f}GiB, {swapUsed:0.1f}GiB Swap"
-    },
-    "cpu": {
-        "format": " {usage}%"
-    },
-    "clock": {
-        "interval": 1,
-        "format": "{:%T}",
-        "tooltip-format": "<tt><small>{calendar}</small></tt>",
-        "calendar": {
-                    "mode"          : "year",
-                    "mode-mon-col"  : 3,
-                    "weeks-pos"     : "right",
-                    "on-scroll"     : 1,
-                    "format": {
-                              "months":     "<span color='#89b4fa'><b>{}</b></span>",
-                              "days":       "<span color='#eba0ac'><b>{}</b></span>",
-                              "weeks":      "<span color='#a6e3a1'><b>W{}</b></span>",
-                              "weekdays":   "<span color='#fab387'><b>{}</b></span>",
-                              "today":      "<span color='#cba6f7'><b><u>{}</u></b></span>"
-                              }
-                    },
-    }
+    ]
 }
diff --git a/.config/waybar/modules.jsonc b/.config/waybar/modules.jsonc
new file mode 100644
index 00000000..f995bf15
--- /dev/null
+++ b/.config/waybar/modules.jsonc
@@ -0,0 +1,77 @@
+{
+    "custom/logo": {
+        "format": ""
+    },
+    "mpris": {
+        "format": "{status_icon} {title} - {artist}",
+        "title-len": 50,
+        "artist-len": 20,
+        "status-icons": {
+            "playing": "",
+            "paused": ""
+        }
+    },
+    "network": {
+        "format": "󰤭",
+        "format-ethernet": "󰈀",
+        "format-wifi": "{icon}",
+        "format-icons": [
+            "󰤟",
+            "󰤢",
+            "󰤥",
+            "󰤨"
+        ],
+        "format-alt": "{ipaddr} / {gwaddr}",
+        "tooltip-format": "{ifname} - {essid}"
+    },
+    "bluetooth": {
+        "format": "󰂲",
+        "format-connected": "󰂱",
+        "tooltip-format": "{status} - {device_alias}",
+        "on-click": "blueman-manager"
+    },
+    "custom/notifs": {
+        "format": "",
+        "on-click": "swaync-client --open-panel"
+    },
+    "battery": {
+        "format": "{icon} {capacity}%",
+        "format-plugged": "󰂄 {capacity}%",
+        "format-charging": "󰂄 {capacity}%",
+        "states": {
+            "warning": 30,
+            "critical": 15
+        },
+        "format-icons": [
+            "",
+            "",
+            "",
+            ""
+        ]
+    },
+    "memory": {
+        "format": " {percentage}%",
+        "tooltip-format": "{used:0.1f}GiB, {swapUsed:0.1f}GiB Swap"
+    },
+    "cpu": {
+        "format": " {usage}%"
+    },
+    "clock": {
+        "interval": 1,
+        "format": "{:%T}",
+        "tooltip-format": "<tt><small>{calendar}</small></tt>",
+        "calendar": {
+                    "mode"          : "year",
+                    "mode-mon-col"  : 3,
+                    "weeks-pos"     : "right",
+                    "on-scroll"     : 1,
+                    "format": {
+                              "months":     "<span color='#89b4fa'><b>{}</b></span>",
+                              "days":       "<span color='#eba0ac'><b>{}</b></span>",
+                              "weeks":      "<span color='#a6e3a1'><b>W{}</b></span>",
+                              "weekdays":   "<span color='#fab387'><b>{}</b></span>",
+                              "today":      "<span color='#cba6f7'><b><u>{}</u></b></span>"
+                              }
+                    },
+    }
+}
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index d5fa509e..3416d881 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -2,6 +2,7 @@
     font-family: "Fira Mono Nerd Font";
     font-size: 16px;
     font-weight: bold;
+		min-height: 16px;
     margin: 0;
     padding: 0;
 
diff --git a/.nixos b/.nixos
index 90277a89..c7b96e7d 160000
--- a/.nixos
+++ b/.nixos
@@ -1 +1 @@
-Subproject commit 90277a89cde982a4847d189979678bc504da36d7
+Subproject commit c7b96e7d96f9d4ed69b4ab072130aeaf7af64f4f
diff --git a/laptop-files/.config/waybar/config.jsonc b/laptop-files/.config/waybar/config.jsonc
new file mode 100644
index 00000000..594c6f72
--- /dev/null
+++ b/laptop-files/.config/waybar/config.jsonc
@@ -0,0 +1,26 @@
+{
+		"include": [
+			"~/.config/waybar/modules.jsonc"
+		],
+    "height": 20,
+    "margin": "3 6",
+    "reload_style_on_change": true,
+    "position": "top",
+    "modules-left": [
+        "custom/logo",
+        "hyprland/workspaces"
+    ],
+    "modules-center": [
+        "mpris"
+    ],
+    "modules-right": [
+        "network",
+        "bluetooth",
+        "custom/notifs",
+        "battery",
+        "memory",
+        "cpu",
+        "custom/swaync",
+        "clock"
+    ]
+}
diff --git a/pc-files/.config/hypr/windows.conf b/pc-files/.config/hypr/windows.conf
index d12d306d..4dc5ce7b 100644
--- a/pc-files/.config/hypr/windows.conf
+++ b/pc-files/.config/hypr/windows.conf
@@ -1,7 +1,7 @@
 monitor = DP-1, 1920x1080@60, 0x0, 1
-monitor = DP-3, 1920x1080@60, 1920x0, 1
+monitor = DP-2, 1920x1080@60, 1920x0, 1
 monitor = HDMI-A-1, 1920x1080@60, -1920x0, 1
 
 workspace = 2, monitor:HDMI-A-1, default:true
-workspace = 3, monitor:DP-3, default:true
+workspace = 3, monitor:DP-2, default:true
 workspace = 1, monitor:DP-1, default:true
diff --git a/pc-files/.config/waybar/config.jsonc b/pc-files/.config/waybar/config.jsonc
new file mode 100644
index 00000000..1b5a34d2
--- /dev/null
+++ b/pc-files/.config/waybar/config.jsonc
@@ -0,0 +1,25 @@
+{
+		"include": [
+			"~/.config/waybar/modules.jsonc"
+		],
+    "height": 20,
+    "margin": "3 6",
+    "reload_style_on_change": true,
+    "position": "top",
+    "modules-left": [
+        "custom/logo",
+        "hyprland/workspaces"
+    ],
+    "modules-center": [
+        "mpris"
+    ],
+    "modules-right": [
+        "network",
+        "bluetooth",
+        "custom/notifs",
+        "memory",
+        "cpu",
+        "custom/swaync",
+        "clock"
+    ]
+}