diff --git a/.gitignore b/.gitignore
index 1cc4c7d..a8209a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.stfolder
 Downloads
 __pycache__
 Win
diff --git a/Linux/Scripts/dev.sh b/Internal/unix_dev.sh
old mode 100755
new mode 100644
similarity index 100%
rename from Linux/Scripts/dev.sh
rename to Internal/unix_dev.sh
diff --git a/Win/Scripts/dev.bat b/Internal/win_dev.bat
similarity index 100%
rename from Win/Scripts/dev.bat
rename to Internal/win_dev.bat
diff --git a/Internal/win_non_portable_app_websites.cmd b/Internal/win_non_portable_app_websites.cmd
deleted file mode 100644
index a73e7fc..0000000
--- a/Internal/win_non_portable_app_websites.cmd
+++ /dev/null
@@ -1,14 +0,0 @@
-@echo off
-start /B https://brave.com
-start /B https://desktop.telegram.org
-start /B https://ledger.com/ledger-live
-start /B https://getsession.org/windows
-start /B https://github.com/kapitainsky/RcloneBrowser/releases
-start /B https://mozilla.org/en-US/firefox/new
-start /B https://obsidian.md/download
-start /B https://protonvpn.com/download
-start /B https://signal.org/download
-start /B https://safing.io
-start /B https://spotify.com/us/download
-start /B https://discord.com/download
-start /B https://www.gpsoft.com.au/dscripts/download.asp
diff --git a/Win/Scripts/msys2_env.bat b/Win/Scripts/msys2_env.bat
deleted file mode 100644
index 038d102..0000000
--- a/Win/Scripts/msys2_env.bat
+++ /dev/null
@@ -1,29 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-
-if "%~1"=="help"   goto :help
-if "%~1"==""       goto :help
-if "%~1"=="--help" goto :help
-if "%~1"=="/?"     goto :help
-if "%~2"==""       goto :help
-goto :run
-
-:help
-echo USAGE: msys2_env.bat ^<environment^> ^<command^>
-echo.
-echo ENVIRONMENTS:
-echo   ^| Name      ^| Toolchain ^| Arch ^| C Runtime ^| C++ Runtime ^|
-echo   ^| 'clang64' ^| llvm      ^| x64  ^| ucrt      ^| libc++      ^|
-echo   ^| 'mingw32' ^| gcc       ^| x86  ^| msvcrt    ^| libstdc++   ^|
-echo   ^| 'mingw64' ^| gcc       ^| x64  ^| msvcrt    ^| libstdc++   ^|
-echo   ^| 'msys2'   ^| gcc       ^| x64  ^| cygwin    ^| libstdc++   ^|
-echo   ^| 'ucrt64'  ^| gcc       ^| x64  ^| ucrt      ^| libstdc++   ^|
-goto :eof
-
-:run
-set msys_env=%~1
-for /f "tokens=1,* delims= " %%a in ("%*") do set remaining_args=%%b
-
-set cmd=%devenver_root%\MSYS2\20240113\msys2_shell.cmd -%msys_env% -no-start -defterm -here -c "%remaining_args%"
-echo [SCRIPT] Executing '%cmd%'
-%cmd%
diff --git a/devenver.py b/devenver.py
index be7e313..9863c8d 100644
--- a/devenver.py
+++ b/devenver.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
 # DEVenver
-# ------------------------------------------------------------------------------
 # A simple python script to download portable applications and install them by
 # unzipping them to a structured directory tree.
 
@@ -22,11 +21,8 @@ from string import Template
 from enum import Enum
 
 # Internal
-# ------------------------------------------------------------------------------
 DOWNLOAD_CHUNK_SIZE = 1 * 1024 * 1024 # 1 megabyte
 
-# ------------------------------------------------------------------------------
-
 # These variables are set once they are downloaded dynamically and installed
 # from the internal app listing!
 zstd_exe           = ""
@@ -34,7 +30,6 @@ zip7_exe           = ""
 zip7_bootstrap_exe = ""
 
 # Functions
-# ------------------------------------------------------------------------------
 def print_header(title):
     line = f'> ' + title + ' ';
     print(line.ljust(100, '-'))
diff --git a/install.py b/install.py
index d25e02e..25be3eb 100644
--- a/install.py
+++ b/install.py
@@ -193,7 +193,6 @@ return {{
 """)
 
         # Wezterm super terminal
-        # --------------------------------------------------------------------------
         wezterm_terminal_script_path = install_dir / "dev_terminal.bat"
         devenver.lprint(f"Installing WezTerm terminal script to {wezterm_terminal_script_path}")
 
@@ -214,10 +213,6 @@ start "" /MAX "%~dp0{installed_dev_apps["WezTerm"][0]["exe_path"].relative_to(in
         # PyNvim
         devenver.lprint(f"Installing PyNVIM")
         subprocess.run(f"{python_exe_path} -m pip install pynvim")
-    else:
-        dev_env_script_path = (install_dir / "dev_env_update.sh")
-        dev_env_script_path.write_text(f"{sys.executable} {install_script_path} --with-dev-apps linux\n")
-        subprocess.run(args=["chmod", "+x", dev_env_script_path])
 
     # Use LLVM script to fix up bloated installation
     # See: https://github.com/zufuliu/llvm-utils/blob/main/llvm/llvm-link.bat
@@ -240,6 +235,13 @@ start "" /MAX "%~dp0{installed_dev_apps["WezTerm"][0]["exe_path"].relative_to(in
         shutil.copy(internal_dir / "unix_fzf-completion.bash", install_dir)
         shutil.copy(internal_dir / "unix_fzf-key-bindings.bash", install_dir)
 
+    # Install dev scripts
+    if is_windows:
+        shutil.copy(internal_dir / "win_dev.bat", install_dir / "dev.bat")
+    else:
+        shutil.copy(internal_dir / "unix_dev.sh", install_dir / "dev.sh")
+        subprocess.run(args=["chmod", "+x", install_dir / "dev.sh")
+
     # Install left-overs
     devenver.print_header("Install configuration files")