diff --git a/flake.lock b/flake.lock
index 6e71213..1333ab5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -31,11 +31,11 @@
         "yaml": "yaml"
       },
       "locked": {
-        "lastModified": 1739810732,
-        "narHash": "sha256-2ZJ3kB0LUAdYs2DH2mnnbDiiSR6yoqUDCdnQTCSrjRo=",
+        "lastModified": 1740181894,
+        "narHash": "sha256-HGrUM5aZ9jiZvuS93UJP969UW13CibkrarlQmVBsqq8=",
         "ref": "dev",
-        "rev": "86d452422e784e164b8ac093a8dabf920caa1cf9",
-        "revCount": 216,
+        "rev": "bc1146c34f39b2fdc0876cae9b64f1e5ca31d8e9",
+        "revCount": 219,
         "type": "git",
         "url": "ssh://git@github.com/RobloxUSArmyCID/CIDBot"
       },
@@ -50,11 +50,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "lastModified": 1738453229,
+        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
         "type": "github"
       },
       "original": {
@@ -106,11 +106,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739913864,
-        "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=",
+        "lastModified": 1740624780,
+        "narHash": "sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "97ac0801d187b2911e8caa45316399de12f6f199",
+        "rev": "b8869e4ead721bbd4f0d6b927e8395705d4f16e6",
         "type": "github"
       },
       "original": {
@@ -121,11 +121,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1735150973,
-        "narHash": "sha256-OJhcCAoaMMXeD6o4qI/hxBCNELJp4dN8D5LJZc8w8XA=",
+        "lastModified": 1738852285,
+        "narHash": "sha256-8Y1uyE6gGHxdU0Vcx2CMg/dAmDSxJw19aAl3TKbbo54=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "40cd0b006cc48dffd0f8698ad7f54cf1d56779a6",
+        "rev": "6ae73dc9cb72cea17bcc2e3d4670825f483e80e8",
         "type": "github"
       },
       "original": {
@@ -177,11 +177,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739866667,
-        "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
+        "lastModified": 1740560979,
+        "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
+        "rev": "5135c59491985879812717f4c9fea69604e7f26f",
         "type": "github"
       },
       "original": {
@@ -192,14 +192,14 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1733096140,
-        "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=",
+        "lastModified": 1738452942,
+        "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
       }
     },
     "nmd": {
@@ -231,11 +231,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1739751511,
-        "narHash": "sha256-aKM96IPTHxpnPDSGl8+jo4WIPFUUDQTQKHGTZ3IkYhE=",
+        "lastModified": 1740659022,
+        "narHash": "sha256-eUbuxeOQFKZln1ctHDgJDyRzvEK8XkjG6pMVkONQEBA=",
         "owner": "NotAShelf",
         "repo": "nvf",
-        "rev": "e42bcbe1ecb3392ecd8a7638edf991b9628f4d55",
+        "rev": "7e53fc47243448fdd01adf2a5b780831853c5dca",
         "type": "github"
       },
       "original": {
@@ -284,11 +284,11 @@
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1739679385,
-        "narHash": "sha256-Pu6gN/indwmI5OIKS5Q+Ffr7/yaOfDDWn5av4gshuNM=",
+        "lastModified": 1740284169,
+        "narHash": "sha256-Ne+3kEyOFD2sNfw3cnKk+Zi/tTk+WkmnsfE7PDLNEXU=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "8bac1688d527ec3b107353b8ea55b929af5193d4",
+        "rev": "fd31f20e2bd2bf3894d729590bf578c02c252239",
         "type": "github"
       },
       "original": {
diff --git a/system/configuration.nix b/system/configuration.nix
index 90b7432..4935eb9 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -12,18 +12,19 @@ in {
     ./adb.nix
     ./bluetooth.nix
     ./bootloader.nix
+    ./docker.nix
+    ./flatpak.nix
+    ./fonts.nix
     ./hardware-configuration.nix
-    ./networking.nix
     ./locale.nix
     ./locate.nix
-    ./xserver.nix
-    ./fonts.nix
+    ./networking.nix
+    ./nix.nix
     ./sound.nix
+    ./swap.nix
     ./user.nix
-    ./nix.nix
-    ./flatpak.nix
+    ./xserver.nix
     ./zsh.nix
-    ./docker.nix
 
     nvidia
     ./${systemSettings.displayManager}.nix
diff --git a/system/fonts.nix b/system/fonts.nix
index 8c7d740..2160d04 100644
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -8,5 +8,6 @@
     nerd-fonts.ubuntu
     nerd-fonts.ubuntu-mono
     nerd-fonts.ubuntu-sans
+    nerd-fonts.intone-mono
   ];
 }
diff --git a/system/swap.nix b/system/swap.nix
new file mode 100644
index 0000000..ece363c
--- /dev/null
+++ b/system/swap.nix
@@ -0,0 +1,8 @@
+{...}: {
+  swapDevices = [
+    {
+      device = "/swapfile";
+      size = 16 * 1024;
+    }
+  ];
+}
diff --git a/user/gleam.nix b/user/gleam.nix
index 74889b5..a8ab596 100644
--- a/user/gleam.nix
+++ b/user/gleam.nix
@@ -1,3 +1,3 @@
 {pkgs, ...}: {
-  home.packages = [pkgs.gleam pkgs.exercism pkgs.erlang_nox pkgs.rebar3];
+  #  home.packages = [pkgs.gleam pkgs.exercism pkgs.erlang_nox pkgs.rebar3];
 }
diff --git a/user/kitty.nix b/user/kitty.nix
index 2820707..22cd7b8 100644
--- a/user/kitty.nix
+++ b/user/kitty.nix
@@ -3,15 +3,16 @@
     enable = true;
     themeFile = "Nord";
     font = {
-      name = "UbuntuSans Nerd Font";
-      package = pkgs.nerd-fonts.ubuntu-sans;
+      name = "IntoneMono Nerd Font";
+      package = pkgs.nerd-fonts.intone-mono;
     };
     settings = {
       # TODO: Add on-click events
       scrollback_lines = 10000;
       enable_audio_bell = false;
       update_check_interval = 0;
-      font_size = 14.5;
+      font_size = 13.5;
+      font_features = "+ss01";
       cursor_shape = "block";
       cursor_blink_interval = "cubic-bezier(0.7, 0, 0.84, 0)";
       cursor_trail = 1;
diff --git a/user/misc.nix b/user/misc.nix
index 47da0a2..38d4c23 100644
--- a/user/misc.nix
+++ b/user/misc.nix
@@ -32,6 +32,7 @@
     brightnessctl
     cliphist
     heroic
-#    ciscoPacketTracer8
+    #    ciscoPacketTracer8
+    gamescope
   ];
 }
diff --git a/user/nvf.nix b/user/nvf.nix
index 9eb19c3..eac4d57 100644
--- a/user/nvf.nix
+++ b/user/nvf.nix
@@ -42,7 +42,6 @@
           };
         };
         go.enable = true;
-        gleam.enable = true;
         css.enable = true;
         zig.enable = true;
         bash.enable = true;
diff --git a/user/waybar.css b/user/waybar.css
index 532dea7..b590599 100644
--- a/user/waybar.css
+++ b/user/waybar.css
@@ -19,6 +19,14 @@
   padding: 10px;
 }
 
+#workspaces button.active {
+  background: rgba(59, 66, 82, 0.9);
+}
+
+#workspaces button.urgent {
+  background: rgba(191, 97, 106, 0.9);
+}
+
 .modules-left > *,
 .modules-center > *,
 .modules-right > * {