diff --git a/src_files/.config/nvim/lua/david_standard/key_mappings.lua b/src_files/.config/nvim/lua/david_standard/key_mappings.lua
index 91da789..09e18d6 100644
--- a/src_files/.config/nvim/lua/david_standard/key_mappings.lua
+++ b/src_files/.config/nvim/lua/david_standard/key_mappings.lua
@@ -16,11 +16,12 @@ vim.keymap.set("n", "=ap", "ma=ap'a")
 
 -- shortcuts for deleting into the void register
 vim.keymap.set({ "n", "v" }, "<leader>d", "\"_d")
-vim.keymap.set("x", "<leader>p", [["_dP]]) -- replace selected text, keep main register
+vim.keymap.set("x", "<leader>P", [["_dP]]) -- replace selected text, keep main register
 
 -- shortcuts for using + register (system clipboard)
 vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]])
 vim.keymap.set("n", "<leader>Y", [["+Y]])
+vim.keymap.set("n", "<leader>p", [["+p]])
 
 -- search-and-replace shortcuts
 vim.keymap.set("n", "<leader>rw", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
diff --git a/src_files/.config/nvim/lua/david_standard/plugins_lazy/colorschemes.lua b/src_files/.config/nvim/lua/david_standard/plugins_lazy/colorschemes.lua
index cdf7e17..bf5c0cb 100644
--- a/src_files/.config/nvim/lua/david_standard/plugins_lazy/colorschemes.lua
+++ b/src_files/.config/nvim/lua/david_standard/plugins_lazy/colorschemes.lua
@@ -35,6 +35,7 @@ return {
     {
         "folke/tokyonight.nvim",
         lazy = false,
+        priority = 1000,
         opts = {
             style = "night", -- "night", "storm", "moon", "day"
             styles = {
@@ -43,6 +44,7 @@ return {
             on_colors = function(colors)
                 colors.hint = colors.orange
                 colors.error = "#ff0000"
+                colors.fg_gutter = "#9098B8"
             end
         },
     }
diff --git a/src_files/.config/nvim/lua/david_standard/plugins_lazy/treesitter.lua b/src_files/.config/nvim/lua/david_standard/plugins_lazy/treesitter.lua
index ee45c76..6a35b8f 100644
--- a/src_files/.config/nvim/lua/david_standard/plugins_lazy/treesitter.lua
+++ b/src_files/.config/nvim/lua/david_standard/plugins_lazy/treesitter.lua
@@ -8,7 +8,7 @@ return {
             require("nvim-treesitter.configs").setup({
                 ensure_installed = {
                     "vimdoc", "bash", "lua", "c", "cpp", "go", "python", "ruby",
-                    "html", "css", "json", "sql", "javascript", "jsdoc",
+                    "html", "css", "javascript", "jsdoc", "sql", "json", "yaml",
                     "markdown", "markdown_inline",
                     -- "odin", "zig", "ocaml", "java", "typescript",
                 },
diff --git a/src_files/.config/nvim/lua/david_standard/settings.lua b/src_files/.config/nvim/lua/david_standard/settings.lua
index e503886..6107f22 100644
--- a/src_files/.config/nvim/lua/david_standard/settings.lua
+++ b/src_files/.config/nvim/lua/david_standard/settings.lua
@@ -14,17 +14,18 @@ vim.opt.signcolumn = "yes" -- "auto", "yes", "no", "number"
 vim.opt.laststatus = 2
 vim.opt.splitright = true
 vim.opt.splitbelow = true
+vim.opt.nu = true
+vim.opt.relativenumber = true
+vim.opt.cursorline = true
+vim.opt.cursorlineopt = "both"
+vim.opt.smartindent = true
+vim.opt.wrap = true
 
 vim.opt.errorbells = false
 vim.opt.visualbell = false
 
 vim.opt.updatetime = 1000
 
-vim.opt.nu = true
-vim.opt.relativenumber = true
-vim.opt.smartindent = true
-vim.opt.wrap = true
-
 vim.opt.tabstop = 4
 vim.opt.softtabstop = 4
 vim.opt.shiftwidth = 4
diff --git a/src_files/.config/tmux/tmux.conf b/src_files/.config/tmux/tmux.conf
index f546a68..b0cc22d 100644
--- a/src_files/.config/tmux/tmux.conf
+++ b/src_files/.config/tmux/tmux.conf
@@ -2,8 +2,8 @@
 set -s escape-time 0
 
 unbind C-b
-set-option -g prefix C-a
-bind-key C-a send-prefix
+set-option -g prefix C-Space
+bind-key C-Space send-prefix
 set -g status-style 'bg=#111111 fg=#22cc00'
 set -g base-index 0
 
@@ -26,12 +26,13 @@ bind-key Q rename-session zzzz-temp-kill\; switch-client -p\; kill-session -t zz
 bind-key W kill-session
 
 # find and switching for sessions, include using tmux-sessionizer
-unbind-key f
+unbind-key f; unbind-key C-f; unbind-key C-s
+unbind-key C-h; unbind-key C-l; unbind-key C-o; unbind-key C-n; unbind-key C-p
 bind-key C-f run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer"
 bind-key C-s run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer existing"
 bind-key C-h run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer hub"
 bind-key C-l switch-client -l
-bind -r C-o last-window
-bind-key C-n next-window
-bind-key C-p previous-window
+bind-key C-o last-window
+bind-key -r C-n next-window
+bind-key -r C-p previous-window