diff --git a/Fix Outlook Temp folder.bat b/Fix Outlook Temp folder.cmd
similarity index 94%
rename from Fix Outlook Temp folder.bat
rename to Fix Outlook Temp folder.cmd
index 88bdf9a8f5144ec411d47a3c2c73bcc672d96562..c8046562a74ef1f307521becca4c2ed60e9754fc 100644
--- a/Fix Outlook Temp folder.bat	
+++ b/Fix Outlook Temp folder.cmd	
@@ -1,5 +1,5 @@
-@echo off
-del /Q /F %localappdata%\Temp\*
-echo Outlook Temp folder cleared.
-pause
-exit
+@echo off
+del /Q /F %localappdata%\Temp\*
+echo Outlook Temp folder cleared.
+pause
+exit
diff --git a/Fix blank icons.bat b/Fix blank icons.cmd
similarity index 96%
rename from Fix blank icons.bat
rename to Fix blank icons.cmd
index 0e8fcc29a8ed02cdcd99e0cd3bb97b89c4e05741..62a20c6e7c92d5f3866d5314ff2267bcc012a69f 100644
--- a/Fix blank icons.bat	
+++ b/Fix blank icons.cmd	
@@ -1,38 +1,38 @@
-@echo off
-set iconcache=%localappdata%\IconCache.db
-set iconcache_x=%localappdata%\Microsoft\Windows\Explorer\iconcache*
-
-echo.
-echo The explorer process must be temporarily killed before deleting the IconCache.db file.
-echo Please SAVE ALL OPEN WORK before continuing.
-echo.
-pause
-echo.
-If exist "%iconcache%" goto delete
-echo The %localappdata%\IconCache.db file has already been deleted.
-echo.
-If exist "%iconcache_x%" goto delete
-echo The %localappdata%\Microsoft\Windows\Explorer\IconCache_*.db files have already been deleted.
-echo.
-exit /B
-
-:delete
-echo Attempting to delete IconCache.db files...
-echo.
-ie4uinit.exe -show
-taskkill /IM explorer.exe /F
-If exist del /A /F /Q "%iconcache%"
-If exist del /A /F /Q "%iconcache_x%"
-start explorer.exe
-echo IconCache database files have been successfully deleted.
-echo.
-echo You will need to restart the PC to finish rebuilding your icon cache.
-CHOICE /C:YN /M "Do you want to restart the PC now?"
-IF ERRORLEVEL 2 goto no
-IF ERRORLEVEL 1 goto yes
-
-:yes
-shutdown /r /f /t 00
-
-:no
-exit
+@echo off
+set iconcache=%localappdata%\IconCache.db
+set iconcache_x=%localappdata%\Microsoft\Windows\Explorer\iconcache*
+
+echo.
+echo The explorer process must be temporarily killed before deleting the IconCache.db file.
+echo Please SAVE ALL OPEN WORK before continuing.
+echo.
+pause
+echo.
+If exist "%iconcache%" goto delete
+echo The %localappdata%\IconCache.db file has already been deleted.
+echo.
+If exist "%iconcache_x%" goto delete
+echo The %localappdata%\Microsoft\Windows\Explorer\IconCache_*.db files have already been deleted.
+echo.
+exit /B
+
+:delete
+echo Attempting to delete IconCache.db files...
+echo.
+ie4uinit.exe -show
+taskkill /IM explorer.exe /F
+If exist del /A /F /Q "%iconcache%"
+If exist del /A /F /Q "%iconcache_x%"
+start explorer.exe
+echo IconCache database files have been successfully deleted.
+echo.
+echo You will need to restart the PC to finish rebuilding your icon cache.
+CHOICE /C:YN /M "Do you want to restart the PC now?"
+IF ERRORLEVEL 2 goto no
+IF ERRORLEVEL 1 goto yes
+
+:yes
+shutdown /r /f /t 00
+
+:no
+exit
diff --git a/Fix edgegdi.dll.bat b/Fix edgegdi.dll.cmd
similarity index 97%
rename from Fix edgegdi.dll.bat
rename to Fix edgegdi.dll.cmd
index 16cb899dd787f89bc50739b19ff9ece4ffe9d918..01ad5f527e33e0b6832aa92bb7d1fc5e0b7dea80 100644
--- a/Fix edgegdi.dll.bat	
+++ b/Fix edgegdi.dll.cmd	
@@ -1,44 +1,44 @@
-@echo off
-REM Ensure Admin rights
-setlocal DisableDelayedExpansion
-set "batchPath=%~0"
-for %%k in (%0) do set batchName=%%~nk
-set "vbsGetPrivileges=%temp%\OEgetPriv_%batchName%.vbs"
-setlocal EnableDelayedExpansion
-net file 1>nul 2>nul
-if '%errorlevel%' == '0' (goto gotPrivileges) else (goto getPrivileges)
-
-:getPrivileges
-if '%1'=='ELEV' (echo ELEV & shift /1 & goto gotPrivileges)
-REM If you have non-ASCII chars in your path you'll need to set the codepage appropriate to your locale:
-REM chcp 1252
-REM (ANSI-Latin1 - Western European, e.g. German)
-cls
-echo Set UAC = CreateObject^("Shell.Application"^) > "%vbsGetPrivileges%"
-echo args = "ELEV " >> "%vbsGetPrivileges%"
-echo For Each strArg in WScript.Arguments >> "%vbsGetPrivileges%"
-echo args = args ^& strArg ^& " " >> "%vbsGetPrivileges%"
-echo Next >> "%vbsGetPrivileges%"
-echo UAC.ShellExecute "!batchPath!", args, "", "runas", 1 >> "%vbsGetPrivileges%"
-"%SystemRoot%\System32\WScript.exe" "%vbsGetPrivileges%" %*
-exit
-
-:gotPrivileges
-if '%1'=='ELEV' (del "%vbsGetPrivileges%" 1>nul 2>nul & shift /1)
-
-
-REM Functional part
-robocopy "C:\Windows\SysWOW64" "%localappdata%\Temp" EdgeManager.dll
-ren "%localappdata%\Temp\EdgeManager.dll" "edgegdi.dll"
-robocopy "%localappdata%\Temp" "C:\Windows\SysWOW64" "edgegdi.dll"
-del "%localappdata%\Temp\edgegdi.dll"
-
-
-robocopy "C:\Windows\System32" "%localappdata%\Temp" EdgeManager.dll
-ren "%localappdata%\Temp\EdgeManager.dll" "edgegdi.dll"
-robocopy "%localappdata%\Temp" "C:\Windows\System32" "edgegdi.dll"
-del "%localappdata%\Temp\edgegdi.dll"
-
-echo Done.
-pause
-exit
+@echo off
+REM Ensure Admin rights
+setlocal DisableDelayedExpansion
+set "batchPath=%~0"
+for %%k in (%0) do set batchName=%%~nk
+set "vbsGetPrivileges=%temp%\OEgetPriv_%batchName%.vbs"
+setlocal EnableDelayedExpansion
+net file 1>nul 2>nul
+if '%errorlevel%' == '0' (goto gotPrivileges) else (goto getPrivileges)
+
+:getPrivileges
+if '%1'=='ELEV' (echo ELEV & shift /1 & goto gotPrivileges)
+REM If you have non-ASCII chars in your path you'll need to set the codepage appropriate to your locale:
+REM chcp 1252
+REM (ANSI-Latin1 - Western European, e.g. German)
+cls
+echo Set UAC = CreateObject^("Shell.Application"^) > "%vbsGetPrivileges%"
+echo args = "ELEV " >> "%vbsGetPrivileges%"
+echo For Each strArg in WScript.Arguments >> "%vbsGetPrivileges%"
+echo args = args ^& strArg ^& " " >> "%vbsGetPrivileges%"
+echo Next >> "%vbsGetPrivileges%"
+echo UAC.ShellExecute "!batchPath!", args, "", "runas", 1 >> "%vbsGetPrivileges%"
+"%SystemRoot%\System32\WScript.exe" "%vbsGetPrivileges%" %*
+exit
+
+:gotPrivileges
+if '%1'=='ELEV' (del "%vbsGetPrivileges%" 1>nul 2>nul & shift /1)
+
+
+REM Functional part
+robocopy "C:\Windows\SysWOW64" "%localappdata%\Temp" EdgeManager.dll
+ren "%localappdata%\Temp\EdgeManager.dll" "edgegdi.dll"
+robocopy "%localappdata%\Temp" "C:\Windows\SysWOW64" "edgegdi.dll"
+del "%localappdata%\Temp\edgegdi.dll"
+
+
+robocopy "C:\Windows\System32" "%localappdata%\Temp" EdgeManager.dll
+ren "%localappdata%\Temp\EdgeManager.dll" "edgegdi.dll"
+robocopy "%localappdata%\Temp" "C:\Windows\System32" "edgegdi.dll"
+del "%localappdata%\Temp\edgegdi.dll"
+
+echo Done.
+pause
+exit
diff --git a/Fix long login times.bat b/Fix long login times.cmd
similarity index 96%
rename from Fix long login times.bat
rename to Fix long login times.cmd
index b5807c31d7f969a24be89cd1716474e9b7d7c7e0..6e8364a5e44bf6280e3cf17e61f46eb1a7192ec4 100644
--- a/Fix long login times.bat	
+++ b/Fix long login times.cmd	
@@ -1,45 +1,45 @@
-@echo off
-REM Ensure Admin rights
-setlocal DisableDelayedExpansion
-set "batchPath=%~0"
-for %%k in (%0) do set batchName=%%~nk
-set "vbsGetPrivileges=%temp%\OEgetPriv_%batchName%.vbs"
-setlocal EnableDelayedExpansion
-net file 1>nul 2>nul
-if '%errorlevel%' == '0' (goto gotPrivileges) else (goto getPrivileges)
-
-:getPrivileges
-if '%1'=='ELEV' (echo ELEV & shift /1 & goto gotPrivileges)
-REM If you have non-ASCII chars in your path you'll need to set the codepage appropriate to your locale:
-REM chcp 1252
-REM (ANSI-Latin1 - Western European, e.g. German)
-cls
-echo Set UAC = CreateObject^("Shell.Application"^) > "%vbsGetPrivileges%"
-echo args = "ELEV " >> "%vbsGetPrivileges%"
-echo For Each strArg in WScript.Arguments >> "%vbsGetPrivileges%"
-echo args = args ^& strArg ^& " " >> "%vbsGetPrivileges%"
-echo Next >> "%vbsGetPrivileges%"
-echo UAC.ShellExecute "!batchPath!", args, "", "runas", 1 >> "%vbsGetPrivileges%"
-"%SystemRoot%\System32\WScript.exe" "%vbsGetPrivileges%" %*
-exit
-
-:gotPrivileges
-if '%1'=='ELEV' (del "%vbsGetPrivileges%" 1>nul 2>nul & shift /1)
-
-
-REM Functional part
-pushd "C:\Users" && (
-for /f "tokens=*" %%a in ('dir /A:D /b') do (
- if not "%%a" == "Public" if not "%%a" == "All Users" if not "%%a" == "Default User" (
- pushd "C:\Users\%%a\AppData\Local\Microsoft\Windows" && (
-  rd /s /q WebCache
-  del /q /f WebCacheLock.dat
-)
- popd
-)
-)
-popd
-)
-echo Done.
-pause
-exit
+@echo off
+REM Ensure Admin rights
+setlocal DisableDelayedExpansion
+set "batchPath=%~0"
+for %%k in (%0) do set batchName=%%~nk
+set "vbsGetPrivileges=%temp%\OEgetPriv_%batchName%.vbs"
+setlocal EnableDelayedExpansion
+net file 1>nul 2>nul
+if '%errorlevel%' == '0' (goto gotPrivileges) else (goto getPrivileges)
+
+:getPrivileges
+if '%1'=='ELEV' (echo ELEV & shift /1 & goto gotPrivileges)
+REM If you have non-ASCII chars in your path you'll need to set the codepage appropriate to your locale:
+REM chcp 1252
+REM (ANSI-Latin1 - Western European, e.g. German)
+cls
+echo Set UAC = CreateObject^("Shell.Application"^) > "%vbsGetPrivileges%"
+echo args = "ELEV " >> "%vbsGetPrivileges%"
+echo For Each strArg in WScript.Arguments >> "%vbsGetPrivileges%"
+echo args = args ^& strArg ^& " " >> "%vbsGetPrivileges%"
+echo Next >> "%vbsGetPrivileges%"
+echo UAC.ShellExecute "!batchPath!", args, "", "runas", 1 >> "%vbsGetPrivileges%"
+"%SystemRoot%\System32\WScript.exe" "%vbsGetPrivileges%" %*
+exit
+
+:gotPrivileges
+if '%1'=='ELEV' (del "%vbsGetPrivileges%" 1>nul 2>nul & shift /1)
+
+
+REM Functional part
+pushd "C:\Users" && (
+for /f "tokens=*" %%a in ('dir /A:D /b') do (
+ if not "%%a" == "Public" if not "%%a" == "All Users" if not "%%a" == "Default User" (
+ pushd "C:\Users\%%a\AppData\Local\Microsoft\Windows" && (
+  rd /s /q WebCache
+  del /q /f WebCacheLock.dat
+)
+ popd
+)
+)
+popd
+)
+echo Done.
+pause
+exit
diff --git a/Fix printer installation error 0x00000bcb.bat b/Fix printer installation error 0x00000bcb.cmd
similarity index 100%
rename from Fix printer installation error 0x00000bcb.bat
rename to Fix printer installation error 0x00000bcb.cmd
diff --git a/Fix printer not install- and selectable.bat b/Fix printer not install- and selectable.cmd
similarity index 96%
rename from Fix printer not install- and selectable.bat
rename to Fix printer not install- and selectable.cmd
index 373be57753deb20f4e13b63ff5cfb87604cbc6d1..15e6776ca4e5491d3e71841aba56b203be630f7d 100644
--- a/Fix printer not install- and selectable.bat	
+++ b/Fix printer not install- and selectable.cmd	
@@ -1,40 +1,40 @@
-@echo off
-REM Ensure Admin rights
-setlocal DisableDelayedExpansion
-set "batchPath=%~0"
-for %%k in (%0) do set batchName=%%~nk
-set "vbsGetPrivileges=%temp%\OEgetPriv_%batchName%.vbs"
-setlocal EnableDelayedExpansion
-net file 1>nul 2>nul
-if '%errorlevel%' == '0' (goto gotPrivileges) else (goto getPrivileges)
-
-:getPrivileges
-if '%1'=='ELEV' (echo ELEV & shift /1 & goto gotPrivileges)
-REM If you have non-ASCII chars in your path you'll need to set the codepage appropriate to your locale:
-REM chcp 1252
-REM (ANSI-Latin1 - Western European, e.g. German)
-cls
-echo Set UAC = CreateObject^("Shell.Application"^) > "%vbsGetPrivileges%"
-echo args = "ELEV " >> "%vbsGetPrivileges%"
-echo For Each strArg in WScript.Arguments >> "%vbsGetPrivileges%"
-echo args = args ^& strArg ^& " " >> "%vbsGetPrivileges%"
-echo Next >> "%vbsGetPrivileges%"
-echo UAC.ShellExecute "!batchPath!", args, "", "runas", 1 >> "%vbsGetPrivileges%"
-"%SystemRoot%\System32\WScript.exe" "%vbsGetPrivileges%" %*
-exit
-
-:gotPrivileges
-if '%1'=='ELEV' (del "%vbsGetPrivileges%" 1>nul 2>nul & shift /1)
-
-
-REM Functional part
-net stop spooler
-pushd "%~dp0\ScriptFiles\PrinterNotInstallable" && (
-reg import "Printer Spooler Registry.reg"
-robocopy spool C:\Windows\System32\spool *
-)
-popd
-net start spooler
-echo Done.
-pause
-exit
+@echo off
+REM Ensure Admin rights
+setlocal DisableDelayedExpansion
+set "batchPath=%~0"
+for %%k in (%0) do set batchName=%%~nk
+set "vbsGetPrivileges=%temp%\OEgetPriv_%batchName%.vbs"
+setlocal EnableDelayedExpansion
+net file 1>nul 2>nul
+if '%errorlevel%' == '0' (goto gotPrivileges) else (goto getPrivileges)
+
+:getPrivileges
+if '%1'=='ELEV' (echo ELEV & shift /1 & goto gotPrivileges)
+REM If you have non-ASCII chars in your path you'll need to set the codepage appropriate to your locale:
+REM chcp 1252
+REM (ANSI-Latin1 - Western European, e.g. German)
+cls
+echo Set UAC = CreateObject^("Shell.Application"^) > "%vbsGetPrivileges%"
+echo args = "ELEV " >> "%vbsGetPrivileges%"
+echo For Each strArg in WScript.Arguments >> "%vbsGetPrivileges%"
+echo args = args ^& strArg ^& " " >> "%vbsGetPrivileges%"
+echo Next >> "%vbsGetPrivileges%"
+echo UAC.ShellExecute "!batchPath!", args, "", "runas", 1 >> "%vbsGetPrivileges%"
+"%SystemRoot%\System32\WScript.exe" "%vbsGetPrivileges%" %*
+exit
+
+:gotPrivileges
+if '%1'=='ELEV' (del "%vbsGetPrivileges%" 1>nul 2>nul & shift /1)
+
+
+REM Functional part
+net stop spooler
+pushd "%~dp0\ScriptFiles\PrinterNotInstallable" && (
+reg import "Printer Spooler Registry.reg"
+robocopy spool C:\Windows\System32\spool *
+)
+popd
+net start spooler
+echo Done.
+pause
+exit
diff --git a/Fix prompt for password change.bat b/Fix prompt for password change.cmd
similarity index 100%
rename from Fix prompt for password change.bat
rename to Fix prompt for password change.cmd
diff --git a/Fix search and settings.bat b/Fix search and settings.cmd
similarity index 100%
rename from Fix search and settings.bat
rename to Fix search and settings.cmd
diff --git a/Fix work file not createable.bat b/Fix work file not createable.cmd
similarity index 100%
rename from Fix work file not createable.bat
rename to Fix work file not createable.cmd
diff --git a/README.md b/README.md
index 372cfe8e02e37731c6fccb0bdb7d8b01c0491a10..35d74da5a5632dbbe9d6986811f92a54a1491c88 100644
--- a/README.md
+++ b/README.md
@@ -3,15 +3,15 @@ A collection of scripts to fix various errors cropping up in Windows.\
 These are made for running via double-clicking the scripts in file explorer.
 
 * `Disable Cortana & start menu Bing search.reg` disables the use of Cortana and the start menu searching on the internet via Bing for all users.
