diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml
index f3b966c..f461fc2 100644
--- a/.config/alacritty/alacritty.toml
+++ b/.config/alacritty/alacritty.toml
@@ -1,3 +1,6 @@
+import = [
+    "~/.config/alacritty/themes/kanagawa_wave.toml"
+]
 
 [env]
 TERM = "xterm-256color"
@@ -25,8 +28,3 @@ style = "Regular"
 action = "SpawnNewInstance"
 key = "Return"
 mods = "Control|Shift"
-
-[general]
-import = [
-    "~/.config/alacritty/themes/kanagawa_wave.toml"
-]
diff --git a/.config/nvim/after/queries/blade/highlights.scm b/.config/nvim/after/queries/blade/highlights.scm
new file mode 100644
index 0000000..29bec30
--- /dev/null
+++ b/.config/nvim/after/queries/blade/highlights.scm
@@ -0,0 +1,9 @@
+(directive) @function
+(directive_start) @function
+(directive_end) @function
+(comment) @comment
+((parameter) @include (#set! "priority" 110))
+((php_only) @include (#set! "priority" 110))
+((bracket_start) @function (#set! "priority" 120))
+((bracket_end) @function (#set! "priority" 120))
+(keyword) @function
diff --git a/.config/nvim/after/queries/blade/injections.scm b/.config/nvim/after/queries/blade/injections.scm
new file mode 100644
index 0000000..8f7af78
--- /dev/null
+++ b/.config/nvim/after/queries/blade/injections.scm
@@ -0,0 +1,4 @@
+((text) @injection.content
+    (#not-has-ancestor? @injection.content "envoy")
+    (#set! injection.combined)
+    (#set! injection.language php))
diff --git a/.config/nvim/lua/core/autocmd.lua b/.config/nvim/lua/core/autocmd.lua
index 0ebc951..f0fbbea 100644
--- a/.config/nvim/lua/core/autocmd.lua
+++ b/.config/nvim/lua/core/autocmd.lua
@@ -25,6 +25,7 @@ local aucmd_dict = {
             end
         }
     },
+
     FileType = {
         {
 	        -- Set tabstop to 2 for Dart, Vue, JavaScript, TypeScript, and JSON files
@@ -51,15 +52,6 @@ local aucmd_dict = {
     },
 
     BufRead = {
-        {
-            -- Return cursor to where it was previously when re-opening a file
-            callback = function()
-                if vim.fn.expand('%:p') ~= '.git/COMMIT_EDITMSG' and vim.fn.line("'\"") > 1 and vim.fn.line("'\"") <= vim.fn.line("$") then
-                    vim.cmd("normal! g`\"")
-                end
-            end
-        },
-
         {
             -- Set syntax for Dockerfiles
             pattern = { '*.docker' },
@@ -67,11 +59,6 @@ local aucmd_dict = {
                 vim.opt_local.syntax = 'dockerfile'
             end
         },
-
-        {
-            pattern = { '*.blade.php' },
-            command = [[set syntax=html]],
-        },
     },
 
     BufNewFile = {
diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua
index 46c0b96..b5f72be 100644
--- a/.config/nvim/lua/plugins/cmp.lua
+++ b/.config/nvim/lua/plugins/cmp.lua
@@ -4,7 +4,7 @@ return {
         'rafamadriz/friendly-snippets',
     },
 
-    version = 'v0.*',
+    version = '*',
     opts = {
         appearance = {
             use_nvim_cmp_as_default = true,
diff --git a/.config/nvim/lua/plugins/formatting.lua b/.config/nvim/lua/plugins/formatting.lua
index 314af24..eeb2f7a 100644
--- a/.config/nvim/lua/plugins/formatting.lua
+++ b/.config/nvim/lua/plugins/formatting.lua
@@ -19,6 +19,7 @@ return {
 				shell = { "shfmt", "shellcheck" },
 				python = { "isort", "black" },
 				php = { "phpcbf" },
+                blade = { "blade-formatter" }
 			},
 			log_level = vim.log.levels.WARN,
 			notify_on_error = false,
diff --git a/.config/nvim/lua/plugins/nvim-treesitter.lua b/.config/nvim/lua/plugins/nvim-treesitter.lua
index 06a79a8..08c6bd6 100644
--- a/.config/nvim/lua/plugins/nvim-treesitter.lua
+++ b/.config/nvim/lua/plugins/nvim-treesitter.lua
@@ -7,6 +7,49 @@ return {
 			{ "nvim-treesitter/nvim-treesitter-textobjects" },
 		},
 		config = function()
+			---@class ParserConfig
+			---@field install_info table
+			---@field filetype string
+			local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
+
+			parser_config.blade = {
+				install_info = {
+					url = "https://github.com/EmranMR/tree-sitter-blade",
+					files = { "src/parser.c" },
+					branch = "main",
+				},
+				filetype = "blade",
+			}
+
+            vim.filetype.add({
+                extension = { blade = "blade" },
+                pattern = {
+                    ['.*%.blade%.php'] = 'blade',
+                },
+            })
+
+            ---
+            ---:TSEditQuery highlights blade
+            ---
+            ---(directive) @function
+            ---(directive_start) @function
+            ---(directive_end) @function
+            ---(comment) @comment
+            ---((parameter) @include (#set! "priority" 110))
+            ---((php_only) @include (#set! "priority" 110))
+            ---((bracket_start) @function (#set! "priority" 120))
+            ---((bracket_end) @function (#set! "priority" 120))
+            ---(keyword) @function
+            ---
+
+            ---
+            ---:TSEditQuery injections blade
+            ---((text) @injection.content
+            ---    (#not-has-ancestor? @injection.content "envoy")
+            ---    (#set! injection.combined)
+            ---    (#set! injection.language php))
+            ---
+
 			-- import nvim-treesitter plugin
 			local treesitter = require("nvim-treesitter.configs")
 
@@ -30,6 +73,7 @@ return {
 					"gitignore",
 					"php",
 					"latex",
+                    "blade",
 				},
 				ignore_install = {},
 				modules = {},
@@ -92,26 +136,6 @@ return {
 					},
 				},
 			})
-
-			---@class ParserConfig
-			---@field install_info table
-			---@field filetype string
-			local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
-
-			parser_config.blade = {
-				install_info = {
-					url = "https://github.com/EmranMR/tree-sitter-blade",
-					files = { "src/parser.c" },
-					branch = "main",
-				},
-				filetype = "blade",
-			}
-
-			vim.filetype.add({
-				pattern = {
-					[".*%.blade%.php"] = "blade",
-				},
-			})
 		end,
 	},
 }
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 21c0d32..f65bb51 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -95,10 +95,12 @@ if [[ $(uname) == 'Darwin' ]]; then
 fi
 export PATH="${PATH}:${ANDROID_HOME}/platform-tools:$ANDROID_HOME/cmdline-tools/latest/bin"
 
+export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
+
 # Load nvm on load to speed up shell init
 function nvm() {
     unset -f nvm node npm npx
-    [ -s "/usr/share/nvm/init-nvm.sh" ] && source "/usr/share/nvm/init-nvm.sh"
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
     nvm "$@"
 }
 function node { nvm; node "$@" }
diff --git a/.tmux.conf b/.tmux.conf
index 6d5b870..04de61a 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -54,9 +54,9 @@ bind 'V' copy-mode
 # Enable clipboard integration
 set-option -g set-clipboard on
 
-# Use xclip for copying text in copy mode
-bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xclip -selection clipboard -in"
-bind-key -T copy-mode y send-keys -X copy-pipe-and-cancel "xclip -selection clipboard -in"
+# Use xclip for copying text in copy mode and stay in copy mode
+bind-key -T copy-mode-vi y send-keys -X copy-pipe "xclip -selection clipboard -in"
+bind-key -T copy-mode y send-keys -X copy-pipe "xclip -selection clipboard -in"
 
 # Shortcut for manual copying outside of copy mode
 bind-key C-c run-shell "tmux save-buffer - | xclip -selection clipboard -in"