diff --git a/home/config-files/wezterm.lua b/home/config-files/wezterm.lua
index 52d2297..19529f8 100644
--- a/home/config-files/wezterm.lua
+++ b/home/config-files/wezterm.lua
@@ -11,7 +11,7 @@ end
 
 local HOSTNAME = getHostname()
 
-config.color_scheme = "Catppuccin Mocha"
+config.color_scheme = "Apathy"
 -- config.font = wezterm.font 'Hack Nerd Font Mono'
 config.font = wezterm.font 'ComicShannsMono Nerd Font Mono'
 if getHostname() == "lilith" or getHostname() == "alastor" then
@@ -70,28 +70,28 @@ config.keys = {
 		},
 	},
 	{
-		key = "LeftArrow",
+		key = "h",
 		mods = 'CTRL | SHIFT',
 		action = wezterm.action.SplitPane {
 			direction = 'Left',
 		},
 	},
 	{
-		key = "RightArrow",
+		key = "l",
 		mods = 'CTRL | SHIFT',
 		action = wezterm.action.SplitPane {
 			direction = 'Right',
 		},
 	},
 	{
-		key = "UpArrow",
+		key = "k",
 		mods = 'CTRL | SHIFT',
 		action = wezterm.action.SplitPane {
 			direction = 'Up',
 		},
 	},
 	{
-		key = "DownArrow",
+		key = "j",
 		mods = 'CTRL | SHIFT',
 		action = wezterm.action.SplitPane {
 			direction = 'Down',
diff --git a/home/modules/home-pkgs.nix b/home/modules/home-pkgs.nix
index 5c249df..11c4b3c 100644
--- a/home/modules/home-pkgs.nix
+++ b/home/modules/home-pkgs.nix
@@ -15,10 +15,12 @@ in {
       yubioath-flutter
       steam
       heroic
+      mpv
       protonup-qt
       via
       telegram-desktop
       jetbrains.rust-rover
+      tor-browser
       tutanota-desktop
       bitwarden-desktop
       bottles
@@ -41,6 +43,7 @@ in {
       qmk-udev-rules
       jellyfin-media-player
       signal-desktop
+      kleopatra
       # ida-free
       # spotify
     ]))
@@ -75,10 +78,6 @@ in {
 
       openvpn
 
-      tor-browser
-
-      kleopatra
-
       moodle-dl
 
       obsidian
@@ -119,7 +118,6 @@ in {
       ripgrep
 
       sayonara
-      mpv
       feishin
 
       nix-tree
diff --git a/home/modules/nixvim.nix b/home/modules/nixvim.nix
index 85a94cd..16e6fe5 100644
--- a/home/modules/nixvim.nix
+++ b/home/modules/nixvim.nix
@@ -27,7 +27,14 @@
       shiftwidth = 2; # Tab width should be 2
     };
 
-    colorschemes.catppuccin.enable = true;
+    # colorschemes.catppuccin.enable = true;
+    colorschemes.base16 = {
+      enable = true;
+      colorscheme = "apathy";
+      settings = {
+	telescope_borders = true;
+      };
+    };
     plugins = {
       lspkind.enable = true;
       persistence = {