-* `Fix Outlook Temp folder.bat` empties the Temp folder of MS Office Outlook to fix it filling up the main harddrive.
-* `Fix blank icons` fixes desktop icons appearing as blank white rectangles instead of their usual icon. Adapted from the [ElevenForums](https://www.elevenforum.com/t/rebuild-icon-cache-in-windows-11.2049/) [[Archived link](https://web.archive.org/web/20211017173532/https://www.elevenforum.com/t/rebuild-icon-cache-in-windows-11.2049/)]
-* `Fix edgegdi.dll.bat` fixes the `edgegdi.dll` not being available for certain tasks, leading to errors thrown.
-* `Fix long login times.bat` deletes `WebCache`and `WebCacheLock.dat` on all normal users to fix unbearable login times after installing windows through a custom made image.
-* `Fix printer installation error 0x00000bcb.bat` adds a temporary registry hack to fix error 0x00000bcb during printer install, then removes it again afterwards.
-* `Fix printer not install- and selectable.bat` fixes a problem where no printer can be selected or even installed, caused by corrupted files.
-* `Fix prompt for password change.bat` disables the prompting for a password change when using a Microsoft account.
-* `Fix search and settings.bat` fixes the windows search and the settings app not starting up correctly and freezing.
+* `Fix Outlook Temp folder.cmd` empties the Temp folder of MS Office Outlook to fix it filling up the main harddrive.
+* `Fix blank icons.cmd` fixes desktop icons appearing as blank white rectangles instead of their usual icon. Adapted from the [ElevenForums](https://www.elevenforum.com/t/rebuild-icon-cache-in-windows-11.2049/) [[Archived link](https://web.archive.org/web/20211017173532/https://www.elevenforum.com/t/rebuild-icon-cache-in-windows-11.2049/)]
+* `Fix edgegdi.dll.cmd` fixes the `edgegdi.dll` not being available for certain tasks, leading to errors thrown.
+* `Fix long login times.cmd` deletes `WebCache`and `WebCacheLock.dat` on all normal users to fix unbearable login times after installing windows through a custom made image.
+* `Fix printer installation error 0x00000bcb.cmd` adds a temporary registry hack to fix error 0x00000bcb during printer install, then removes it again afterwards.
+* `Fix printer not install- and selectable.cmd` fixes a problem where no printer can be selected or even installed, caused by corrupted files.
+* `Fix prompt for password change.cmd` disables the prompting for a password change when using a Microsoft account.
+* `Fix search and settings.cmd` fixes the windows search and the settings app not starting up correctly and freezing.
 * `Fix winmail.dat - Disable RTF & TNEF.reg` fixes the receiver of an email getting a `winmail.dat` file as attachment instead of a normal file by introducing a registry fix to keep Outlook from ever sending emails in RTF format or TNEF encryption.
-* `Fix work file not createable.bat` fixes the "Could not create the work file" error in Office.
-* `Remove Java remains.bat` removes remains of a Java installation after uninstall.
-* `Windows activation helper.bat` shows you the product key of your current Windows installation to potentially resolve activation issues.
\ No newline at end of file
+* `Fix work file not createable.cmd` fixes the "Could not create the work file" error in Office.
+* `Remove Java remains.cmd` removes remains of a Java installation after uninstall.
+* `Windows activation helper.cmd` shows you the product key of your current Windows installation to potentially resolve activation issues.
\ No newline at end of file
diff --git a/Remove Java remains.bat b/Remove Java remains.cmd
similarity index 100%
rename from Remove Java remains.bat
rename to Remove Java remains.cmd
diff --git a/Windows activation helper.bat b/Windows activation helper.cmd
similarity index 96%
rename from Windows activation helper.bat
rename to Windows activation helper.cmd
index 140d58cf8f2bfe8a8d90e83dce7b54102d7eb0ea..cc1836f4b5de0dd45a895454f3acd5d2aaefe2cb 100644
--- a/Windows activation helper.bat	
+++ b/Windows activation helper.cmd	
@@ -1,5 +1,5 @@
-@echo off
-echo Input the following key at "Activate/Change Key":
-wmic path softwarelicensingservice get OA3xOriginalProductKey
-pause
-exit
+@echo off
+echo Input the following key at "Activate/Change Key":
+wmic path softwarelicensingservice get OA3xOriginalProductKey
+pause
+exit