diff --git a/config/waybar/style.css b/config/waybar/style.css
index 0a5bc3b..1286bc2 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -1,4 +1,7 @@
 * {
+  background-color: @background;
+  color: @foreground;
+
   border: none;
   border-radius: 0;
   min-height: 0;
@@ -6,14 +9,18 @@
   font-size: 12px;
 }
 
-#workspaces {
-  margin-left: 7px;
+.modules-left {
+  margin-left: 8px;
+}
+
+.modules-right {
+  margin-right: 8px;
 }
 
 #workspaces button {
   all: initial;
-  padding: 2px 6px;
-  margin-right: 3px;
+  padding: 0 6px;
+  margin: 0 1.5px;
 }
 
 #custom-dropbox,
@@ -26,7 +33,7 @@
 #clock,
 #custom-power-menu {
   min-width: 12px;
-  margin-right: 13px;
+  margin: 0 10px;
 }
 
 #custom-expand-icon {
diff --git a/install/network.sh b/install/network.sh
index 5f06ce8..66b6c63 100644
--- a/install/network.sh
+++ b/install/network.sh
@@ -4,3 +4,13 @@ if ! command -v iwd &>/dev/null; then
   yay -S --noconfirm --needed iwd
   sudo systemctl enable --now iwd.service
 fi
+
+# Fix systemd-networkd-wait-online timeout for multiple interfaces
+# Wait for any interface to be online rather than all interfaces
+# https://wiki.archlinux.org/title/Systemd-networkd#Multiple_interfaces_that_are_not_connected_all_the_time
+sudo mkdir -p /etc/systemd/system/systemd-networkd-wait-online.service.d
+sudo tee /etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf >/dev/null <<EOF
+[Service]
+ExecStart=
+ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --any
+EOF
diff --git a/migrations/1752251002.sh b/migrations/1752251002.sh
new file mode 100644
index 0000000..39cb487
--- /dev/null
+++ b/migrations/1752251002.sh
@@ -0,0 +1,5 @@
+echo "Migrate to the modular, variable-based implementation of waybar style.css"
+if [ -L ~/.config/waybar/style.css ]; then
+  rm ~/.config/waybar/style.css
+  cp ~/.local/share/omarchy/config/waybar/style.css ~/.config/waybar/style.css
+fi
diff --git a/migrations/1752365998.sh b/migrations/1752365998.sh
new file mode 100644
index 0000000..8eff5a3
--- /dev/null
+++ b/migrations/1752365998.sh
@@ -0,0 +1,7 @@
+echo "Add override to only require one network interface to be online"
+sudo mkdir -p /etc/systemd/system/systemd-networkd-wait-online.service.d
+sudo tee /etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf >/dev/null <<EOF
+[Service]
+ExecStart=
+ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --any
+EOF
diff --git a/themes/catppuccin/waybar.css b/themes/catppuccin/waybar.css
index 20d1a8b..bf35a40 100644
--- a/themes/catppuccin/waybar.css
+++ b/themes/catppuccin/waybar.css
@@ -1,5 +1,2 @@
-* {
-  color: #cdd6f4;
-  background-color: #181824;
-}
-
+@define-color foreground #cdd6f4;
+@define-color background #181824;
diff --git a/themes/everforest/waybar.css b/themes/everforest/waybar.css
index 25876f1..e8249f7 100644
--- a/themes/everforest/waybar.css
+++ b/themes/everforest/waybar.css
@@ -1,5 +1,2 @@
-* {
-  color: #d3c6aa;
-  background-color: #2d353b;
-}
-
+@define-color foreground #d3c6aa;
+@define-color background #2d353b;
diff --git a/themes/gruvbox/waybar.css b/themes/gruvbox/waybar.css
index 2cd0727..598de57 100644
--- a/themes/gruvbox/waybar.css
+++ b/themes/gruvbox/waybar.css
@@ -1,5 +1,2 @@
-* {
-  color: #d4be98;
-  background-color: #282828;
-}
-
+@define-color foreground #d4be98;
+@define-color background #282828;
diff --git a/themes/kanagawa/waybar.css b/themes/kanagawa/waybar.css
index 4c5e634..029cc07 100644
--- a/themes/kanagawa/waybar.css
+++ b/themes/kanagawa/waybar.css
@@ -1,5 +1,2 @@
-* {
-  color: #dcd7ba;
-  background-color: #1f1f28;
-}
-
+@define-color foreground #dcd7ba;
+@define-color background #1f1f28;
diff --git a/themes/matte-black/waybar.css b/themes/matte-black/waybar.css
index e2dbce1..1b8bb7f 100644
--- a/themes/matte-black/waybar.css
+++ b/themes/matte-black/waybar.css
@@ -1,4 +1,2 @@
-* {
-  color: #8a8a8d;
-  background-color: #1e1e1e;
-}
+@define-color foreground #8a8a8d;
+@define-color background #1e1e1e;
diff --git a/themes/nord/waybar.css b/themes/nord/waybar.css
index dd126b7..bc2a99d 100644
--- a/themes/nord/waybar.css
+++ b/themes/nord/waybar.css
@@ -1,5 +1,2 @@
-* {
-  color: #d8dee9;
-  background-color: #2e3440;
-}
-
+@define-color foreground #d8dee9;
+@define-color background #2e3440;
diff --git a/themes/tokyo-night/waybar.css b/themes/tokyo-night/waybar.css
index e19e988..ecd3da0 100644
--- a/themes/tokyo-night/waybar.css
+++ b/themes/tokyo-night/waybar.css
@@ -1,5 +1,2 @@
-* {
-  color: #cdd6f4;
-  background-color: #1a1b26;
-}
-
+@define-color foreground #cdd6f4;
+@define-color background #1a1b26;