diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index fce5a71..8672426 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -86,7 +86,7 @@ echo.
 call install-far.cmd
 echo.
 
-powershell -command install-windowsterminal.ps1
+powershell -command .\install-windowsterminal.ps1
 echo.
 
 call install-sublime.cmd
diff --git a/scripts/config/aerolite.theme b/scripts/config/aerolite.theme
new file mode 100644
index 0000000..6a4ddef
--- /dev/null
+++ b/scripts/config/aerolite.theme
@@ -0,0 +1,67 @@
+; Copyright © Microsoft Corp.
+
+[Theme]
+; Windows - IDS_THEME_DISPLAYNAME_AERO
+DisplayName=Aero Lite
+SetLogonBackground=0
+
+; Computer - SHIDI_SERVER
+[CLSID\{20D04FE0-3AEA-1069-A2D8-08002B30309D}\DefaultIcon]
+DefaultValue=%SystemRoot%\System32\imageres.dll,-109
+
+; UsersFiles - SHIDI_USERFILES
+[CLSID\{59031A47-3F72-44A7-89C5-5595FE6B30EE}\DefaultIcon]
+DefaultValue=%SystemRoot%\System32\imageres.dll,-123
+
+; Network - SHIDI_MYNETWORK
+[CLSID\{F02C1A0D-BE21-4350-88B0-7367FC96EF3C}\DefaultIcon]
+DefaultValue=%SystemRoot%\System32\imageres.dll,-25
+
+; Recycle Bin - SHIDI_RECYCLERFULL SHIDI_RECYCLER
+[CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon]
+Full=%SystemRoot%\System32\imageres.dll,-54
+Empty=%SystemRoot%\System32\imageres.dll,-55
+
+[Control Panel\Cursors]
+AppStarting=%SystemRoot%\cursors\aero_working.ani
+Arrow=%SystemRoot%\cursors\aero_arrow.cur
+Crosshair=
+Hand=%SystemRoot%\cursors\aero_link.cur
+Help=%SystemRoot%\cursors\aero_helpsel.cur
+IBeam=
+No=%SystemRoot%\cursors\aero_unavail.cur
+NWPen=%SystemRoot%\cursors\aero_pen.cur
+SizeAll=%SystemRoot%\cursors\aero_move.cur
+SizeNESW=%SystemRoot%\cursors\aero_nesw.cur
+SizeNS=%SystemRoot%\cursors\aero_ns.cur
+SizeNWSE=%SystemRoot%\cursors\aero_nwse.cur
+SizeWE=%SystemRoot%\cursors\aero_ew.cur
+UpArrow=%SystemRoot%\cursors\aero_up.cur
+Wait=%SystemRoot%\cursors\aero_busy.ani
+DefaultValue=Windows Default
+DefaultValue.MUI=@main.cpl,-1020
+
+[Control Panel\Desktop]
+Wallpaper=%SystemRoot%\web\wallpaper\Windows\img0.jpg
+TileWallpaper=0
+WallpaperStyle=10
+Pattern=
+
+[VisualStyles]
+Path=%ResourceDir%\Themes\aero\aerolite.msstyles
+ColorStyle=NormalColor
+Size=NormalSize
+AutoColorization=1
+ColorizationColor=0XC40078D7
+SystemMode=Dark
+
+[boot]
+SCRNSAVE.EXE=
+
+[MasterThemeSelector]
+MTSM=RJSPBS
+
+[Sounds]
+; IDS_SCHEME_DEFAULT
+SchemeName=@%SystemRoot%\System32\mmres.dll,-800
+
diff --git a/scripts/config/wt-settings.json b/scripts/config/wt-settings.json
index 5d84d87..ced9448 100644
--- a/scripts/config/wt-settings.json
+++ b/scripts/config/wt-settings.json
@@ -17,7 +17,7 @@
         [
             {
                 "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
-                "name": "Command Prompt",
+                "name": "Commandline",
                 "commandline": "cmd.exe /K c:\\tools\\start-ssh-agent.cmd",
                 "cursorShape": "filledBox",
                 "startingDirectory": "%USERPROFILE%\\workspace",
@@ -26,7 +26,7 @@
             },            
             {
                 "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
-                "name": "Windows PowerShell",
+                "name": "PowerShell",
                 "commandline": "powershell.exe",
                 "cursorShape": "filledBox",
                 "startingDirectory": "%USERPROFILE%\\workspace",
diff --git a/scripts/deploy/logon.cmd b/scripts/deploy/logon.cmd
index a0373e4..93ca514 100644
--- a/scripts/deploy/logon.cmd
+++ b/scripts/deploy/logon.cmd
@@ -46,12 +46,6 @@ if NOT EXIST %USERPROFILE%\.vimrc (
     %USERPROFILE%\.vimrc
 )
 
-rem WEZTERM
-if NOT EXIST %USERPROFILE%\.wezterm.lua (
-  copy /Y %TOOLS%\scripts\config\wezterm.lua ^
-    %USERPROFILE%\.wezterm.lua
-)
-
 rem TOTALCOMMANDER
 if NOT EXIST %APPDATA%\GHISLER\WINCMD.ini (
   mkdir %APPDATA%\GHISLER 1>nul 2>nul
diff --git a/scripts/modify-desktoptheme.cmd b/scripts/modify-desktoptheme.cmd
index 9cca179..40b9694 100644
--- a/scripts/modify-desktoptheme.cmd
+++ b/scripts/modify-desktoptheme.cmd
@@ -1,10 +1,13 @@
 @echo off
+set THEMES=C:\Windows\Resources\Themes
 
 echo ####### %0 #######
 
+copy /Y config\aerolite.theme %THEMES%
+
 echo activating AEROLITE theme ...
 @echo on
-powershell -command "Start-Process C:\Windows\Resources\Themes\aerolite.theme"
+powershell -command "Start-Process %THEMES%\aerolite.theme"
 @echo off
 
 echo ####### %0 #######
diff --git a/scripts/uninstall-edge.cmd b/scripts/uninstall-edge.cmd
index 497472a..4cbaccb 100644
--- a/scripts/uninstall-edge.cmd
+++ b/scripts/uninstall-edge.cmd
@@ -9,6 +9,9 @@ echo ####### %0 #######
 %EDGEROOT%\%INSTALLER%\setup.exe --uninstall --system-level --verbose-logging --force-uninstall
 
 echo cleanup ...
+tasklist
+taskkill /F /IM "*edge*"
+
 @echo on
 rd /S /Q %EDGEROOT%
 rd /S /Q %EDGEUPDATE%
diff --git a/wim/remove-apps.cmd b/wim/remove-apps.cmd
index 415566b..c0be774 100644
--- a/wim/remove-apps.cmd
+++ b/wim/remove-apps.cmd
@@ -43,7 +43,7 @@ dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.XboxSpee
 dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.YourPhone_2019.430.2026.0_neutral_~_8wekyb3d8bbwe
 dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.ZuneMusic_2019.19071.19011.0_neutral_~_8wekyb3d8bbwe
 dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.ZuneVideo_2019.19071.19011.0_neutral_~_8wekyb3d8bbwe
-rem dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WindowsCalculator_2020.1906.55.0_neutral_~_8wekyb3d8bbwe
+dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WindowsCalculator_2020.1906.55.0_neutral_~_8wekyb3d8bbwe
 
 @echo off