diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index 7fd8bfc..c68d6f7 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -91,7 +91,7 @@ in {
   environment.homeBinInPath = true;
 
   environment.variables = {
-    EDITOR = "nvim";
+    EDITOR = "hx";
   };
 
   networking.firewall.trustedInterfaces = ["tailscale0"];
diff --git a/users/configs/system/helix/config/config.toml b/users/configs/system/helix/config/config.toml
index 5c19648..b7710ea 100644
--- a/users/configs/system/helix/config/config.toml
+++ b/users/configs/system/helix/config/config.toml
@@ -1,4 +1,4 @@
-theme = "catppuccin_macchiato"
+theme = "catppuccin_custom"
 
 [editor]
 cursorline = true
diff --git a/users/configs/system/helix/config/themes/catppuccin_custom.toml b/users/configs/system/helix/config/themes/catppuccin_custom.toml
new file mode 100644
index 0000000..78d516c
--- /dev/null
+++ b/users/configs/system/helix/config/themes/catppuccin_custom.toml
@@ -0,0 +1,10 @@
+inherits = "catppuccin_macchiato"
+
+"namespace" = { fg = "yellow" }
+
+"variable.other.member" = "peach"
+
+"string.special.symbol" = { fg = "flamingo" }
+"string.special" = { fg = "pink" }
+
+"attribute" = { fg = "teal", modifiers = ["italic"] }