From 797daa23a16bcd4fbf7a0c95cd8171e77460b5af Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Sun, 13 Nov 2022 22:12:39 +0100
Subject: [PATCH] normal Users ... #61

---
 optional/install-antivir.cmd         |  47 +--
 optional/install-ausweisapp2.cmd     |  59 ++--
 optional/install-bluejeans.cmd       |  67 ++---
 optional/install-citrixworkspace.cmd |  55 ++--
 optional/install-dbbrowser.cmd       |  55 ++--
 optional/install-emclient.cmd        |  87 +++---
 optional/install-horizon.cmd         |  39 +--
 optional/install-inkscape.cmd        |  61 ++--
 optional/install-iview.cmd           |  61 ++--
 optional/install-java.cmd            |  39 +--
 optional/install-keepass2.cmd        |  49 ++--
 optional/install-moneyplex.cmd       |  69 ++---
 optional/install-motorescue.cmd      |  65 ++--
 optional/install-obsstudio.cmd       |  55 ++--
 optional/install-openvpn.cmd         | 113 +++----
 optional/install-pdf24.cmd           |  69 ++---
 optional/install-purebasic.cmd       | 155 +++++-----
 optional/install-python2.cmd         |  45 +--
 optional/install-seafile.cmd         |  73 ++---
 optional/install-sharemouse.cmd      |  49 ++--
 optional/install-softmaker.cmd       | 279 +++++++++---------
 optional/install-sonos2.cmd          |  55 ++--
 optional/install-spotify.cmd         |  41 +--
 optional/install-steam.cmd           |  55 ++--
 optional/install-teams.cmd           |  46 +--
 optional/install-telegram.cmd        |  58 ++--
 optional/install-totalcommander.cmd  |  79 ++---
 optional/install-vcesimulator.cmd    |  53 ++--
 optional/install-virtualbox.cmd      |  79 ++---
 optional/install-vscode.cmd          |  97 +++---
 optional/install-xojo.cmd            |  49 ++--
 optional/uninstall-store.ps1         |   1 +
 optional/uninstall-telemetry.cmd     | 423 ++++++++++++++-------------
 optional/unpack-hakchi2.cmd          |  58 ++--
 optional/unpack-mame.cmd             |  80 ++---
 optional/unpack-snapcontrol.cmd      |  46 +--
 optional/unpack-winauth.cmd          |  52 ++--
 tools/check-for-admin.cmd            |   2 +-
 38 files changed, 1446 insertions(+), 1419 deletions(-)

