diff --git a/bin/bundler.cmd b/bin/bundler.cmd
new file mode 100644
index 0000000..586f226
--- /dev/null
+++ b/bin/bundler.cmd
@@ -0,0 +1,4 @@
+@echo off
+where bundler.bat >nul 2>nul
+if errorlevel 1 call gem install bundler
+call bundler.bat %*
\ No newline at end of file
diff --git a/bin/cargo.cmd b/bin/cargo.cmd
new file mode 100644
index 0000000..80d1d59
--- /dev/null
+++ b/bin/cargo.cmd
@@ -0,0 +1,4 @@
+@echo off
+where cargo.exe 2>nul >nul
+if errorlevel 1 call scoop install rust & call %~dp0\v-choco-refreshenv
+cargo.exe %*
\ No newline at end of file
diff --git a/bin/v-choco.cmd b/bin/choco.cmd
similarity index 100%
rename from bin/v-choco.cmd
rename to bin/choco.cmd
diff --git a/bin/gem.bat b/bin/gem.bat
new file mode 100644
index 0000000..c2abe6c
--- /dev/null
+++ b/bin/gem.bat
@@ -0,0 +1,4 @@
+@echo off
+where gem.cmd >nul 2>nul
+if errorlevel 1 call choco install ruby -y & call %~dp0\v-choco-refreshenv
+call gem.cmd %*
\ No newline at end of file
diff --git a/bin/ghc.cmd b/bin/ghc.cmd
new file mode 100644
index 0000000..63dee47
--- /dev/null
+++ b/bin/ghc.cmd
@@ -0,0 +1,4 @@
+@echo off
+where ghc.exe >nul 2>nul
+if errorlevel 1 call choco install ghc -y & call %~dp0\v-choco-refreshenv
+ghc.exe %*
\ No newline at end of file
diff --git a/bin/v-ghci.cmd b/bin/ghci.cmd
similarity index 88%
rename from bin/v-ghci.cmd
rename to bin/ghci.cmd
index bfb3332..1036864 100644
--- a/bin/v-ghci.cmd
+++ b/bin/ghci.cmd
@@ -1,4 +1,4 @@
 @echo off
 where ghci.exe >nul 2>nul
 if errorlevel 1 call v-choco install ghc -y & call %~dp0\v-choco-refreshenv
-ghci %*
\ No newline at end of file
+ghci.exe %*
\ No newline at end of file
diff --git a/bin/irb.cmd b/bin/irb.cmd
new file mode 100644
index 0000000..718f0cc
--- /dev/null
+++ b/bin/irb.cmd
@@ -0,0 +1,4 @@
+@echo off
+where ruby.exe >nul 2>nul
+if errorlevel 1 call choco install ruby -y & call %~dp0\v-choco-refreshenv
+irb.bat %*
\ No newline at end of file
diff --git a/bin/node.cmd b/bin/node.cmd
new file mode 100644
index 0000000..e5bdf46
--- /dev/null
+++ b/bin/node.cmd
@@ -0,0 +1,4 @@
+@echo off
+where node.exe >nul 2>nul
+if errorlevel 1 call choco install nodejs -y & call %~dp0\v-choco-refreshenv
+call node.exe %*
\ No newline at end of file
diff --git a/bin/npm.bat b/bin/npm.bat
new file mode 100644
index 0000000..0ca9c58
--- /dev/null
+++ b/bin/npm.bat
@@ -0,0 +1,4 @@
+@echo off
+where npm.cmd >nul 2>nul
+if errorlevel 1 call choco install nodejs -y & call %~dp0\v-choco-refreshenv
+call npm.cmd %*
\ No newline at end of file
diff --git a/bin/qemu.cmd b/bin/qemu.cmd
new file mode 100644
index 0000000..c255f6d
--- /dev/null
+++ b/bin/qemu.cmd
@@ -0,0 +1,4 @@
+@echo off
+where qemu-system-x86_64.exe 2>nul >nul
+if errorlevel 1 call scoop install qemu & call %~dp0\v-choco-refreshenv
+%userprofile%\scoop\apps\qemu\6.2.0\qemu-system-x86_64.exe %*
\ No newline at end of file
diff --git a/bin/ruby.cmd b/bin/ruby.cmd
new file mode 100644
index 0000000..4315391
--- /dev/null
+++ b/bin/ruby.cmd
@@ -0,0 +1,4 @@
+@echo off
+where ruby.exe >nul 2>nul
+if errorlevel 1 call choco install ruby -y & call %~dp0\v-choco-refreshenv
+ruby.exe %*
\ No newline at end of file
diff --git a/bin/rubyw.cmd b/bin/rubyw.cmd
new file mode 100644
index 0000000..1c61240
--- /dev/null
+++ b/bin/rubyw.cmd
@@ -0,0 +1,4 @@
+@echo off
+where rubyw.exe >nul 2>nul
+if errorlevel 1 call choco install ruby -y & call %~dp0\v-choco-refreshenv
+rubyw.exe %*
\ No newline at end of file
diff --git a/bin/runghc.cmd b/bin/runghc.cmd
new file mode 100644
index 0000000..b89d886
--- /dev/null
+++ b/bin/runghc.cmd
@@ -0,0 +1,4 @@
+@echo off
+where runghc.exe >nul 2>nul
+if errorlevel 1 call choco install ghc -y & call %~dp0\v-choco-refreshenv
+runghc.exe %*
\ No newline at end of file
diff --git a/bin/v-rustc.cmd b/bin/rustc.cmd
similarity index 100%
rename from bin/v-rustc.cmd
rename to bin/rustc.cmd
diff --git a/bin/v-scoop.cmd b/bin/scoop.bat
similarity index 79%
rename from bin/v-scoop.cmd
rename to bin/scoop.bat
index e547833..ee525b5 100644
--- a/bin/v-scoop.cmd
+++ b/bin/scoop.bat
@@ -1,4 +1,4 @@
 @echo off
