diff --git a/flake.lock b/flake.lock
index 936a4a3a..5b3e579f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -37,18 +37,12 @@
       }
     },
     "crane": {
-      "inputs": {
-        "nixpkgs": [
-          "lanzaboote",
-          "nixpkgs"
-        ]
-      },
       "locked": {
-        "lastModified": 1717535930,
-        "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=",
+        "lastModified": 1746291859,
+        "narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "55e7754ec31dac78980c8be45f8a28e80e370946",
+        "rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5",
         "type": "github"
       },
       "original": {
@@ -64,11 +58,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746729224,
-        "narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=",
+        "lastModified": 1748225455,
+        "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "85555d27ded84604ad6657ecca255a03fd878607",
+        "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba",
         "type": "github"
       },
       "original": {
@@ -80,11 +74,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
         "type": "github"
       },
       "original": {
@@ -96,11 +90,11 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -133,11 +127,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717285511,
-        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
+        "lastModified": 1743550720,
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
         "type": "github"
       },
       "original": {
@@ -189,24 +183,6 @@
       "inputs": {
         "systems": "systems_2"
       },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
       "locked": {
         "lastModified": 1731533236,
         "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
@@ -221,6 +197,32 @@
         "type": "github"
       }
     },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": [
+          "mailserver",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore_2",
+        "nixpkgs": [
+          "mailserver",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -243,13 +245,35 @@
         "type": "github"
       }
     },
