diff --git a/Internal/os_nvim_init.vim b/Internal/os_nvim_init.vim
index 827c5c4..095e43e 100644
--- a/Internal/os_nvim_init.vim
+++ b/Internal/os_nvim_init.vim
@@ -309,31 +309,31 @@ augroup persistent_settings
 augroup end
 
 function! RemedyBGOpenFile()
-    execute("!start remedybg open-file " . expand("%:p") . " " . line("."))
+    execute("Spawn! remedybg open-file " . expand("%:p") . " " . line("."))
     execute("!powershell -Command Add-Type -AssemblyName Microsoft.VisualBasic; [Microsoft.VisualBasic.Interaction]::AppActivate(' - RemedyBG')")
 endfunction
 command RemedyBGOpenFile call RemedyBGOpenFile()
 
 function! RemedyBGStartDebugging()
-    execute("!start remedybg start-debugging " . expand("%:p") . " " . line("."))
+    execute("Spawn! start remedybg start-debugging " . expand("%:p") . " " . line("."))
 endfunction
 command RemedyBGStartDebugging call RemedyBGStartDebugging()
 
 function! RemedyBGStopDebugging()
-    execute("!start remedybg stop-debugging " . expand("%:p") . " " . line("."))
+    execute("Spawn! remedybg stop-debugging " . expand("%:p") . " " . line("."))
 endfunction
 command RemedyBGStopDebugging call RemedyBGStopDebugging()
 
 function! RemedyBGRunToCursor()
-    execute("!start remedybg open-file " . expand("%:p") . " " . line("."))
-    execute("!start remedybg run-to-cursor " . expand("%:p") . " " . line("."))
+    execute("Spawn! remedybg open-file " . expand("%:p") . " " . line("."))
+    execute("Spawn! remedybg run-to-cursor " . expand("%:p") . " " . line("."))
     execute("!powershell -Command Add-Type -AssemblyName Microsoft.VisualBasic; [Microsoft.VisualBasic.Interaction]::AppActivate(' - RemedyBG')")
 endfunction
 command RemedyBGRunToCursor call RemedyBGRunToCursor()
 
 function! RemedyBGAddBreakpointAtFile()
-    execute("!start remedybg open-file " . expand("%:p") . " " . line("."))
-    execute("!start remedybg add-breakpoint-at-file " . expand("%:p") . " " . line("."))
+    execute("Spawn! remedybg open-file " . expand("%:p") . " " . line("."))
+    execute("Spawn! remedybg add-breakpoint-at-file " . expand("%:p") . " " . line("."))
     execute("!powershell -Command Add-Type -AssemblyName Microsoft.VisualBasic; [Microsoft.VisualBasic.Interaction]::AppActivate(' - RemedyBG')")
 endfunction
 command RemedyBGAddBreakpointAtFile call RemedyBGAddBreakpointAtFile()
@@ -435,11 +435,11 @@ set errorformat+=%\\%%(CTIME%\\)%\\@=%m                        " ctime.exe -stat
 " ==============================================================================
 let s:running_windows = has("win16") || has("win32") || has("win64")
 if s:running_windows
-    set makeprg=./build.bat
+    set makeprg=build
+    nnoremap <C-b> :Make ./build.bat<cr>
 else
     " Set vim terminal to enter normal mode using escape like normal vim behaviour
     tnoremap <Esc> <C-\><C-n>
+    nnoremap <C-b> :Make ./build.sh<cr>
     set makeprg=./build.sh
 endif
-
-nnoremap <C-b> :Make<cr>
diff --git a/Win/Scripts/remedybg.bat b/Win/Scripts/remedybg.bat
new file mode 100644
index 0000000..14f7adf
--- /dev/null
+++ b/Win/Scripts/remedybg.bat
@@ -0,0 +1,12 @@
+@echo off
+setlocal
+  set desired_path=%devenver_root%\..\..\Cryptomator\Dev\Win\RemedyBG\0_3_9_4
+  set desired_exe=remedybg.exe
+
+  set path=%desired_path%;%path%
+  set exe_to_use=""
+  for /f "delims=" %%a in ('where "$desired_path:%desired_exe%"') do ( set "exe_to_use=%%a")
+  echo [DEVENVER] Executing script "%~dpnx0" with "%exe_to_use%"
+
+  call %desired_exe% %*
+endlocal