diff --git a/tiNGrundpaketClient.txt b/tiNGrundpaketClient.txt
index 69227ad..0cdf1c4 100644
--- a/tiNGrundpaketClient.txt
+++ b/tiNGrundpaketClient.txt
@@ -1,41 +1,54 @@
-#Windows 11 Pro Client Boxstarter Script: Grundpaket und Konfiguration (c) Tüit GmbH
-#TODO: Defaultprograms for Datatypes, Install all Updates (not only critical)
+# Windows 11 Pro Client Boxstarter Script: Grundpaket und Konfiguration (c) Tüit GmbH
+# TODO: Default programs for Datatypes, Install all Updates (not only critical)
 
 #----------------Setting Variables------------------------
-
-#Other Variables
+# Other Variables
 $dHostname = Read-Host 'Input desired Hostname (Default: Keep current hostname)'
 if($dHostname -eq ""){$dHostname = [Net.Dns]::GetHostName()}
 
 #---------------Configure Chocolatey and Environment-------------------------------
+# Install Chocolatey if not already installed
+if (-not (Get-Command choco -ErrorAction SilentlyContinue)) {
+    Write-Host "Chocolatey not found. Installing Chocolatey..."
+    Set-ExecutionPolicy Bypass -Scope Process -Force
+    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
+    iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
+} else {
+    Write-Host "Chocolatey already installed."
+}
+
+# Enable useful Chocolatey features
 choco features enable -n=allowGlobalConfirmation
 choco feature enable -n=allowEmptyChecksums
-New-Item -ErrorAction Ignore -Path "C:\" -Name "temp" -ItemType "directory"`
+New-Item -ErrorAction Ignore -Path "C:\" -Name "temp" -ItemType "directory"
 
 #----------------Configure Windows------------------------
-#Set Hostname
-Write-Host "Setting Hostname to $dHostname":
+# Set Hostname
+Write-Host "Setting Hostname to $dHostname"
 Rename-Computer -NewName "$dHostname" -Force
-#Enable RemoteDesktop
+
+# Enable Remote Desktop
 Enable-RemoteDesktop
-#Remove annoying Windows Stuff
+
+# Remove annoying Windows Stuff
 Disable-GameBarTips
-#Set Taskbar to Lock and put it to the bottom and show all icons
+
+# Set Taskbar to Lock, Bottom and show all icons
 Set-TaskbarOptions -Size Small -Dock Bottom -Combine Full -Lock
 Set-TaskbarOptions -Size Small -Dock Bottom -Combine Full -AlwaysShowIconsOn
-#Show Hidden Files, File Extensions, Systemfiles and Full-Path in Titlebar
+
+# Show Hidden Files, File Extensions, Systemfiles and Full-Path in Titlebar
 Set-WindowsExplorerOptions -EnableShowFullPathInTitleBar
-#Disable IPv6
-Write-Host DisabledComponents registry key:
+
+# Disable IPv6
+Write-Host "DisabledComponents registry key"
 reg add HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip6\Parameters /v DisabledComponents /t REG_DWORD /d 0xFF /f
-#Zeitserver einstellen
-#reg add HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers /v (Standard) /t REG_SZ /d 1 /f
-#reg add HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers /v 1 /t REG_SZ /d 0.de.pool.ntp.org /f
-#reg add HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers /v 2 /t REG_SZ /d 1.de.pool.ntp.org /f
+
+# Zeitserver einstellen
 net time /setsntp:"0.de.pool.ntp.org"
 
 #---------------Install important Windows Packages---------------
-#Install all critical OS Updates
+# Install all critical OS Updates
 Install-WindowsUpdate -AcceptEula -GetUpdatesFromMS
 choco install javaruntime -y --cacheLocation="c:\temp"
 
@@ -84,7 +97,6 @@ $applicationList = @(
     "*McAfee*"
     "*Minecraft*"
     "*Twitter*"
-
     "*outlook*"
     "*onedrive*"
     "*onenote*"
@@ -103,7 +115,7 @@ $applicationList = @(
     "Microsoft.OneDriveSync"
     "Microsoft.People"
     "Microsoft.SkypeApp"
-	"Microsoft.MicrosoftSolitaireCollection"
+    "Microsoft.MicrosoftSolitaireCollection"
     "Microsoft.Wallet"
     "Microsoft.WindowsFeedbackHub"
     "Microsoft.WindowsMaps"
@@ -112,8 +124,8 @@ $applicationList = @(
     "Microsoft.Zune*"
     "MicrosoftTeams"
     "*WebExperience*"
-);
+)
 
 foreach ($app in $applicationList) {
     removeApp $app
-}
\ No newline at end of file
+}