diff --git a/flake.lock b/flake.lock
index 02e25cf..cd441ac 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,21 +23,6 @@
         "type": "github"
       }
     },
-    "catppuccin": {
-      "locked": {
-        "lastModified": 1712482981,
-        "narHash": "sha256-LJOOpTey9Y29C/TK4h9KP7v4HvqDL3mLyT9hSWCfFlI=",
-        "owner": "catppuccin",
-        "repo": "nix",
-        "rev": "4043beb6c792a40e9c513aa261f4ba10601a4457",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
     "catppuccin-vsc": {
       "inputs": {
         "nixpkgs": [
@@ -355,7 +340,6 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "catppuccin": "catppuccin",
         "catppuccin-vsc": "catppuccin-vsc",
         "home-manager": "home-manager_2",
         "home-manager-unstable": "home-manager-unstable",
diff --git a/flake.nix b/flake.nix
index 90defdb..81171bf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,8 +68,6 @@
     nix-flatpak.url = "github:gmodena/nix-flatpak/main";
 
     nur.url = "github:nix-community/NUR";
-
-    catppuccin.url = "github:catppuccin/nix";
   };
 
   outputs = {...} @ inputs:
@@ -133,7 +131,6 @@
               agenix.nixosModules.default
               home-manager-unstable.nixosModule
               nix-index-db-unstable.nixosModules.nix-index
-              catppuccin.nixosModules.catppuccin
               ./roles/common
               ./roles/desktop
               ./roles/kde
@@ -154,7 +151,6 @@
               home-manager-unstable.nixosModule
               nixos-hardware.nixosModules.microsoft-surface-go
               nix-index-db-unstable.nixosModules.nix-index
-              catppuccin.nixosModules.catppuccin
               ./roles/common
               ./roles/desktop
               ./roles/kde
@@ -173,7 +169,6 @@
               jovian.nixosModules.default
               home-manager-unstable.nixosModule
               nix-index-db-unstable.nixosModules.nix-index
-              catppuccin.nixosModules.catppuccin
               ./roles/common
               ./roles/desktop
               ./roles/kde
@@ -195,7 +190,6 @@
               home-manager-unstable.nixosModule
               nix-index-db-unstable.nixosModules.nix-index
               nixos-hardware.nixosModules.gpd-win-max-2-2023
-              catppuccin.nixosModules.catppuccin
               ./roles/common
               ./roles/desktop
               ./roles/kde
@@ -215,7 +209,6 @@
               agenix.nixosModules.default
               home-manager.nixosModule
               nix-index-db.nixosModules.nix-index
-              catppuccin.nixosModules.catppuccin
               ./roles/common
               ./roles/server
               ./machines/Everest
diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix
index 8af3482..53fa7ba 100755
--- a/roles/common/configuration.nix
+++ b/roles/common/configuration.nix
@@ -90,18 +90,13 @@
     )
   ];
 
-  catppuccin.flavour = "mocha";
-
   home-manager = {
     backupFileExtension = "hm-backup";
     useGlobalPkgs = true;
     verbose = true;
-    sharedModules = [flakeSelf.inputs.catppuccin.homeManagerModules.catppuccin];
-    users.toast = {osConfig, ...}: {
-      catppuccin.flavour = osConfig.catppuccin.flavour;
+    users.toast = {...}: {
       home.stateVersion = "23.11";
       xdg = {
-        enable = true;
         userDirs = {
           enable = true;
           createDirectories = true;
@@ -118,7 +113,11 @@
     ];
   };
 
-  boot.loader.grub.catppuccin.enable = true;
+  boot.loader.grub = {
+    theme = "${pkgs.catppuccin}/grub";
+    backgroundColor = "#1E1E2E";
+    splashImage = "${pkgs.catppuccin}/grub/background.png";
+  };
 
   /*
   I used to keep the host keys in the repo as a secret, but since I use the
diff --git a/roles/common/programs/bat.nix b/roles/common/programs/bat.nix
index cce65c9..021d531 100644
--- a/roles/common/programs/bat.nix
+++ b/roles/common/programs/bat.nix
@@ -1,8 +1,25 @@
-{...}: {
+{
+  config,
+  pkgs,
+  ...
+}: let
+  themeName =
+    if config.system.nixos.release == "23.11"
+    then "Catppuccin-mocha"
+    else "Catppuccin Mocha";
+in {
   home-manager = {
     users.toast.programs.bat = {
       enable = true;
-      catppuccin.enable = true;
+      config = {
+        theme = "catppuccin-mocha";
+      };
+      themes = {
+        catppuccin-mocha = {
+          src = pkgs.catppuccin;
+          file = "bat/${themeName}.tmTheme";
+        };
+      };
     };
   };
 }
diff --git a/roles/common/programs/btop.nix b/roles/common/programs/btop.nix
index 1e25cbe..c0bf0de 100644
--- a/roles/common/programs/btop.nix
+++ b/roles/common/programs/btop.nix
@@ -1,9 +1,14 @@
-{...}: {
+{pkgs, ...}: {
   home-manager = {
     users.toast = {
       programs.btop = {
         enable = true;
-        catppuccin.enable = true;
+        settings = {
+          color_theme = "catppuccin_mocha";
+        };
+      };
+      xdg.configFile = {
+        "btop/themes".source = "${pkgs.catppuccin}/btop";
       };
     };
   };
diff --git a/roles/common/programs/git.nix b/roles/common/programs/git.nix
index f9f2b4e..3b125df 100644
--- a/roles/common/programs/git.nix
+++ b/roles/common/programs/git.nix
@@ -1,4 +1,11 @@
-{...}: {
+{pkgs, ...}: let
+  catppuccinDelta = pkgs.fetchFromGitHub {
+    owner = "catppuccin";
+    repo = "delta";
+    rev = "main";
+    hash = "sha256-0QQLkfLBVuB2re6tjtPNuOQZNK0MDBAIFgNGHZM8afs=";
+  };
+in {
   home-manager.users.toast = {
     programs.git = {
       enable = true;
@@ -6,8 +13,12 @@
       userEmail = "toast003@tutamail.com";
       delta = {
         enable = true;
-        catppuccin.enable = true;
+        options = {
+          syntax-theme = "catppuccin-mocha";
+          features = "catppuccin-mocha";
+        };
       };
+      includes = [{path = "${catppuccinDelta}/themes/mocha.gitconfig";}];
       extraConfig = {
         init.defaultBranch = "main";
         diff.colorMoved = "default";
diff --git a/roles/common/programs/helix.nix b/roles/common/programs/helix.nix
index c5ea603..70fa320 100644
--- a/roles/common/programs/helix.nix
+++ b/roles/common/programs/helix.nix
@@ -7,11 +7,8 @@
         nixpkgs-fmt
         nil
       ];
-      catppuccin = {
-        enable = true;
-        useItalics = true;
-      };
       settings = {
+        theme = "catppuccin_mocha";
         editor = {
           mouse = true;
           cursorline = true;
diff --git a/roles/common/programs/starship.nix b/roles/common/programs/starship.nix
index 527034a..8e60667 100644
--- a/roles/common/programs/starship.nix
+++ b/roles/common/programs/starship.nix
@@ -49,13 +49,4 @@ in {
       }
     ];
   };
-  # The catppuccin module only works for home-manager, so this
-  # sets up starship with home-manager using the system config
-  home-manager.users.toast = {osConfig, ...}: {
-    programs.starship = {
-      enable = true;
-      catppuccin.enable = true;
-      settings = osConfig.programs.starship.settings;
-    };
-  };
 }