diff --git a/optional/install-antivir.cmd b/optional/install-antivir.cmd
index 79d40fd..c1e91a8 100644
--- a/optional/install-antivir.cmd
+++ b/optional/install-antivir.cmd
@@ -1,23 +1,24 @@
-@echo off
-
-set EXE=..\software\F-SecureNetworkInstaller-AV_AVTR20F930_.exe
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing F-Secure Anti-Virus ...
-start /wait %EXE%
-
-echo removing F-Secure desktop link ...
-del /F "%PUBLIC%\Desktop\F-Secure Anti-Virus.lnk" 2>nul
-
-rem refresh desktop (W10 style)
-ie4uinit.exe -show
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set EXE=..\software\F-SecureNetworkInstaller-AV_AVTR20F930_.exe
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing F-Secure Anti-Virus ...
+start /wait %EXE%
+
+echo removing F-Secure desktop link ...
+del /F "%PUBLIC%\Desktop\F-Secure Anti-Virus.lnk" 2>nul
+
+rem refresh desktop (W10 style)
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-ausweisapp2.cmd b/optional/install-ausweisapp2.cmd
index 4a3e27c..ad690dc 100644
--- a/optional/install-ausweisapp2.cmd
+++ b/optional/install-ausweisapp2.cmd
@@ -1,29 +1,30 @@
-@echo off
-
-set OPT=..\optional
-set SOFTWARE=..\software
-set MSI=ausweisapp2-setup.msi
-
-if NOT EXIST %SOFTWARE%\%MSI% (
-  echo ERROR: %SOFTWARE%\%MSI% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing Ausweisapp 2 ...
-cd %SOFTWARE%
-@echo on
-msiexec /i %MSI% /quiet
-@echo off
-cd %OPT%
-
-echo removing Ausweisapp2 Desktop icon ...
-del /F /Q  %PUBLIC%\Desktop\AusweisApp2.lnk 2>nul
-
-rem refresh desktop (W10 style)
-ie4uinit.exe -show
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set OPT=..\optional
+set SOFTWARE=..\software
+set MSI=ausweisapp2-setup.msi
+
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing Ausweisapp 2 ...
+cd %SOFTWARE%
+@echo on
+msiexec /i %MSI% /quiet
+@echo off
+cd %OPT%
+
+echo removing Ausweisapp2 Desktop icon ...
+del /F /Q  %PUBLIC%\Desktop\AusweisApp2.lnk 2>nul
+
+rem refresh desktop (W10 style)
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-bluejeans.cmd b/optional/install-bluejeans.cmd
index 8fa9485..218d1c3 100644
--- a/optional/install-bluejeans.cmd
+++ b/optional/install-bluejeans.cmd
@@ -1,33 +1,34 @@
-@echo off
-
-set OPT=..\optional
-set SOFTWARE=..\software
-set MSI=bluejeans-setup.msi
-
-if NOT EXIST %SOFTWARE%\%MSI% (
-  echo ERROR: %SOFTWARE%\%MSI% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing Verizon BlueJeans ...
-cd %SOFTWARE%
-@echo on
-msiexec /i %MSI% INSTALLAUDIODRIVER=1 INSTALLUPDATESVC=0 LAUNCHAFTERINSTALL=0 /q
-@echo off
-cd %OPT%
-
-echo removing Desktop icon ...
-del /F "%USERPROFILE%\Desktop\BlueJeans.lnk" 2>nul
-
-echo removing autostart for BlueJeans-Client ...
-reg delete "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" ^
-  /v "BlueJeans.Detector" /f
-
-echo refreshing desktop (W10 style) ...
-ie4uinit.exe -show
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set OPT=..\optional
+set SOFTWARE=..\software
+set MSI=bluejeans-setup.msi
+
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing Verizon BlueJeans ...
+cd %SOFTWARE%
+@echo on
+msiexec /i %MSI% INSTALLAUDIODRIVER=1 INSTALLUPDATESVC=0 LAUNCHAFTERINSTALL=0 /q
+@echo off
+cd %OPT%
+
+echo removing Desktop icon ...
+del /F "%USERPROFILE%\Desktop\BlueJeans.lnk" 2>nul
+
+echo removing autostart for BlueJeans-Client ...
+reg delete "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" ^
+  /v "BlueJeans.Detector" /f
+
+echo refreshing desktop (W10 style) ...
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-citrixworkspace.cmd b/optional/install-citrixworkspace.cmd
index 7e1d322..c52a194 100644
--- a/optional/install-citrixworkspace.cmd
+++ b/optional/install-citrixworkspace.cmd
@@ -1,27 +1,28 @@
-@echo off
-
-set EXE=..\software\citrixworkspace-setup.exe
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  echo GOTO: https://www.citrix.com/de-de/downloads/workspace-app/workspace-app-for-windows-long-term-service-release 
-  echo and save the file as "citrixworkspace-setup.exe" in folder "software" !
-  pause
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing Citrix Workspace LTS ...
-start /wait %EXE% /silent /noreboot /AutoUpdateCheck=disabled
-
-echo disabling autostart for Citrix Workspace ...
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\StartupApproved\Run32" ^
-  /v "ConnectionCenter" /d 0300000065d2d743d402d701 /t REG_BINARY /f
-
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\StartupApproved\Run32" ^
-  /v "Redirector" /d 030000005e06c842d402d701 /t REG_BINARY /f
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set EXE=..\software\citrixworkspace-setup.exe
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  echo GOTO: https://www.citrix.com/de-de/downloads/workspace-app/workspace-app-for-windows-long-term-service-release 
+  echo and save the file as "citrixworkspace-setup.exe" in folder "software" !
+  pause
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing Citrix Workspace LTS ...
+start /wait %EXE% /silent /noreboot /AutoUpdateCheck=disabled
+
+echo disabling autostart for Citrix Workspace ...
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\StartupApproved\Run32" ^
+  /v "ConnectionCenter" /d 0300000065d2d743d402d701 /t REG_BINARY /f
+
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\StartupApproved\Run32" ^
+  /v "Redirector" /d 030000005e06c842d402d701 /t REG_BINARY /f
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-dbbrowser.cmd b/optional/install-dbbrowser.cmd
index 0bae0cf..b9f3417 100644
--- a/optional/install-dbbrowser.cmd
+++ b/optional/install-dbbrowser.cmd
@@ -1,27 +1,28 @@
-@echo off
-
-set OPT=..\optional
-set SOFTWARE=..\software
-set MSI=dbbrowser-setup.msi
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-
-if NOT EXIST %SOFTWARE%\%MSI% (
-  echo ERROR: %SOFTWARE%\%MSI% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing DB-Browser ...
-cd %SOFTWARE%
-@echo on
-msiexec /i %MSI% /passive
-@echo off
-cd %OPT%
-
-echo copying startmenu shortcut ...
-copy /Y startmenu\SQLite-DBB.lnk %STARTMENU%
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set OPT=..\optional
+set SOFTWARE=..\software
+set MSI=dbbrowser-setup.msi
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing DB-Browser ...
+cd %SOFTWARE%
+@echo on
+msiexec /i %MSI% /passive
+@echo off
+cd %OPT%
+
+echo copying startmenu shortcut ...
+copy /Y startmenu\SQLite-DBB.lnk %STARTMENU%
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-emclient.cmd b/optional/install-emclient.cmd
index 7a348fc..e3c2c29 100644
--- a/optional/install-emclient.cmd
+++ b/optional/install-emclient.cmd
@@ -1,43 +1,44 @@
-@echo off
-
-set OPT=..\optional
-set SOFTWARE=..\software
-set MSI=emclient-setup.msi
-set EMSERVERIP=168.62.48.183
-
-if NOT EXIST %SOFTWARE%\%MSI% (
-  echo ERROR: %SOFTWARE%\%MSI% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing em-Client ...
-cd %SOFTWARE%
-@echo on
-msiexec /i %MSI% /quiet
-@echo off
-cd %OPT%
-
-echo removing autostart for em-Client ...
-reg delete "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" ^
-  /v "eM Client" /f
-
-taskkill /F /IM SystemSettings.exe 2>nul
-
-echo copying link to desktop ...
-copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\eM Client.lnk" ^
-  %PUBLIC%\Desktop
-
-echo refreshing desktop ...
-ie4uinit.exe -show
-
-echo disabling automatic updates via W10 firewall ...
-netsh advfirewall firewall delete rule name="block_emclient_updates" 2>nul
-netsh advfirewall firewall add rule name="block_emclient_updates" ^
-  dir=out action=block protocol=tcp localip=any remoteip=%EMSERVERIP% ^
-  remoteport=80,443 program="%ProgramFiles(x86)%\eM Client\MailClient.exe"
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set OPT=..\optional
+set SOFTWARE=..\software
+set MSI=emclient-setup.msi
+set EMSERVERIP=168.62.48.183
+
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing em-Client ...
+cd %SOFTWARE%
+@echo on
+msiexec /i %MSI% /quiet
+@echo off
+cd %OPT%
+
+echo removing autostart for em-Client ...
+reg delete "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" ^
+  /v "eM Client" /f
+
+taskkill /F /IM SystemSettings.exe 2>nul
+
+echo copying link to desktop ...
+copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\eM Client.lnk" ^
+  %PUBLIC%\Desktop
+
+echo refreshing desktop ...
+ie4uinit.exe -show
+
+echo disabling automatic updates via W10 firewall ...
+netsh advfirewall firewall delete rule name="block_emclient_updates" 2>nul
+netsh advfirewall firewall add rule name="block_emclient_updates" ^
+  dir=out action=block protocol=tcp localip=any remoteip=%EMSERVERIP% ^
+  remoteport=80,443 program="%ProgramFiles(x86)%\eM Client\MailClient.exe"
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-horizon.cmd b/optional/install-horizon.cmd
index 792365b..a78abfa 100644
--- a/optional/install-horizon.cmd
+++ b/optional/install-horizon.cmd
@@ -1,19 +1,20 @@
-@echo off
-
-set EXE=..\software\horizon-setup.exe
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-)
-
-echo ####### %0 #######
-
-echo installing VMware Horizon client ...
-start /wait %EXE% /silent /norestart AUTO_UPDATE_ENABLED=0
-
-echo installing Desktop shortcut ...
-move /Y "%PUBLIC%\Desktop\VMware Horizon Client.lnk" "%PUBLIC%\Desktop\Horizon.lnk"
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set EXE=..\software\horizon-setup.exe
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+)
+
+echo ####### %0 #######
+
+echo installing VMware Horizon client ...
+start /wait %EXE% /silent /norestart AUTO_UPDATE_ENABLED=0
+
+echo installing Desktop shortcut ...
+move /Y "%PUBLIC%\Desktop\VMware Horizon Client.lnk" "%PUBLIC%\Desktop\Horizon.lnk"
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-inkscape.cmd b/optional/install-inkscape.cmd
index 6c923bd..58cc2ea 100644
--- a/optional/install-inkscape.cmd
+++ b/optional/install-inkscape.cmd
@@ -1,30 +1,31 @@
-@echo off
-
-set EXE=..\software\inkscape-setup.exe
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo killing INKSCAPE processes...
-taskkill /F /IM inkscape.exe 2>nul
-
-echo installing INKSCAPE ...
-start /wait %EXE% /S
-
-echo moving Inkscape startmenu shortcut ...
-move /Y %STARTMENU%\"Inkscape\Inkscape.lnk" %STARTMENU%\Inkscape.lnk
-
-echo removing Inkscape startmenu folder ...
-rd /S /Q %STARTMENU%\"Inkscape" 2>nul
-
-echo installing Inkscape desktop shortcut ...
-copy /Y %STARTMENU%\"Inkscape.lnk" %PUBLIC%\Desktop 2>nul
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set EXE=..\software\inkscape-setup.exe
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo killing INKSCAPE processes...
+taskkill /F /IM inkscape.exe 2>nul
+
+echo installing INKSCAPE ...
+start /wait %EXE% /S
+
+echo moving Inkscape startmenu shortcut ...
+move /Y %STARTMENU%\"Inkscape\Inkscape.lnk" %STARTMENU%\Inkscape.lnk
+
+echo removing Inkscape startmenu folder ...
+rd /S /Q %STARTMENU%\"Inkscape" 2>nul
+
+echo installing Inkscape desktop shortcut ...
+copy /Y %STARTMENU%\"Inkscape.lnk" %PUBLIC%\Desktop 2>nul
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-iview.cmd b/optional/install-iview.cmd
index 1ac101f..50dc303 100644
--- a/optional/install-iview.cmd
+++ b/optional/install-iview.cmd
@@ -1,30 +1,31 @@
-@echo off
-
-set EXE=..\software\iview-setup.exe
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  echo GOTO: https://www.irfanview.com/64bit.htm
-  echo and save the file as "iview-setup.exe" in folder "software" !
-  pause
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing IrfanView ...
-start /wait %EXE% /silent /desktop=1 /thumbs=1 /folder="c:\iview" /group=1 /allusers=1 /assoc=1
-
-echo removing IrfanView startmenu folder ...
-rd /S /Q %STARTMENU%\"IrfanView" 2>nul
-
-echo moving IrfanView desktop links to Startmenu ...
-move /Y "%PUBLIC%\Desktop\IrfanView*.lnk" %STARTMENU%
-
-rem refresh desktop (W10 style)
-ie4uinit.exe -show
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set EXE=..\software\iview-setup.exe
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  echo GOTO: https://www.irfanview.com/64bit.htm
+  echo and save the file as "iview-setup.exe" in folder "software" !
+  pause
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing IrfanView ...
+start /wait %EXE% /silent /desktop=1 /thumbs=1 /folder="c:\iview" /group=1 /allusers=1 /assoc=1
+
+echo removing IrfanView startmenu folder ...
+rd /S /Q %STARTMENU%\"IrfanView" 2>nul
+
+echo moving IrfanView desktop links to Startmenu ...
+move /Y "%PUBLIC%\Desktop\IrfanView*.lnk" %STARTMENU%
+
+rem refresh desktop (W10 style)
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-java.cmd b/optional/install-java.cmd
index d255b00..ad3f38b 100644
--- a/optional/install-java.cmd
+++ b/optional/install-java.cmd
@@ -1,19 +1,20 @@
-@echo off
-
-set CONFIG=config\install-java.txt
-set EXE=..\software\java-setup.exe
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing JAVA ...
-start /wait %EXE% INSTALL_SILENT=Enable AUTO_UPDATE=0 NOSTARTMENU=1 REBOOT=0 ^
-  INSTALLDIR="%ProgramFiles%\java"
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set CONFIG=config\install-java.txt
+set EXE=..\software\java-setup.exe
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing JAVA ...
+start /wait %EXE% INSTALL_SILENT=Enable AUTO_UPDATE=0 NOSTARTMENU=1 REBOOT=0 ^
+  INSTALLDIR="%ProgramFiles%\java"
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-keepass2.cmd b/optional/install-keepass2.cmd
index 3c6d16f..29bd7be 100644
--- a/optional/install-keepass2.cmd
+++ b/optional/install-keepass2.cmd
@@ -1,24 +1,25 @@
-@echo off
-
-set CONFIG=config\install-keepass2.txt
-set EXE=..\software\keepass2-setup.exe
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo killing KeePass 2 process ...
-taskkill /F /IM KeePass.exe 2>nul
-
-echo installing KeePass 2 ...
-start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
-
-rem refresh desktop (W10 style)
-ie4uinit.exe -show
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set CONFIG=config\install-keepass2.txt
+set EXE=..\software\keepass2-setup.exe
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo killing KeePass 2 process ...
+taskkill /F /IM KeePass.exe 2>nul
+
+echo installing KeePass 2 ...
+start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
+
+rem refresh desktop (W10 style)
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-moneyplex.cmd b/optional/install-moneyplex.cmd
index fb03c2f..079167a 100644
--- a/optional/install-moneyplex.cmd
+++ b/optional/install-moneyplex.cmd
@@ -1,34 +1,35 @@
-@echo off
-
-set CONFIG=config\install-moneyxplex.txt
-set EXE=..\software\moneyplex-setup.exe
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo killing moneyplex processes...
-taskkill /F /IM moneyplex.exe 2>nul
-
-echo installing moneyplex ...
-start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
-
-echo moving moneyplex startmenu shortcut ...
-move /Y %STARTMENU%\"moneyplex\moneyplex.lnk" %STARTMENU%\"MoneyPlex.lnk"
-
-echo removing moneyplex startmenu folder ...
-rd /S /Q %STARTMENU%\"moneyplex" 2>nul
-
-echo renaming moneyplex icon on desktop ...
-move /Y "%PUBLIC%\Desktop\moneyplex.lnk" "%PUBLIC%\Desktop\MoneyPlex.lnk"
-
-rem refresh desktop (W10 style)
-ie4uinit.exe -show
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set CONFIG=config\install-moneyxplex.txt
+set EXE=..\software\moneyplex-setup.exe
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo killing moneyplex processes...
+taskkill /F /IM moneyplex.exe 2>nul
+
+echo installing moneyplex ...
+start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
+
+echo moving moneyplex startmenu shortcut ...
+move /Y %STARTMENU%\"moneyplex\moneyplex.lnk" %STARTMENU%\"MoneyPlex.lnk"
+
+echo removing moneyplex startmenu folder ...
+rd /S /Q %STARTMENU%\"moneyplex" 2>nul
+
+echo renaming moneyplex icon on desktop ...
+move /Y "%PUBLIC%\Desktop\moneyplex.lnk" "%PUBLIC%\Desktop\MoneyPlex.lnk"
+
+rem refresh desktop (W10 style)
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-motorescue.cmd b/optional/install-motorescue.cmd
index 7aa0340..a19e719 100644
--- a/optional/install-motorescue.cmd
+++ b/optional/install-motorescue.cmd
@@ -1,32 +1,33 @@
-@echo off
-
-set EXE=..\software\motorescue-setup.exe
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-set STARTMENU_USER=%APPDATA%\"Microsoft\Windows\Start Menu\Programs"
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  pause
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing Motorola/Lenovo Smart Assistant ...
-start /wait %EXE%
-
-echo removing Desktop icon ...
-del /F "%USERPROFILE%\Desktop\Rescue and Smart Assistant.lnk" 2>nul
-
-echo moving Smart Assistant startmenu shortcut ...
-move /Y %STARTMENU_USER%\"Lenovo\Rescue and Smart Assistant.lnk" %STARTMENU%\"Lenovo Smart Assistant.lnk"
-
-echo removing Smart Assistant startmenu folder ...
-rd /S /Q %STARTMENU_USER%\"Lenovo" 2>nul
-
-echo refreshing desktop (W10 style) ...
-ie4uinit.exe -show
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set EXE=..\software\motorescue-setup.exe
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+set STARTMENU_USER=%APPDATA%\"Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  pause
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing Motorola/Lenovo Smart Assistant ...
+start /wait %EXE%
+
+echo removing Desktop icon ...
+del /F "%USERPROFILE%\Desktop\Rescue and Smart Assistant.lnk" 2>nul
+
+echo moving Smart Assistant startmenu shortcut ...
+move /Y %STARTMENU_USER%\"Lenovo\Rescue and Smart Assistant.lnk" %STARTMENU%\"Lenovo Smart Assistant.lnk"
+
+echo removing Smart Assistant startmenu folder ...
+rd /S /Q %STARTMENU_USER%\"Lenovo" 2>nul
+
+echo refreshing desktop (W10 style) ...
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-obsstudio.cmd b/optional/install-obsstudio.cmd
index 6155e3f..183d5fe 100644
--- a/optional/install-obsstudio.cmd
+++ b/optional/install-obsstudio.cmd
@@ -1,27 +1,28 @@
-@echo off
-
-set EXE=..\software\obsstudio-setup.exe
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  pause
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing OBS Studio ...
-start /wait %EXE% /S
-
-echo moving OBS Studio startmenu shortcut ...
-move /Y %STARTMENU%\"OBS Studio\OBS*.lnk" %STARTMENU%
-
-echo removing OBS Studio startmenu folder ...
-rd /S /Q %STARTMENU%\"OBS Studio" 2>nul
-
-echo refreshing desktop (W10 style) ...
-ie4uinit.exe -show
-
-echo ####### %0 #######
-pause
+@echo off
+call check-for-admin
+
+set EXE=..\software\obsstudio-setup.exe
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  pause
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing OBS Studio ...
+start /wait %EXE% /S
+
+echo moving OBS Studio startmenu shortcut ...
+move /Y %STARTMENU%\"OBS Studio\OBS*.lnk" %STARTMENU%
+
+echo removing OBS Studio startmenu folder ...
+rd /S /Q %STARTMENU%\"OBS Studio" 2>nul
+
+echo refreshing desktop (W10 style) ...
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
diff --git a/optional/install-openvpn.cmd b/optional/install-openvpn.cmd
index e652527..f8d11ce 100644
--- a/optional/install-openvpn.cmd
+++ b/optional/install-openvpn.cmd
@@ -1,56 +1,57 @@
-@echo off
-
-set OPT=..\optional
-set SOFTWARE=..\software
-set MSI=openvpn-setup.msi
-set SETTINGS=..\personal\settings.cmd
-set openvpn_configfile=configfile
-set capicli="%ProgramFiles(x86)%\OpenVPN Technologies\OpenVPN Client\core\capicli.exe"
-
-if NOT EXIST %SOFTWARE%\%MSI% (
-  echo ERROR: %SOFTWARE%\%MSI% not found!
-  exit /b
-)
-
-rem ===================
-rem CONFIGFILE CHECK
-rem ===================
-
-if NOT EXIST %SETTINGS% (
-  echo.
-  echo WARNING: %SETTINGS% NOT FOUND
-  echo.
-) else (
-  call %SETTINGS%
-)
-
-
-echo ####### %0 #######
-
-echo installing OpenVPN ...
-cd %SOFTWARE%
-@echo on
-msiexec /i %MSI% /q
-@echo off
-cd %OPT%
-
-echo removing Desktop icon ...
-del /F "%PUBLIC%\Desktop\OpenVPN Connect.lnk" 2>nul
-
-echo refreshing desktop (W10 style) ...
-ie4uinit.exe -show
-
-echo sleep 5 seconds ...
-ping 127.0.0.1 -n 5 > NUL 2>&1
-
-rem install configfile from folder personal ...
-if EXIST ..\personal\%openvpn_configfile% (
-  echo importing OpenVPN configfile ...
-  %capicli% -f ..\personal\%openvpn_configfile% ImportProfile
-) else (
-  echo no configfile found!
-)
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set OPT=..\optional
+set SOFTWARE=..\software
+set MSI=openvpn-setup.msi
+set SETTINGS=..\personal\settings.cmd
+set openvpn_configfile=configfile
+set capicli="%ProgramFiles(x86)%\OpenVPN Technologies\OpenVPN Client\core\capicli.exe"
+
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
+
+rem ===================
+rem CONFIGFILE CHECK
+rem ===================
+
+if NOT EXIST %SETTINGS% (
+  echo.
+  echo WARNING: %SETTINGS% NOT FOUND
+  echo.
+) else (
+  call %SETTINGS%
+)
+
+
+echo ####### %0 #######
+
+echo installing OpenVPN ...
+cd %SOFTWARE%
+@echo on
+msiexec /i %MSI% /q
+@echo off
+cd %OPT%
+
+echo removing Desktop icon ...
+del /F "%PUBLIC%\Desktop\OpenVPN Connect.lnk" 2>nul
+
+echo refreshing desktop (W10 style) ...
+ie4uinit.exe -show
+
+echo sleep 5 seconds ...
+ping 127.0.0.1 -n 5 > NUL 2>&1
+
+rem install configfile from folder personal ...
+if EXIST ..\personal\%openvpn_configfile% (
+  echo importing OpenVPN configfile ...
+  %capicli% -f ..\personal\%openvpn_configfile% ImportProfile
+) else (
+  echo no configfile found!
+)
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-pdf24.cmd b/optional/install-pdf24.cmd
index 33b61d2..f691f8b 100644
--- a/optional/install-pdf24.cmd
+++ b/optional/install-pdf24.cmd
@@ -1,34 +1,35 @@
-@echo off
-
-set OPT=..\optional
-set SOFTWARE=..\software
-set MSI=pdf24-setup.msi
-set CONFIG=config\pdf24.reg
-
-if NOT EXIST %SOFTWARE%\%MSI% (
-  echo ERROR: %SOFTWARE%\%MSI% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing PDF24 ...
-cd %SOFTWARE%
-@echo on
-msiexec /i %MSI% /q
-@echo off
-cd %OPT%
-
-echo tweaking PDF24 ...
-reg import %CONFIG%
-
-echo removing Desktop icons ...
-del /F "%PUBLIC%\Desktop\PDF24.lnk" 2>nul
-del /F "%USERPROFILE%\Desktop\Online PDF Tools.url" 2>nul
-
-echo refreshing desktop (W10 style) ...
-ie4uinit.exe -show
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set OPT=..\optional
+set SOFTWARE=..\software
+set MSI=pdf24-setup.msi
+set CONFIG=config\pdf24.reg
+
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing PDF24 ...
+cd %SOFTWARE%
+@echo on
+msiexec /i %MSI% /q
+@echo off
+cd %OPT%
+
+echo tweaking PDF24 ...
+reg import %CONFIG%
+
+echo removing Desktop icons ...
+del /F "%PUBLIC%\Desktop\PDF24.lnk" 2>nul
+del /F "%USERPROFILE%\Desktop\Online PDF Tools.url" 2>nul
+
+echo refreshing desktop (W10 style) ...
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-purebasic.cmd b/optional/install-purebasic.cmd
index c44e741..f6ad5da 100644
--- a/optional/install-purebasic.cmd
+++ b/optional/install-purebasic.cmd
@@ -1,77 +1,78 @@
-@echo off
-set T=c:\TEMP
-set TOOLS=c:\tools
-
-set CONFIG=config\install-purebasic.txt
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-
-rem licensed version (exe contains key!)
-rem access only for customers ...
-set EXE=..\company\purebasic-setup.exe
-
-rem demo version (publically accessible)
-set ZIP=..\software\purebasic.zip
-
-echo killing PureBasic processes...
-taskkill /F /IM PureBasic.exe 2>nul
-taskkill /F /IM pbcompiler.exe 2>nul
-
-rem YES - this works. It is a "AND" construct...
-if NOT EXIST %EXE% if NOT EXIST %ZIP% (
-  echo WARNING: no PureBasic zipfile or exe-installer found!
-  goto END
-)
-
-echo ####### %0 #######
-
-if EXIST %EXE% (
-  echo INFO: %EXE% found, installing licensed version ...
-
-  rem remove old links ...
-  del /F /Q /A %PUBLIC%\Desktop\PureBasic*.lnk 2>nul
-
-  echo installing purebasic ...
-  start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL ^
-    /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
-  goto LINK
-)
-
-if EXIST %ZIP% (
-  echo INFO: %ZIP% found, installing demo version ...
-
-  rem remove old links ...
-  del /F /Q /A %PUBLIC%\Desktop\PureBasic*.lnk 2>nul
-
-  %TOOLS%\7z e -y -aoa -o%T%\purebasic %ZIP%
-  move /Y %T%\purebasic\PureBasic*.exe %T%\purebasic\purebasic-setup.exe
-
-  echo installing purebasic ...
-  start /wait %T%\purebasic\purebasic-setup.exe ^
-    /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
-
-  echo cleanup ...
-  rd /S /Q %T%\purebasic 2>nul  
-  goto LINK
-)
-
-:LINK
-rem remove personal link ...
-del /F /Q /A %USERPROFILE%\Desktop\PureBasic*.lnk 2>nul
-
-echo copy new PureBasic link to desktop ...
-copy /Y "%STARTMENU%\PureBasic\PureBasic (x64).lnk" ^
-  %PUBLIC%\Desktop\PureBasic.lnk
-
-rem refresh desktop (W10 style)
-ie4uinit.exe -show
-
-echo moving PureBasic startmenu shortcut ...
-move /Y %STARTMENU%\"PureBasic\PureBasic (x64).lnk" %STARTMENU%
-
-echo removing PureBasic startmenu folder ...
-rd /S /Q %STARTMENU%\"PureBasic" 2>nul
-
-echo ####### %0 #######
-:END
-pause
-
+@echo off
+call check-for-admin
+
+set T=c:\TEMP
+
+set CONFIG=config\install-purebasic.txt
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
+rem licensed version (exe contains key!)
+rem access only for customers ...
+set EXE=..\company\purebasic-setup.exe
+
+rem demo version (publically accessible)
+set ZIP=..\software\purebasic.zip
+
+echo killing PureBasic processes...
+taskkill /F /IM PureBasic.exe 2>nul
+taskkill /F /IM pbcompiler.exe 2>nul
+
+rem YES - this works. It is a "AND" construct...
+if NOT EXIST %EXE% if NOT EXIST %ZIP% (
+  echo WARNING: no PureBasic zipfile or exe-installer found!
+  goto END
+)
+
+echo ####### %0 #######
+
+if EXIST %EXE% (
+  echo INFO: %EXE% found, installing licensed version ...
+
+  rem remove old links ...
+  del /F /Q /A %PUBLIC%\Desktop\PureBasic*.lnk 2>nul
+
+  echo installing purebasic ...
+  start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL ^
+    /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
+  goto LINK
+)
+
+if EXIST %ZIP% (
+  echo INFO: %ZIP% found, installing demo version ...
+
+  rem remove old links ...
+  del /F /Q /A %PUBLIC%\Desktop\PureBasic*.lnk 2>nul
+
+  7z e -y -aoa -o%T%\purebasic %ZIP%
+  move /Y %T%\purebasic\PureBasic*.exe %T%\purebasic\purebasic-setup.exe
+
+  echo installing purebasic ...
+  start /wait %T%\purebasic\purebasic-setup.exe ^
+    /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
+
+  echo cleanup ...
+  rd /S /Q %T%\purebasic 2>nul  
+  goto LINK
+)
+
+:LINK
+rem remove personal link ...
+del /F /Q /A %USERPROFILE%\Desktop\PureBasic*.lnk 2>nul
+
+echo copy new PureBasic link to desktop ...
+copy /Y "%STARTMENU%\PureBasic\PureBasic (x64).lnk" ^
+  %PUBLIC%\Desktop\PureBasic.lnk
+
+rem refresh desktop (W10 style)
+ie4uinit.exe -show
+
+echo moving PureBasic startmenu shortcut ...
+move /Y %STARTMENU%\"PureBasic\PureBasic (x64).lnk" %STARTMENU%
+
+echo removing PureBasic startmenu folder ...
+rd /S /Q %STARTMENU%\"PureBasic" 2>nul
+
+echo ####### %0 #######
+:END
+pause
+
diff --git a/optional/install-python2.cmd b/optional/install-python2.cmd
index 805a448..76848c7 100644
--- a/optional/install-python2.cmd
+++ b/optional/install-python2.cmd
@@ -1,22 +1,23 @@
-@echo off
-
-set OPT=..\optional
-set SOFTWARE=..\software
-set MSI=python2-setup.msi
-
-if NOT EXIST %SOFTWARE%\%MSI% (
-  echo ERROR: %SOFTWARE%\%MSI% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-cd %SOFTWARE%
-@echo on
-msiexec /i %MSI% /passive
-@echo off
-cd %OPT%
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set OPT=..\optional
+set SOFTWARE=..\software
+set MSI=python2-setup.msi
+
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+cd %SOFTWARE%
+@echo on
+msiexec /i %MSI% /passive
+@echo off
+cd %OPT%
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-seafile.cmd b/optional/install-seafile.cmd
index 0b4a507..5974f27 100644
--- a/optional/install-seafile.cmd
+++ b/optional/install-seafile.cmd
@@ -1,36 +1,37 @@
-@echo off
-
-set OPT=..\optional
-set SOFTWARE=..\software
-set MSI=seafile-setup.msi
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-
-if NOT EXIST %SOFTWARE%\%MSI% (
-  echo ERROR: %SOFTWARE%\%MSI% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing SeaFile ...
-cd %SOFTWARE%
-@echo on
-msiexec /i %MSI% /qn
-@echo off
-cd %OPT%
-
-echo removing SeaFile Desktop icon ...
-del /F "%Public%\Desktop\SeaFile.lnk" 2>nul
-
-echo moving SeaFile startmenu shortcut ...
-move /Y %STARTMENU%\"Seafile\Start Seafile.lnk" %STARTMENU%\SeaFile.lnk
-
-echo removing SeaFile startmenu folder ...
-rd /S /Q %STARTMENU%\"Seafile" 2>nul
-
-echo refreshing desktop (W10 style) ...
-ie4uinit.exe -show
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set OPT=..\optional
+set SOFTWARE=..\software
+set MSI=seafile-setup.msi
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing SeaFile ...
+cd %SOFTWARE%
+@echo on
+msiexec /i %MSI% /qn
+@echo off
+cd %OPT%
+
+echo removing SeaFile Desktop icon ...
+del /F "%Public%\Desktop\SeaFile.lnk" 2>nul
+
+echo moving SeaFile startmenu shortcut ...
+move /Y %STARTMENU%\"Seafile\Start Seafile.lnk" %STARTMENU%\SeaFile.lnk
+
+echo removing SeaFile startmenu folder ...
+rd /S /Q %STARTMENU%\"Seafile" 2>nul
+
+echo refreshing desktop (W10 style) ...
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-sharemouse.cmd b/optional/install-sharemouse.cmd
index 4632eae..5d26b21 100644
--- a/optional/install-sharemouse.cmd
+++ b/optional/install-sharemouse.cmd
@@ -1,24 +1,25 @@
-@echo off
-
-set CONFIG=config\install-sharemouse.txt
-set EXE=..\software\sharemouse-setup.exe
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo killing ShareMouse processes...
-taskkill /F /IM sharemouse.exe 2>nul
-
-echo installing ShareMouse ...
-start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
-
-rem refresh desktop (W10 style)
-ie4uinit.exe -show
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set CONFIG=config\install-sharemouse.txt
+set EXE=..\software\sharemouse-setup.exe
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo killing ShareMouse processes...
+taskkill /F /IM sharemouse.exe 2>nul
+
+echo installing ShareMouse ...
+start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
+
+rem refresh desktop (W10 style)
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-softmaker.cmd b/optional/install-softmaker.cmd
index c2e7ff3..6233206 100644
--- a/optional/install-softmaker.cmd
+++ b/optional/install-softmaker.cmd
@@ -1,139 +1,140 @@
-@echo off
-
-set OPT=..\optional
-set CONFIG=config
-set SOFTWARE=..\software
-set MSI=softmaker-setup.msi 
-set SETTINGS=..\company\settings.cmd
-set softmaker_license=0
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-
-if NOT EXIST %SOFTWARE%\%MSI% (
-  echo ERROR: %SOFTWARE%\%MSI% not found!
-  exit /b
-)
-
-rem ===================
-rem CONFIGFILE CHECK
-rem ===================
-
-if NOT EXIST %SETTINGS% (
-  echo.
-  echo WARNING: %SETTINGS% NOT FOUND
-  echo.
-) else (
-  call %SETTINGS%
-)
-
-echo ####### %0 #######
-
-cd %SOFTWARE%
-@echo on
-msiexec /i %MSI% /qb APPLICATIONFOLDER="c:\Program Files\Softmaker Office 2021" ^
-  INSTALLTM=1 INSTALLPM=1 INSTALLPR=1 INSTALLTB1=0 INSTALLTB2=0 /l*v c:\temp\softmaker.log
-@echo off
-del /F c:\temp\softmaker.log
-cd %OPT%
-
-echo installing desktop icons ...
-copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Softmaker Office 2021\PlanMaker 2021.lnk" ^
-  %PUBLIC%\Desktop\PlanMaker.lnk
-copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Softmaker Office 2021\Presentations 2021.lnk" ^
-  %PUBLIC%\Desktop\Presentations.lnk
-copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Softmaker Office 2021\TextMaker 2021.lnk" ^
-  %PUBLIC%\Desktop\Textmaker.lnk
-
-rem refresh desktop (W10 style)
-ie4uinit.exe -show
-
-echo cleaning startmenu ...
-del /F /Q /A %STARTMENU%\"Softmaker Office 2021\Bitte*.*" 2>nul
-
-echo disabling automatic updates for Softmaker Office 2021 ...
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^
-  /v "UpdateCheckEnabled" /d 0 /t REG_DWORD /f
-
-echo disabling WEB help ...
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^
-  /v "HelpSoftMaker" /d 0 /t REG_DWORD /f
-
-echo disabling License Management ...
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^
-  /v "HelpManage" /d 0 /t REG_DWORD /f
-
-echo disabling the asking for user infos ...
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^
-  /v "AskUserInfo" /d 0 /t REG_DWORD /f
-
-echo setting dialog language to US-english ...
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^
-  /v "DlgLID" /d 409 /t REG_DWORD /f
-
-echo disabling backups ...
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\TextMaker 2021" ^
-  /v "AutoSave" /d 0 /t REG_DWORD /f
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\PlanMaker 2021" ^
-  /v "AutoSave" /d 0 /t REG_DWORD /f
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\Presentations 2021" ^
-  /v "AutoSave" /d 0 /t REG_DWORD /f
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\TextMaker 2021" ^
-  /v "BackupFilesNumber" /d 1 /t REG_DWORD /f
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\PlanMaker 2021" ^
-  /v "BackupFilesNumber" /d 1 /t REG_DWORD /f
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\Presentations 2021" ^
-  /v "BackupFilesNumber" /d 1 /t REG_DWORD /f
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\TextMaker 2021" ^
-  /v "BackupFilesPath" /d "" /t REG_SZ /f
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\PlanMaker 2021" ^
-  /v "BackupFilesPath" /d "" /t REG_SZ /f
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\Presentations 2021" ^
-  /v "BackupFilesPath" /d "" /t REG_SZ /f
-
-echo copying .ini files ...
-mkdir %USERPROFILE%\Documents\SoftMaker\Settings 2>nul
-copy /Y %CONFIG%\*21config.ini %USERPROFILE%\Documents\SoftMaker\Settings
-
-echo preparing Softmaker documents folders ...
-for %%D in (
-
-  "Backup"
-  "Bullets"
-  "Samples"
-  "PlanMaker 2021 templates"
-  "Presentations 2021 designs"
-  "TextMaker 2021 templates"
-
-) do (
-
-  mkdir %USERPROFILE%\Documents\SoftMaker\%%D 2>/nul
-  attrib +R %USERPROFILE%\Documents\SoftMaker\%%D 2>/nul
-
-)
-
-echo setting default formats ...
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\TextMaker 2021" ^
-  /v "DefaultFormat" /d 6 /t REG_DWORD /f
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\PlanMaker 2021" ^
-  /v "DefaultFormat" /d 6 /t REG_DWORD /f
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\Presentations 2021" ^
-  /v "DefaultFormat" /d 6 /t REG_DWORD /f
-
-echo disabling smart quotes ...
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\TextMaker 2021" ^
-  /v "SmartQuotes" /d 0 /t REG_DWORD /f
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\PlanMaker 2021" ^
-  /v "SmartQuotes" /d 0 /t REG_DWORD /f
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\Presentations 2021" ^
-  /v "SmartQuotes" /d 0 /t REG_DWORD /f
-
-if softmaker_license == 0 (
-  echo no softmaker license found!
-) else (
-  echo adding softmaker license ...
-  reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^
-    /v "ProductKey" /d "%softmaker_license%" /t REG_SZ /f
-)
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set OPT=..\optional
+set CONFIG=config
+set SOFTWARE=..\software
+set MSI=softmaker-setup.msi 
+set SETTINGS=..\company\settings.cmd
+set softmaker_license=0
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
+
+rem ===================
+rem CONFIGFILE CHECK
+rem ===================
+
+if NOT EXIST %SETTINGS% (
+  echo.
+  echo WARNING: %SETTINGS% NOT FOUND
+  echo.
+) else (
+  call %SETTINGS%
+)
+
+echo ####### %0 #######
+
+cd %SOFTWARE%
+@echo on
+msiexec /i %MSI% /qb APPLICATIONFOLDER="c:\Program Files\Softmaker Office 2021" ^
+  INSTALLTM=1 INSTALLPM=1 INSTALLPR=1 INSTALLTB1=0 INSTALLTB2=0 /l*v c:\temp\softmaker.log
+@echo off
+del /F c:\temp\softmaker.log
+cd %OPT%
+
+echo installing desktop icons ...
+copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Softmaker Office 2021\PlanMaker 2021.lnk" ^
+  %PUBLIC%\Desktop\PlanMaker.lnk
+copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Softmaker Office 2021\Presentations 2021.lnk" ^
+  %PUBLIC%\Desktop\Presentations.lnk
+copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Softmaker Office 2021\TextMaker 2021.lnk" ^
+  %PUBLIC%\Desktop\Textmaker.lnk
+
+rem refresh desktop (W10 style)
+ie4uinit.exe -show
+
+echo cleaning startmenu ...
+del /F /Q /A %STARTMENU%\"Softmaker Office 2021\Bitte*.*" 2>nul
+
+echo disabling automatic updates for Softmaker Office 2021 ...
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^
+  /v "UpdateCheckEnabled" /d 0 /t REG_DWORD /f
+
+echo disabling WEB help ...
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^
+  /v "HelpSoftMaker" /d 0 /t REG_DWORD /f
+
+echo disabling License Management ...
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^
+  /v "HelpManage" /d 0 /t REG_DWORD /f
+
+echo disabling the asking for user infos ...
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^
+  /v "AskUserInfo" /d 0 /t REG_DWORD /f
+
+echo setting dialog language to US-english ...
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^
+  /v "DlgLID" /d 409 /t REG_DWORD /f
+
+echo disabling backups ...
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\TextMaker 2021" ^
+  /v "AutoSave" /d 0 /t REG_DWORD /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\PlanMaker 2021" ^
+  /v "AutoSave" /d 0 /t REG_DWORD /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\Presentations 2021" ^
+  /v "AutoSave" /d 0 /t REG_DWORD /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\TextMaker 2021" ^
+  /v "BackupFilesNumber" /d 1 /t REG_DWORD /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\PlanMaker 2021" ^
+  /v "BackupFilesNumber" /d 1 /t REG_DWORD /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\Presentations 2021" ^
+  /v "BackupFilesNumber" /d 1 /t REG_DWORD /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\TextMaker 2021" ^
+  /v "BackupFilesPath" /d "" /t REG_SZ /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\PlanMaker 2021" ^
+  /v "BackupFilesPath" /d "" /t REG_SZ /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\Presentations 2021" ^
+  /v "BackupFilesPath" /d "" /t REG_SZ /f
+
+echo copying .ini files ...
+mkdir %USERPROFILE%\Documents\SoftMaker\Settings 2>nul
+copy /Y %CONFIG%\*21config.ini %USERPROFILE%\Documents\SoftMaker\Settings
+
+echo preparing Softmaker documents folders ...
+for %%D in (
+
+  "Backup"
+  "Bullets"
+  "Samples"
+  "PlanMaker 2021 templates"
+  "Presentations 2021 designs"
+  "TextMaker 2021 templates"
+
+) do (
+
+  mkdir %USERPROFILE%\Documents\SoftMaker\%%D 2>/nul
+  attrib +R %USERPROFILE%\Documents\SoftMaker\%%D 2>/nul
+
+)
+
+echo setting default formats ...
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\TextMaker 2021" ^
+  /v "DefaultFormat" /d 6 /t REG_DWORD /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\PlanMaker 2021" ^
+  /v "DefaultFormat" /d 6 /t REG_DWORD /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\Presentations 2021" ^
+  /v "DefaultFormat" /d 6 /t REG_DWORD /f
+
+echo disabling smart quotes ...
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\TextMaker 2021" ^
+  /v "SmartQuotes" /d 0 /t REG_DWORD /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\PlanMaker 2021" ^
+  /v "SmartQuotes" /d 0 /t REG_DWORD /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\Presentations 2021" ^
+  /v "SmartQuotes" /d 0 /t REG_DWORD /f
+
+if softmaker_license == 0 (
+  echo no softmaker license found!
+) else (
+  echo adding softmaker license ...
+  reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^
+    /v "ProductKey" /d "%softmaker_license%" /t REG_SZ /f
+)
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-sonos2.cmd b/optional/install-sonos2.cmd
index c644a47..68fb2d4 100644
--- a/optional/install-sonos2.cmd
+++ b/optional/install-sonos2.cmd
@@ -1,27 +1,28 @@
-@echo off
-
-set EXE=..\software\sonos2-setup.exe
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing SONOS 2 client ...
-start /wait %EXE% /L1031 /S /v/qn
-
-echo moving SONOS startmenu shortcut ...
-move /Y %STARTMENU%\"Sonos\Sonos.lnk" %STARTMENU%\Sonos.lnk
-
-echo removing SONOS startmenu folder ...
-rd /S /Q %STARTMENU%\"Sonos" 2>nul
-
-rem refresh desktop (W10 style)
-ie4uinit.exe -show
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set EXE=..\software\sonos2-setup.exe
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing SONOS 2 client ...
+start /wait %EXE% /L1031 /S /v/qn
+
+echo moving SONOS startmenu shortcut ...
+move /Y %STARTMENU%\"Sonos\Sonos.lnk" %STARTMENU%\Sonos.lnk
+
+echo removing SONOS startmenu folder ...
+rd /S /Q %STARTMENU%\"Sonos" 2>nul
+
+rem refresh desktop (W10 style)
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-spotify.cmd b/optional/install-spotify.cmd
index cdff2af..8facabf 100644
--- a/optional/install-spotify.cmd
+++ b/optional/install-spotify.cmd
@@ -1,20 +1,21 @@
-@echo off
-
-set EXE=..\software\spotify-setup.exe
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing Spotify for user %USERNAME% ...
-%EXE%
-
-rem refresh desktop (W10 style)
-ie4uinit.exe -show
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set EXE=..\software\spotify-setup.exe
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing Spotify for user %USERNAME% ...
+%EXE%
+
+rem refresh desktop (W10 style)
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-steam.cmd b/optional/install-steam.cmd
index f38e180..478e15a 100644
--- a/optional/install-steam.cmd
+++ b/optional/install-steam.cmd
@@ -1,27 +1,28 @@
-@echo off
-
-set EXE=..\software\steam-setup.exe
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo killing STEAM processes...
-taskkill /F /IM steam.exe 2>nul
-
-echo installing STEAM ...
-start /wait %EXE% /S
-
-echo moving STEAM startmenu shortcut ...
-move /Y %STARTMENU%\"Steam\Steam.lnk" %STARTMENU%
-
-echo removing Steam startmenu folder ...
-rd /S /Q %STARTMENU%\"Steam" 2>nul
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set EXE=..\software\steam-setup.exe
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo killing STEAM processes...
+taskkill /F /IM steam.exe 2>nul
+
+echo installing STEAM ...
+start /wait %EXE% /S
+
+echo moving STEAM startmenu shortcut ...
+move /Y %STARTMENU%\"Steam\Steam.lnk" %STARTMENU%
+
+echo removing Steam startmenu folder ...
+rd /S /Q %STARTMENU%\"Steam" 2>nul
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-teams.cmd b/optional/install-teams.cmd
index d38ec20..23bd47b 100644
--- a/optional/install-teams.cmd
+++ b/optional/install-teams.cmd
@@ -1,23 +1,23 @@
-@echo off
-
-set EXE=..\software\teams-setup.exe
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing Microsoft Teams ...
-start /wait %EXE% -s
-
-echo renaming Teams desktop link ...
-move /Y "%USERPROFILE%\Desktop\Microsoft Teams.lnk" "%USERPROFILE%\Desktop\Teams.lnk"
-
-rem refresh desktop (W10 style)
-ie4uinit.exe -show
-
-echo ####### %0 #######
-pause
-
+@echo off
+
+set EXE=..\software\teams-setup.exe
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing Microsoft Teams ...
+start /wait %EXE% -s
+
+echo renaming Teams desktop link ...
+move /Y "%USERPROFILE%\Desktop\Microsoft Teams.lnk" "%USERPROFILE%\Desktop\Teams.lnk"
+
+rem refresh desktop (W10 style)
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-telegram.cmd b/optional/install-telegram.cmd
index 1b624b0..7e339d4 100644
--- a/optional/install-telegram.cmd
+++ b/optional/install-telegram.cmd
@@ -1,31 +1,27 @@
-@echo off
-
-set EXE=..\software\telegram-setup.exe
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-set STARTMENU_USER="%APPDATA%\Microsoft\Windows\Start Menu\Programs"
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing Telegram Desktop Client ...
-start /wait %EXE% /silent /norestart %EXE%
-
-echo moving Telegram startmenu shortcut ...
-move /Y %STARTMENU_USER%\"Telegram Desktop\Telegram.lnk" %STARTMENU%
-
-echo removing Telegram startmenu folder ...
-rd /S /Q %STARTMENU_USER%\"Telegram Desktop" 2>nul
-
-echo moving Telegram Desktop icon ...
-move /Y "%USERPROFILE%\Desktop\Telegram.lnk" %PUBLIC%\Desktop
-
-rem refresh desktop (W10 style)
-ie4uinit.exe -show
-
-echo ####### %0 #######
-pause
-
+@echo off
+
+set EXE=..\software\telegram-setup.exe
+set STARTMENU_USER="%APPDATA%\Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing Telegram Desktop Client ...
+start /wait %EXE% /silent /norestart %EXE%
+
+echo moving Telegram startmenu shortcut ...
+move /Y %STARTMENU_USER%\"Telegram Desktop\Telegram.lnk" %STARTMENU_USER%
+
+echo removing Telegram startmenu folder ...
+rd /S /Q %STARTMENU_USER%\"Telegram Desktop" 2>nul
+
+rem refresh desktop (W10 style)
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-totalcommander.cmd b/optional/install-totalcommander.cmd
index 5a46754..80d2ce8 100644
--- a/optional/install-totalcommander.cmd
+++ b/optional/install-totalcommander.cmd
@@ -1,39 +1,40 @@
-@echo off
-
-set EXE=..\software\totalcommander-setup.exe
-set KEY=..\comany\wincmd.key
-set TARGET=c:\totalcmd
-set STARTMENU=%PROGRAMDATA%\"Microsoft\Windows\Start Menu\Programs"
-set STARTMENU_USER=%APPDATA%\"Microsoft\Windows\Start Menu\Programs"
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing TotalCommander ...
-start /wait %EXE% /AHMGDU
-
-rem ... stupid Total Commander is installing its links to user area ? WTF ?
-echo renaming and moving TotalCommander desktop link to public desktop ...
-move /Y "%USERPROFILE%\Desktop\Total Commander*" "%PUBLIC%\Desktop\TCM.lnk"
-
-echo moving Total Commander startmenu shortcut ...
-move /Y %STARTMENU_USER%\"Total Commander\Total Commander 64 bit.lnk" %STARTMENU%
-
-echo removing Total Commander startmenu folder ...
-rd /S /Q %STARTMENU_USER%\"Total Commander" 2>nul
-
-if EXIST %KEY% (
-  echo installing license ...
-  copy /Y %KEY% %TARGET%
-)
-
-rem refresh desktop (W10 style)
-ie4uinit.exe -show
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set EXE=..\software\totalcommander-setup.exe
+set KEY=..\comany\wincmd.key
+set TARGET=c:\totalcmd
+set STARTMENU=%PROGRAMDATA%\"Microsoft\Windows\Start Menu\Programs"
+set STARTMENU_USER=%APPDATA%\"Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing TotalCommander ...
+start /wait %EXE% /AHMGDU
+
+rem ... stupid Total Commander is installing its links to user area ? WTF ?
+echo renaming and moving TotalCommander desktop link to public desktop ...
+move /Y "%USERPROFILE%\Desktop\Total Commander*" "%PUBLIC%\Desktop\TCM.lnk"
+
+echo moving Total Commander startmenu shortcut ...
+move /Y %STARTMENU_USER%\"Total Commander\Total Commander 64 bit.lnk" %STARTMENU%
+
+echo removing Total Commander startmenu folder ...
+rd /S /Q %STARTMENU_USER%\"Total Commander" 2>nul
+
+if EXIST %KEY% (
+  echo installing license ...
+  copy /Y %KEY% %TARGET%
+)
+
+rem refresh desktop (W10 style)
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-vcesimulator.cmd b/optional/install-vcesimulator.cmd
index f7532d8..42c52d9 100644
--- a/optional/install-vcesimulator.cmd
+++ b/optional/install-vcesimulator.cmd
@@ -1,26 +1,27 @@
-@echo off
-
-set CONFIG=config\install-vcesimulator.txt
-set EXE=..\software\vce_exam_simulator_setup.exe
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing VCE Simulator 2 ...
-start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
-
-echo cleanup ...
-del /F %STARTMENU%\"VCE Exam Simulator\VCE Exam Simulator on the Web.url" 2>nul
-del /F %STARTMENU%\"VCE Exam Simulator\Uninstall VCE Exam Simulator.lnk" 2>nul
-
-rem refresh desktop (W10 style)
-ie4uinit.exe -show
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set CONFIG=config\install-vcesimulator.txt
+set EXE=..\software\vce_exam_simulator_setup.exe
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing VCE Simulator 2 ...
+start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
+
+echo cleanup ...
+del /F %STARTMENU%\"VCE Exam Simulator\VCE Exam Simulator on the Web.url" 2>nul
+del /F %STARTMENU%\"VCE Exam Simulator\Uninstall VCE Exam Simulator.lnk" 2>nul
+
+rem refresh desktop (W10 style)
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-virtualbox.cmd b/optional/install-virtualbox.cmd
index c882792..5f235d8 100644
--- a/optional/install-virtualbox.cmd
+++ b/optional/install-virtualbox.cmd
@@ -1,39 +1,40 @@
-@echo off
-
-set EXE=..\software\virtualbox-setup.exe
-set VBOXMANAGE="%ProgramFiles%\Oracle\VirtualBox\VBoxManage.exe"
-set STARTMENU=%PROGRAMDATA%\"Microsoft\Windows\Start Menu\Programs"
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing VirtualBox ...
-%EXE% --silent --ignore-reboot
-
-echo renaming Desktop shortcut ...
-move /Y "%PUBLIC%\Desktop\Oracle VM VirtualBox.lnk" ^
-  "%PUBLIC%\Desktop\VirtualBox.lnk"
-
-rem refresh desktop (W10 style)
-ie4uinit.exe -show
-
-echo disabling VirtualBox update search ...
-%VBOXMANAGE% setextradata global GUI/UpdateDate never
-
-echo moving VirtualBox startmenu shortcut ...
-move /Y %STARTMENU%\"Oracle VM VirtualBox\Oracle VM VirtualBox.lnk" %STARTMENU%
-
-echo removing VirtualBox startmenu folder ...
-rd /S /Q %STARTMENU%\"Oracle VM VirtualBox" 2>nul
-
-echo disabling VirtualBox bridging protocol ...
-powershell -Command "Disable-NetAdapterBinding -Name '*' -ComponentID oracle_VBoxNetLwf"
-powershell -Command "Get-NetAdapterBinding -ComponentID oracle_VBoxNetLwf"
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set EXE=..\software\virtualbox-setup.exe
+set VBOXMANAGE="%ProgramFiles%\Oracle\VirtualBox\VBoxManage.exe"
+set STARTMENU=%PROGRAMDATA%\"Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing VirtualBox ...
+%EXE% --silent --ignore-reboot
+
+echo renaming Desktop shortcut ...
+move /Y "%PUBLIC%\Desktop\Oracle VM VirtualBox.lnk" ^
+  "%PUBLIC%\Desktop\VirtualBox.lnk"
+
+rem refresh desktop (W10 style)
+ie4uinit.exe -show
+
+echo disabling VirtualBox update search ...
+%VBOXMANAGE% setextradata global GUI/UpdateDate never
+
+echo moving VirtualBox startmenu shortcut ...
+move /Y %STARTMENU%\"Oracle VM VirtualBox\Oracle VM VirtualBox.lnk" %STARTMENU%
+
+echo removing VirtualBox startmenu folder ...
+rd /S /Q %STARTMENU%\"Oracle VM VirtualBox" 2>nul
+
+echo disabling VirtualBox bridging protocol ...
+powershell -Command "Disable-NetAdapterBinding -Name '*' -ComponentID oracle_VBoxNetLwf"
+powershell -Command "Get-NetAdapterBinding -ComponentID oracle_VBoxNetLwf"
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-vscode.cmd b/optional/install-vscode.cmd
index af027fd..9d24366 100644
--- a/optional/install-vscode.cmd
+++ b/optional/install-vscode.cmd
@@ -1,48 +1,49 @@
-@echo off
-
-set CONFIG=config\install-vscode.txt
-set EXE=..\software\vscode-setup.exe
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-
-rem update.code.visualstudio.com
-set VSCODEUPDATEIP=51.144.164.215
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo killing VisualStudio code processes...
-taskkill /F /IM Code.exe 2>nul
-
-echo cleanup ...
-del /F "%PUBLIC%\Desktop\VScode.lnk" 2>nul
-
-echo installing Visual Studio CODE ...
-start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
-
-echo installing Desktop shortcut ...
-copy /Y %STARTMENU%\"Visual Studio Code\Visual*.lnk" "%PUBLIC%\Desktop"
-move /Y "%PUBLIC%\Desktop\Visual*.lnk" "%PUBLIC%\Desktop\VScode.lnk"
-
-rem refresh desktop (W10 style)
-ie4uinit.exe -show
-
-echo moving VScode startmenu shortcut ...
-move /Y %STARTMENU%\"Visual Studio Code\Visual*.lnk" %STARTMENU%
-
-echo removing VScode startmenu folder ...
-rd /S /Q %STARTMENU%\"Visual Studio Code" 2>nul
-
-rem NO updates here! FUCK YOU!
-echo disabling automatic updates via W10 firewall ...
-netsh advfirewall firewall delete rule name="block_vscode_updates" 2>nul
-netsh advfirewall firewall add rule name="block_vscode_updates" ^
-  dir=out action=block protocol=tcp localip=any remoteip=%VSCODEUPDATEIP% ^
-  remoteport=80,443 program="%ProgramFiles%\Microsoft VS Code\Code.exe"
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set CONFIG=config\install-vscode.txt
+set EXE=..\software\vscode-setup.exe
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
+rem update.code.visualstudio.com
+set VSCODEUPDATEIP=51.144.164.215
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo killing VisualStudio code processes...
+taskkill /F /IM Code.exe 2>nul
+
+echo cleanup ...
+del /F "%PUBLIC%\Desktop\VScode.lnk" 2>nul
+
+echo installing Visual Studio CODE ...
+start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
+
+echo installing Desktop shortcut ...
+copy /Y %STARTMENU%\"Visual Studio Code\Visual*.lnk" "%PUBLIC%\Desktop"
+move /Y "%PUBLIC%\Desktop\Visual*.lnk" "%PUBLIC%\Desktop\VScode.lnk"
+
+rem refresh desktop (W10 style)
+ie4uinit.exe -show
+
+echo moving VScode startmenu shortcut ...
+move /Y %STARTMENU%\"Visual Studio Code\Visual*.lnk" %STARTMENU%
+
+echo removing VScode startmenu folder ...
+rd /S /Q %STARTMENU%\"Visual Studio Code" 2>nul
+
+rem NO updates here! FUCK YOU!
+echo disabling automatic updates via W10 firewall ...
+netsh advfirewall firewall delete rule name="block_vscode_updates" 2>nul
+netsh advfirewall firewall add rule name="block_vscode_updates" ^
+  dir=out action=block protocol=tcp localip=any remoteip=%VSCODEUPDATEIP% ^
+  remoteport=80,443 program="%ProgramFiles%\Microsoft VS Code\Code.exe"
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-xojo.cmd b/optional/install-xojo.cmd
index 11e9839..75c5655 100644
--- a/optional/install-xojo.cmd
+++ b/optional/install-xojo.cmd
@@ -1,24 +1,25 @@
-@echo off
-
-set CONFIG=config\install-xojo.txt
-set EXE=..\software\xojo-setup.exe
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo killing XOJO processes...
-taskkill /F /IM xojo.exe 2>nul
-
-echo installing XOJO ...
-start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
-
-echo renaming XOJO desktop icon ...
-move /Y %PUBLIC%\Desktop\Xojo*.lnk %PUBLIC%\Desktop\XOJO.lnk 2>nul
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set CONFIG=config\install-xojo.txt
+set EXE=..\software\xojo-setup.exe
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo killing XOJO processes...
+taskkill /F /IM xojo.exe 2>nul
+
+echo installing XOJO ...
+start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
+
+echo renaming XOJO desktop icon ...
+move /Y %PUBLIC%\Desktop\Xojo*.lnk %PUBLIC%\Desktop\XOJO.lnk 2>nul
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/uninstall-store.ps1 b/optional/uninstall-store.ps1
index ca74524..c00c708 100644
--- a/optional/uninstall-store.ps1
+++ b/optional/uninstall-store.ps1
@@ -1,4 +1,5 @@
 # REMOVE the Store ...
+check-for-admin.cmd
 
 write-host '#######',(split-path $PSCommandPath -Leaf),'#######'
 
diff --git a/optional/uninstall-telemetry.cmd b/optional/uninstall-telemetry.cmd
index 7bf95b2..30f40db 100644
--- a/optional/uninstall-telemetry.cmd
+++ b/optional/uninstall-telemetry.cmd
@@ -1,211 +1,212 @@
-@echo off
-
-echo ####### %0 #######
-rem most of this was took from:
-rem https://forum.level1techs.com/t/take-back-your-windows-10-privacy/143097/2
-rem THANKS!
-
-echo.
-echo WARNING: executing this script may cripple some important functions in windows!
-echo especially the store app will not work anymore - and it will be removed by this script!
-
-echo.
-echo WARNING: system will be REBOOTED after modify!
-echo SAVE YOUR WORK AND COME BACK!
-echo.
-
-set answer=
-:ask
-  set /p answer="REALLY remove all Microsoft telemetry (Y/N)? "
-  if /i "%answer:~,1%" EQU "Y" (
-    GOTO CONT 
-  )
-  if /i "%answer:~,1%" EQU "N" (
-    echo ABORTED.
-    exit /b
-  )
-  echo Please type Y or N.
-  goto ask
-:CONT
-
-echo.
-echo OK ... trying to remove ALL the stupid fucking microsoft TELEMETRY BULLSHIT!
-
-echo.
-echo ADDING some registry keys to disable telemetry ...
-reg add "HKCU\Software\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppContainer\Storage\microsoft.microsoftedge_8wekyb3d8bbwe\MicrosoftEdge\PhishingFilter" ^
-  /v "EnabledV9" /t REG_DWORD /d "0" /f
-reg add "HKLM\SOFTWARE\Policies\Microsoft\MicrosoftEdge\PhishingFilter" /v "EnabledV9" /t REG_DWORD /d 0 /f
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\AppCompat" /v AITEnable /t REG_DWORD /d 0 /f
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\AppCompat" /v DisableInventory /t REG_DWORD /d 1 /f
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\AppCompat" /v DisablePCA /t REG_DWORD /d 1 /f
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\AppCompat" /v DisableUAR /t REG_DWORD /d 1 /f
-reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows Defender" /v DisableAntiSpyware /t REG_DWORD /d 1 /f
-reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows Defender\Spynet" /v SpyNetReporting /t REG_DWORD /d 0 /f
-reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows Defender\Spynet" /v SubmitSamplesConsent /t REG_DWORD /d 2 /f
-reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows Defender\Spynet" /v DontReportInfectionInformation /t REG_DWORD /d 1 /f
-reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\GameDVR" /v AllowGameDVR /t REG_DWORD /d 0 /f
-reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Windows Error Reporting" /v Disabled /t REG_DWORD /d 1 /f
-reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v NoAutoUpdate /t REG_DWORD /d 0 /f
-reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v AUOptions /t REG_DWORD /d 2 /f
-reg add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v DisableSoftLanding /t REG_DWORD /d 1 /f
-reg add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v DisableWindowsSpotlightFeatures /t REG_DWORD /d 1 /f
-reg add "HKLM\SOFTWARE\Policies\Microsoft\MRT" /v "DontReportInfectionInformation" /t REG_DWORD /d 1 /f
-reg add "HKLM\SOFTWARE\Policies\Microsoft\MRT" /v "DontOfferThroughWUAU" /t REG_DWORD /d 1 /f
-reg add "HKLM\Software\Policies\Microsoft\WindowsStore" /v RemoveWindowsStore /t REG_DWORD /d 1 /f
-reg add "HKLM\Software\Policies\Microsoft\WindowsStore" /v DisableStoreApps /t REG_DWORD /d 1 /f
-reg add "HKLM\SOFTWARE\Policies\Microsoft\PushToInstall" /v DisablePushToInstall /t REG_DWORD /d 1 /f
-reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\SystemRestore" /v "DisableConfig" /t "REG_DWORD" /d "1" /f
-reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\SystemRestore" /v "DisableSR " /t "REG_DWORD" /d "1" /f
-reg add "HKLM\Software\Policies\Microsoft\Windows NT\CurrentVersion\Software Protection Platform" /v NoGenTicket /t REG_DWORD /d 1 /f
-reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /v AllowCortana /t REG_DWORD /d 0 /f
-reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\System" /v "EnableSmartScreen" /t REG_DWORD /d 0 /f
-reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore" /v "DisableConfig" /t "REG_DWORD" /d "1" /f
-reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore" /v "DisableSR " /t "REG_DWORD" /d "1" /f
-reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\SecHealthUI.exe" /v Debugger ^
-  /t REG_SZ /d "%windir%\System32\taskkill.exe" /f
-reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\CompatTelRunner.exe" /v Debugger ^
-  /t REG_SZ /d "%windir%\System32\taskkill.exe" /f
-reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\DeviceCensus.exe" /v Debugger ^
-  /t REG_SZ /d "%windir%\System32\taskkill.exe" /f
-reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer" /v SmartScreenEnabled /t REG_SZ /d "Off" /f
-reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\AppHost" /v "EnableWebContentEvaluation" /t REG_DWORD /d "0" /f
-reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.SecurityAndMaintenance" ^
-  /v "Enabled" /t REG_DWORD /d 0 /f
-reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\AppHost" /v "EnableWebContentEvaluation" /t REG_DWORD /d 0 /f
-reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v SilentInstalledAppsEnabled /t REG_DWORD /d 0 /f
-reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\Explorer" /v "NoRecentDocsHistory" /t REG_DWORD /d 1 /f
-reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting" /v Disabled /t REG_DWORD /d 1 /f
-reg add "HKCU\Software\Microsoft\Internet Explorer\PhishingFilter" /v "EnabledV9" /t REG_DWORD /d 0 /f
-reg add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v DisableWindowsConsumerFeatures /t REG_DWORD /d 1 /f
-reg add "HKLM\Software\Policies\Microsoft\Windows\DataCollection" /v DoNotShowFeedbackNotifications /t REG_DWORD /d 1 /f
-reg add "HKLM\Software\Policies\Microsoft\WindowsInkWorkspace" /v AllowSuggestedAppsInWindowsInkWorkspace /t REG_DWORD /d 0 /f
-reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v ScheduledInstallDay /t REG_DWORD /d 0 /f
-reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v ScheduledInstallTime /t REG_DWORD /d 3 /f
-reg add "HKLM\Software\Policies\Microsoft\Windows\SettingSync" /v DisableSettingSync /t REG_DWORD /d 2 /f
-reg add "HKLM\Software\Policies\Microsoft\Windows\SettingSync" /v DisableSettingSyncUserOverride /t REG_DWORD /d 1 /f
-reg add "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Siuf\Rules" /v "NumberOfSIUFInPeriod" /t REG_DWORD /d 0 /f
-reg add "HKLM\SYSTEM\ControlSet001\Control\WMI\AutoLogger\AutoLogger-Diagtrack-Listener" /v Start /t REG_DWORD /d 0 /f
-reg add "HKLM\SYSTEM\CurrentControlSet\Services\SharedAccess\Parameters\FirewallPolicy\FirewallRules" /v "{2765E0F4-2918-4A46-B9C9-43CDD8FCBA2B}" ^
-  /t REG_SZ /d "BlockCortana|Action=Block|Active=TRUE|Dir=Out|App=C:\windows\systemapps\microsoft.windows.cortana_cw5n1h2txyewy\searchui.exe|Name=Search and Cortana application|AppPkgId=S-1-15-2-1861897761-1695161497-2927542615-642690995-327840285-2659745135-2630312742|" /f
-
-echo.
-echo DELETING some registry keys to disable telemetry ...
-reg delete "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Siuf\Rules" /v "PeriodInNanoSeconds" /f
-reg delete "HKLM\SYSTEM\CurrentControlSet\Services\xbgm" /f
-reg delete "HKLM\SYSTEM\CurrentControlSet\Services\Sense" /f
-reg delete "HKLM\SYSTEM\CurrentControlSet\Services\SecurityHealthService" /f
-reg delete "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" /v "SecurityHealth" /f
-reg delete "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\StartupApproved\Run" /v "SecurityHealth" /f
-for /f "tokens=1" %%I in ('reg query "HKLM\SYSTEM\CurrentControlSet\Services" ^
-  /k /f "wscsvc" ^| find /i "wscsvc"') do (reg delete %%I /f)
-for /f "tokens=1" %%I in ('reg query "HKLM\SYSTEM\CurrentControlSet\Services" ^
-  /k /f "OneSyncSvc" ^| find /i "OneSyncSvc"') do (reg delete %%I /f)
-for /f "tokens=1" %%I in ('reg query "HKLM\SYSTEM\CurrentControlSet\Services" ^
-  /k /f "MessagingService" ^| find /i "MessagingService"') do (reg delete %%I /f)
-for /f "tokens=1" %%I in ('reg query "HKLM\SYSTEM\CurrentControlSet\Services" ^
-  /k /f "PimIndexMaintenanceSvc" ^| find /i "PimIndexMaintenanceSvc"') do (reg delete %%I /f)
-for /f "tokens=1" %%I in ('reg query "HKLM\SYSTEM\CurrentControlSet\Services" ^
-  /k /f "UserDataSvc" ^| find /i "UserDataSvc"') do (reg delete %%I /f)
-for /f "tokens=1" %%I in ('reg query "HKLM\SYSTEM\CurrentControlSet\Services" ^
-  /k /f "UnistoreSvc" ^| find /i "UnistoreSvc"') do (reg delete %%I /f)
-for /f "tokens=1" %%I in ('reg query "HKLM\SYSTEM\CurrentControlSet\Services" ^
-  /k /f "BcastDVRUserService" ^| find /i "BcastDVRUserService"') do (reg delete %%I /f)
-for /f "tokens=1" %%I in ('reg query "HKLM\SYSTEM\CurrentControlSet\Services" ^
-  /k /f "Sgrmbroker" ^| find /i "Sgrmbroker"') do (reg delete %%I /f)
-for /f "tokens=1" %%I in ('reg query "HKLM\SYSTEM\CurrentControlSet\Services" ^
-  /k /f "ClipSVC" ^| find /i "ClipSVC"') do (reg delete %%I /f)
-
-echo.
-echo DELETING some services ...
-sc delete PushToInstall
-sc delete XblAuthManager
-sc delete XblGameSave
-sc delete XboxNetApiSvc
-sc delete XboxGipSvc
-sc delete MapsBroker
-sc delete lfsvc
-sc delete DiagTrack
-sc delete dmwappushservice
-sc delete WerSvc
-sc delete OneSyncSvc
-sc delete MessagingService
-sc delete wercplsupport
-sc delete PcaSvc
-sc delete wisvc
-sc delete RetailDemo
-sc delete diagsvc
-sc delete shpamsvc
-sc delete TermService
-sc delete UmRdpService
-sc delete SessionEnv
-sc delete TroubleshootingSvc
-sc delete diagnosticshub.standardcollector.service
-
-echo.
-echo RECONFIGURING some services ...
-sc config wlidsvc start=demand
-
-echo.
-echo DISABLING some tasks ...
-schtasks /Change /TN "Microsoft\XblGameSave\XblGameSaveTask" /disable
-schtasks /Change /TN "Microsoft\XblGameSave\XblGameSaveTaskLogon" /disable
-schtasks /Change /TN "\Microsoft\Windows\Maps\MapsUpdateTask" /disable
-schtasks /Change /TN "\Microsoft\Windows\Maps\MapsToastTask" /disable
-schtasks /Change /TN "\Microsoft\Windows\HelloFace\FODCleanupTask" /Disable
-schtasks /Change /TN "\Microsoft\Windows\SystemRestore\SR" /disable
-schtasks /Change /TN "Microsoft\Windows\AppID\SmartScreenSpecific" /disable
-schtasks /Change /TN "Microsoft\Windows\Application Experience\AitAgent" /disable
-schtasks /Change /TN "Microsoft\Windows\Application Experience\Microsoft Compatibility Appraiser" /disable
-schtasks /Change /TN "Microsoft\Windows\Application Experience\ProgramDataUpdater" /disable
-schtasks /Change /TN "Microsoft\Windows\Application Experience\StartupAppTask" /disable
-schtasks /Change /TN "Microsoft\Windows\Autochk\Proxy" /disable
-schtasks /Change /TN "Microsoft\Windows\CloudExperienceHost\CreateObjectTask" /disable
-schtasks /Change /TN "Microsoft\Windows\Customer Experience Improvement Program\BthSQM" /disable
-schtasks /Change /TN "Microsoft\Windows\Customer Experience Improvement Program\Consolidator" /disable
-schtasks /Change /TN "Microsoft\Windows\Customer Experience Improvement Program\KernelCeipTask" /disable
-schtasks /Change /TN "Microsoft\Windows\Customer Experience Improvement Program\Uploader" /disable
-schtasks /Change /TN "Microsoft\Windows\Customer Experience Improvement Program\UsbCeip" /disable
-schtasks /Change /TN "Microsoft\Windows\DiskDiagnostic\Microsoft-Windows-DiskDiagnosticDataCollector" /disable
-schtasks /Change /TN "Microsoft\Windows\DiskFootprint\Diagnostics" /disable
-schtasks /Change /TN "Microsoft\Windows\FileHistory\File History (maintenance mode)" /disable
-schtasks /Change /TN "Microsoft\Windows\Maintenance\WinSAT" /disable
-schtasks /Change /TN "Microsoft\Windows\PI\Sqm-Tasks" /disable
-schtasks /Change /TN "Microsoft\Windows\Power Efficiency Diagnostics\AnalyzeSystem" /disable
-schtasks /Change /TN "Microsoft\Windows\Shell\FamilySafetyMonitor" /disable
-schtasks /Change /TN "Microsoft\Windows\Shell\FamilySafetyRefresh" /disable
-schtasks /Change /TN "Microsoft\Windows\Shell\FamilySafetyUpload" /disable
-schtasks /Change /TN "Microsoft\Windows\Windows Error Reporting\QueueReporting" /disable
-schtasks /Change /TN "Microsoft\Windows\WindowsUpdate\Automatic App Update" /disable
-schtasks /Change /TN "Microsoft\Windows\License Manager\TempSignedLicenseExchange" /disable
-schtasks /Change /TN "Microsoft\Windows\Clip\License Validation" /disable
-schtasks /Change /TN "\Microsoft\Windows\ApplicationData\DsSvcCleanup" /disable
-schtasks /Change /TN "\Microsoft\Windows\Power Efficiency Diagnostics\AnalyzeSystem" /disable
-schtasks /Change /TN "\Microsoft\Windows\PushToInstall\LoginCheck" /disable
-schtasks /Change /TN "\Microsoft\Windows\PushToInstall\Registration" /disable
-schtasks /Change /TN "\Microsoft\Windows\Shell\FamilySafetyMonitor" /disable
-schtasks /Change /TN "\Microsoft\Windows\Shell\FamilySafetyMonitorToastTask" /disable
-schtasks /Change /TN "\Microsoft\Windows\Shell\FamilySafetyRefreshTask" /disable
-schtasks /Change /TN "\Microsoft\Windows\Subscription\EnableLicenseAcquisition" /disable
-schtasks /Change /TN "\Microsoft\Windows\Subscription\LicenseAcquisition" /disable
-schtasks /Change /TN "\Microsoft\Windows\Diagnosis\RecommendedTroubleshootingScanner" /disable
-schtasks /Change /TN "\Microsoft\Windows\Diagnosis\Scheduled" /disable
-schtasks /Change /TN "\Microsoft\Windows\NetTrace\GatherNetworkInfo" /disable
-
-echo.
-echo DELETING shadow copies ...
-vssadmin delete shadows /all /Quiet
-
-echo.
-echo DELETING some files ...
-del /F /Q "C:\Windows\System32\Tasks\Microsoft\Windows\SettingSync\*" 
-
-echo.
-echo REMOVING the store ...
-powershell -Command ./uninstall-store.ps1
-
-echo.
-echo ####### %0 #######
-pause
-shutdown -g -t 0
-
+@echo off
+call check-for-admin
+
+echo ####### %0 #######
+rem most of this was took from:
+rem https://forum.level1techs.com/t/take-back-your-windows-10-privacy/143097/2
+rem THANKS!
+
+echo.
+echo WARNING: executing this script may cripple some important functions in windows!
+echo especially the store app will not work anymore - and it will be removed by this script!
+
+echo.
+echo WARNING: system will be REBOOTED after modify!
+echo SAVE YOUR WORK AND COME BACK!
+echo.
+
+set answer=
+:ask
+  set /p answer="REALLY remove all Microsoft telemetry (Y/N)? "
+  if /i "%answer:~,1%" EQU "Y" (
+    GOTO CONT 
+  )
+  if /i "%answer:~,1%" EQU "N" (
+    echo ABORTED.
+    exit /b
+  )
+  echo Please type Y or N.
+  goto ask
+:CONT
+
+echo.
+echo OK ... trying to remove ALL the stupid fucking microsoft TELEMETRY BULLSHIT!
+
+echo.
+echo ADDING some registry keys to disable telemetry ...
+reg add "HKCU\Software\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppContainer\Storage\microsoft.microsoftedge_8wekyb3d8bbwe\MicrosoftEdge\PhishingFilter" ^
+  /v "EnabledV9" /t REG_DWORD /d "0" /f
+reg add "HKLM\SOFTWARE\Policies\Microsoft\MicrosoftEdge\PhishingFilter" /v "EnabledV9" /t REG_DWORD /d 0 /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\AppCompat" /v AITEnable /t REG_DWORD /d 0 /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\AppCompat" /v DisableInventory /t REG_DWORD /d 1 /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\AppCompat" /v DisablePCA /t REG_DWORD /d 1 /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\AppCompat" /v DisableUAR /t REG_DWORD /d 1 /f
+reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows Defender" /v DisableAntiSpyware /t REG_DWORD /d 1 /f
+reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows Defender\Spynet" /v SpyNetReporting /t REG_DWORD /d 0 /f
+reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows Defender\Spynet" /v SubmitSamplesConsent /t REG_DWORD /d 2 /f
+reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows Defender\Spynet" /v DontReportInfectionInformation /t REG_DWORD /d 1 /f
+reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\GameDVR" /v AllowGameDVR /t REG_DWORD /d 0 /f
+reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Windows Error Reporting" /v Disabled /t REG_DWORD /d 1 /f
+reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v NoAutoUpdate /t REG_DWORD /d 0 /f
+reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v AUOptions /t REG_DWORD /d 2 /f
+reg add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v DisableSoftLanding /t REG_DWORD /d 1 /f
+reg add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v DisableWindowsSpotlightFeatures /t REG_DWORD /d 1 /f
+reg add "HKLM\SOFTWARE\Policies\Microsoft\MRT" /v "DontReportInfectionInformation" /t REG_DWORD /d 1 /f
+reg add "HKLM\SOFTWARE\Policies\Microsoft\MRT" /v "DontOfferThroughWUAU" /t REG_DWORD /d 1 /f
+reg add "HKLM\Software\Policies\Microsoft\WindowsStore" /v RemoveWindowsStore /t REG_DWORD /d 1 /f
+reg add "HKLM\Software\Policies\Microsoft\WindowsStore" /v DisableStoreApps /t REG_DWORD /d 1 /f
+reg add "HKLM\SOFTWARE\Policies\Microsoft\PushToInstall" /v DisablePushToInstall /t REG_DWORD /d 1 /f
+reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\SystemRestore" /v "DisableConfig" /t "REG_DWORD" /d "1" /f
+reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\SystemRestore" /v "DisableSR " /t "REG_DWORD" /d "1" /f
+reg add "HKLM\Software\Policies\Microsoft\Windows NT\CurrentVersion\Software Protection Platform" /v NoGenTicket /t REG_DWORD /d 1 /f
+reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /v AllowCortana /t REG_DWORD /d 0 /f
+reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\System" /v "EnableSmartScreen" /t REG_DWORD /d 0 /f
+reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore" /v "DisableConfig" /t "REG_DWORD" /d "1" /f
+reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore" /v "DisableSR " /t "REG_DWORD" /d "1" /f
+reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\SecHealthUI.exe" /v Debugger ^
+  /t REG_SZ /d "%windir%\System32\taskkill.exe" /f
+reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\CompatTelRunner.exe" /v Debugger ^
+  /t REG_SZ /d "%windir%\System32\taskkill.exe" /f
+reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\DeviceCensus.exe" /v Debugger ^
+  /t REG_SZ /d "%windir%\System32\taskkill.exe" /f
+reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer" /v SmartScreenEnabled /t REG_SZ /d "Off" /f
+reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\AppHost" /v "EnableWebContentEvaluation" /t REG_DWORD /d "0" /f
+reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.SecurityAndMaintenance" ^
+  /v "Enabled" /t REG_DWORD /d 0 /f
+reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\AppHost" /v "EnableWebContentEvaluation" /t REG_DWORD /d 0 /f
+reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v SilentInstalledAppsEnabled /t REG_DWORD /d 0 /f
+reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\Explorer" /v "NoRecentDocsHistory" /t REG_DWORD /d 1 /f
+reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting" /v Disabled /t REG_DWORD /d 1 /f
+reg add "HKCU\Software\Microsoft\Internet Explorer\PhishingFilter" /v "EnabledV9" /t REG_DWORD /d 0 /f
+reg add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v DisableWindowsConsumerFeatures /t REG_DWORD /d 1 /f
+reg add "HKLM\Software\Policies\Microsoft\Windows\DataCollection" /v DoNotShowFeedbackNotifications /t REG_DWORD /d 1 /f
+reg add "HKLM\Software\Policies\Microsoft\WindowsInkWorkspace" /v AllowSuggestedAppsInWindowsInkWorkspace /t REG_DWORD /d 0 /f
+reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v ScheduledInstallDay /t REG_DWORD /d 0 /f
+reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v ScheduledInstallTime /t REG_DWORD /d 3 /f
+reg add "HKLM\Software\Policies\Microsoft\Windows\SettingSync" /v DisableSettingSync /t REG_DWORD /d 2 /f
+reg add "HKLM\Software\Policies\Microsoft\Windows\SettingSync" /v DisableSettingSyncUserOverride /t REG_DWORD /d 1 /f
+reg add "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Siuf\Rules" /v "NumberOfSIUFInPeriod" /t REG_DWORD /d 0 /f
+reg add "HKLM\SYSTEM\ControlSet001\Control\WMI\AutoLogger\AutoLogger-Diagtrack-Listener" /v Start /t REG_DWORD /d 0 /f
+reg add "HKLM\SYSTEM\CurrentControlSet\Services\SharedAccess\Parameters\FirewallPolicy\FirewallRules" /v "{2765E0F4-2918-4A46-B9C9-43CDD8FCBA2B}" ^
+  /t REG_SZ /d "BlockCortana|Action=Block|Active=TRUE|Dir=Out|App=C:\windows\systemapps\microsoft.windows.cortana_cw5n1h2txyewy\searchui.exe|Name=Search and Cortana application|AppPkgId=S-1-15-2-1861897761-1695161497-2927542615-642690995-327840285-2659745135-2630312742|" /f
+
+echo.
+echo DELETING some registry keys to disable telemetry ...
+reg delete "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Siuf\Rules" /v "PeriodInNanoSeconds" /f
+reg delete "HKLM\SYSTEM\CurrentControlSet\Services\xbgm" /f
+reg delete "HKLM\SYSTEM\CurrentControlSet\Services\Sense" /f
+reg delete "HKLM\SYSTEM\CurrentControlSet\Services\SecurityHealthService" /f
+reg delete "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" /v "SecurityHealth" /f
+reg delete "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\StartupApproved\Run" /v "SecurityHealth" /f
+for /f "tokens=1" %%I in ('reg query "HKLM\SYSTEM\CurrentControlSet\Services" ^
+  /k /f "wscsvc" ^| find /i "wscsvc"') do (reg delete %%I /f)
+for /f "tokens=1" %%I in ('reg query "HKLM\SYSTEM\CurrentControlSet\Services" ^
+  /k /f "OneSyncSvc" ^| find /i "OneSyncSvc"') do (reg delete %%I /f)
+for /f "tokens=1" %%I in ('reg query "HKLM\SYSTEM\CurrentControlSet\Services" ^
+  /k /f "MessagingService" ^| find /i "MessagingService"') do (reg delete %%I /f)
+for /f "tokens=1" %%I in ('reg query "HKLM\SYSTEM\CurrentControlSet\Services" ^
+  /k /f "PimIndexMaintenanceSvc" ^| find /i "PimIndexMaintenanceSvc"') do (reg delete %%I /f)
+for /f "tokens=1" %%I in ('reg query "HKLM\SYSTEM\CurrentControlSet\Services" ^
+  /k /f "UserDataSvc" ^| find /i "UserDataSvc"') do (reg delete %%I /f)
+for /f "tokens=1" %%I in ('reg query "HKLM\SYSTEM\CurrentControlSet\Services" ^
+  /k /f "UnistoreSvc" ^| find /i "UnistoreSvc"') do (reg delete %%I /f)
+for /f "tokens=1" %%I in ('reg query "HKLM\SYSTEM\CurrentControlSet\Services" ^
+  /k /f "BcastDVRUserService" ^| find /i "BcastDVRUserService"') do (reg delete %%I /f)
+for /f "tokens=1" %%I in ('reg query "HKLM\SYSTEM\CurrentControlSet\Services" ^
+  /k /f "Sgrmbroker" ^| find /i "Sgrmbroker"') do (reg delete %%I /f)
+for /f "tokens=1" %%I in ('reg query "HKLM\SYSTEM\CurrentControlSet\Services" ^
+  /k /f "ClipSVC" ^| find /i "ClipSVC"') do (reg delete %%I /f)
+
+echo.
+echo DELETING some services ...
+sc delete PushToInstall
+sc delete XblAuthManager
+sc delete XblGameSave
+sc delete XboxNetApiSvc
+sc delete XboxGipSvc
+sc delete MapsBroker
+sc delete lfsvc
+sc delete DiagTrack
+sc delete dmwappushservice
+sc delete WerSvc
+sc delete OneSyncSvc
+sc delete MessagingService
+sc delete wercplsupport
+sc delete PcaSvc
+sc delete wisvc
+sc delete RetailDemo
+sc delete diagsvc
+sc delete shpamsvc
+sc delete TermService
+sc delete UmRdpService
+sc delete SessionEnv
+sc delete TroubleshootingSvc
+sc delete diagnosticshub.standardcollector.service
+
+echo.
+echo RECONFIGURING some services ...
+sc config wlidsvc start=demand
+
+echo.
+echo DISABLING some tasks ...
+schtasks /Change /TN "Microsoft\XblGameSave\XblGameSaveTask" /disable
+schtasks /Change /TN "Microsoft\XblGameSave\XblGameSaveTaskLogon" /disable
+schtasks /Change /TN "\Microsoft\Windows\Maps\MapsUpdateTask" /disable
+schtasks /Change /TN "\Microsoft\Windows\Maps\MapsToastTask" /disable
+schtasks /Change /TN "\Microsoft\Windows\HelloFace\FODCleanupTask" /Disable
+schtasks /Change /TN "\Microsoft\Windows\SystemRestore\SR" /disable
+schtasks /Change /TN "Microsoft\Windows\AppID\SmartScreenSpecific" /disable
+schtasks /Change /TN "Microsoft\Windows\Application Experience\AitAgent" /disable
+schtasks /Change /TN "Microsoft\Windows\Application Experience\Microsoft Compatibility Appraiser" /disable
+schtasks /Change /TN "Microsoft\Windows\Application Experience\ProgramDataUpdater" /disable
+schtasks /Change /TN "Microsoft\Windows\Application Experience\StartupAppTask" /disable
+schtasks /Change /TN "Microsoft\Windows\Autochk\Proxy" /disable
+schtasks /Change /TN "Microsoft\Windows\CloudExperienceHost\CreateObjectTask" /disable
+schtasks /Change /TN "Microsoft\Windows\Customer Experience Improvement Program\BthSQM" /disable
+schtasks /Change /TN "Microsoft\Windows\Customer Experience Improvement Program\Consolidator" /disable
+schtasks /Change /TN "Microsoft\Windows\Customer Experience Improvement Program\KernelCeipTask" /disable
+schtasks /Change /TN "Microsoft\Windows\Customer Experience Improvement Program\Uploader" /disable
+schtasks /Change /TN "Microsoft\Windows\Customer Experience Improvement Program\UsbCeip" /disable
+schtasks /Change /TN "Microsoft\Windows\DiskDiagnostic\Microsoft-Windows-DiskDiagnosticDataCollector" /disable
+schtasks /Change /TN "Microsoft\Windows\DiskFootprint\Diagnostics" /disable
+schtasks /Change /TN "Microsoft\Windows\FileHistory\File History (maintenance mode)" /disable
+schtasks /Change /TN "Microsoft\Windows\Maintenance\WinSAT" /disable
+schtasks /Change /TN "Microsoft\Windows\PI\Sqm-Tasks" /disable
+schtasks /Change /TN "Microsoft\Windows\Power Efficiency Diagnostics\AnalyzeSystem" /disable
+schtasks /Change /TN "Microsoft\Windows\Shell\FamilySafetyMonitor" /disable
+schtasks /Change /TN "Microsoft\Windows\Shell\FamilySafetyRefresh" /disable
+schtasks /Change /TN "Microsoft\Windows\Shell\FamilySafetyUpload" /disable
+schtasks /Change /TN "Microsoft\Windows\Windows Error Reporting\QueueReporting" /disable
+schtasks /Change /TN "Microsoft\Windows\WindowsUpdate\Automatic App Update" /disable
+schtasks /Change /TN "Microsoft\Windows\License Manager\TempSignedLicenseExchange" /disable
+schtasks /Change /TN "Microsoft\Windows\Clip\License Validation" /disable
+schtasks /Change /TN "\Microsoft\Windows\ApplicationData\DsSvcCleanup" /disable
+schtasks /Change /TN "\Microsoft\Windows\Power Efficiency Diagnostics\AnalyzeSystem" /disable
+schtasks /Change /TN "\Microsoft\Windows\PushToInstall\LoginCheck" /disable
+schtasks /Change /TN "\Microsoft\Windows\PushToInstall\Registration" /disable
+schtasks /Change /TN "\Microsoft\Windows\Shell\FamilySafetyMonitor" /disable
+schtasks /Change /TN "\Microsoft\Windows\Shell\FamilySafetyMonitorToastTask" /disable
+schtasks /Change /TN "\Microsoft\Windows\Shell\FamilySafetyRefreshTask" /disable
+schtasks /Change /TN "\Microsoft\Windows\Subscription\EnableLicenseAcquisition" /disable
+schtasks /Change /TN "\Microsoft\Windows\Subscription\LicenseAcquisition" /disable
+schtasks /Change /TN "\Microsoft\Windows\Diagnosis\RecommendedTroubleshootingScanner" /disable
+schtasks /Change /TN "\Microsoft\Windows\Diagnosis\Scheduled" /disable
+schtasks /Change /TN "\Microsoft\Windows\NetTrace\GatherNetworkInfo" /disable
+
+echo.
+echo DELETING shadow copies ...
+vssadmin delete shadows /all /Quiet
+
+echo.
+echo DELETING some files ...
+del /F /Q "C:\Windows\System32\Tasks\Microsoft\Windows\SettingSync\*" 
+
+echo.
+echo REMOVING the store ...
+powershell -Command ./uninstall-store.ps1
+
+echo.
+echo ####### %0 #######
+pause
+shutdown -g -t 0
+
diff --git a/optional/unpack-hakchi2.cmd b/optional/unpack-hakchi2.cmd
index 51e5026..bd96282 100644
--- a/optional/unpack-hakchi2.cmd
+++ b/optional/unpack-hakchi2.cmd
@@ -1,29 +1,29 @@
-@echo off
-
-set TOOLS=c:\tools
-set CONFIG=config\hakchi2_config.ini
-set ZIP=..\software\hakchi2.zip
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-
-if NOT EXIST %ZIP% (
-  echo ERROR: %ZIP% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo killing hakchi2 processes...
-taskkill /F /IM hakchi.exe 2>nul
-
-echo unpacking Hakchi2 ...
-%TOOLS%\7z x -y -aoa -o"%ProgramFiles(x86)%" %ZIP%
-
-echo copying config ...
-mkdir "%ProgramFiles(x86)%\hakchi2\config" 2>nul
-copy /Y %CONFIG% "%ProgramFiles(x86)%\hakchi2\config\config.ini"
-
-echo copy startmenu link ...
-copy /Y startmenu\HakChi2.lnk %STARTMENU%
-
-echo ####### %0 #######
-pause
+@echo off
+call check-for-admin
+
+set CONFIG=config\hakchi2_config.ini
+set ZIP=..\software\hakchi2.zip
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %ZIP% (
+  echo ERROR: %ZIP% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo killing hakchi2 processes...
+taskkill /F /IM hakchi.exe 2>nul
+
+echo unpacking Hakchi2 ...
+7z x -y -aoa -o"%ProgramFiles(x86)%" %ZIP%
+
+echo copying config ...
+mkdir "%ProgramFiles(x86)%\hakchi2\config" 2>nul
+copy /Y %CONFIG% "%ProgramFiles(x86)%\hakchi2\config\config.ini"
+
+echo copy startmenu link ...
+copy /Y startmenu\HakChi2.lnk %STARTMENU%
+
+echo ####### %0 #######
+pause
diff --git a/optional/unpack-mame.cmd b/optional/unpack-mame.cmd
index 79d1680..6476247 100644
--- a/optional/unpack-mame.cmd
+++ b/optional/unpack-mame.cmd
@@ -1,40 +1,40 @@
-@echo off
-
-set T=c:\TEMP
-set TOOLS=c:\tools
-set ZIP=..\software\mame64.7z
-set TARGET=c:\MAME
-set CONFIG=config\mame.ini
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-
-if NOT EXIST %ZIP% (
-  echo ERROR: %ZIP% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo killing MAME64 processes...
-taskkill /F /IM hakchi.exe 2>nul
-
-rem create directory ...
-mkdir %TARGET% 2>nul
-
-echo unpacking MAME64 ...
-%TOOLS%\7z x -y -aoa -o%T%\mame %ZIP%
-
-echo moving files ...
-move /Y %T%\mame\mame64.exe %TARGET%
-move /Y %T%\mame\mame64.sym %TARGET%
-mkdir %TARGET%\roms 2>nul
-rd /S /Q %T%\mame
-echo.
-
-echo copy ini file ...
-copy /Y %CONFIG% %TARGET%
-
-echo copy startmenu link ...
-copy /Y startmenu\MAME64.lnk %STARTMENU%
-
-echo ####### %0 #######
-pause
+@echo off
+call check-for-admin
+
+set T=c:\TEMP
+set ZIP=..\software\mame64.7z
+set TARGET=c:\MAME
+set CONFIG=config\mame.ini
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %ZIP% (
+  echo ERROR: %ZIP% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo killing MAME64 processes...
+taskkill /F /IM hakchi.exe 2>nul
+
+rem create directory ...
+mkdir %TARGET% 2>nul
+
+echo unpacking MAME64 ...
+7z x -y -aoa -o%T%\mame %ZIP%
+
+echo moving files ...
+move /Y %T%\mame\mame64.exe %TARGET%
+move /Y %T%\mame\mame64.sym %TARGET%
+mkdir %TARGET%\roms 2>nul
+rd /S /Q %T%\mame
+echo.
+
+echo copy ini file ...
+copy /Y %CONFIG% %TARGET%
+
+echo copy startmenu link ...
+copy /Y startmenu\MAME64.lnk %STARTMENU%
+
+echo ####### %0 #######
+pause
diff --git a/optional/unpack-snapcontrol.cmd b/optional/unpack-snapcontrol.cmd
index 66e7f4f..31ef59b 100644
--- a/optional/unpack-snapcontrol.cmd
+++ b/optional/unpack-snapcontrol.cmd
@@ -1,23 +1,23 @@
-@echo off
-
-set TOOLS=c:\tools
-set ZIP=..\software\snapcontrol.zip
-set T=C:\TEMP
-
-if NOT EXIST %ZIP% (
-  echo ERROR: %ZIP% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-%TOOLS%\7z e -y -aoa -o%T%\snapcontrol %ZIP% 1>nul
-%T%\snapcontrol\snapcontrol.exe /I
-copy /Y %T%\snapcontrol\LICENSE.txt c:\snapshot
-copy /Y %T%\snapcontrol\README.md c:\snapshot
-rd /S /Q %T%\snapcontrol
-echo.
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set T=C:\TEMP
+set ZIP=..\software\snapcontrol.zip
+
+if NOT EXIST %ZIP% (
+  echo ERROR: %ZIP% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+7z e -y -aoa -o%T%\snapcontrol %ZIP% 1>nul
+%T%\snapcontrol\snapcontrol.exe /I
+copy /Y %T%\snapcontrol\LICENSE.txt c:\snapshot
+copy /Y %T%\snapcontrol\README.md c:\snapshot
+rd /S /Q %T%\snapcontrol
+echo.
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/unpack-winauth.cmd b/optional/unpack-winauth.cmd
index 74925b0..6df3166 100644
--- a/optional/unpack-winauth.cmd
+++ b/optional/unpack-winauth.cmd
@@ -1,26 +1,26 @@
-@echo off
-
-set TOOLS=c:\tools
-set ZIP=..\software\winauth.zip
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-
-if NOT EXIST %ZIP% (
-  echo ERROR: %ZIP% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo killing WinAuth processes...
-taskkill /F /IM winauth.exe 2>nul
-
-echo unpacking WinAuth ...
-%TOOLS%\7z x -y -aoa -o"%ProgramFiles(x86)%" %ZIP%
-
-echo copy startmenu link ...
-copy /Y startmenu\WinAuth.lnk %STARTMENU%
-copy /Y startmenu\WinAuth.lnk %PUBLIC%\Desktop
-
-echo ####### %0 #######
-pause
-
+@echo off
+call check-for-admin
+
+set ZIP=..\software\winauth.zip
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %ZIP% (
+  echo ERROR: %ZIP% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo killing WinAuth processes...
+taskkill /F /IM winauth.exe 2>nul
+
+echo unpacking WinAuth ...
+7z x -y -aoa -o"%ProgramFiles(x86)%" %ZIP%
+
+echo copy startmenu link ...
+copy /Y startmenu\WinAuth.lnk %STARTMENU%
+copy /Y startmenu\WinAuth.lnk %PUBLIC%\Desktop
+
+echo ####### %0 #######
+pause
+
diff --git a/tools/check-for-admin.cmd b/tools/check-for-admin.cmd
index a87f0e8..12ca881 100644
--- a/tools/check-for-admin.cmd
+++ b/tools/check-for-admin.cmd
@@ -4,7 +4,7 @@ net session >nul 2>&1
 if NOT %ERRORLEVEL% == 0 ( 
   echo ERROR: User has NO ADMINISTRATOR rights!
   pause
-  exit /b
+  exit
 )
 
 echo OK. User is an ADMINISTRATOR.