diff --git a/Droidnix/README.org b/Droidnix/README.org
index 63d37d955..44886dc6e 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1110,15 +1110,19 @@ let
 in
 {
   home-manager.users.${user.username} = {
-    # Kitty Terminal
     programs.kitty = {
       enable = true;
     };
 
-    # Kitty config (main + theme)
-    xdg.configFile."kitty/kitty.conf".source = "${flakeRoot}/assets/conf/kitty/kitty.conf";
+    # Copy the actual kitty.conf (not a symlink)
+    xdg.configFile."kitty/kitty.conf".text = lib.concatStringsSep "\n" [
+      (builtins.readFile "${flakeRoot}/assets/common/conf/kitty/kitty.conf")
+      "include ${kittyConfigDir}/themes/Catppuccin-Mocha.conf"
+    ];
 
-    };
+    # Copy the theme file
+    xdg.configFile."kitty/themes/Catppuccin-Mocha.conf".source = "${flakeRoot}/assets/common/conf/kitty/themes/Catppuccin-Mocha.conf";
+  };
 }
 #+END_SRC
 
@@ -1130,10 +1134,10 @@ This file sets up starship prompt
   home-manager.users.${user.username} = {
     programs.starship = {
       enable = true;
+      settings = {
+        configFile = "${flakeRoot}/assets/common/conf/starship.toml";
+      };
     };
-
-    # Use the starship.toml from your assets <-- this should be the only place doing it!
-    xdg.configFile."starship.toml".source = "${flakeRoot}/assets/common/conf/starship.toml";
   };
 }
 #+END_SRC
@@ -1150,6 +1154,7 @@ in
     # Install zsh-syntax-highlighting
     home.packages = with pkgs; [
       zsh-syntax-highlighting
+      starship
     ];
 
     programs.zsh = {
diff --git a/Droidnix/assets/common/conf/kitty/kitty.conf b/Droidnix/assets/common/conf/kitty/kitty.conf
deleted file mode 120000
index 0eb75308c..000000000
--- a/Droidnix/assets/common/conf/kitty/kitty.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/hqg1qv89c89x5z6hyafbbyc0ncy0jbqs-home-manager-files/.config/kitty/kitty.conf
\ No newline at end of file
diff --git a/Droidnix/assets/common/conf/kitty/themes/Catppuccin-Mocha.conf b/Droidnix/assets/common/conf/kitty/themes/Catppuccin-Mocha.conf
deleted file mode 120000
index 9f70e625d..000000000
--- a/Droidnix/assets/common/conf/kitty/themes/Catppuccin-Mocha.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/hqg1qv89c89x5z6hyafbbyc0ncy0jbqs-home-manager-files/.config/kitty/themes/Catppuccin-Mocha.conf
\ No newline at end of file