+    "gitignore_2": {
+      "inputs": {
+        "nixpkgs": [
+          "mailserver",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
     "hardware": {
       "locked": {
-        "lastModified": 1747860404,
-        "narHash": "sha256-9IMwxC4g1AyhOHTx8iTimoKnyzl9Rk2OJZiDtFoF3pA=",
+        "lastModified": 1747900541,
+        "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "2b9118883d29290a1b16ae3a12aedc478dae2546",
+        "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06",
         "type": "github"
       },
       "original": {
@@ -265,16 +289,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1747020534,
-        "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=",
+        "lastModified": 1748226808,
+        "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca",
+        "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -302,11 +326,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747109298,
-        "narHash": "sha256-v6P2Lm2ucRhFpVdY2feQKxJIGfaud3CVHV5GWoCNji8=",
+        "lastModified": 1748411314,
+        "narHash": "sha256-fvtRp+oHGDLiSQico9+LTAr6Z8CU1AIldLYLQ9mHqjo=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "7ceb01d01e02fa55699db1ecb99df1295b47b499",
+        "rev": "9d69aed9023082af370b71bffdfcd414b6b61593",
         "type": "github"
       },
       "original": {
@@ -320,7 +344,6 @@
         "crane": "crane",
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
-        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "stable"
         ],
@@ -328,16 +351,15 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1718178907,
-        "narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=",
+        "lastModified": 1747056319,
+        "narHash": "sha256-qSKcBaISBozadtPq6BomnD+wIYTZIkiua3UuHLaD52c=",
         "owner": "nix-community",
         "repo": "lanzaboote",
-        "rev": "b627ccd97d0159214cee5c7db1412b75e4be6086",
+        "rev": "2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "v0.4.1",
         "repo": "lanzaboote",
         "type": "github"
       }
@@ -346,22 +368,23 @@
       "inputs": {
         "blobs": "blobs",
         "flake-compat": "flake-compat_2",
+        "git-hooks": "git-hooks",
         "nixpkgs": [
           "stable"
         ],
-        "nixpkgs-24_11": "nixpkgs-24_11"
+        "nixpkgs-25_05": "nixpkgs-25_05"
       },
       "locked": {
-        "lastModified": 1746469806,
-        "narHash": "sha256-kL3cc25sc0x+6gBZYjuE4566RT1E3XLQs4V8sl7D+VE=",
+        "lastModified": 1747965231,
+        "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "14857a0309d7bbdf7c51bbfa309d0d13448ae77e",
+        "rev": "53007af63fade28853408370c4c600a63dd97f41",
         "type": "gitlab"
       },
       "original": {
         "owner": "simple-nixos-mailserver",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixos-mailserver",
         "type": "gitlab"
       }
@@ -369,15 +392,15 @@
     "minecraft": {
       "inputs": {
         "flake-compat": "flake-compat_3",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1747188102,
-        "narHash": "sha256-h/J6hSskrsR+YFCjWW4x4qXm1oGcUUvXH8TEZDZnLqk=",
+        "lastModified": 1748225187,
+        "narHash": "sha256-gpNN43fNJQoHhnK1Z+nms4lo6i/t9t2rfZMAxc165vQ=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "cc53b6b79022c9dd31b9d426bb5a5f39246196e1",
+        "rev": "98c1bcaaa4dbd5980523a08a5b32e35d44e830e5",
         "type": "github"
       },
       "original": {
@@ -423,33 +446,18 @@
         "type": "indirect"
       }
     },
-    "nixpkgs-24_11": {
+    "nixpkgs-25_05": {
       "locked": {
-        "lastModified": 1734083684,
-        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
+        "lastModified": 1747610100,
+        "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-24.11",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1710695816,
-        "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
+        "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -479,11 +487,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1747196235,
-        "narHash": "sha256-41VHCKCevxL7Luqwc9A2r3DPTOz6Ky+nRkHp1eurtmA=",
+        "lastModified": 1748444636,
+        "narHash": "sha256-wjcrY2/bFfHLm16HPuxDhHEqe3HBbLwZ5kT/BBklPKE=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "2378adbb9ebb4654dc0d41786609839b6ad4a7ef",
+        "rev": "c68efc6197f91cae2904f68937bdfb235c3c7799",
         "type": "github"
       },
       "original": {
@@ -502,15 +510,14 @@
         "nixpkgs": [
           "lanzaboote",
           "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable"
+        ]
       },
       "locked": {
-        "lastModified": 1717664902,
-        "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=",
+        "lastModified": 1746537231,
+        "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1",
+        "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969",
         "type": "github"
       },
       "original": {
@@ -538,21 +545,17 @@
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": [
-          "lanzaboote",
-          "flake-utils"
-        ],
         "nixpkgs": [
           "lanzaboote",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1717813066,
-        "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=",
+        "lastModified": 1747017456,
+        "narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465",
+        "rev": "5b07506ae89b025b14de91f697eba23b48654c52",
         "type": "github"
       },
       "original": {
@@ -563,16 +566,16 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1746957726,
-        "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
+        "lastModified": 1748162331,
+        "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
+        "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "type": "indirect"
       }
     },
@@ -606,21 +609,6 @@
         "type": "github"
       }
     },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -644,11 +632,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1746904237,
-        "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
+        "lastModified": 1748370509,
+        "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
+        "rev": "4faa5f5321320e49a78ae7848582f684d64783e9",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index a71f999f..85a531aa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
     # General inputs
-    stable.url = "nixpkgs/nixos-24.11";
+    stable.url = "nixpkgs/nixos-25.05";
     unstable.url = "nixpkgs/nixos-unstable";
 
     # Flake helpers
@@ -16,7 +16,7 @@
     impermanence.url = "github:nix-community/impermanence";
 
     lanzaboote = {
-      url = "github:nix-community/lanzaboote/v0.4.1";
+      url = "github:nix-community/lanzaboote";
       inputs.nixpkgs.follows = "stable";
     };
 
@@ -30,7 +30,7 @@
 
     # Service inputs
     mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.11";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05";
       inputs.nixpkgs.follows = "stable";
     };
 
@@ -38,7 +38,7 @@
 
     # Home inputs
     hm = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "stable";
     };
     nur = {
diff --git a/hosts/jupiter/boot/default.nix b/hosts/jupiter/boot/default.nix
index fae86e7f..133c08ac 100644
--- a/hosts/jupiter/boot/default.nix
+++ b/hosts/jupiter/boot/default.nix
@@ -1,6 +1,7 @@
-{ ... }:
+{ pkgsStable, ... }:
 {
   boot = {
+    kernelPackages = pkgsStable.linuxPackages_latest;
     loader.systemd-boot.enable = true;
     plymouth.enable = true;
   };
diff --git a/hosts/jupiter/jovian/default.nix b/hosts/jupiter/jovian/default.nix
index b60fd795..0d4f8db6 100644
--- a/hosts/jupiter/jovian/default.nix
+++ b/hosts/jupiter/jovian/default.nix
@@ -23,7 +23,7 @@
     };
 
     boot = {
-      kernelPackages = pkgs.linuxPackages_jovian;
+      kernelPackages = lib.mkForce pkgs.linuxPackages_jovian;
       kernelParams = [ "amd_pstate=active" ];
     };
 
@@ -67,6 +67,7 @@
         gnome-logs
         gnome-maps
         gnome-music
+        gnome-remote-desktop
         gnome-shell-extensions
         gnome-software
         gnome-system-monitor
diff --git a/modules/home/programs/gui/librewolf/default.nix b/modules/home/programs/gui/librewolf/default.nix
index 00a3e612..9ea04edb 100644
--- a/modules/home/programs/gui/librewolf/default.nix
+++ b/modules/home/programs/gui/librewolf/default.nix
@@ -21,7 +21,7 @@
           };
         };
 
