diff --git a/Internal/os_nvim_init.vim b/Internal/os_nvim_init.vim
index fff18b3..0563639 100644
--- a/Internal/os_nvim_init.vim
+++ b/Internal/os_nvim_init.vim
@@ -18,7 +18,7 @@ call plug#begin(stdpath('config') . '/plugged')
     " Plug 'https://github.com/nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
     Plug 'junegunn/vim-easy-align'
     Plug 'https://github.com/bfrg/vim-cpp-modern'
-    Plug 'https://github.com/ggandor/leap.nvim'
+    Plug 'https://codeberg.org/andyg/leap.nvim'
     Plug 'https://github.com/sainnhe/gruvbox-material'
     Plug 'https://github.com/Tetralux/odin.vim' "Odin Syntax highlighting
 
@@ -196,10 +196,6 @@ lua <<EOF
     }
   })
 
-  require'nvim-treesitter.configs'.setup {
-    auto_install = false,
-  }
-
   -- Set spelling errors in a purple hint
   vim.opt.spell = true
   vim.api.nvim_create_autocmd("LspAttach", {
@@ -210,30 +206,6 @@ lua <<EOF
     end,
   })
 
-  -- Treesitter ////////////////////////////////////////////////////////////////////////////////////
-  -- TODO: 2022-06-19 Treesitter is too slow on large C++ files
-  -- require('nvim-treesitter.configs').setup {
-  --   ensure_installed = { "c", "cpp" }, -- A list of parser names, or "all"
-  --   sync_install     = false,          -- Install parsers synchronously (only applied to `ensure_installed`)
-  --   ignore_install   = { },            -- List of parsers to ignore installing (for "all")
-
-  --   highlight = {
-  --     enable = false, -- `false` will disable the whole extension
-
-  --     -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to
-  --     -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is
-  --     -- the name of the parser)
-  --     -- list of language that will be disabled
-  --     disable = { },
-
-  --     -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-  --     -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-  --     -- Using this option may slow down your editor, and you may see some duplicate highlights.
-  --     -- Instead of true it can also be a list of languages
-  --     additional_vim_regex_highlighting = false,
-  --   },
-  -- }
-
   -- Per-Project Bindings /////////////////////////////////////////////////////////////////////////////
   -- Automatically load project file on buffer enter
   vim.api.nvim_create_autocmd({"BufEnter"}, {
diff --git a/Linux/Scripts/dev.sh b/Linux/Scripts/dev.sh
index 6d0e4ee..c64ff42 100755
--- a/Linux/Scripts/dev.sh
+++ b/Linux/Scripts/dev.sh
@@ -16,9 +16,9 @@ virustotal_url="https://www.virustotal.com/gui/file"
 option="$1"
 shift
 
-if [ "$option" = "clang"      ]; then                                                         exe_dir="$clang_dir/$1/bin" && PATH="$exe_dir:$PATH"  && cmd_line="$2" && shift && shift; fi
-if [ "$option" = "cmake"      ]; then                                                         exe_dir="$cmake_dir/$1"     && PATH="$exe_dir:$PATH"  && cmd_line="$2" && shift && shift; fi
-if [ "$option" = "node"       ]; then                                                         exe_dir="$node_dir/$1/bin"  && PATH="$exe_dir:$PATH"  && cmd_line="$2" && shift && shift; fi
+if [ "$option" = "clang"      ]; then exe_dir="$clang_dir/$1/bin" && PATH="$exe_dir:$PATH"  && cmd_line="$2" && shift && shift; fi
+if [ "$option" = "cmake"      ]; then exe_dir="$cmake_dir/$1"     && PATH="$exe_dir:$PATH"  && cmd_line="$2" && shift && shift; fi
+if [ "$option" = "node"       ]; then exe_dir="$node_dir/$1/bin"  && PATH="$exe_dir:$PATH"  && cmd_line="$2" && shift && shift; fi
 if [ "$option" = "python"     ]; then
     python_root=$python_dir/$1/install
     # Shit like building UWSGI in Python via PIP with wheel doesn't seem to use
@@ -40,7 +40,7 @@ if [ "$option" = "help" ]; then
 USAGE: dev [option] [args...]
 
 NOTES:
-  Commands suffixed with '_env' augment the system PATH with the tool's path for the current shell session.
+  Commands augment the system PATH with the tool's path for the current shell session.
   You can chain the commands to augment the PATH, e.g:
 
     dev.sh python 3.12.9+20250317 dev.sh node 20.18.2 yarn build-everything
diff --git a/Win/Scripts/dev.bat b/Win/Scripts/dev.bat
index 1cbbf55..34dcc89 100644
--- a/Win/Scripts/dev.bat
+++ b/Win/Scripts/dev.bat
@@ -24,6 +24,7 @@ set rad_update_exe=update_trunk.bat
 set remedybg_dir=%root_dir%\RemedyBG
 set remedybg_exe=remedybg.exe
 set virustotal_url=https://www.virustotal.com/gui/file
+set rust_dir=%userprofile%\.rustup\toolchains\stable-x86_64-pc-windows-msvc\bin
 
 :: Argument parsing ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 :: Remove the first argument which is the command (e.g. raddbg or radlink)
@@ -39,6 +40,7 @@ if "%option%"=="raddbg"       set "exe_dir=%raddbg_dir%"       && set path=%exe_
 if "%option%"=="raddbg_env"   endlocal                         && set path=%raddbg_dir%;%path% && goto :eof
 if "%option%"=="radlink"      set "exe_dir=%radlink_dir%"      && set path=%exe_dir%;%path% && set cmd_line=!exe_dir!\%radlink_exe%
 if "%option%"=="radlink_env"  endlocal                         && set path=%radlink_dir%;%path% && goto :eof
+if "%option%"=="rust_env"     endlocal                         && set path=%rsut_dir%;%path% && goto :eof
 if "%option%"=="remedybg"     set "exe_dir=%remedybg_dir%\%1"  && set path=%exe_dir%;%path% && set cmd_line=start /B !exe_dir!\%remedybg_exe% && shift
 if "%option%"=="virustotal"   for /f "delims=" %%a in ('powershell -Command "(Get-FileHash \"%1\" -Algorithm SHA256).Hash"') do set virustotal_hash=%%a && shift
 if "%option%"=="virustotal"   set cmd_line=start /B %virustotal_url%/%virustotal_hash%
@@ -55,14 +57,13 @@ if "%option%"=="help" (
     echo USAGE: dev [option] [args...]
     echo.
     echo NOTES:
-    echo   Commands suffixed with '_env' augment the system path with the path to the tool for the
-    echo   current shell session.
+    echo   Commands augment the system path with the path to the tool for the current shell session.
     echo.
     echo OPTIONS:
-    echo   cmake [version] [exe]           CMake build system:                    '%cmake_dir%\[version]\[exe] %cmake_args%'
+    echo   cmake [version] [exe]           CMake build system:                    'set PATH=%cmake_dir%\[version]\[exe];%%PATH%% %cmake_args%'
     echo                                   Versions:                              !cmake_versions!
     echo.
-    echo   clang [version] [exe]           CLANG compiler:                        '%clang_dir%\[version]\[exe] %clang_args%'
+    echo   clang [version] [exe]           CLANG compiler:                        'set PATH=%clang_dir%\[version]\[exe];%%PATH%% %clang_args%'
     echo                                   Example:                               'dev clang 18.1.4 clang++.exe --help'
     echo                                   Versions:                              !clang_versions!
     echo.
@@ -75,14 +76,20 @@ if "%option%"=="help" (
     echo                                   Versions:                              !node_versions!
     echo.
     echo   raddbg                          RAD debugger:                          '%raddbg_dir%\%raddbg_exe% %raddbg_args%'
-    echo   raddbg_env [cmd...]                                                    '%raddbg_dir%;[PATH]'
+    echo   raddbg_env                      Add RAD debugger to PATH env:          'set PATH=%raddbg_dir%;%%PATH%%'
     echo   radlink                         RAD linker:                            '%radlink_dir%\%radlink_exe%'
-    echo   radlink_env [cmd...]                                                   '%radlink_dir%;[PATH]'
+    echo   radlink_env                     Add RAD linker to PATH env:            'set PATH=%radlink_dir%;%%PATH%%'
     echo   rad_update                      Update the RAD linker and debugger:    '%rad_update_dir%\%rad_update_exe%'
+    echo.
     echo   remedybg [version]              C/C++ debugger:                        '%remedybg_dir%\%remedybg_exe%'
     echo                                   Versions:                              !remedybg_versions!
     echo.
+    if exist "!rust_dir!\cargo.exe" (
+    echo   rust_env                        Add Rust to PATH env:                  'set PATH=!rust_dir!;%%PATH%%'
+    echo.
+    )
     echo   virustotal [file]               Lookup file SHA256 hash on VirusTotal: '%virustotal_url%/[file]'
+
     goto :eof
 )
 
diff --git a/app_manifest_dev.py b/app_manifest_dev.py
index df81565..dde142e 100644
--- a/app_manifest_dev.py
+++ b/app_manifest_dev.py
@@ -1058,7 +1058,7 @@ def get_manifest(is_windows):
                     {
                         "path": exe_path,
                         "symlink": symlink,
-                        "add_to_devenv_path": True,
+                        "add_to_devenv_path": False,
                         "checksum": checksum,
                     }
                 ],
diff --git a/devenver.py b/devenver.py
index f2bf1b0..629f6cb 100644
--- a/devenver.py
+++ b/devenver.py
@@ -810,6 +810,7 @@ def run(user_app_list,
 
         devenv_script_buffer += "set path=%~dp0Symlinks;%PATH%\n"
         devenv_script_buffer += "set path=%~dp0Scripts;%PATH%\n"
+        devenv_script_buffer += "set path=%~dp0..\PC\Programs;%PATH%\n"
     else:
         devenv_script_buffer += f"export devenver_root=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )\"\n"
         devenv_script_buffer += f"PATH=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )/Scripts\":$PATH\n"