diff --git a/01_ExtractIso.cmd b/01_ExtractIso.cmd
index 5dfa2f6..a064a3e 100644
--- a/01_ExtractIso.cmd
+++ b/01_ExtractIso.cmd
@@ -2,12 +2,12 @@
 set T=c:\TEMP
 set W10=%T%\W10
 
+IF %1.==. GOTO USAGE
+
 echo ====================
 echo Extract ISO file ...
 echo ====================
 
-IF %1.==. GOTO USAGE
-
 rem get fullpath of isofile ...
 set ISOFILE=%~f1
 
diff --git a/05_CreateStick.cmd b/05_CreateStick.cmd
index c9db839..51ca17b 100644
--- a/05_CreateStick.cmd
+++ b/05_CreateStick.cmd
@@ -1,13 +1,13 @@
 @echo off
 
+IF %1.==. GOTO USAGE
+IF %2.==. GOTO USAGE
+
 echo.
 echo ====================
 echo Create USB Stick ...
 echo ====================
 
-IF %1.==. GOTO USAGE
-IF %2.==. GOTO USAGE
-
 rem get fullpath of isofile ...
 set USBDRIVE=%1
 set ISOFILE=%~f2
diff --git a/06_PrepareStick.cmd b/06_PrepareStick.cmd
index 28b081c..2cbb70a 100644
--- a/06_PrepareStick.cmd
+++ b/06_PrepareStick.cmd
@@ -4,13 +4,13 @@ set BOOT=boot.wim
 set IMAGE=install_FINAL.esd
 set ALTIMAGE=install_FINAL_lastrun.esd
 
+IF %1.==. GOTO USAGE
+
 echo.
 echo =====================
 echo Prepare USB Stick ...
 echo =====================
 
-IF %1.==. GOTO USAGE
-
 set USBDRIVE=%1
 
 if /I %USBDRIVE% == C: (
diff --git a/07_MakeIso.cmd b/07_MakeIso.cmd
index b1f5b9d..9b4b573 100644
--- a/07_MakeIso.cmd
+++ b/07_MakeIso.cmd
@@ -3,12 +3,13 @@ set OSCDPATH="%ProgramFiles(x86)%\Windows Kits\10\Assessment and Deployment Kit\
 set OSLABEL=WIN10-AUTO
 set ISOFILE=c:\temp\%OSLABEL%.iso
 
+IF %1.==. GOTO USAGE
+
 echo ===================
 echo Make ISO file ...
 echo ===================
 echo.
 
-IF %1.==. GOTO USAGE
 set USBDRIVE=%1
 
 if /I %USBDRIVE% == C: (
diff --git a/source/installwarning.pb b/source/installer.pb
similarity index 78%
rename from source/installwarning.pb
rename to source/installer.pb
index 3e2c925..d66986f 100644
--- a/source/installwarning.pb
+++ b/source/installer.pb
@@ -1,20 +1,24 @@
-; installwarning.pb
+; installer.pb
 ; ------------------------------------------------------------
-; shows a warning when starting the install process 
+; installer wrapper for setup.exe 
 ; LICENSE  : GPL
 ; AUTHOR   : Michael H.G. Schmidt
 ; EMAIL    : michael@schmidt2.de
-; DATE     : 20210315
+; DATE     : 20210317
 ; ------------------------------------------------------------
 ;
 
-dummy$ = ""
-
 ; preparations to use native "system" command...
 ImportC "msvcrt.lib"
   system(str.p-ascii)
 EndImport
 
+; open window to hide all other windows on dekstop ...
+OpenWindow(0, 0, 0, 0, 0, "", #PB_Window_BorderLess | #PB_Window_Maximize)
+ 
+; set colour to windows blue ...
+SetWindowColor(0, RGB($00,$a2,$ed)) 
+
 Result = MessageRequester("+++ Windows 10 unattended Installation +++",
                           "This will install a new OS (unattended)" + Chr(13) +
                           "and it will DELETE all DATA an your [ C: ] Drive!",
@@ -36,7 +40,7 @@ If Result = #PB_MessageRequester_Yes
 EndIf
 
 ; show abort message ...
-OpenWindow(0, 0, 0, 270, 70, "Installation ABORTED",
+OpenWindow(1, 0, 0, 270, 70, "Installation ABORTED",
            #PB_Window_SystemMenu | #PB_Window_ScreenCentered)
 
 If LoadFont(0, "System", 10)
@@ -50,4 +54,5 @@ Repeat : Until WaitWindowEvent() = True
 
 ; IDE Options = PureBasic 5.73 LTS (Windows - x64)
 ; CursorPosition = 32
+; FirstLine = 8
 ; EnableXP
\ No newline at end of file
diff --git a/tools/pbc.cmd b/tools/pbc.cmd
index 6da2227..2a4e64d 100644
--- a/tools/pbc.cmd
+++ b/tools/pbc.cmd
@@ -1,10 +1,15 @@
 @echo off
 
 IF %1.==. GOTO USAGE
-rem removing extension ...
+
+rem remove extension ...
 set BASENAME=%~n1
-rem adding extension again ...
-set SOURCEFILE=%BASENAME%.pb
+
+rem removing extension and get full path ...
+set FULLBASE=%~dpn1
+
+rem adding extension to fullbase again ...
+set SOURCEFILE=%FULLBASE%.pb
 
 pbcompiler /EXE %BASENAME%.exe /CONSOLE %SOURCEFILE%
 GOTO END
diff --git a/wim/finish-boot.cmd b/wim/finish-boot.cmd
index ad35ab9..470e282 100644
--- a/wim/finish-boot.cmd
+++ b/wim/finish-boot.cmd
@@ -2,13 +2,16 @@
 set SOURCES=c:\TEMP\W10\sources
 set BOOT=c:\TEMP\BOOT
 
-echo renaming Windows setup.exe ...
 if NOT EXIST %BOOT%\winsetup.exe (
+  echo renaming Windows setup.exe to boot ...
   move /Y %BOOT%\setup.exe %BOOT%\winsetup.exe
 )
 
-echo copy install utility to boot ...
-copy /Y installwarning.exe %BOOT%\setup.exe
+echo replacing setup.exe with our installer utility ...
+copy /Y installer.exe %BOOT%\setup.exe
+
+echo showing boot contents ...
+dir %BOOT%
 
 echo unmounting and committing changes to %SOURCES%\boot.wim ...
 dism /Unmount-Wim /MountDir:%BOOT% /Commit
diff --git a/wim/installwarning.exe b/wim/installwarning.exe
deleted file mode 100644
index f1115db..0000000
Binary files a/wim/installwarning.exe and /dev/null differ