diff --git a/flake.nix b/flake.nix
index 7652c33a..eb0dd3a7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,8 +49,6 @@
     hyprland.url = "github:hyprwm/Hyprland";
     # Steam Deck configs for NixOS
     jovian.url = "github:Jovian-Experiments/Jovian-NixOS";
-    # Status line for Zellij 
-    zjstatus.url  = "github:dj95/zjstatus";
   };
   outputs = { self, nixpkgs, nixpkgs-wayland, home-manager, lanzaboote, nur, sops-nix, doom-emacs, nixos-generators, deploy-rs, jovian, ... } @inputs:
   let
diff --git a/home-manager/common/software/cli/default.nix b/home-manager/common/software/cli/default.nix
index 8ea6a068..f714483c 100644
--- a/home-manager/common/software/cli/default.nix
+++ b/home-manager/common/software/cli/default.nix
@@ -12,6 +12,5 @@
         ./nixvim.nix
         ./rbw.nix
         ./tmux.nix
-        ./zellij.nix
     ];
 }
diff --git a/home-manager/common/software/cli/fish.nix b/home-manager/common/software/cli/fish.nix
index c1ad6034..a4228b7e 100644
--- a/home-manager/common/software/cli/fish.nix
+++ b/home-manager/common/software/cli/fish.nix
@@ -7,11 +7,11 @@
     interactiveShellInit = ''
       set EDITOR vim
       ssh-add > /dev/null &> /dev/null
-      if set -q ZELLIJ 
+      if set -q TMUX 
       else 
         if set -q DISABLE_TMUX
         else
-          exec zellij attach -c "MAIN" && exit
+          tmux attach || exec tmux new-session && exit
         end
       end
       '';
@@ -23,7 +23,6 @@
         find secrets -name "*.yaml" -exec sops updatekeys {} \;
       '';
       restart-docker = ''
-     # set GPG_TTY $tty
         pushd /Storage/Data/docker-compose/sysctl.io/
         docker stop $argv
         docker rm $argv
diff --git a/home-manager/common/software/cli/zellij.nix b/home-manager/common/software/cli/zellij.nix
index f85876d2..a7468141 100644
--- a/home-manager/common/software/cli/zellij.nix
+++ b/home-manager/common/software/cli/zellij.nix
@@ -1,8 +1,6 @@
 { config, pkgs, inputs, system, ... }: {
   programs.zellij = {
     enable = true;
-    # enableBashIntegration = true;
-    # enableFishIntegration = true;
     settings = {
       session_serialization = false;
       default_layout = "compact";
@@ -26,47 +24,4 @@
       };
     };
   };
-  
-  xdg.configFile."zjstatus-layout-default" = {
-    enable = false;
-    target = "zellij/layouts/default.kdl";
-    text = ''
-      layout {
-          default_tab_template {
-              children
-              pane size=1 borderless=false {
-                  plugin location="file:${inputs.zjstatus.packages.${system}.default}/bin/zjstatus.wasm" {
-                      format_left   "{mode} #[fg=#89B4FA,bold]{session}"
-                      format_center "{tabs}"
-                      format_right  "{command_git_branch} {datetime}"
-                      format_space  ""
-
-                      border_enabled  "false"
-                      border_char     "─"
-                      border_format   "#[fg=#6C7086]{char}"
-                      border_position "top"
-
-                      hide_frame_for_single_pane "true"
-
-                      mode_normal  "#[bg=blue] "
-                      mode_tmux    "#[bg=#ffc387] "
-
-                      tab_normal   "#[fg=#6C7086] {name} "
-                      tab_active   "#[fg=#9399B2,bold,italic] {name} "
-
-                      command_git_branch_command     "git rev-parse --abbrev-ref HEAD"
-                      command_git_branch_format      "#[fg=blue] {stdout} "
-                      command_git_branch_interval    "10"
-                      command_git_branch_rendermode  "static"
-
-                      datetime        "#[fg=#6C7086,bold] {format} "
-                      datetime_format "%A, %d %b %Y %H:%M"
-                      datetime_timezone "Europe/Berlin"
-                  }
-              }
-          }
-      }
-    '';
-  };
-
 }
diff --git a/home-manager/small.nix b/home-manager/small.nix
index 80f5fd9b..4e02c2c7 100644
--- a/home-manager/small.nix
+++ b/home-manager/small.nix
@@ -4,12 +4,11 @@
     # ./common/software/cli/bash.nix
     ./common/software/cli/fish.nix
     ./common/software/cli/git.nix
-    # ./common/software/cli/nixvim/base.nix
+    ./common/software/cli/nixvim/base.nix
     ./common/software/cli/ssh.nix
     ./common/software/cli/btop.nix
     ./common/software/cli/starship.nix
-    # ./common/software/cli/tmux.nix
-    ./common/software/cli/zellij.nix
+    ./common/software/cli/tmux.nix
     ./common/software/cli/atuin.nix
       
     # User configs
diff --git a/nixos/hosts/backups-rpi4/scripts/rsync-sysctl.sh b/nixos/hosts/backups-rpi4/scripts/rsync-sysctl.sh
index 20921192..d0bca87a 100644
--- a/nixos/hosts/backups-rpi4/scripts/rsync-sysctl.sh
+++ b/nixos/hosts/backups-rpi4/scripts/rsync-sysctl.sh
@@ -29,6 +29,8 @@ fi
 # If an old backup is still running, don't continue
 if [[ `ps aux | grep $BACKUP_NAME | grep -v grep` ]] ; then 
   echo -e "$BACKUP_NAME rsync still running.  Exiting...."
+  echo "Output:  "
+  ps aux | grep $BACKUP_NAME | grep -v grep
   payload="{\"message\": \"$BACKUP_NAME stopped.  $BACKUP_NAME is still running.\nDate: `date`\", \"priority\": 2,\"title\": \"japan-rpi4:  $BACKUP_NAME Backup Stopped\"}"
   curl -X "POST" "https://gotify.sysctl.io/message" -H "accept: application/json" -H "Content-Type: application/json" -H "X-Gotify-Key:  $GOTIFY_TOKEN" -d "$payload"
   exit
diff --git a/stylix/common/default.nix b/stylix/common/default.nix
index ac140980..f63fe258 100644
--- a/stylix/common/default.nix
+++ b/stylix/common/default.nix
@@ -1,4 +1,5 @@
 { lib, ... }: {
   stylix.targets.tmux.enable = lib.mkForce false;   # Custom theme in main config
   stylix.targets.zellij.enable = lib.mkForce false; # Custom theme in main config
+  stylix.targets.fish.enable = lib.mkForce false;   # Slow load times with tmux
 }