diff --git a/tiNGrundpaketClient.txt b/tiNGrundpaketClient.txt
index 0cdf1c4..949a489 100644
--- a/tiNGrundpaketClient.txt
+++ b/tiNGrundpaketClient.txt
@@ -2,12 +2,10 @@
 # TODO: Default programs for Datatypes, Install all Updates (not only critical)
 
 #----------------Setting 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
@@ -17,25 +15,24 @@ if (-not (Get-Command choco -ErrorAction SilentlyContinue)) {
     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"
 
 #----------------Configure Windows------------------------
-# Set Hostname
 Write-Host "Setting Hostname to $dHostname"
 Rename-Computer -NewName "$dHostname" -Force
 
-# Enable Remote Desktop
 Enable-RemoteDesktop
-
-# Remove annoying Windows Stuff
 Disable-GameBarTips
 
-# 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
+#---------------Taskbar configuration for Windows 11---------------
+Write-Host "Configuring Taskbar for Windows 11..."
+# Always show all icons
+Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" -Name "TaskbarSmallIcons" -Value 1
+Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" -Name "TaskbarGlomLevel" -Value 2
+# Restart Explorer to apply
+Stop-Process -f -ProcessName explorer
 
 # Show Hidden Files, File Extensions, Systemfiles and Full-Path in Titlebar
 Set-WindowsExplorerOptions -EnableShowFullPathInTitleBar
@@ -48,19 +45,15 @@ reg add HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip6\Parameters /
 net time /setsntp:"0.de.pool.ntp.org"
 
 #---------------Install important Windows Packages---------------
-# Install all critical OS Updates
 Install-WindowsUpdate -AcceptEula -GetUpdatesFromMS
 choco install javaruntime -y --cacheLocation="c:\temp"
 
 #---------------Install Tueit Basic Software---------------------
 choco install vlc -y --cacheLocation="c:\temp"
-#choco install adobereader -y --cacheLocation="c:\temp"
 choco install 7zip -y --cacheLocation="c:\temp"
 choco install firefox -y --cacheLocation="c:\temp"
-#choco install googlechrome -y --cacheLocation="c:\temp"
 choco install greenshot -y --cacheLocation="c:\temp"
 choco install thunderbird -y --cacheLocation="c:\temp"
-#choco install pdf24 -y --cacheLocation="c:\temp"
 choco install openvpn-connect -y --cacheLocation="c:\temp"
 choco install rustdesk --params "'/config: host=rd.tueit.de,key=udW7BhgOOwFypZX4KKGMBORO4EG6+MvsPVEmY99F4UA='"
 
@@ -69,7 +62,7 @@ function removeApp {
     Param ([string]$appName)
     Write-Output "Trying to remove $appName"
     Get-AppxPackage $appName -AllUsers | Remove-AppxPackage
-    Get-AppXProvisionedPackage -Online | Where DisplayNam -like $appName | Remove-AppxProvisionedPackage -Online
+    Get-AppXProvisionedPackage -Online | Where DisplayName -like $appName | Remove-AppxProvisionedPackage -Online
 }
 
 $applicationList = @(
@@ -86,7 +79,7 @@ $applicationList = @(
     "*Facebook*"
     "*Keeper*"
     "*.EclipseManager"
-    "ActiproSoftwareLLC.562882FEEB491" # Code Writer
+    "ActiproSoftwareLLC.562882FEEB491"
     "*DolbyAccess*"
     "*disney*"
     "*HiddenCityMysteryofShadows*"
@@ -128,4 +121,4 @@ $applicationList = @(
 
 foreach ($app in $applicationList) {
     removeApp $app
-}
+}
\ No newline at end of file