diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 83d5624..5f1a163 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -11,10 +11,9 @@
   "codeium.nvim": { "branch": "main", "commit": "d3b88eb3aa1de6da33d325c196b8a41da2bcc825" },
   "colorbuddy.nvim": { "branch": "master", "commit": "8b968581e5c19d22a861d5f3fe5dbd83394fa681" },
   "conform.nvim": { "branch": "master", "commit": "dc950e5717f1da65b1fcd986b1bbff0d6bd0e2ee" },
-  "crates.nvim": { "branch": "main", "commit": "7d8541ec0e3b30ac2c43864d3ee13a632e1231ed" },
+  "crates.nvim": { "branch": "main", "commit": "cfd14e75867e77fe2f38fae09dcb1a36bc6aa95b" },
   "dashboard-nvim": { "branch": "master", "commit": "a0a78099658c7d4be3714f657b18ca8285d5d106" },
   "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" },
-  "edgy.nvim": { "branch": "main", "commit": "de79b7d92a5979cd71a9a1d8b6282515345e5055" },
   "friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" },
   "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" },
   "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" },
@@ -23,7 +22,6 @@
   "lazy.nvim": { "branch": "main", "commit": "758bb5de98b805acc5eeed8cdc8ac7f0bc4b0b86" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" },
-  "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" },
   "mason.nvim": { "branch": "main", "commit": "1b3d60405d1d720b2c4927f19672e9479703b00f" },
   "mini.ai": { "branch": "main", "commit": "55e9b7217f29e62f734e239bfeed5731a065d801" },
   "mini.bufremove": { "branch": "main", "commit": "931a3bb514147d9e812767275c4beba6b779b1d3" },
@@ -39,18 +37,12 @@
   "none-ls.nvim": { "branch": "main", "commit": "f5632db2491fbe02b54f1a321a98548a8ba2bd15" },
   "nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" },
   "nvim-cmp": { "branch": "main", "commit": "24122371810089d390847d8ba66325c1f1aa64c0" },
-  "nvim-dap": { "branch": "master", "commit": "615a1b2046e1eaf7995e0ba8e8a65f344201349d" },
-  "nvim-dap-go": { "branch": "main", "commit": "5faf165f5062187320eaf9d177c3c1f647adc22e" },
-  "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "3e8e207513e6ef520894950acd76b79902714103" },
   "nvim-lint": { "branch": "master", "commit": "83ee4952a968d89329e5a49b4648831d98124783" },
   "nvim-lspconfig": { "branch": "master", "commit": "94513a5b246cf32a8f87ca714af50911df63351c" },
-  "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
-  "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" },
   "nvim-noirbuddy": { "branch": "master", "commit": "9cb20d2a649153d07649c9c85c092c0533d4883d" },
   "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
   "nvim-spectre": { "branch": "master", "commit": "4651801ba37a9407b7257287aec45b6653ffc5e9" },
-  "nvim-treesitter": { "branch": "master", "commit": "0d2c80b4d00c8f793e17d2d1d24d4aa5aaa88bc2" },
+  "nvim-treesitter": { "branch": "master", "commit": "d5a1c2b0c8ec5bb377a41c1c414b315d6b3e9432" },
   "nvim-treesitter-context": { "branch": "master", "commit": "1e52a2c4223c1e7b0def9c76a1f3757d372196c3" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "dfa4178c0cadb44f687603d72ad0908474c28dd9" },
   "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
@@ -62,10 +54,10 @@
   "sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" },
   "telescope-frecency.nvim": { "branch": "master", "commit": "6b6565e6584c86ca501bdac485cbdc2ca64556e4" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
-  "telescope.nvim": { "branch": "master", "commit": "fac83a556e7b710dc31433dec727361ca062dbe9" },
+  "telescope.nvim": { "branch": "master", "commit": "02a60a83961cf9c80e471599171982a31d1cc853" },
   "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
   "tokyonight.nvim": { "branch": "main", "commit": "67afeaf7fd6ebba000633e89f63c31694057edde" },
-  "trouble.nvim": { "branch": "dev", "commit": "f6a3fbfb667c3cccea8df9b7471fb9b31b1235fc" },
+  "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
   "vim-illuminate": { "branch": "master", "commit": "e522e0dd742a83506db0a72e1ced68c9c130f185" },
   "vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" },
   "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
