diff --git a/flake.nix b/flake.nix
index 777c863d..e3d2004f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,12 +25,11 @@
         homeModules = [
           ./home/accounts/default.nix
           ./home/hyprland/default.nix
+          ./home/media/default.nix
           ./home/nyxt/default.nix
           ./home/alacritty.nix
-          ./home/btop.nix
           ./home/default.nix
           ./home/emacs.nix
-          ./home/media.nix
           ./home/pass.nix
         ];
         stateVersion = "23.05";
diff --git a/home/btop.nix b/home/btop.nix
deleted file mode 100644
index 8de438d6..00000000
--- a/home/btop.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  programs.btop = {
-    enable = true;
-    settings = {
-      color_theme = "tokyo-night";
-      graph_symbol = "braille";
-      update_ms = 1000;
-      proc_tree = true;
-      proc_colors = true;
-      proc_gradient = true;
-    };
-  };
-}
diff --git a/home/default.nix b/home/default.nix
index db66dd24..40da74dc 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,14 +1,11 @@
-{ config, lib, pkgs, ... }:
-
-{
-  home.packages = with pkgs; [ fd ripgrep dig nitch neofetch ];
+{ config, lib, pkgs, ... }: {
   stylix.targets = {
     avizo.enable = true;
     fzf.enable = true;
     mako.enable = true;
     rofi.enable = true;
-    tmux.enable = true;
     xresources.enable = true;
+    zellij.enable = true;
   };
   xdg.configFile = {
     "style.css".text = with config.lib.stylix.colors.withHashtag; ''
@@ -33,8 +30,8 @@
   };
   programs = {
     bash.enable = true;
-    nushell.enable = true;
     fish.enable = true;
+    bat.enable = true;
     zsh.initExtra = ''
       xdg-query-program () {
         FILETYPE=$(xdg-mime query filetype $@)
@@ -43,22 +40,14 @@
       }
       rsync-local-config () {
         HOST=$1
-        for TARGET in bat git emacs/init.el emacs/templates starship.toml; do
+        for TARGET in bat/themes/tokyonight_night.tmTheme git/config starship.toml; do
           SOURCE="${config.xdg.configHome}/$TARGET"
           TMP_TARGET=/tmp/rsync-local-config
-          TMP_SOURCE=$TMP_TARGET
-          NIX_SED="${pkgs.gnused}/bin/sed -i 's|/nix/.*/bin/||g'"
-          NIX_REPLACE="$NIX_SED $TMP_TARGET"
           if [[ -e ${config.xdg.configHome}/$TARGET ]]; then
-            if [[ -d $SOURCE ]]; then
-              SOURCE=$SOURCE/
-              TMP_SOURCE=$TMP_SOURCE/
-              NIX_REPLACE="${pkgs.fd}/bin/fd -g '**' $TMP_TARGET -tfile -x $NIX_SED {};"
-            fi
-            ${pkgs.rsync}/bin/rsync -avzL --exclude=".git*" $SOURCE $TMP_TARGET
-            ${pkgs.coreutils}/bin/chmod u+rw -R $TMP_SOURCE
-            ${pkgs.bash}/bin/sh -c "$NIX_REPLACE"
-            ${pkgs.rsync}/bin/rsync -avzL --delete --exclude=".git*" $TMP_SOURCE $HOST:.config/$TARGET
+            ${pkgs.rsync}/bin/rsync -avzL $SOURCE $TMP_TARGET
+            ${pkgs.coreutils}/bin/chmod u+rw -R $TMP_TARGET
+            ${pkgs.gnused}/bin/sed -i 's|/nix/.*/bin/||g' $TMP_TARGET
+            ${pkgs.rsync}/bin/rsync -avzL --delete $TMP_TARGET $HOST:.config/$TARGET
             ${pkgs.coreutils}/bin/rm -rf $TMP_SOURCE
           fi
         done
@@ -78,6 +67,17 @@
         set completion-ignore-case On
       '';
     };
+    btop = {
+      enable = true;
+      settings = {
+        color_theme = "tokyo-night";
+        graph_symbol = "braille";
+        update_ms = 1000;
+        proc_tree = true;
+        proc_colors = true;
+        proc_gradient = true;
+      };
+    };
     direnv = {
       enable = true;
       nix-direnv.enable = true;
@@ -89,7 +89,6 @@
       enableBashIntegration = true;
       enableFishIntegration = true;
     };
-    bat.enable = true;
     git = {
       enable = true;
       package = pkgs.gitFull;
@@ -243,28 +242,10 @@
         };
       };
     };
-    tmux = {
+    zellij = {
       enable = true;
-      baseIndex = 1;
-      clock24 = true;
-      keyMode = "emacs";
-      mouse = true;
-      secureSocket = true;
-      sensibleOnTop = true;
-      shortcut = "Space";
-      terminal = "xterm-256color";
-      plugins = with pkgs.tmuxPlugins; [ yank tmux-fzf ];
-      extraConfig = ''
-        # https://old.reddit.com/r/tmux/comments/mesrci/tmux_2_doesnt_seem_to_use_256_colors/
-        set -ga terminal-overrides ",*256col*,alacritty:Tc"
-        set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q'
-        set-environment -g COLORTERM "truecolor"
-
-        # easy-to-remember split pane commands
-        bind | split-window -h -c "#{pane_current_path}"
-        bind - split-window -v -c "#{pane_current_path}"
-        bind c new-window -c "#{pane_current_path}"
-      '';
+      enableBashIntegration = true;
+      enableFishIntegration = true;
     };
   };
 }
diff --git a/home/games/default.nix b/home/games/default.nix
index e5903a40..f20a3432 100644
--- a/home/games/default.nix
+++ b/home/games/default.nix
@@ -1 +1 @@
-{ ... }: { imports = [ ./minecraft.nix ./marathon.nix ]; }
+{ ... }: { imports = [ ./obs.nix ./minecraft.nix ./marathon.nix ]; }
diff --git a/home/obs.nix b/home/games/obs.nix
similarity index 100%
rename from home/obs.nix
rename to home/games/obs.nix
diff --git a/home/media.nix b/home/media/default.nix
similarity index 100%
rename from home/media.nix
rename to home/media/default.nix
diff --git a/system/default.nix b/system/default.nix
index c167c37a..238e9e80 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
 let flakeURL = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main";
 in {
   networking = {
@@ -13,6 +13,11 @@ in {
       gitFull
       zip
       unzip
+      fd
+      ripgrep
+      dig
+      du-dust
+      nitch
     ];
     localBinInPath = true;
   };