diff --git a/flake.lock b/flake.lock
index b2a5aa7..af4f540 100644
--- a/flake.lock
+++ b/flake.lock
@@ -67,6 +67,24 @@
         "type": "github"
       }
     },
+    "catppuccin": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1769946009,
+        "narHash": "sha256-cjPsPx3qlP7RW78lcGJoTP/B6yqY6BJJjwT7QUg8ByY=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "ff59ad5085b7d71705ea1f019c02b08dfe40d9c8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "curl-src": {
       "flake": false,
       "locked": {
@@ -289,7 +307,7 @@
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "hyprwire": "hyprwire",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems",
         "xdph": "xdph"
@@ -639,24 +657,24 @@
         "minhook-src": "minhook-src",
         "mini-src": "mini-src",
         "minizip-src": "minizip-src",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "re2-src": "re2-src",
         "websocketpp-src": "websocketpp-src",
         "zlib-src": "zlib-src"
       },
       "locked": {
         "dir": "packages/nix",
-        "lastModified": 1768601512,
-        "narHash": "sha256-I0aRTdaAWTitvKtRRLDMP6PNbU9C5rsCZ525bXgI/Rw=",
-        "owner": "trivaris",
-        "repo": "millennium",
-        "rev": "e8de42d42c21b55e59b05b9ec0df9b4f2dde3681",
+        "lastModified": 1770057666,
+        "narHash": "sha256-NJRfAS1+x4dlbm+Hi/WtjfijoUnlUcifF5I7bWmqn7k=",
+        "owner": "SteamClientHomebrew",
+        "repo": "Millennium",
+        "rev": "393d6fc9e4a358b80fb0043be05c8b5393a76992",
         "type": "github"
       },
       "original": {
         "dir": "packages/nix",
-        "owner": "trivaris",
-        "repo": "millennium",
+        "owner": "SteamClientHomebrew",
+        "repo": "Millennium",
         "type": "github"
       }
     },
@@ -745,6 +763,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1769461804,
+        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1767379071,
         "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
@@ -760,7 +794,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1770141374,
         "narHash": "sha256-yD4K/vRHPwXbJf5CK3JkptBA6nFWUKNX/jlFp2eKEQc=",
@@ -776,7 +810,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1768875095,
         "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=",
@@ -817,7 +851,7 @@
     "nixvim_2": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "systems": "systems_3"
       },
       "locked": {
@@ -897,10 +931,11 @@
     },
     "root": {
       "inputs": {
+        "catppuccin": "catppuccin",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "millennium": "millennium",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nixvim": "nixvim",
         "nur": "nur"
       }
diff --git a/flake.nix b/flake.nix
index 4db0733..a400ee1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,6 @@
 {
 	inputs = {
 		nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-		millennium.url = "github:trivaris/millennium?dir=packages/nix"; # Temporary fix until this is merged into main millennium repo 
 		home-manager = {
 			url = "github:nix-community/home-manager";
 			inputs.nixpkgs.follows = "nixpkgs";
@@ -11,14 +10,16 @@
         		url = "github:Superredstone/nixvim";
         		inputs.nixpkgs.follows = "nixpkgs";
 		};
-		hyprland.url = "github:hyprwm/Hyprland";
 		nur = {
 			url = "github:nix-community/NUR";
 			inputs.nixpkgs.follows = "nixpkgs";
 		};
+		millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix";
+		hyprland.url = "github:hyprwm/Hyprland";
+		catppuccin.url = "github:catppuccin/nix";
 	};
 
-	outputs = { self, nixpkgs, home-manager, nixvim, millennium, hyprland, nur, ... }@inputs: 
+	outputs = { self, nixpkgs, home-manager, nixvim, millennium, hyprland, nur, catppuccin, ... }@inputs: 
 	let
 		overlays = [
 			millennium.overlays.default
@@ -45,6 +46,9 @@
 			gamingSystem = true;
 			# Currently supported: plasma, gnome, hyprland and none
 			desktopEnvironment = "gnome";
+			additionalModules = [
+				catppuccin.nixosModules.catppuccin
+			];
 		};
 		nixosConfigurations.workstation = mkSystem "workstation" {
 			system = "x86_64-linux";
diff --git a/lib/mksystem.nix b/lib/mksystem.nix
index a3c7fb3..7b3c7ca 100644
--- a/lib/mksystem.nix
+++ b/lib/mksystem.nix
@@ -16,7 +16,8 @@ name:
 	stable ? false,
 	gamingSystem ? false,
 	workSystem ? false,
-	desktopEnvironment ? ""
+	desktopEnvironment ? "",
+	additionalModules ? [],
 }:
 let
 	nixConfig = ../modules/nix-config/default.nix;
@@ -39,6 +40,7 @@ let
 		millennium = millennium;
 		nur = nur;
 		inputs = inputs;
+		additionalModules = additionalModules;
 	};
 in
 nixpkgs.lib.nixosSystem {
@@ -60,6 +62,6 @@ nixpkgs.lib.nixosSystem {
 			];
 		}
 		machineConfig
-	];
+	] ++ additionalModules;
 }