diff --git a/software/basic.csv b/software/basic.csv
index 98f35ca..e34da9b 100644
--- a/software/basic.csv
+++ b/software/basic.csv
@@ -52,3 +52,4 @@ https://ftp.halifax.rwth-aachen.de/osdn/crystaldiskinfo/78192/CrystalDiskInfo8_1
 https://drive.google.com/uc?id=18y-dVgXVmkrUEniOs38kL-lPQrzufwPT&export=download sku.zip
 https://github.com/massgravel/Microsoft-Activation-Scripts/archive/refs/heads/master.zip mas.zip
 https://github.com/stascorp/rdpwrap/releases/download/v1.6.2/RDPWrap-v1.6.2.zip rdpwrap.zip
+https://www.donkz.nl/download/remote-desktop-plus/?tmstv=1706629805 rdp.exe
diff --git a/source/thinclient.pb b/source/thinclient.pb
new file mode 100644
index 0000000..fc9e9d9
--- /dev/null
+++ b/source/thinclient.pb
@@ -0,0 +1,85 @@
+; thinclient.pb
+; ------------------------------------------------------------
+; wrapper for mstsc.exe & vnc.exe (tvnviewer.exe) 
+; LICENSE  : GPL
+; AUTHOR   : Michael H.G. Schmidt
+; EMAIL    : michael@schmidt2.de
+; DATE     : 20240130
+; ------------------------------------------------------------
+;
+
+; Get system drive
+Global SYS$=GetEnvironmentVariable("SystemDrive")
+
+Procedure StartRDP()
+  ; start RDP ...
+  dummy=RunProgram(SYS$ + "\tools\rdp.exe","/kiosk:cup /ontop /nodrives /noprinters /span","")
+EndProcedure
+
+Procedure StartVNC()
+  ; start VNC ...
+  dummy=RunProgram(SYS$ + "\tools\tvnviewer.exe")
+EndProcedure
+
+
+; Button handler procedure
+Procedure ButtonHandler()
+  
+  Select EventGadget()    
+    Case 0
+      StartRDP()
+      
+    Case 1
+      StartVNC()
+      
+  EndSelect
+
+EndProcedure
+
+;;;;;;;
+; MAIN
+;;;;;;;
+
+; open window to hide all other windows on desktop ...
+OpenWindow(0, 0, 0, 0, 0, "", #PB_Window_BorderLess | #PB_Window_Maximize)
+ 
+; set colour to windows blue ...
+SetWindowColor(0, RGB($04,$92,$c2)) 
+
+; Get window size
+W = WindowWidth(0)
+H = WindowHeight(0)
+
+; Shrink factor for buttons
+S=0.1
+
+; position calculations for the buttons
+X0=W/2-(W*S/2)
+
+GAP=W*0.01
+ButtonW=W*0.1
+ButtonH=H*0.1
+
+BX0=X0 - (ButtonW*2 + GAP)/2
+BX1=BX0 + ButtonW + GAP
+
+BY=H/2-ButtonH/2
+
+; use a bigger font the buttons
+LoadFont(0, "MS Shell Dlg", 16)
+SetGadgetFont(#PB_Default, FontID(0))
+
+; Create Buttons
+ButtonGadget(0, BX0, BY, ButtonW, ButtonH, "Remote Desktop", #PB_Button_MultiLine)
+BindGadgetEvent(0, @ButtonHandler())
+
+ButtonGadget(1, BX1, BY, ButtonW, ButtonH, "VNC viewer", #PB_Button_MultiLine)
+BindGadgetEvent(1, @ButtonHandler())
+
+; MAIN LOOP
+Repeat : Until WaitWindowEvent() = #PB_Event_CloseWindow
+
+; IDE Options = PureBasic 5.73 LTS (Windows - x64)
+; CursorPosition = 22
+; Folding = -
+; EnableXP
\ No newline at end of file
diff --git a/tools/disable-thinclient.cmd b/tools/disable-thinclient.cmd
index 826e9b9..dd9e6f2 100644
--- a/tools/disable-thinclient.cmd
+++ b/tools/disable-thinclient.cmd
@@ -15,7 +15,6 @@ reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" ^
 
 echo Deleting user %THINUSER% ...
 net user %THINUSER% /DELETE
-%TOOLS%\deltree %PARENT%%THINUSER%
 
 echo Disabling Auto Logon for user %THINUSER% ...
 reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" ^
@@ -32,3 +31,4 @@ echo Please REBOOT NOW.
 echo.
 
 echo ####### %0 #######
+
diff --git a/tools/setup-thinclient.cmd b/tools/setup-thinclient.cmd
index 7b32f1e..d18d223 100644
--- a/tools/setup-thinclient.cmd
+++ b/tools/setup-thinclient.cmd
@@ -1,13 +1,13 @@
 @echo off
 set TOOLS=c:\tools
 set THINUSER=THINCLIENT
-set THINPASS=a024b1b5f67a4866af17e5fdd1168b7d
+set THINPASS=a024b1b5f6
 
 echo ####### %0 #######
 
 echo Changing shell to THINCLIENT.EXE ...
 reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" ^
-  /v Shell /t REG_SZ /d "cmd.exe /C %TOOLS%\logonalt.vbs" /f 2>/nul
+  /v Shell /t REG_SZ /d "%TOOLS%\thinclient.exe" /f 2>/nul
 
 echo Creating user %THINUSER% ...
 net user %THINUSER% %THINPASS% /ADD
diff --git a/tools/thinclient.cmd b/tools/thinclient.cmd
deleted file mode 100644
index aabcb5e..0000000
--- a/tools/thinclient.cmd
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off
-
-:THINLOOP
-start /WAIT thinclient.exe
-goto :THINLOOP
-
diff --git a/tools/thinclient.exe b/tools/thinclient.exe
index 609606e..f68b071 100644
Binary files a/tools/thinclient.exe and b/tools/thinclient.exe differ
diff --git a/tools/thinclient.vbs b/tools/thinclient.vbs
deleted file mode 100644
index eeea057..0000000
--- a/tools/thinclient.vbs
+++ /dev/null
@@ -1,3 +0,0 @@
-Set LogonScript = CreateObject("WScript.Shell")
-LogonScript.Run "%SystemDrive%\tools\thinclient.cmd", 0, False
-