diff --git a/hosts/modules/programs.nix b/hosts/modules/programs.nix
index 667ed03..b79042d 100644
--- a/hosts/modules/programs.nix
+++ b/hosts/modules/programs.nix
@@ -28,6 +28,9 @@
           neofetch = "${pkgs.fastfetch}/bin/fastfetch";
           tree = "ls --tree";
           syscleanup = "sudo nix-collect-garbage -d; sudo /run/current-system/bin/switch-to-configuration boot";
+          vi = "${pkgs.evil-helix}/bin/hx";
+          vim = "${pkgs.evil-helix}/bin/hx";
+          nvim = "${pkgs.evil-helix}/bin/hx";
         };
       };
 
@@ -116,7 +119,6 @@
               quickemu
               quickgui
               rclone
-              sakura
               steam-run
               toggleaudiosink
               unrar
diff --git a/users/modules/programs.nix b/users/modules/programs.nix
index 24d5ccd..90231a2 100644
--- a/users/modules/programs.nix
+++ b/users/modules/programs.nix
@@ -24,6 +24,7 @@
 
         helix = {
           enable = true;
+          package = pkgs.evil-helix;
           settings = {
             editor = {
               file-picker.hidden = false;
@@ -39,14 +40,7 @@
               indent-guides.render = true;
             };
             keys.normal.space = {
-              space = "file_picker";
-              w = ":w";
-              q = ":q";
               o = "file_picker_in_current_buffer_directory";
-              esc = [
-                "collapse_selection"
-                "keep_primary_selection"
-              ];
             };
           };
         };
@@ -94,6 +88,16 @@
 
     # Workstation specific configuration
     (lib.mkIf hostType.isWorkstation {
+      programs.rio = {
+        enable = true;
+        settings = {
+          padding-x = 8;
+          padding-y = [
+            8
+            8
+          ];
+        };
+      };
     })
   ];
 }