diff --git a/common/fish/key-bindings.fish b/common/fish/key-bindings.fish
index 101bae1..82e9f04 100644
--- a/common/fish/key-bindings.fish
+++ b/common/fish/key-bindings.fish
@@ -2,6 +2,13 @@ function fish_user_key_bindings
 	command -q sk && functions | grep skim_key_bindings &>/dev/null && skim_key_bindings
 	fish_vi_key_bindings insert --no-erase
 
+	set --universal fish_cursor_default block
+	set --universal fish_cursor_insert line
+	set --universal fish_cursor_block block
+
+	fish_vi_cursor
+	set --universal fish_vi_force_cursor 1
+
 	# bind "jk" from insert mode to return to normal mode
 	set normal_mode "if commandline -P; commandline -f cancel; else; set fish_bind_mode default; commandline -f backward-char force-repaint; end"
 	bind -M insert jk $normal_mode
diff --git a/common/fish/vars.fish b/common/fish/vars.fish
index 75ac21d..0e576dd 100644
--- a/common/fish/vars.fish
+++ b/common/fish/vars.fish
@@ -13,8 +13,6 @@ set --export --universal BROWSER firefox
 set --export --universal PAGER "less"
 set --export --universal MANPAGER "less"
 
-set --universal fish_cursor_insert line
-
 if command --search --quiet hx
 	set --export --universal EDITOR hx
 	set --export --universal VISUAL hx
diff --git a/common/helix/themes/custom.toml b/common/helix/themes/custom.toml
index d0da693..f6252f7 100644
--- a/common/helix/themes/custom.toml
+++ b/common/helix/themes/custom.toml
@@ -1,2 +1,11 @@
 inherits = "catppuccin_mocha"
+
+"ui.background" = "default"
+
+# "ui.cursorline.primary" = { bg = "default" }
+# "ui.cursorline.secondary" = { bg = "default" }
+# "ui.cursorcolumn.primary" = { bg = "default" }
+# "ui.cursorcolumn.secondary" = { bg = "default" }
+# "ui.virtual.ruler" = { bg = "default" }
+
 "ui.bufferline.active" = { fg = "sapphire", bg = "base", underline = { color = "sapphire", style = "" } }
diff --git a/common/wezterm/catpuccin.lua b/common/wezterm/catpuccin.lua
index cbc183f..8ed3057 100644
--- a/common/wezterm/catpuccin.lua
+++ b/common/wezterm/catpuccin.lua
@@ -174,8 +174,8 @@ function M.select(palette, flavor, accent)
 		tab_bar = {
 			background = c.crust,
 			active_tab = {
-				bg_color = c[accent],
-				fg_color = c.crust,
+				bg_color = c.crust,
+				fg_color = c[accent],
 			},
 			inactive_tab = {
 				bg_color = c.mantle,
@@ -278,7 +278,7 @@ function M.apply_to_config(c, opts)
 		active_titlebar_fg = colors[o.flavor].text,
 		inactive_titlebar_bg = colors[o.flavor].crust,
 		inactive_titlebar_fg = colors[o.flavor].text,
-		button_fg = colors[o.flavor].text,
+		button_fg = colors[o.flavor].base,
 		button_bg = colors[o.flavor].base,
 	}
 
diff --git a/common/wezterm/wezterm.lua b/common/wezterm/wezterm.lua
index 8e14731..09ade5f 100644
--- a/common/wezterm/wezterm.lua
+++ b/common/wezterm/wezterm.lua
@@ -7,15 +7,28 @@ if wezterm.config_builder then
   config = wezterm.config_builder()
 end
 
+config.default_cursor_style = 'BlinkingBar'
+
 catpuccin.apply_to_config(config)
 
 config.font = wezterm.font('IosevkaLyteTerm', { weight = 'Regular', italic = false })
 config.font_size = 12.0
 
 config.hide_tab_bar_if_only_one_tab = true
-config.use_fancy_tab_bar = false
+config.use_fancy_tab_bar = true
+config.tab_bar_at_bottom = true
 config.window_background_opacity = 1.0
 
+config.color_scheme = "Catppuccin Mocha"
+
+config.window_frame.font = wezterm.font { family = 'IosevkaLyteTerm', weight = 'Regular' }
+config.window_frame.font_size = 12.0
+
+config.inactive_pane_hsb = {
+  saturation = 0.8,
+  brightness = 0.7,
+}
+
 config.keys = {
   {
     key = 'j',
@@ -47,6 +60,11 @@ config.keys = {
     mods = 'CTRL|SHIFT',
     action = wezterm.action.SplitHorizontal{domain='CurrentPaneDomain'}
   },
+  {
+    key = 'l',
+    mods = 'CTRL|SHIFT|ALT',
+    action = wezterm.action.ShowDebugOverlay
+  },
 }
 
 config.default_gui_startup_args = { 'connect', 'unix' }
diff --git a/os/linux/hypr/hyprland.conf b/os/linux/hypr/hyprland.conf
index 0d39ce8..062c97d 100644
--- a/os/linux/hypr/hyprland.conf
+++ b/os/linux/hypr/hyprland.conf
@@ -117,6 +117,7 @@ $mainMod = SUPER
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
 bind = $mainMod, Q, exec, wezterm
 bind = $mainMod, U, exec, firefox
+bind = $mainMod, space, exec, wofi --show drun
 bind = $mainMod, ret, exec, wezterm
 bind = $mainMod, return, exec, wezterm
 bind = $mainMod, C, killactive, 
@@ -137,6 +138,11 @@ bind = $mainMod, l, movefocus, r
 bind = $mainMod, k, movefocus, u
 bind = $mainMod, j, movefocus, d
 
+bind = $mainMod SHIFT, H, movewindow, l
+bind = $mainMod SHIFT, L, movewindow, r
+bind = $mainMod SHIFT, K, movewindow, u
+bind = $mainMod SHIFT, J, movewindow, d 
+
 # Switch workspaces with mainMod + [0-9]
 bind = $mainMod, 1, workspace, 1
 bind = $mainMod, 2, workspace, 2