diff --git a/home/alacritty/default.nix b/home/alacritty/default.nix
index 3b6b85b..4999284 100644
--- a/home/alacritty/default.nix
+++ b/home/alacritty/default.nix
@@ -10,6 +10,9 @@
                 dynamic_title = true;
                 opacity = 0.3;
             };
+            env = {
+                TERM = "xterm-256color";
+            };
             colors = {
                 bright = {
                     black = "#555556";
diff --git a/home/tmux/default.nix b/home/tmux/default.nix
index 1eb5d6f..d20b7e6 100644
--- a/home/tmux/default.nix
+++ b/home/tmux/default.nix
@@ -1,23 +1,8 @@
 { inputs, config, pkgs, ... }:
-
-let
-    tmux-themepack = pkgs.tmuxPlugins.mkTmuxPlugin {
-        pluginName = "tmux-themepack";
-        rtpFilePath = "themepack.tmux";
-        version = "unstable-2019-12-22";
-        src = pkgs.fetchFromGitHub {
-            owner = "jimeh";
-            repo = "tmux-themepack";
-            rev = "7c59902f64dcd7ea356e891274b21144d1ea5948";
-            sha256 = "sha256-c5EGBrKcrqHWTKpCEhxYfxPeERFrbTuDfcQhsUAbic4=";
-        };
-    };
-
-in
-    {
+{
     programs.tmux = {
         shell = "${pkgs.zsh}/bin/zsh";
-        terminal = "screen-256color";
+        terminal = "tmux-256color";
         enable = true;
         clock24 = true;
         shortcut = "a";
@@ -30,29 +15,42 @@ in
             pkgs.tmuxPlugins.better-mouse-mode
             pkgs.tmuxPlugins.yank
             {
-                plugin = tmux-themepack;
+                plugin = pkgs.tmuxPlugins.catppuccin;
                 extraConfig = ''
-          set -g @themepack "powerline/double/blue"
-          set-window-option -g status-left " #S "
-          set-window-option -g status-right " #{prefix_highlight} \"#(hostname)\" %H:%M %d-%b-%y "
-          set-window-option -g window-status-format " #I: #W "
-          set-window-option -g window-status-current-format " #I: #W "
+                    set -g @catppuccin_window_current_color "#0F7FCF"
+                    set -g @catppuccin_window_current_background "#1F2430"
+                    set -g @catppuccin_window_default_color "#5a5d70"
+                    set -g @catppuccin_window_default_background "#181825"
+                    set -g @catppuccin_pane_border_style "fg=#181825"
+                    set -g @catppuccin_pane_active_border_style "fg=#023269"
+                    set -g @catppuccin_status_background "default"
+                    set -g @catppuccin_window_default_text "#W"
+                    set -g @catppuccin_window_current_text "#W"
+                    set -g @catppuccin_status_modules_right "directory"
+                    set -g @catppuccin_window_left_separator ""
+                    set -g @catppuccin_window_right_separator " "
+                    set -g @catppuccin_directory_color "#0F7FCF"
+                    set -g @catppuccin_date_time_text "%Y-%m-%d %H:%M:%S"
+                    set -g @catppuccin_menu_selected_style "fg=#{thm_gray},bg=#0F7FCF"
                 '';
 
             }
         ];
+
         extraConfig = ''
-      set-window-option -g mode-keys vi
-      bind-key -T copy-mode-vi 'v' send -X begin-selection
-      bind-key -T copy-mode-vi 'y' send -X copy-selection
+            set -ag terminal-overrides ",xterm-256color:RGB"
+            set-window-option -g mode-keys vi
+            bind-key -T copy-mode-vi 'v' send -X begin-selection
+            bind-key -T copy-mode-vi 'y' send -X copy-selection
 
-      bind | split-window -h -c "#{pane_current_path}"
-      bind - split-window -v -c "#{pane_current_path}"
-      bind c new-window -c "#{pane_current_path}"
-      unbind '"'
-      unbind %
+            bind | split-window -h -c "#{pane_current_path}"
+            bind - split-window -v -c "#{pane_current_path}"
+            bind c new-window -c "#{pane_current_path}"
+            unbind '"'
+            unbind %
 
-      set-option -g xterm-keys on
+            set -g base-index 1
+            setw -g pane-base-index 1
         '';
     };
 }