diff --git a/flake.lock b/flake.lock
index 7cdee51..a61960c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,20 @@
 {
   "nodes": {
+    "catppuccin": {
+      "locked": {
+        "lastModified": 1720472194,
+        "narHash": "sha256-CYscFEts6tyvosc1T29nxhzIYJAj/1CCEkV3ZMzSN/c=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "d75d5803852fb0833767dc969a4581ac13204e22",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -38,11 +53,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1720957393,
-        "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
+        "lastModified": 1721379653,
+        "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
+        "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
         "type": "github"
       },
       "original": {
@@ -54,6 +69,7 @@
     },
     "root": {
       "inputs": {
+        "catppuccin": "catppuccin",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "spicetify-nix": "spicetify-nix"
@@ -67,11 +83,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721103144,
-        "narHash": "sha256-vHGUl/kagv0/QsPXMW+caSPyuvHvMUJSV80cbe+0/2M=",
+        "lastModified": 1721448793,
+        "narHash": "sha256-k3gP2K58IkxRZRbr17gNkIo36YnjBFmmokm6G2GC2yw=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "085ddf8abc78a7f1682c99715584e8735f4903cf",
+        "rev": "f244c6e512a4ca4211414c2c37f5f7516cfbab24",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 0609f41..aeecc7c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,19 +13,29 @@
       url = "github:Gerg-L/spicetify-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    catppuccin.url = "github:catppuccin/nix";
   };
 
   outputs =
-    { home-manager, nixpkgs, ... }@inputs:
+    {
+      home-manager,
+      nixpkgs,
+      catppuccin,
+      ...
+    }@inputs:
     let
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
     in
     {
-      nixosConfigurations."nixos" =
+      nixosConfigurations."wizdesk" =
         let
           specialArgs = inputs;
-          modules = [ ./nixos.nix ];
+          modules = [
+            ./nixos.nix
+            catppuccin.nixosModules.catppuccin
+          ];
         in
         nixpkgs.lib.nixosSystem { inherit system specialArgs modules; };
 
@@ -33,7 +43,10 @@
         inherit pkgs;
 
         extraSpecialArgs = inputs;
-        modules = [ ./home-manager.nix ];
+        modules = [
+          ./home-manager.nix
+          catppuccin.homeManagerModules.catppuccin
+        ];
       };
 
       formatter."${system}" = pkgs.nixfmt-rfc-style;
diff --git a/home-manager.nix b/home-manager.nix
index 20f111a..3023b51 100644
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -19,6 +19,8 @@
     ./programs/spotify
     ./programs/tmux
     ./programs/waybar.nix
+    # Enable catppuccin theme everywhere
+    ./theming/catppuccin.nix
   ];
 
   # Home Manager needs a bit of information about you and the paths it should
@@ -166,35 +168,11 @@
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
   # plain files is through 'home.file'.
   home.file = {
-    # Cattpuccin theme for fish shell.
-    ".config/fish/themes/Catppuccin-Frappe.theme".source = ./programs/fish/Catppuccin-Frappe.theme;
-
     # Configuration for gamemode, for running games with optimizations.
     ".config/gamemode.ini".source = ./programs/gamemode.ini;
 
     # Configuration for mako, a notification daemon.
     ".config/mako".source = ./programs/mako;
-
-    ## Kvantum's theme configuration.
-    ".config/Kvantum/Catppuccin-Frappe-Lavender" = {
-      source = "${
-        pkgs.catppuccin-kvantum.override {
-          accent = "Lavender";
-          variant = "Frappe";
-        }
-      }/share/Kvantum/Catppuccin-Frappe-Lavender";
-    };
-
-    ".config/Kvantum/kvantum.kvconfig".text = ''
-      [General]
-      theme=Catppuccin-Frappe-Lavender
-    '';
-    ##
-
-    ## Themeing configuration for qt5 and qt6
-    ".config/qt5ct/colors".source = ./theming/qt5ct;
-
-    ".config/qt6ct/colors".source = ./theming/qt5ct; # We use the qt5ct because it's the SAME spec
     ##
 
     # Configure pipewire for microphone noise supression.
@@ -287,7 +265,8 @@
   # Configure QT
   qt = {
     enable = true;
-    platformTheme.name = "qtct";
+    platformTheme.name = "kvantum";
+    style.name = "kvantum";
   };
 
   # Configure XDG
diff --git a/nixos.nix b/nixos.nix
index 9310348..d7f575f 100644
--- a/nixos.nix
+++ b/nixos.nix
@@ -16,6 +16,8 @@
     ./services/archi.nix
     ./services/caddy.nix
     ./services/jellyfin.nix
+    # Enable catppuccin theme everywhere
+    ./theming/catppuccin.nix
   ];
 
   # Enable experimental features
@@ -94,7 +96,7 @@
     fileSystems = [ "/" ];
   };
 
-  networking.hostName = "nixos"; # Define your hostname.
+  networking.hostName = "wizdesk"; # Define your hostname.
 
   # Enable networking
   networking.networkmanager.enable = true;
@@ -238,8 +240,8 @@
   # Enable SDDM.
   services.displayManager.sddm = {
     enable = true;
+    package = pkgs.kdePackages.sddm;
     wayland.enable = true;
-    theme = "${import ./theming/sddm { inherit pkgs; }}";
   };
 
   # Enable Hyprland
diff --git a/programs/alacritty.nix b/programs/alacritty.nix
index 323d4b9..7888c1b 100644
--- a/programs/alacritty.nix
+++ b/programs/alacritty.nix
@@ -1,19 +1,9 @@
 { pkgs, ... }:
 
-let
-  catppuccin-theme = pkgs.fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "alacritty";
-    rev = "94800165c13998b600a9da9d29c330de9f28618e";
-    hash = "sha256-Pi1Hicv3wPALGgqurdTzXEzJNx7vVh+8B9tlqhRpR2Y=";
-  };
-in
 {
   programs.alacritty = {
     enable = true;
     settings = {
-      import = [ "${catppuccin-theme}/catppuccin-frappe.toml" ];
-
       font = {
         normal = {
           family = "FantasqueSansM Nerd Font";
diff --git a/programs/fish/Catppuccin-Frappe.theme b/programs/fish/Catppuccin-Frappe.theme
deleted file mode 100644
index 3dc51d4..0000000
--- a/programs/fish/Catppuccin-Frappe.theme
+++ /dev/null
@@ -1,30 +0,0 @@
-# name: 'Catppuccin frappe'
-# url: 'https://github.com/catppuccin/fish'
-# preferred_background: 303446
-
-fish_color_normal c6d0f5
-fish_color_command 8caaee
-fish_color_param eebebe
-fish_color_keyword e78284
-fish_color_quote a6d189
-fish_color_redirection f4b8e4
-fish_color_end ef9f76
-fish_color_comment 838ba7
-fish_color_error e78284
-fish_color_gray 737994
-fish_color_selection --background=414559
-fish_color_search_match --background=414559
-fish_color_option a6d189
-fish_color_operator f4b8e4
-fish_color_escape ea999c
-fish_color_autosuggestion 737994
-fish_color_cancel e78284
-fish_color_cwd e5c890
-fish_color_user 81c8be
-fish_color_host 8caaee
-fish_color_host_remote a6d189
-fish_color_status e78284
-fish_pager_color_progress 737994
-fish_pager_color_prefix f4b8e4
-fish_pager_color_completion c6d0f5
-fish_pager_color_description 737994
diff --git a/programs/mako/config b/programs/mako/config
index 0567279..5938647 100644
--- a/programs/mako/config
+++ b/programs/mako/config
@@ -1,32 +1,21 @@
 anchor=bottom-right
-background-color=#282a36
-border-color=#282a36
-border-radius=20
-border-size=2
+border-radius=30
+border-size=1
 default-timeout=10000
 format=<span font="FantasqueSansMono NF weight=325 Italic" size="12288">%s</span>\n<span font="FantasqueSansMono NF weight=325" size="12288">%b</span>
 group-by=summary
-height=125
+height=180
 icon-location=right
 layer=top
-margin=0,20,15
+margin=0
 markup=1
 max-icon-size=48
-padding=10,5,10
-text-color=#44475a
-width=300
+outer-margin=8
+padding=25
+width=375
 
 [grouped]
 format=<span font="FantasqueSansMono NF weight=325 Italic" size="12288">%s</span>\n<span font="FantasqueSansMono NF weight=325" size="12288">%b</span>
 
 [mode=do-not-disturb]
 invisible=1
-
-[urgency=low]
-border-color=#282a36
-
-[urgency=normal]
-border-color=#f1fa8c
-
-[urgency=high]
-border-color=#ff5555
diff --git a/programs/rofi/default.nix b/programs/rofi/default.nix
index 1ad328b..f022b80 100644
--- a/programs/rofi/default.nix
+++ b/programs/rofi/default.nix
@@ -22,7 +22,5 @@
       sidebar-mode = true;
       terminal = "alacritty";
     };
-
-    theme = ./catppuccin-frappe.rasi;
   };
 }
diff --git a/programs/tmux/default.nix b/programs/tmux/default.nix
index 2ed07ac..8001888 100644
--- a/programs/tmux/default.nix
+++ b/programs/tmux/default.nix
@@ -4,13 +4,5 @@
   programs.tmux = {
     enable = true;
     clock24 = true;
-    plugins = with pkgs.tmuxPlugins; [
-      {
-        plugin = catppuccin;
-        extraConfig = ''
-          set -g @catppuccin_flavour 'frappe'
-        '';
-      }
-    ];
   };
 }
diff --git a/theming/catppuccin.nix b/theming/catppuccin.nix
new file mode 100644
index 0000000..f0c13e8
--- /dev/null
+++ b/theming/catppuccin.nix
@@ -0,0 +1,7 @@
+{
+  catppuccin = {
+    enable = true;
+    accent = "lavender";
+    flavor = "frappe";
+  };
+}
diff --git a/theming/qt5ct/Catppuccin-Frappe.conf b/theming/qt5ct/Catppuccin-Frappe.conf
deleted file mode 100644
index 48e4169..0000000
--- a/theming/qt5ct/Catppuccin-Frappe.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[ColorScheme]
-active_colors=#ffc6d0f5, #ff292c3c, #ffa5adce, #ff949cbb, #ff51576d, #ff737994, #ffc6d0f5, #ffc6d0f5, #ffc6d0f5, #ff303446, #ff292c3c, #ff838ba7, #ff8caaee, #ff303446, #ff8caaee, #ffe78284, #ff303446, #ffc6d0f5, #ff232634, #ffc6d0f5, #80838ba7
-disabled_colors=#ffa5adce, #ff292c3c, #ffa5adce, #ff949cbb, #ff51576d, #ff737994, #ffa5adce, #ffa5adce, #ffa5adce, #ff303446, #ff292c3c, #ff838ba7, #ff626880, #ffb5bfe2, #ff8caaee, #ffe78284, #ff303446, #ffc6d0f5, #ff232634, #ffc6d0f5, #80838ba7
-inactive_colors=#ffc6d0f5, #ff292c3c, #ffa5adce, #ff949cbb, #ff51576d, #ff737994, #ffc6d0f5, #ffc6d0f5, #ffc6d0f5, #ff303446, #ff292c3c, #ff838ba7, #ff414559, #ffa5adcb, #ff8caaee, #ffe78284, #ff303446, #ffc6d0f5, #ff232634, #ffc6d0f5, #80838ba7
diff --git a/theming/qt5ct/Catppuccin-Latte.conf b/theming/qt5ct/Catppuccin-Latte.conf
deleted file mode 100644
index 42db9c5..0000000
--- a/theming/qt5ct/Catppuccin-Latte.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[ColorScheme]
-active_colors=#ff4c4f69, #ffe6e9ef, #ff6c6f85, #ff7c7f93, #ffbcc0cc, #ff9ca0b0, #ff4c4f69, #ff4c4f69, #ff4c4f69, #ffeff1f5, #ffe6e9ef, #ff8c8fa1, #ff1e66f5, #ffeff1f5, #ff7287fd, #ffe64553, #ffeff1f5, #ff4c4f69, #ffdce0e8, #ff4c4f69, #808c8fa1
-disabled_colors=#ff6c6f85, #ffe6e9ef, #ff6c6f85, #ff7c7f93, #ffbcc0cc, #ff9ca0b0, #ff6c6f85, #ff6c6f85, #ff6c6f85, #ffeff1f5, #ffe6e9ef, #ff8c8fa1, #ff9ca0b0, #ff5c5f77, #ff7287fd, #ffe64553, #ffeff1f5, #ff4c4f69, #ffdce0e8, #ff4c4f69, #808c8fa1
-inactive_colors=#ff4c4f69, #ffe6e9ef, #ff6c6f85, #ff7c7f93, #ffbcc0cc, #ff9ca0b0, #ff4c4f69, #ff4c4f69, #ff4c4f69, #ffeff1f5, #ffe6e9ef, #ff8c8fa1, #ffccd0da, #ff6c6f85, #ff7287fd, #ffe64553, #ffeff1f5, #ff4c4f69, #ffdce0e8, #ff4c4f69, #808c8fa1
diff --git a/theming/qt5ct/Catppuccin-Macchiato.conf b/theming/qt5ct/Catppuccin-Macchiato.conf
deleted file mode 100644
index fdae012..0000000
--- a/theming/qt5ct/Catppuccin-Macchiato.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[ColorScheme]
-active_colors=#ffcad3f5, #ff1e2030, #ffa5adcb, #ff939ab7, #ff494d64, #ff6e738d, #ffcad3f5, #ffcad3f5, #ffcad3f5, #ff24273a, #ff1e2030, #ff8087a2, #ff8aadf4, #ff24273a, #ff8aadf4, #ffed8796, #ff24273a, #ffcad3f5, #ff181926, #ffcad3f5, #808087a2
-disabled_colors=#ffa5adcb, #ff1e2030, #ffa5adcb, #ff939ab7, #ff494d64, #ff6e738d, #ffa5adcb, #ffa5adcb, #ffa5adcb, #ff24273a, #ff1e2030, #ff8087a2, #ff8aadf4, #ff494d64, #ff8aadf4, #ffed8796, #ff24273a, #ffcad3f5, #ff181926, #ffcad3f5, #808087a2
-inactive_colors=#ffcdd6f4, #ff1e2030, #ffa5adcb, #ff939ab7, #ff494d64, #ff6e738d, #ffcad3f5, #ffcad3f5, #ffcad3f5, #ff24273a, #ff1e2030, #ff8087a2, #ff8aadf4, #ffa5adcb, #ff8aadf4, #ffed8796, #ff24273a, #ffcad3f5, #ff181926, #ffcad3f5, #808087a2
diff --git a/theming/qt5ct/Catppuccin-Mocha.conf b/theming/qt5ct/Catppuccin-Mocha.conf
deleted file mode 100644
index e566a63..0000000
--- a/theming/qt5ct/Catppuccin-Mocha.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[ColorScheme]
-active_colors=#ffcdd6f4, #ff1e1e2e, #ffa6adc8, #ff9399b2, #ff45475a, #ff6c7086, #ffcdd6f4, #ffcdd6f4, #ffcdd6f4, #ff1e1e2e, #ff181825, #ff7f849c, #ff89b4fa, #ff1e1e2e, #ff89b4fa, #fff38ba8, #ff1e1e2e, #ffcdd6f4, #ff11111b, #ffcdd6f4, #807f849c
-disabled_colors=#ffa6adc8, #ff1e1e2e, #ffa6adc8, #ff9399b2, #ff45475a, #ff6c7086, #ffa6adc8, #ffa6adc8, #ffa6adc8, #ff1e1e2e, #ff11111b, #ff7f849c, #ff89b4fa, #ff45475a, #ff89b4fa, #fff38ba8, #ff1e1e2e, #ffcdd6f4, #ff11111b, #ffcdd6f4, #807f849c
-inactive_colors=#ffcdd6f4, #ff1e1e2e, #ffa6adc8, #ff9399b2, #ff45475a, #ff6c7086, #ffcdd6f4, #ffcdd6f4, #ffcdd6f4, #ff1e1e2e, #ff181825, #ff7f849c, #ff89b4fa, #ffa6adc8, #ff89b4fa, #fff38ba8, #ff1e1e2e, #ffcdd6f4, #ff11111b, #ffcdd6f4, #807f849c
diff --git a/theming/sddm/Background.jpg b/theming/sddm/Background.jpg
deleted file mode 100644
index 01fce54..0000000
Binary files a/theming/sddm/Background.jpg and /dev/null differ
diff --git a/theming/sddm/default.nix b/theming/sddm/default.nix
deleted file mode 100644
index 6f79482..0000000
--- a/theming/sddm/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs }:
-
-let
-  image = ./Background.jpg;
-in
-pkgs.stdenv.mkDerivation {
-  name = "sddm-theme";
-  src = pkgs.fetchFromGitHub {
-    owner = "MarianArlt";
-    repo = "sddm-sugar-dark";
-    rev = "ceb2c455663429be03ba62d9f898c571650ef7fe";
-    sha256 = "0153z1kylbhc9d12nxy9vpn0spxgrhgy36wy37pk6ysq7akaqlvy";
-  };
-  installPhase = ''
-    mkdir -p $out
-    cp -R ./* $out/
-    cd $out/
-    rm Background.jpg
-    cp -r ${image} $out/Background.jpg
-  '';
-}