diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29..0000000
diff --git a/configuration.nix b/configuration.nix
index 2b2801d..0948b73 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -152,8 +152,6 @@ services.displayManager.sddm =
 	enable = true;
 	autoNumlock = true; # Enable NumLock at login
 	wayland.enable = true;
-	theme = "catppuccin-mocha";
-	#package = pkgs.kdePackages.sddm; # managed by plasma6
 };
 
 services.xserver.displayManager.startx.enable = true;
@@ -323,14 +321,6 @@ environment.etc.crypttab = {
 		home-manager								# Nix's Home-Manager
 		egl-wayland									# NVIDIA compat
 		nvidia-vaapi-driver							# NVIDIA compat
-		catppuccin-cursors.mochaDark # Catppuccin Mouse Cursors
-		(catppuccin-sddm.override {
-      		flavor = "mocha";
-      		font  = "Fira Sans";
-      		fontSize = "9";
-      		#backgroundbin = "$XDG_PICTURES_DIR/Wallpapers/current";
-      		loginBackground = true;
-      		})
 	];
 	
 	programs = {
@@ -425,6 +415,17 @@ virtualisation.docker = {
 
 virtualisation.libvirtd.enable = true;
 
+catppuccin = {
+	enable = true;
+	accent = "blue";
+	sddm = {
+		enable = true;
+      		font  = "Fira Sans";
+      		fontSize = "9";
+      		loginBackground = true;
+		background = "/home/leon/Pictures/Wallpapers/current";
+	};
+};
 
 # Man pages
 documentation.dev.enable = true;
diff --git a/flake.lock b/flake.lock
index 8e0d0cd..35498ba 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,12 +1,27 @@
 {
   "nodes": {
+    "catppuccin": {
+      "locked": {
+        "lastModified": 1735028008,
+        "narHash": "sha256-crbQNRVQgPH0hX5vZk8xL9JStXo74Es7zDBjRcc4i+A=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "bfd20bcf45f1de0e97b551be51495abf8a727f1a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "crane": {
       "locked": {
-        "lastModified": 1730652660,
-        "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=",
+        "lastModified": 1731098351,
+        "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458",
+        "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28",
         "type": "github"
       },
       "original": {
@@ -86,11 +101,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1731941836,
-        "narHash": "sha256-zpmAzrvK8KdssBSwiIwwRxaUJ77oWORbW0XFvgCFpTE=",
+        "lastModified": 1734994463,
+        "narHash": "sha256-S9MgfQjNt4J3I7obdLOVY23h+Yl/hnyibwGfOl+1uOE=",
         "owner": "nix-community",
         "repo": "lanzaboote",
-        "rev": "2f48272f34174fd2a5ab3df4d8a46919247be879",
+        "rev": "93e6f0d77548be8757c11ebda5c4235ef4f3bc67",
         "type": "github"
       },
       "original": {
@@ -101,11 +116,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732521221,
-        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
+        "lastModified": 1734649271,
+        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
+        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
         "type": "github"
       },
       "original": {
@@ -117,11 +132,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1720386169,
-        "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
+        "lastModified": 1730741070,
+        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
+        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
         "type": "github"
       },
       "original": {
@@ -145,11 +160,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1730302582,
-        "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
+        "lastModified": 1731363552,
+        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
+        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
         "type": "github"
       },
       "original": {
@@ -160,6 +175,7 @@
     },
     "root": {
       "inputs": {
+        "catppuccin": "catppuccin",
         "lanzaboote": "lanzaboote",
         "nixpkgs": "nixpkgs"
       }
@@ -172,11 +188,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730601085,
-        "narHash": "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=",
+        "lastModified": 1731897198,
+        "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "8d1b40f8dfd7539aaa3de56e207e22b3cc451825",
+        "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index b2af994..9547963 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    catppuccin.url = "github:catppuccin/nix";
     lanzaboote = {
       url = "github:nix-community/lanzaboote";
 
@@ -11,13 +12,14 @@
     };
   };
 
-  outputs = inputs@{ nixpkgs, lanzaboote, ... }: {
+  outputs = inputs@{ nixpkgs, lanzaboote, catppuccin, ... }: {
     nixosConfigurations = {
       Zuse1 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
           ./configuration.nix
 	  lanzaboote.nixosModules.lanzaboote
+	  catppuccin.nixosModules.catppuccin
 	  ({ pkgs, lib, ... }: {
 
             environment.systemPackages = [