diff --git a/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl b/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl
index 9b108d4..54ebd6f 100644
--- a/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl
+++ b/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl
@@ -18,16 +18,16 @@
 
 
 (defn define-sign [level sign]
-  (let [sign-level (.. "LspDiagnosticsSign" level)]
+  (let [sign-level (.. "DiagnosticSign" level)]
     (nvim.fn.sign_define sign-level
                      {:texthl sign-level
                       :text sign
                       :numhl sign-level})))
 
 (define-sign :Error "☢️")
-(define-sign :Warning  "⚠️")
-(define-sign :Hint   "🔎")
-(define-sign :Information  "ℹ️")
+(define-sign :Warn  "⚠️")
+(define-sign :SignHint "🔎")
+(define-sign :Info  "ℹ️")
 
 (def core-nmappings
   {
@@ -36,14 +36,14 @@
   :gi "lua vim.lsp.buf.implementation()"
   :gr "lua vim.lsp.buf.references()"
   :K "lua vim.lsp.buf.hover()"
-  "[g" "lua vim.lsp.diagnostic.goto_prev()"
-  "]g" "lua vim.lsp.diagnostic.goto_prev()"
+  "[g" "lua vim.diagnostic.goto_prev()"
+  "]g" "lua vim.diagnostic.goto_next()"
   :<c-k> "lua vim.lsp.buf.signature_help()"
   :<leader>ca "lua vim.lsp.buf.code_action()"
   :<leader>cl "lua vim.lsp.codelens.run()"
   :<leader>ic "lua vim.lsp.buf.incoming_calls()"
   :<leader>oc "lua vim.lsp.buf.outgoing_calls()"
-  :<leader>sld "lua vim.lsp.diagnostic.show_line_diagnostics()"
+  :<leader>sld "lua vim.diagnostic.open_float(nil, {source = 'always'})"
   :<leader>rn "lua vim.lsp.buf.rename()"
   :<leader>fa "lua vim.lsp.buf.formatting_sync()"
   })
diff --git a/tmux.conf b/tmux.conf
index 56cdbfc..195641e 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -31,9 +31,9 @@ bind L resize-pane -R 5
 
 setw -g mouse off
 
-# set -g default-terminal "xterm-25:color"
+# set -g default-terminal "xterm-256:color"
 # set -g default-terminal "${TERM}"
-set -g default-terminal "tmux-256color"
+set -s default-terminal "tmux-256color"
 set -g history-limit 6000
 
 set -g window-status-style dim
@@ -46,10 +46,12 @@ set -g status-right '#(~/dotfiles/bin/tmux_battery_charge_indicator.sh) #[bg=whi
 set -g update-environment "DISPLAY SSH_ASKPASS SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY"
 set-environment -g 'SSH_AUTH_SOCK' ~/.ssh/ssh_auth_sock
 
-set-option -as terminal-overrides ',xterm-256color:RGB'
+# set -as terminal-overrides ',xterm-257color:RGB'
+set -as terminal-features ',xterm-256color:RGB'
 
 # Undercurl
-# set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm'  # undercurl support
-# set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m'  # underscore colours - needs tmux-3.0
+set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm'  # undercurl support
+# set -gas terminal-overrides ',*:Ss=\E[%p1%d q:Se=\E[2 q'
+set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m'  # underscore colours - needs tmux-3.0
 
 set-option -g focus-events on