diff --git a/data/kitty/kitty.conf b/data/kitty/kitty.conf
index 56bab4a..36ec5bb 100644
--- a/data/kitty/kitty.conf
+++ b/data/kitty/kitty.conf
@@ -3,7 +3,7 @@ include mocha.conf
 
 # https://sw.kovidgoyal.net/kitty/conf/#fonts
 font_family JetBrains Mono
-font_size 14.0
+font_size 16.0
 # kitty +list-fonts --psnames
 
 modify_font cell_height 120%
diff --git a/data/nvim/init.lua b/data/nvim/init.lua
index 2e00fdc..4708e06 100644
--- a/data/nvim/init.lua
+++ b/data/nvim/init.lua
@@ -63,6 +63,7 @@ vim.g.loaded_netrw = 1
 vim.g.loaded_netrwPlugin = 1
 
 -- Use plugin neoformat
+vim.g.neoformat_basic_format_trim = 1
 vim.g.neoformat_enabled_go = { "gofumpt" }
 vim.g.shfmt_opt = "-ci"
 
diff --git a/data/wezterm/wezterm.lua b/data/wezterm/wezterm.lua
index 4f5fbdb..e8f55b5 100644
--- a/data/wezterm/wezterm.lua
+++ b/data/wezterm/wezterm.lua
@@ -1,7 +1,13 @@
 local wezterm = require("wezterm")
 return {
-	-- font = wezterm.font("JetBrains Mono"),
-	font = wezterm.font("Iosevka Term SS08"),
+	font = wezterm.font({
+		family = "JetBrains Mono",
+		harfbuzz_features = {
+			"ss02", -- f l m t Ww y
+			"cv18", -- 2 6 9
+			"cv20", -- 5
+		},
+	}),
 	font_size = 16.0,
 	line_height = 1.2,
 	use_cap_height_to_scale_fallback_fonts = true,