diff --git a/platforms/home-manager/modules/nmasur/presets/programs/helix.nix b/platforms/home-manager/modules/nmasur/presets/programs/helix.nix
index df5099f..59ecf5f 100644
--- a/platforms/home-manager/modules/nmasur/presets/programs/helix.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/helix.nix
@@ -123,6 +123,25 @@ in
         keys.normal = {
           # Enable and disable inlay hints
           space.H = ":toggle lsp.display-inlay-hints";
+          space.l = [
+            ":write-all"
+            ":new"
+            ":insert-output ${lib.getExe pkgs.lazygit}"
+            ":buffer-close!"
+            # ":redraw"
+            # ":reload-all"
+          ];
+
+          # Open yazi
+          # https://github.com/sxyazi/yazi/pull/2461
+          # Won't work until next Helix release
+          # C-y = [
+          #   ":sh rm -f /tmp/unique-file"
+          #   ":insert-output ${lib.getExe pkgs.yazi} %{buffer_name} --chooser-file=/tmp/unique-file"
+          #   ":insert-output echo \\x1b[?1049h\\x1b[?2004h > /dev/tty"
+          #   ":open %sh{cat /tmp/unique-file}"
+          #   ":redraw"
+          # ];
 
           # Extend selection above
           X = "select_line_above";
@@ -140,19 +159,6 @@ in
             "paste_before"
           ];
 
-          # Copy lines up or down
-          A-J = [
-            "extend_to_line_bounds"
-            "yank"
-            "paste_after"
-          ];
-
-          A-K = [
-            "extend_to_line_bounds"
-            "yank"
-            "paste_before"
-          ];
-
         };
 
         editor = {
diff --git a/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix b/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix
index 21d5261..adbc0db 100644
--- a/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix
@@ -74,28 +74,6 @@ in
 
         show_startup_tips = false;
 
-        # plugins = {
-        #   autolock = {
-        #     _props = {
-        #       location = "https://github.com/fresh2dev/zellij-autolock/releases/download/0.2.2/zellij-autolock.wasm";
-        #     };
-        #     is_enabled = {
-        #       _args = [ true ];
-        #     };
-        #     triggers = {
-        #       _args = [ "vim|nvim|hx|git|fzf|zoxide|atuin|gh" ];
-        #     };
-        #     reaction_seconds = {
-        #       _args = [ "0.3" ];
-        #     };
-        #     print_to_log = {
-        #       _args = [ true ];
-        #     };
-        #   };
-        # };
-        # load_plugins = {
-        #   autolock = { };
-        # };
         keybinds = {
           normal = {
           };
@@ -111,6 +89,14 @@ in
               };
             };
           };
+          scroll = {
+            "bind \"e\"" = {
+              EditScrollback = { };
+              SwitchToMode = {
+                _args = [ "locked" ];
+              };
+            };
+          };
           shared = {
             "bind \"Alt Shift p\"" = {
               "Run" = {
@@ -122,12 +108,24 @@ in
                 close_on_exit = true;
               };
             };
+            "bind \"Alt Shift k\"" = {
+              EditScrollback = { };
+              SwitchToMode = {
+                _args = [ "locked" ];
+              };
+            };
             "bind \"Super Shift ]\"" = {
               "GoToNextTab" = { };
             };
             "bind \"Super Shift [\"" = {
               "GoToPreviousTab" = { };
             };
+            "bind \"Ctrl Tab\"" = {
+              "GoToNextTab" = { };
+            };
+            "bind \"Ctrl Shift Tab\"" = {
+              "GoToPreviousTab" = { };
+            };
             "bind \"Super t\"" = {
               "NewTab" = { };
             };
@@ -136,16 +134,16 @@ in
         };
         theme = "custom";
         themes.custom = {
-          fg = "${config.theme.colors.base05}";
+          fg = "${config.theme.colors.base03}";
           bg = "${config.theme.colors.base02}";
           black = "${config.theme.colors.base00}";
           red = "${config.theme.colors.base08}";
-          green = "${config.theme.colors.base0B}";
+          green = "${config.theme.colors.base04}";
           yellow = "${config.theme.colors.base0A}";
           blue = "${config.theme.colors.base0D}";
           magenta = "${config.theme.colors.base0E}";
           cyan = "${config.theme.colors.base0C}";
-          white = "${config.theme.colors.base05}";
+          white = "${config.theme.colors.base04}";
           orange = "${config.theme.colors.base09}";
         };
       };