diff --git a/home/home.nix b/home/home.nix
index 9d8e5f8..fa75ba2 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -71,18 +71,6 @@
       Install.WantedBy = [ "timers.target" ];
     };
 
-    systemd.user.services.theme-apply = lib.mkIf hostConfig.isLinux {
-      Unit = {
-        Description = "Apply theme on login";
-        After = [ "graphical-session.target" ];
-      };
-      Service = {
-        Type = "oneshot";
-        ExecStart = "${pkgs.bash}/bin/bash -lc '${config.home.homeDirectory}/.config/nix/scripts/theme ${config.theme}'";
-      };
-      Install.WantedBy = [ "graphical-session.target" ];
-    };
-
     systemd.user.services.cliphist-wipe = lib.mkIf hostConfig.isLinux {
       Unit.Description = "Clear clipboard history on session end";
       Service = {
diff --git a/home/modules/shell.nix b/home/modules/shell.nix
index dcbeee5..ee4778a 100644
--- a/home/modules/shell.nix
+++ b/home/modules/shell.nix
@@ -297,6 +297,7 @@ in
 
   programs.tmux = {
     enable = true;
+    terminal = "tmux-256color";
     sensibleOnTop = false;
 
     plugins = with pkgs.tmuxPlugins; [
diff --git a/home/modules/theme.nix b/home/modules/theme.nix
index ab74a18..f6213a2 100644
--- a/home/modules/theme.nix
+++ b/home/modules/theme.nix
@@ -105,15 +105,16 @@ in
     home.activation.linkTheme = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
       cfg="${config.xdg.configHome}"
       theme="${config.theme}"
+      link() { [ -e "$2" ] || $DRY_RUN_CMD ln -sf "$1" "$2"; }
       ${lib.optionalString hostConfig.isLinux ''
-        $DRY_RUN_CMD ln -sf "$cfg/hypr/themes/$theme.conf" "$cfg/hypr/themes/theme.conf"
-        $DRY_RUN_CMD ln -sf "$cfg/waybar/themes/$theme.css" "$cfg/waybar/themes/theme.css"
-        $DRY_RUN_CMD ln -sf "$cfg/fuzzel/themes/$theme.ini" "$cfg/fuzzel/themes/theme.ini"
+        link "$cfg/hypr/themes/$theme.conf" "$cfg/hypr/themes/theme.conf"
+        link "$cfg/waybar/themes/$theme.css" "$cfg/waybar/themes/theme.css"
+        link "$cfg/fuzzel/themes/$theme.ini" "$cfg/fuzzel/themes/theme.ini"
         $DRY_RUN_CMD mkdir -p "$cfg/dunst/dunstrc.d"
-        $DRY_RUN_CMD ln -sf "$cfg/dunst/themes/$theme.conf" "$cfg/dunst/dunstrc.d/theme.conf"
+        link "$cfg/dunst/themes/$theme.conf" "$cfg/dunst/dunstrc.d/theme.conf"
       ''}
-      $DRY_RUN_CMD ln -sf "$cfg/sioyek/themes/$theme.config" "$cfg/sioyek/themes/theme.config"
-      $DRY_RUN_CMD ln -sf "$cfg/fzf/themes/$theme" "$cfg/fzf/themes/theme"
+      link "$cfg/sioyek/themes/$theme.config" "$cfg/sioyek/themes/theme.config"
+      link "$cfg/fzf/themes/$theme" "$cfg/fzf/themes/theme"
     '';
   };
 }