diff --git a/roles/common/programs/btop.nix b/roles/common/programs/btop.nix
new file mode 100644
index 0000000..291d05e
--- /dev/null
+++ b/roles/common/programs/btop.nix
@@ -0,0 +1,27 @@
+{ pkgs, ... }:
+let
+  catppuccinBtop = pkgs.fetchFromGitHub {
+    owner = "catppuccin";
+    repo = "btop";
+    # I know fetiching from master is not best practice but idc this is not going to change often
+    # Latest commit rn is c6469190f2ecf25f017d6120bf4e050e6b1d17af
+    rev = "master";
+    hash = "sha256-jodJl4f2T9ViNqsY9fk8IV62CrpC5hy7WK3aRpu70Cs=";
+};
+
+in
+{
+  home-manager = {
+    users.toast = {
+      programs.btop = {
+        enable = true;
+        settings = {
+          color_theme = "catppuccin_mocha";
+        };
+      };
+      xdg.configFile = {
+        "btop/themes".source = "${catppuccinBtop}/themes";
+      };
+    };
+  };
+}
\ No newline at end of file
diff --git a/roles/common/programs/default.nix b/roles/common/programs/default.nix
index c6ab698..e6d2127 100755
--- a/roles/common/programs/default.nix
+++ b/roles/common/programs/default.nix
@@ -12,6 +12,7 @@
 		./git.nix
 		./starship.nix
 		./bat.nix
+		./btop.nix
 	];
 	# Some programs dont have a programs.*.enable option, so I install their package here
 	environment.systemPackages = with pkgs; [
@@ -23,7 +24,6 @@
 		ncdu
 		tree
 		btdu
-		btop
 		iperf3
 		restic
 	];
diff --git a/roles/common/programs/git.nix b/roles/common/programs/git.nix
index f5bce60..3002894 100644
--- a/roles/common/programs/git.nix
+++ b/roles/common/programs/git.nix
@@ -7,7 +7,6 @@
 			delta.enable = true;
 			extraConfig = {
 				init.defaultBranch = "main";
-				pull.rebase = "interactive";
 				commit.verbose = "true";
 			};
 		};
diff --git a/roles/common/programs/starship.nix b/roles/common/programs/starship.nix
index 9c9cd3b..5b168b7 100644
--- a/roles/common/programs/starship.nix
+++ b/roles/common/programs/starship.nix
@@ -1,7 +1,16 @@
-{ config, ... }:
-
+{ pkgs, ... }:
+let
+	catppuccinFlavour = "mocha";
+	catppuccinStarship = pkgs.fetchFromGitHub {
+		owner = "catppuccin";
+		repo = "starship";
+		# Latest commit is 5629d2356f62a9f2f8efad3ff37476c19969bd4f
+		rev = "main";
+		hash = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0=";
+	} + /palettes/${catppuccinFlavour}.toml;
+in
 {
-	programs.starship = {
+	programs.starship = with builtins; {
 		enable = true;
 		settings = {
 			nix_shell = {
@@ -17,6 +26,9 @@
 				disabled = false;
 				read_only = " 󰌾";
 			};
-		};
+			palette = "catppuccin_${catppuccinFlavour}";
+		} //
+		# Add the catppuccin palette to the settings file
+		(fromTOML (readFile catppuccinStarship));
 	};
 }
diff --git a/roles/kde/programs/default.nix b/roles/kde/programs/default.nix
index 796a605..7c22bb0 100644
--- a/roles/kde/programs/default.nix
+++ b/roles/kde/programs/default.nix
@@ -6,6 +6,7 @@
 		./firefox.nix
 		./skanpage.nix
 		./neochat.nix
+		./konsole.nix
 	];
 
 	# Enable the kde partition manager
diff --git a/roles/kde/programs/konsole.nix b/roles/kde/programs/konsole.nix
new file mode 100644
index 0000000..0dfdf57
--- /dev/null
+++ b/roles/kde/programs/konsole.nix
@@ -0,0 +1,17 @@
+{ pkgs, ... }:
+let
+  catppuccinKonsole = pkgs.fetchFromGitHub {
+    owner = "catppuccin";
+    repo = "konsole";
+    # Latest commit is 7d86b8a1e56e58f6b5649cdaac543a573ac194ca
+    rev = "main";
+    hash = "sha256-EwSJMTxnaj2UlNJm1t6znnatfzgm1awIQQUF3VPfCTM=";
+  } + /Catppuccin-Mocha.colorscheme;
+in
+{
+  home-manager.users.toast = {
+    xdg.dataFile = {
+      "konsole/Catppuccin-Mocha.colorscheme".source = catppuccinKonsole;
+    };
+  };
+}
\ No newline at end of file