diff --git a/homes/x86_64-linux/rafiq/default.nix b/homes/x86_64-linux/rafiq/default.nix
index de893bd..f8a1571 100644
--- a/homes/x86_64-linux/rafiq/default.nix
+++ b/homes/x86_64-linux/rafiq/default.nix
@@ -1,50 +1,44 @@
+{ pkgs, inputs, ... }:
 {
-  pkgs,
-  inputs,
-  ...
-}:
-{
-  cli.shell = "zsh";
-  cli.screensaver.enable = true;
-  cli.screensaver.timeout = "100";
-  cli.screensaver.command = "cbonsai -S";
-  cli.editor = "nvf";
-  cli.file-browser = "yazi";
-  cli.multiplexer = "zellij";
-  cli.fetch = "hyfetch";
-  cli.git.name = "Mohammad Rafiq";
-  cli.git.email = "rafiq@rrv.sh";
-  cli.git.defaultBranch = "prime";
-
-  home.shellAliases = {
-    v = "nvim";
+  cli = {
+    shell = "zsh";
+    screensaver.enable = true;
+    screensaver.timeout = "100";
+    screensaver.command = "cbonsai -S";
+    editor = "nvf";
+    file-browser = "yazi";
+    multiplexer = "zellij";
+    fetch = "hyfetch";
+    git.name = "Mohammad Rafiq";
+    git.email = "rafiq@rrv.sh";
+    git.defaultBranch = "prime";
   };
+  home = {
+    shellAliases.v = "nvim";
 
-  home.packages = with pkgs; [
-    cbonsai
-    ripgrep
-    devenv
-    pantheon.rebuild
-    pantheon.edit
-    inputs.nixspect.packages."x86_64-linux".nixspect
-  ];
+    packages = with pkgs; [
+      cbonsai
+      ripgrep
+      devenv
+      pantheon.rebuild
+      pantheon.edit
+      inputs.nixspect.packages."x86_64-linux".nixspect
+    ];
 
-  home.persistence."/persist/home/rafiq".directories = [ "repos" ];
-
-  programs.direnv = {
-    enable = true;
-    nix-direnv.enable = true;
+    persistence."/persist/home/rafiq".directories = [ "repos" ];
   };
-
   programs = {
+    nh.enable = true;
     thefuck.enable = true;
     tealdeer.enable = true;
     tealdeer.settings.updates.auto_update = true;
+    direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+    };
     fzf = {
       enable = true;
       enableZshIntegration = true;
     };
-    nh.enable = true;
   };
-
 }
diff --git a/modules/home/cli/file-browser/default.nix b/modules/home/cli/file-browser/default.nix
index f206bfe..1711279 100644
--- a/modules/home/cli/file-browser/default.nix
+++ b/modules/home/cli/file-browser/default.nix
@@ -5,6 +5,18 @@
     programs.yazi = {
       enable = true;
       shellWrapperName = "t";
+      settings = {
+        manager = {
+          sort_by = "natural";
+          prepend_keymap = [
+            {
+              on = "l";
+              run = "plugin smart-enter";
+              desc = "";
+            }
+          ];
+        };
+      };
     };
   };
 }
diff --git a/modules/home/cli/multiplexer/default.nix b/modules/home/cli/multiplexer/default.nix
index 775b686..d7f0487 100644
--- a/modules/home/cli/multiplexer/default.nix
+++ b/modules/home/cli/multiplexer/default.nix
@@ -11,8 +11,6 @@
     programs.zellij = {
       enable = true;
       enableZshIntegration = true;
-      attachExistingSession = true;
-      exitShellOnExit = true;
       settings = {
         pane_frames = false;
         show_startup_tips = false;
@@ -41,6 +39,7 @@
 
                         mode_normal        "#[bg=#89B4FA] {name} "
                         mode_locked "#[bg=#f55e18] {name} "
+                        mode_session "#[bq=#00ff00 {name}]"
 
                         tab_normal   "#[fg=#6C7086] {index} "
                         tab_active   "#[fg=#9399B2,bold,italic] {index} "