-where scoop 2>nul >nul
+where scoop.cmd 2>nul >nul
 if errorlevel 1 powershell -c "Set-ExecutionPolicy RemoteSigned -scope CurrentUser; Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')"
-call scoop %*
\ No newline at end of file
+call scoop.cmd %*
\ No newline at end of file
diff --git a/bin/v-bundler.cmd b/bin/v-bundler.cmd
deleted file mode 100644
index 9f90875..0000000
--- a/bin/v-bundler.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-where bundler >nul 2>nul
-if errorlevel 1 call v-gem install bundler
-call bundler %*
\ No newline at end of file
diff --git a/bin/v-cargo.cmd b/bin/v-cargo.cmd
deleted file mode 100644
index 44d5cf5..0000000
--- a/bin/v-cargo.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-where cargo.exe 2>nul >nul
-if errorlevel 1 call v-scoop install rust & call %~dp0\v-choco-refreshenv
-cargo.exe %*
\ No newline at end of file
diff --git a/bin/v-gem.cmd b/bin/v-gem.cmd
deleted file mode 100644
index 77dcbb5..0000000
--- a/bin/v-gem.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-where gem >nul 2>nul
-if errorlevel 1 call v-choco install ruby -y & call %~dp0\v-choco-refreshenv
-call gem %*
\ No newline at end of file
diff --git a/bin/v-ghc.cmd b/bin/v-ghc.cmd
deleted file mode 100644
index 4a27699..0000000
--- a/bin/v-ghc.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-where ghc.exe >nul 2>nul
-if errorlevel 1 call v-choco install ghc -y & call %~dp0\v-choco-refreshenv
-ghc %*
\ No newline at end of file
diff --git a/bin/v-irb.cmd b/bin/v-irb.cmd
deleted file mode 100644
index 19156f1..0000000
--- a/bin/v-irb.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-where irb >nul 2>nul
-if errorlevel 1 call v-choco install ruby -y & call %~dp0\v-choco-refreshenv
-irb %*
\ No newline at end of file
diff --git a/bin/v-node.cmd b/bin/v-node.cmd
deleted file mode 100644
index ba89b3f..0000000
--- a/bin/v-node.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-where npm >nul 2>nul
-if errorlevel 1 call v-choco install nodejs -y & call %~dp0\v-choco-refreshenv
-call node %*
\ No newline at end of file
diff --git a/bin/v-npm.cmd b/bin/v-npm.cmd
deleted file mode 100644
index ff72c58..0000000
--- a/bin/v-npm.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-where npm >nul 2>nul
-if errorlevel 1 call v-choco install nodejs -y & call %~dp0\v-choco-refreshenv
-call npm %*
\ No newline at end of file
diff --git a/bin/v-qemu.cmd b/bin/v-qemu.cmd
deleted file mode 100644
index d39b6e4..0000000
--- a/bin/v-qemu.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-where qemu-system-x86_64.exe 2>nul >nul
-if errorlevel 1 call v-scoop install qemu & call %~dp0\v-choco-refreshenv
-%userprofile%\scoop\apps\qemu\6.2.0\qemu-system-x86_64.exe %*
\ No newline at end of file
diff --git a/bin/v-ruby.cmd b/bin/v-ruby.cmd
deleted file mode 100644
index a430c14..0000000
--- a/bin/v-ruby.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-where ruby.exe >nul 2>nul
-if errorlevel 1 call v-choco install ruby -y & call %~dp0\v-choco-refreshenv
-ruby %*
\ No newline at end of file
diff --git a/bin/v-rubyw.cmd b/bin/v-rubyw.cmd
deleted file mode 100644
index ba42330..0000000
--- a/bin/v-rubyw.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-where rubyw >nul 2>nul
-if errorlevel 1 call v-choco install ruby -y & call %~dp0\v-choco-refreshenv
-rubyw %*
\ No newline at end of file
diff --git a/bin/v-runghc.cmd b/bin/v-runghc.cmd
deleted file mode 100644
index 78cc9ae..0000000
--- a/bin/v-runghc.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-where runghc.exe >nul 2>nul
-if errorlevel 1 call v-choco install ghc -y & call %~dp0\v-choco-refreshenv
-runghc %*
\ No newline at end of file