diff --git a/hmModules/btop/default.nix b/hmModules/btop/default.nix
index 08fc3a7..370fbd2 100644
--- a/hmModules/btop/default.nix
+++ b/hmModules/btop/default.nix
@@ -1,18 +1,10 @@
-{pkgs, ...}: {
+{config, ...}: {
   programs.btop = {
     enable = true;
     settings = {
       update_ms = 100;
       theme_background = false;
-      # color_theme = "${config.programs.btop.package}/share/btop/themes/dracula.theme";
-      color_theme = let
-        catppuccin-theme = pkgs.fetchFromGitHub {
-          owner = "catppuccin";
-          repo = "btop";
-          rev = "21b8d5956a8b07fa52519e3267fb3a2d2e693d17";
-          hash = "sha256-UXeTypc15MhjgGUiCrDUZ40m32yH2o1N+rcrEgY6sME=";
-        };
-      in "${catppuccin-theme}/themes/catppuccin_mocha.theme";
+      color_theme = "${config.programs.btop.package}/share/btop/themes/dracula.theme";
     };
   };
 }
diff --git a/hmModules/calibre/default.nix b/hmModules/calibre/default.nix
deleted file mode 100644
index dca9687..0000000
--- a/hmModules/calibre/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.calibre];
-}
diff --git a/hmModules/helix/default.nix b/hmModules/helix/default.nix
index 89f0e01..6fa8ad9 100644
--- a/hmModules/helix/default.nix
+++ b/hmModules/helix/default.nix
@@ -2,7 +2,7 @@
   programs.helix = {
     enable = true;
     settings = {
-      theme = "catppuccin_mocha";
+      theme = "dracula";
       editor = {
         indent-guides.render = true;
         cursor-shape = {
diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix
index 8a44296..022bae5 100644
--- a/hmModules/shell/default.nix
+++ b/hmModules/shell/default.nix
@@ -96,36 +96,22 @@
   #   '';
   # };
 
-  xdg.configFile = {
-    "dracula-theme" = {
-      target = "fish/themes/dracula.theme";
-      source = let
-        theme = pkgs.fetchFromGitHub {
-          owner = "dracula";
-          repo = "fish";
-          rev = "269cd7d76d5104fdc2721db7b8848f6224bdf554";
-          hash = "sha256-Hyq4EfSmWmxwCYhp3O8agr7VWFAflcUe8BUKh50fNfY=";
-        };
-      in "${theme}/themes/Dracula\ Official.theme";
-    };
-    "catppuccin-theme" = {
-      target = "fish/themes/Catppuccin\ Mocha.theme";
-      source = let
-        theme = pkgs.fetchFromGitHub {
-          owner = "catppuccin";
-          repo = "fish";
-          rev = "a3b9eb5eaf2171ba1359fe98f20d226c016568cf";
-          hash = "sha256-shQxlyoauXJACoZWtRUbRMxmm10R8vOigXwjxBhG8ng=";
-        };
-      in "${theme}/themes/Catppuccin\ Mocha.theme";
-    };
+  xdg.configFile."dracula-theme" = {
+    target = "fish/themes/dracula.theme";
+    source = let
+      theme = pkgs.fetchFromGitHub {
+        owner = "dracula";
+        repo = "fish";
+        rev = "269cd7d76d5104fdc2721db7b8848f6224bdf554";
+        hash = "sha256-Hyq4EfSmWmxwCYhp3O8agr7VWFAflcUe8BUKh50fNfY=";
+      };
+    in "${theme}/themes/Dracula\ Official.theme";
   };
 
   programs.fish = {
     enable = true;
     shellInit = ''
       fish_config theme choose "dracula"
-      fish_config theme choose "Catppuccin Mocha"
       export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
     '';
     shellAliases = {
diff --git a/hmModules/wezterm/default.nix b/hmModules/wezterm/default.nix
index 0575359..b6ad88b 100644
--- a/hmModules/wezterm/default.nix
+++ b/hmModules/wezterm/default.nix
@@ -14,7 +14,7 @@
         };
         font_size = 13;
         allow_square_glyphs_to_overflow_width = "Always";
-        color_scheme = "Catppuccin Mocha";
+        color_scheme = "Dracula (Official)";
         window_background_opacity = 1;
         enable_tab_bar = false;
         hide_mouse_cursor_when_typing = false;
diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix
index 6f840ed..c3c2798 100644
--- a/hosts/picard/default.nix
+++ b/hosts/picard/default.nix
@@ -78,7 +78,6 @@
       "zulip"
       "teams"
       "obs-studio"
-      "calibre"
     ];
     extraGroups = [];
     backupPaths = [];