-        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+        extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
           bitwarden
           darkreader
           return-youtube-dislikes
@@ -33,16 +33,16 @@
 
         search = {
           force = true;
-          default = "Ecosia";
+          default = "ecosia";
           order = [
-            "Ecosia"
-            "NixPKGs"
-            "MyNixOS"
-            "YouTube"
-            "Spotify"
+            "ecosia"
+            "nixpkgs"
+            "mynixos"
+            "youtube"
+            "spotify"
           ];
           engines = {
-            "Ecosia" = {
+            "ecosia" = {
               urls = [{
                 template = "https://www.ecosia.org/search";
                 params = [{
@@ -53,7 +53,7 @@
               definedAliases = [ "@e" ];
             };
 
-            "NixPKGs" = {
+            "nixpkgs" = {
               urls = [{
                 template = "https://search.nixos.org/packages";
                 params = [
@@ -70,7 +70,7 @@
               definedAliases = [ "@p" ];
             };
 
-            "MyNixOS" = {
+            "mynixos" = {
               urls = [{
                 template = "https://mynixos.com/search";
                 params = [{
@@ -81,7 +81,7 @@
               definedAliases = [ "@my" ];
             };
 
-            "YouTube" = {
+            "youtube" = {
               urls = [{
                 template = "https://www.youtube.com/results";
                 params = [{
@@ -92,7 +92,7 @@
               definedAliases = [ "@y" ];
             };
 
-            "Spotify" = {
+            "spotify" = {
               urls = [{ template = "https://open.spotify.com/search/{searchTerms}"; }];
               definedAliases = [ "@s" ];
             };
diff --git a/modules/home/programs/terminal/ranger/default.nix b/modules/home/programs/terminal/ranger/default.nix
index 49057d9a..942fb179 100644
--- a/modules/home/programs/terminal/ranger/default.nix
+++ b/modules/home/programs/terminal/ranger/default.nix
@@ -1,11 +1,11 @@
-{ config, lib, pkgsStable, ... }:
+{ config, lib, pkgs, ... }:
 {
   programs.ranger = {
     enable = true;
-    package = pkgsStable.ranger;
+    #package = pkgs.ranger;
     settings = {
       preview_images = true;
-      preview_images_method = "sixel";
+      #preview_images_method = "sixel";
       dirname_in_tabs = true;
       autosave_bookmarks = false;
       show_hidden = true;
@@ -118,9 +118,6 @@
         P:${XDG_NETWORK_DIR}/Midas/Photos
       '';
     };
-    packages = with pkgsStable; [
-      imagemagick
-      poppler_utils
-    ];
+    packages = with pkgs; [ poppler_utils ];
   };
 }
diff --git a/modules/home/programs/terminal/zsh/default.nix b/modules/home/programs/terminal/zsh/default.nix
index e5345c18..db1ee096 100644
--- a/modules/home/programs/terminal/zsh/default.nix
+++ b/modules/home/programs/terminal/zsh/default.nix
@@ -21,7 +21,7 @@
       ignoreSpace = true;
       path = "$ZDOTDIR/.zsh_history";
     };
-    initExtra = ''
+    initContent = ''
       smallfetch
       source ${pkgs.zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh
     '';
diff --git a/modules/home/settings/fonts/packages/default.nix b/modules/home/settings/fonts/packages/default.nix
index 9107f0b5..e1fd0145 100644
--- a/modules/home/settings/fonts/packages/default.nix
+++ b/modules/home/settings/fonts/packages/default.nix
@@ -1,11 +1,14 @@
-{ config, lib, pkgsStable, ... }:
+{ config, lib, pkgs, ... }:
 {
-  home.packages = lib.mkIf config.home.desktop.enable (with pkgsStable; [
-    liberation_ttf
-    noto-fonts
-    sarasa-gothic
-    twitter-color-emoji
-    ubuntu-classic
-    (nerdfonts.override { fonts = [ "UbuntuMono" ]; })
-  ]);
+  config = lib.mkIf config.home.desktop.enable {
+    home.packages = (with pkgs; [
+      liberation_ttf
+      noto-fonts
+      sarasa-gothic
+      twitter-color-emoji
+    ]) ++ (with pkgs.nerd-fonts; [
+      ubuntu
+      ubuntu-mono
+    ]);
+  };
 }
diff --git a/modules/home/variables/look/fonts/default.nix b/modules/home/variables/look/fonts/default.nix
index 9e3921e8..3a55f47d 100644
--- a/modules/home/variables/look/fonts/default.nix
+++ b/modules/home/variables/look/fonts/default.nix
@@ -1,7 +1,7 @@
 { ... }:
 {
   look.fonts = {
-    main = "Ubuntu";
+    main = "Ubuntu Nerd Font";
     mono = "UbuntuMono Nerd Font";
   };
 }
diff --git a/modules/home/wms/programs/mako/default.nix b/modules/home/wms/programs/mako/default.nix
index 065026c7..b8555a15 100644
--- a/modules/home/wms/programs/mako/default.nix
+++ b/modules/home/wms/programs/mako/default.nix
@@ -2,22 +2,26 @@
 {
   services.mako = {
     enable = config.home.desktop.enable;
-    borderColor = "#${config.look.colors.accent}";
-    backgroundColor = "#${config.look.colors.dark}D9";
-    sort = "+time";
-    layer = "overlay";
-    padding = "8";
-    margin = "0";
-    borderSize = config.look.border.int;
-    maxIconSize = 40;
-    defaultTimeout = 4500;
-    font = "${config.look.fonts.main} 12";
-    anchor = "bottom-right";
-    extraConfig = ''
-      on-button-right=dismiss-all
-      outer-margin=10
-      [mode=do-not-disturb]
-      invisible=1
-    '';
+    settings = {
+      # Theme
+      background-color = "#${config.look.colors.dark}D9";
+      border-color = "#${config.look.colors.accent}";
+      border-size = config.look.border.int;
+      font = "${config.look.fonts.main} 12";
+      margin = 0;
+      max-icon-size = 40;
+      outer-margin = 10;
+      padding = 8;
+
+      # Rules
+      anchor = "bottom-right";
+      default-timeout = 4500;
+      layer = "overlay";
+      on-button-right = "dismiss-all";
+      sort = "+time";
+
+      # Modes
+      "mode=do-not-disturb".invisible = 1;
+    };
   };
 }
diff --git a/modules/home/wms/programs/waybar/default.nix b/modules/home/wms/programs/waybar/default.nix
index 6ab1fee1..137b285f 100644
--- a/modules/home/wms/programs/waybar/default.nix
+++ b/modules/home/wms/programs/waybar/default.nix
@@ -22,11 +22,11 @@
         format-bluetooth = "{icon} {volume}%";
         format-muted = " muted";
         format-icons = {
-          headphone = "󰋋 ";
-          headset = "󰋋 ";
+          headphone = "󰋋";
+          headset = "󰋋";
           default = [
-            " "
-            " "
+            ""
+            ""
           ];
         };
         on-click = "${wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
@@ -37,8 +37,8 @@
 
       "mpris" = {
         player = "mpd";
-        format = "  {title}";
-        format-paused = "  {artist}";
+        format = " {title}";
+        format-paused = " {artist}";
         format-stopped = "";
         tooltip-format = lib.concatStrings [
           "{title} - {artist} - {album}\n"
@@ -60,9 +60,9 @@
 
           # Print the notification status with the tooltip
           if [[ "$mode" == "do-not-disturb" ]]; then
-            printf '{"text":"󱆥  Off","class":"disabled","tooltip":"Notifications Disabled."}'
+            printf '{"text":"󱆥 Off","class":"disabled","tooltip":"Notifications Disabled."}'
           else
-            printf '{"text":"  On","tooltip":"Notifications Enabled."}';
+            printf '{"text":" On","tooltip":"Notifications Enabled."}';
           fi
         '';
         format = "{}";
@@ -74,8 +74,8 @@
       "idle_inhibitor" = {
         format = "{icon}";
         format-icons = {
-          activated = "  On";
-          deactivated = "󰾫  Off";
+          activated = " On";
+          deactivated = "󰾫 Off";
           tooltip-format-activated = "Sleep inhibited.";
           tooltip-format-deactivated = "Sleep uninhibited.";
         };
@@ -90,12 +90,12 @@
       };
 
       "cpu" = {
-        format = "  {usage}%";
+        format = " {usage}%";
         interval = 3;
       };
 
       "memory" = {
-        format = "  {used}G";
+        format = " {used}G";
         tooltip = false;
         interval = 3;
       };
@@ -137,7 +137,7 @@
           fi
           
           # Output the VRAM usage
-          echo "{\"text\": \"󰢮  ''${vram_usage_display}\"}"
+          echo "{\"text\": \"󰢮 ''${vram_usage_display}\"}"
         '';
         format = "{}";
         return-type = "json";
@@ -145,7 +145,7 @@
       };
 
       "backlight" = {
-        format = "{icon}  {percent}%";
+        format = "{icon} {percent}%";
         format-icons = [
           ""
           "󰖨"
@@ -159,7 +159,7 @@
           warning = 30;
           critical = 15;
         };
-        format = "{icon}   {capacity}%";
+        format = "{icon} {capacity}%";
         format-icons = [
           ""
           ""
@@ -171,12 +171,12 @@
 
       "clock" = {
         interval = 1;
-        format = "{:%a %b %d %I:%M:%S%p}";
+        format = "󰥔 {:%a %b %d %I:%M:%S%p}";
         tooltip-format = "<tt><small>{calendar}</small></tt>";
       };
 
       "sway/scratchpad" = {
-        format = "   {count}";
+        format = " {count}";
         show-empty = false;
         tooltip = true;
         tooltip-format = "{title}";
@@ -294,19 +294,17 @@
         border: 0;
         border-radius: 0;
         min-height: 0;
-        font-family: ${config.look.fonts.main}, ${config.look.fonts.mono};
+        font-family: ${config.look.fonts.main};
         font-size: 15.5px;
         color: #${config.look.colors.text};
       }
 
       #waybar { background: #${config.look.colors.dark}; }
-      #tray { padding: 0 2px 0 5px; }
-      #network { padding: 0 10px 0 4px; }
-      #scratchpad, #privacy { margin-left: 4px; }
-      #pulseaudio { margin-right: 5px; }
+      #network { padding: 0 8px 0 4px; }
+      #pulseaudio, #scratchpad, #privacy, #tray, #bluetooth { margin-left: 4px; }
       #mpris, #custom-notifs, #idle_inhibitor, #custom-weather, #cpu, #memory, #custom-vram, #backlight, #battery { margin: 0 5px 0 2px; }
 
-      #workspaces { padding: 0 6px; }
+      #workspaces { padding: 0 6px 0 0; }
       #workspaces button {
         padding: 0 3px;
         color: white;
@@ -325,11 +323,6 @@
         background: #${config.look.colors.light};
       }
 
-      #bluetooth {
-        margin: 0 6px 0 4px;
-        font-size: 13.4px;
-      }
-
       #mpris { border-bottom: 3px solid #ffb066; }
       #custom-notifs { border-bottom: 3px solid #3823C4; }
       #idle_inhibitor { border-bottom: 3px solid #941efc; }
diff --git a/modules/system/services/general/vmware/default.nix b/modules/system/services/general/vmware/default.nix
index 7db71cdd..e7541157 100644
--- a/modules/system/services/general/vmware/default.nix
+++ b/modules/system/services/general/vmware/default.nix
@@ -1,13 +1,10 @@
-{ config, lib, pkgsUnstable, ... }:
+{ config, lib, pkgs, ... }:
 {
   config = lib.mkIf config.virtualisation.vmware.host.enable {
-    virtualisation.vmware.host = {
-      package = pkgsUnstable.vmware-workstation;
-      extraConfig = ''
-        mks.gl.allowUnsupportedDrivers = "TRUE"
-        mks.vk.allowUnsupportedDevices = "TRUE"
-      '';
-    };
+    virtualisation.vmware.host.extraConfig = ''
+      mks.gl.allowUnsupportedDrivers = "TRUE"
+      mks.vk.allowUnsupportedDevices = "TRUE"
+    '';
 
     nixpkgs.allowUnfreePackages = [ "vmware-workstation" ];
   };