diff --git a/.config/wezterm/colors/shelman-dark.toml b/.config/wezterm/colors/shelman-dark.toml
new file mode 100644
index 0000000..5679fbb
--- /dev/null
+++ b/.config/wezterm/colors/shelman-dark.toml
@@ -0,0 +1,40 @@
+[metadata]
+name = "Shelman Dark"
+origin_url = ""
+
+[colors]
+ansi = [
+  "#000000",
+  "#ff0035",
+  "#85ff00",
+  "#ffc900",
+  "#00a7ff",
+  "#cb01ff",
+  "#00e0ff",
+  "#f0f0f0",
+]
+
+brights = [
+  "#000000",
+  "#ff8c88",
+  "#baff94",
+  "#ffe090",
+  "#88ccff",
+  "#e38dff",
+  "#97eeff",
+  "#ffffff",
+]
+
+# background = "#000000"
+background = "#0d1117"
+# background = "#11171d"
+#background = "#171e26"
+# background = "#161923"
+# foreground = "#e3e0cd"
+# foreground = "#d3d0bd"
+foreground = "#cccccc"
+cursor_bg = "#00d992"
+cursor_fg = "#000000"
+cursor_border = "#000000"
+selection_bg = "#d7d7d7"
+selection_fg = "#000000"
diff --git a/.config/wezterm/colors/shelman-light.toml b/.config/wezterm/colors/shelman-light.toml
new file mode 100644
index 0000000..04b0e87
--- /dev/null
+++ b/.config/wezterm/colors/shelman-light.toml
@@ -0,0 +1,34 @@
+[metadata]
+name = "Shelman Light"
+origin_url = ""
+
+[colors]
+ansi = [
+  "#000000",
+  "#9e001d",
+  "#306300",
+  "#deae00",
+  "#00669e",
+  "#7d009e",
+  "#008a9e",
+  "#f0f0f0",
+]
+
+brights = [
+  "#000000",
+  "#ff0035",
+  "#509e00",
+  "#ffc900",
+  "#00a7ff",
+  "#cb01ff",
+  "#00e0ff",
+  "#ffffff",
+]
+
+background = "#fefeff"
+foreground = "#2c363c"
+cursor_bg = "#aa0000"
+cursor_fg = "#ffffff"
+cursor_border = "#ffffff"
+selection_bg = "#ffe6a4"
+selection_fg = "#483600"
diff --git a/.config/wezterm/shelman-dark.toml b/.config/wezterm/shelman-dark.toml
deleted file mode 100644
index 24f0f06..0000000
--- a/.config/wezterm/shelman-dark.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[metadata]
-  name = "Shelman Dark"
-  origin_url = ""
-
-[colors]
-  ansi = ["#000000", "#ff0035", "#85ff00", "#ffc900", "#00a7ff", "#cb01ff", "#00e0ff", "#f0f0f0"]
-  brights = ["#000000", "#ffb4af", "#d2ffba", "#ffebb7", "#b1deff", "#edb5ff", "#bdf4ff", "#ffffff"]
-  background = "#1e2835"
-  foreground = "#e0e0e0"
-  cursor_bg = "#ffcc00"
-  cursor_fg = "#000000"
-  cursor_border = "#ffcc00"
-  selection_bg = "#d7d7d7"
-  selection_fg = "#000000"
diff --git a/.config/wezterm/shelman-light.toml b/.config/wezterm/shelman-light.toml
deleted file mode 100644
index 6b730cb..0000000
--- a/.config/wezterm/shelman-light.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[metadata]
-  name = "Shelman Light"
-  origin_url = ""
-
-[colors]
-  ansi = ["#000000", "#9e001d", "#509e00", "#ffc900", "#00669e", "#7d009e", "#008a9e", "#f0f0f0"]
-  brights = ["#000000", "#ff0035", "#85ff00", "#ffc900", "#00a7ff", "#cb01ff", "#00e0ff", "#ffffff"]
-  background = "#fefeff"
-  foreground = "#000000"
-  cursor_bg = "#aa0000"
-  cursor_fg = "#ffffff"
-  cursor_border = "#aa0000"
-  selection_bg = "#d7d7d7"
-  selection_fg = "#000000"
diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua
index b967d2b..d6565b0 100644
--- a/.config/wezterm/wezterm.lua
+++ b/.config/wezterm/wezterm.lua
@@ -7,15 +7,32 @@ local spawn_dev_nvim = { "ssh", dev_host, "nvim", "--listen", os.getenv("XDG_RUN
 
 wezterm.add_to_config_reload_watch_list(os.getenv("HOME") .. "/.config/shelman-theme/current/wezterm")
 
+local function scheme_for_appearance(appearance)
+	if appearance:find("Dark") then
+		return "Shelman Dark"
+	else
+		return "Shelman Light"
+	end
+end
+
+local function font_for_appearance(appearance)
+	if appearance:find("Dark") then
+		return wezterm.font({
+			family = "IosevkaShelman Nerd Font",
+			weight = "Light",
+		})
+	else
+		return wezterm.font({
+			family = "IosevkaShelman Nerd Font",
+			--	weight = "Regular",
+			--weight = "Regular",
+		})
+	end
+end
+
 return {
-	color_scheme = "Shelman Theme",
-	color_scheme_dirs = {
-		os.getenv("HOME") .. "/.config/shelman-theme/current/wezterm",
-	},
-	font = wezterm.font({
-		family = "IosevkaShelman Nerd Font",
-		weight = "Light",
-	}),
+	color_scheme = scheme_for_appearance(wezterm.gui.get_appearance()),
+	font = font_for_appearance(wezterm.gui.get_appearance()),
 	font_rules = {
 		{
 			italic = true,
diff --git a/.local/share/applications/wezterm-dln-dev-secondary.desktop b/.local/share/applications/wezterm-dln-dev-secondary.desktop
index 39b281b..862fa5a 100644
--- a/.local/share/applications/wezterm-dln-dev-secondary.desktop
+++ b/.local/share/applications/wezterm-dln-dev-secondary.desktop
@@ -7,4 +7,4 @@ TryExec=/usr/bin/wezterm
 Icon=org.wezfurlong.wezterm
 Terminal=false
 Categories=System;TerminalEmulator;
-Exec=/usr/bin/wezterm --config window_background_opacity=0.8 --config 'default_prog={"ssh", "-tq", "dln-dev", "--", "tmux", "-u", "new", "-As1", "-t0"}' start --class=org.wezfurlong.wezterm-secondary
+Exec=/usr/bin/wezterm --config 'default_prog={"ssh", "-tq", "dln-dev", "--", "tmux", "-u", "new", "-As1", "-t0"}' start --class=org.wezfurlong.wezterm-secondary
diff --git a/.ssh/config b/.ssh/config
index 7596805..be346ee 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -4,6 +4,7 @@ ControlMaster auto
 ControlPath ${XDG_RUNTIME_DIR}/ssh_control:%h:%p:%r
 ControlPersist 1200
 Ciphers aes128-gcm@openssh.com,aes256-gcm@openssh.com,chacha20-poly1305@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
+
 AddressFamily inet
 PreferredAuthentications=publickey
 
@@ -21,7 +22,9 @@ LocalForward localhost:3000 localhost:3000
 LocalForward localhost:8000 localhost:8000
 LocalForward localhost:8080 localhost:8080
 LocalForward localhost:9090 localhost:9090
+LocalForward localhost:10000 localhost:10000
 RemoteForward ${XDG_RUNTIME_DIR}/opener.sock ${XDG_RUNTIME_DIR}/opener.dln-dev.sock
+RemoteForward localhost:9022 localhost:9022
 
 Host *
 ForwardAgent no
diff --git a/.tmux.conf b/.tmux.conf
index 6ae19c6..6779453 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -24,6 +24,7 @@ set -g history-limit 10000
 #
 set -g default-terminal "wezterm"
 set -ga terminal-features '*:clipboard:ccolor:hyperlinks:osc7:overline:sixel:strikethrough:title:usstyle:RGB'
+set -ga terminal-overrides ',wezterm:cnorm=\E[?12h\E[?25h'
 
 # Key bindings
 bind -n M-Tab if-shell 'test #{window_panes} -gt 1' 'last-pane' 'last-window'