diff --git a/flake.lock b/flake.lock
index f4eef20..c98adf4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -53,65 +53,6 @@
         "type": "github"
       }
     },
-    "base16": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1658847131,
-        "narHash": "sha256-X6Mml7cT0YR3WCD5fkUhpRVV5ZPcwdcDsND8r8xMqTE=",
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "rev": "6b404cda2e04ca3cf5ca7b877af9c469e1386acb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "type": "github"
-      }
-    },
-    "comma": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "naersk": "naersk",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1666010793,
-        "narHash": "sha256-6zhTpR0cfaHrupOXRZAdCzLAGINgsB6h3HQnj7+qHWs=",
-        "owner": "nix-community",
-        "repo": "comma",
-        "rev": "691120d169189f3a9cb29b1c72bcd521ac372b2b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "comma",
-        "type": "github"
-      }
-    },
-    "dracula-fish": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1657833273,
-        "narHash": "sha256-WywEGAGaRwfHJpT+B3oKoyrnLJZxURTQ+MK9e5Asxl0=",
-        "owner": "dracula",
-        "repo": "fish",
-        "rev": "610147cc384ff161fbabb9a9ebfd22b743f82b67",
-        "type": "github"
-      },
-      "original": {
-        "owner": "dracula",
-        "repo": "fish",
-        "type": "github"
-      }
-    },
     "emacs-overlay": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -133,22 +74,6 @@
         "type": "github"
       }
     },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1650374568,
-        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "locked": {
         "lastModified": 1667395993,
@@ -230,7 +155,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "utils": "utils_2"
+        "utils": "utils"
       },
       "locked": {
         "lastModified": 1667708081,
@@ -283,28 +208,6 @@
         "type": "github"
       }
     },
-    "naersk": {
-      "inputs": {
-        "nixpkgs": [
-          "comma",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1662220400,
-        "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=",
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "master",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1667669848,
@@ -384,9 +287,6 @@
         "agenix": "agenix",
         "arkenfox-userjs": "arkenfox-userjs",
         "asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
-        "base16": "base16",
-        "comma": "comma",
-        "dracula-fish": "dracula-fish",
         "emacs-overlay": "emacs-overlay",
         "forgit-git": "forgit-git",
         "home-manager": "home-manager",
@@ -395,7 +295,7 @@
         "nixpkgs": "nixpkgs",
         "pre-commit-hooks": "pre-commit-hooks_2",
         "stable": "stable",
-        "utils": "utils_3"
+        "utils": "utils_2"
       }
     },
     "stable": {
@@ -415,21 +315,6 @@
       }
     },
     "utils": {
-      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "utils_2": {
       "locked": {
         "lastModified": 1667395993,
         "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@@ -444,7 +329,7 @@
         "type": "github"
       }
     },
-    "utils_3": {
+    "utils_2": {
       "inputs": {
         "flake-utils": "flake-utils_4"
       },
diff --git a/flake.nix b/flake.nix
index 2e2363c..bdb2968 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,17 +29,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    comma = {
-      url = "github:nix-community/comma";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    # Fish specific
-    dracula-fish = {
-      url = "github:dracula/fish";
-      flake = false;
-    };
-
     # Zsh specific
     forgit-git = {
       url = "github:wfxr/forgit";
@@ -57,12 +46,6 @@
       flake = false;
     };
 
-    # Theming
-    base16 = {
-      url = "github:SenchoPens/base16.nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     howdy = {
       url = "sourcehut:~moritzboehme/howdy";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -110,7 +93,6 @@
           };
         }
         inputs.agenix.nixosModules.age
-        inputs.base16.nixosModule
         inputs.howdy.nixosModules.default
       ];
 
diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index d00a341..6bccdc3 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -109,6 +109,7 @@ with lib;
   programs = {
     mtr.enable = true;
     command-not-found.enable = true;
+    starship.enable = true;
   };
 
   services = {
@@ -130,7 +131,6 @@ with lib;
       # Let Home Manager install and manage itself.
       home-manager.enable = true;
       fzf.enable = true;
-      starship.enable = true;
     };
     home = {
       username = "moritz";
diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index a2d64c8..c143217 100644
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -73,12 +73,6 @@ in
             fish_greeting = "";
             cheat = "cht.sh $argv | bat -p";
           };
-          plugins = [
-            {
-              name = "dracula";
-              src = inputs.dracula-fish;
-            }
-          ];
         };
         fzf.enableFishIntegration = true;
         starship.enableFishIntegration = true;
diff --git a/overlays/default.nix b/overlays/default.nix
index 5f8d1a9..a31bed2 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,5 +1,4 @@
 { inputs }: final: prev: {
-  inherit (inputs.comma.packages."${prev.system}") comma;
   nixpkgs-review-checks = inputs.nixpkgs-review-checks.defaultPackage."${prev.system}";
   agenix = inputs.agenix.defaultPackage."${prev.system}";
   master = import inputs.master {