diff --git a/Autounattend/Custom-Scripts.txt b/Autounattend/Custom-Scripts.txt
index ab844b8..6f675cf 100644
--- a/Autounattend/Custom-Scripts.txt
+++ b/Autounattend/Custom-Scripts.txt
@@ -5,13 +5,13 @@ curl -L https://gitea.tcse.us/tricounty/tcse-deploy/archive/main.zip --output C:
 
 # 2. PS1
 Expand-Archive -Path 'C:\Scripts.zip' -DestinationPath 'C:\Scripts'
-timeout /t 15
-Remove-Item -Path 'C:\Scripts.zip'
+timeout /t 30
 
 # 3. PS1
 Move-Item -Path 'C:\Scripts\tcse-deploy\*' -Destination 'C:\Scripts'
 timeout /t 15
 Remove-Item -Path 'C:\Scripts\tcse-deploy\'
+Remove-Item -Path 'C:\Scripts.zip'
 
 # 4. CMD
 C:\Scripts\TCSE-Computer-Deploy.bat
\ No newline at end of file
diff --git a/Autounattend/Desktop/autounattend.xml b/Autounattend/Desktop/autounattend.xml
index e5e9d4f..d29a375 100644
--- a/Autounattend/Desktop/autounattend.xml
+++ b/Autounattend/Desktop/autounattend.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State">
-	<!--https://schneegans.de/windows/unattend-generator/?LanguageMode=Unattended&UILanguage=en-US&Locale=en-US&Keyboard=00000409&GeoLocation=244&ProcessorArchitecture=amd64&BypassRequirementsCheck=true&BypassNetworkCheck=true&ComputerNameMode=Script&ComputerNameScript=return+Read-Host+-Prompt+%27Enter+computer+name%27%3B&CompactOsMode=Default&TimeZoneMode=Explicit&TimeZone=Central+Standard+Time&PartitionMode=Unattended&PartitionLayout=GPT&EspSize=600&RecoveryMode=Partition&RecoverySize=1500&WindowsEditionMode=Unattended&WindowsEdition=pro&UserAccountMode=Unattended&AccountName0=Tech&AccountPassword0=SandlotSlickBoat%2325&AccountGroup0=Administrators&AccountName1=&AccountName2=&AccountName3=&AccountName4=&AutoLogonMode=Own&PasswordExpirationMode=Unlimited&LockoutMode=Default&HideFiles=Hidden&TaskbarSearch=Icon&ShowFileExtensions=true&DisableWidgets=true&LeftTaskbar=true&DeleteTaskbarIcons=true&HideTaskViewButton=true&DisableBingResults=true&AllowPowerShellScripts=true&DisableAppSuggestions=true&PreventDeviceEncryption=true&HideEdgeFre=true&WifiMode=Skip&ExpressSettings=DisableAll&KeysMode=Skip&ColorMode=Custom&SystemColorTheme=Light&AppsColorTheme=Light&AccentColor=%230078d4&WallpaperMode=Solid&WallpaperColor=%230978d3&Remove3DViewer=true&RemoveBingSearch=true&RemoveCalculator=true&RemoveCamera=true&RemoveClipchamp=true&RemoveClock=true&RemoveCopilot=true&RemoveCortana=true&RemoveDevHome=true&RemoveFamily=true&RemoveFeedbackHub=true&RemoveGetHelp=true&RemoveHandwriting=true&RemoveInternetExplorer=true&RemoveMailCalendar=true&RemoveMaps=true&RemoveMathInputPanel=true&RemoveMediaFeatures=true&RemoveMixedReality=true&RemoveZuneVideo=true&RemoveNews=true&RemoveOffice365=true&RemoveOneDrive=true&RemoveOneNote=true&RemoveOneSync=true&RemoveOpenSSHClient=true&RemoveOutlook=true&RemovePaint3D=true&RemovePeople=true&RemovePhotos=true&RemovePowerAutomate=true&RemovePowerShell2=true&RemovePowerShellISE=true&RemoveQuickAssist=true&RemoveRecall=true&RemoveRdpClient=true&RemoveSkype=true&RemoveSolitaire=true&RemoveSpeech=true&RemoveStepsRecorder=true&RemoveStickyNotes=true&RemoveTeams=true&RemoveGetStarted=true&RemoveToDo=true&RemoveVoiceRecorder=true&RemoveWallet=true&RemoveWeather=true&RemoveFaxAndScan=true&RemoveWindowsHello=true&RemoveWindowsMediaPlayer=true&RemoveZuneMusic=true&RemoveWordPad=true&RemoveXboxApps=true&RemoveYourPhone=true&StartTilesMode=Default&StartPinsMode=Empty&FirstLogonScript0=curl+-L+https%3A%2F%2Fgitea.tcse.us%2Ftricounty%2Ftcse-deploy%2Farchive%2Fmain.zip+%2D%2Doutput+C%3A%5CScripts.zip&FirstLogonScriptType0=Cmd&FirstLogonScript1=Expand-Archive+-Path+%27C%3A%5CScripts.zip%27+-DestinationPath+%27C%3A%5CScripts%27%0D%0ARemove-Item+-Path+%27C%3A%5CScripts.zip%27%0D%0AMove-Item+-Path+%27C%3A%5CScripts%5Ctcse-deploy%5C*%27+-Destination+%27C%3A%5CScripts%27%0D%0ARemove-Item+-Path+%27C%3A%5CScripts%5Ctcse-deploy%5C%27&FirstLogonScriptType1=Ps1&FirstLogonScript2=C%3A%5CScripts%5CTCSE-Computer-Deploy.bat&FirstLogonScriptType2=Cmd&WdacMode=Skip-->
+	<!--https://schneegans.de/windows/unattend-generator/?LanguageMode=Unattended&UILanguage=en-US&Locale=en-US&Keyboard=00000409&GeoLocation=244&ProcessorArchitecture=amd64&BypassRequirementsCheck=true&BypassNetworkCheck=true&ComputerNameMode=Script&ComputerNameScript=return+Read-Host+-Prompt+%27Enter+computer+name%27%3B&CompactOsMode=Default&TimeZoneMode=Explicit&TimeZone=Central+Standard+Time&PartitionMode=Unattended&PartitionLayout=GPT&EspSize=600&RecoveryMode=Partition&RecoverySize=1500&WindowsEditionMode=Generic&WindowsEdition=pro&UserAccountMode=Unattended&AccountName0=Tech&AccountPassword0=SandlotSlickBoat%2325&AccountGroup0=Administrators&AccountName1=&AccountName2=&AccountName3=&AccountName4=&AutoLogonMode=Own&PasswordExpirationMode=Unlimited&LockoutMode=Default&HideFiles=Hidden&ShowFileExtensions=true&TaskbarSearch=Icon&TaskbarIconsMode=Empty&DisableWidgets=true&LeftTaskbar=true&HideTaskViewButton=true&DisableBingResults=true&StartTilesMode=Default&StartPinsMode=Empty&AllowPowerShellScripts=true&DisableAppSuggestions=true&PreventDeviceEncryption=true&HideEdgeFre=true&WifiMode=Skip&ExpressSettings=DisableAll&KeysMode=Skip&ColorMode=Custom&SystemColorTheme=Light&AppsColorTheme=Light&AccentColor=%230078d4&WallpaperMode=Solid&WallpaperColor=%230978d3&Remove3DViewer=true&RemoveBingSearch=true&RemoveCalculator=true&RemoveCamera=true&RemoveClipchamp=true&RemoveClock=true&RemoveCopilot=true&RemoveCortana=true&RemoveDevHome=true&RemoveFamily=true&RemoveFeedbackHub=true&RemoveGetHelp=true&RemoveHandwriting=true&RemoveInternetExplorer=true&RemoveMailCalendar=true&RemoveMaps=true&RemoveMathInputPanel=true&RemoveMediaFeatures=true&RemoveMixedReality=true&RemoveZuneVideo=true&RemoveNews=true&RemoveOffice365=true&RemoveOneDrive=true&RemoveOneNote=true&RemoveOneSync=true&RemoveOpenSSHClient=true&RemoveOutlook=true&RemovePaint3D=true&RemovePeople=true&RemovePhotos=true&RemovePowerAutomate=true&RemovePowerShell2=true&RemovePowerShellISE=true&RemoveQuickAssist=true&RemoveRecall=true&RemoveRdpClient=true&RemoveSkype=true&RemoveSolitaire=true&RemoveSpeech=true&RemoveStepsRecorder=true&RemoveStickyNotes=true&RemoveTeams=true&RemoveGetStarted=true&RemoveToDo=true&RemoveVoiceRecorder=true&RemoveWallet=true&RemoveWeather=true&RemoveFaxAndScan=true&RemoveWindowsHello=true&RemoveWindowsMediaPlayer=true&RemoveZuneMusic=true&RemoveWordPad=true&RemoveXboxApps=true&RemoveYourPhone=true&FirstLogonScript0=curl+-L+https%3A%2F%2Fgitea.tcse.us%2Ftricounty%2Ftcse-deploy%2Farchive%2Fmain.zip+%2D%2Doutput+C%3A%5CScripts.zip&FirstLogonScriptType0=Cmd&FirstLogonScript1=Expand-Archive+-Path+%27C%3A%5CScripts.zip%27+-DestinationPath+%27C%3A%5CScripts%27%0D%0Atimeout+%2Ft+30&FirstLogonScriptType1=Ps1&FirstLogonScript2=Move-Item+-Path+%27C%3A%5CScripts%5Ctcse-deploy%5C*%27+-Destination+%27C%3A%5CScripts%27%0D%0Atimeout+%2Ft+15%0D%0ARemove-Item+-Path+%27C%3A%5CScripts%5Ctcse-deploy%5C%27%0D%0ARemove-Item+-Path+%27C%3A%5CScripts.zip%27&FirstLogonScriptType2=Ps1&FirstLogonScript3=C%3A%5CScripts%5CTCSE-Computer-Deploy.bat&FirstLogonScriptType3=Cmd&WdacMode=Skip-->
 	<settings pass="offlineServicing"></settings>
 	<settings pass="windowsPE">
 		<component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
@@ -393,8 +393,16 @@ $logfile = 'C:\Windows\Setup\Scripts\RemoveFeatures.log';
 	}
 } *&gt;&amp;1 &gt;&gt; $logfile;
 		</File>
-		<File path="C:\Windows\Setup\Scripts\TaskbarIcons.ps1" transformation="Text">
-Remove-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Taskband' -Name '*';
+		<File path="C:\Windows\Setup\Scripts\TaskbarLayoutModification.xml" transformation="Text">
+&lt;LayoutModificationTemplate xmlns="http://schemas.microsoft.com/Start/2014/LayoutModification" xmlns:defaultlayout="http://schemas.microsoft.com/Start/2014/FullDefaultLayout" xmlns:start="http://schemas.microsoft.com/Start/2014/StartLayout" xmlns:taskbar="http://schemas.microsoft.com/Start/2014/TaskbarLayout" Version="1"&gt;
+  &lt;CustomTaskbarLayoutCollection PinListPlacement="Replace"&gt;
+    &lt;defaultlayout:TaskbarLayout&gt;
+      &lt;taskbar:TaskbarPinList&gt;
+        &lt;taskbar:DesktopApp DesktopApplicationLinkPath="#leaveempty" /&gt;
+      &lt;/taskbar:TaskbarPinList&gt;
+    &lt;/defaultlayout:TaskbarLayout&gt;
+  &lt;/CustomTaskbarLayoutCollection&gt;
+&lt;/LayoutModificationTemplate&gt;
 		</File>
 		<File path="C:\Windows\Setup\Scripts\SetStartPins.ps1" transformation="Text">
 $json = '{"pinnedList":[]}';
@@ -520,11 +528,15 @@ curl -L https://gitea.tcse.us/tricounty/tcse-deploy/archive/main.zip --output C:
 		</File>
 		<File path="C:\Windows\Setup\Scripts\unattend-02.ps1" transformation="Text">
 Expand-Archive -Path 'C:\Scripts.zip' -DestinationPath 'C:\Scripts'
-Remove-Item -Path 'C:\Scripts.zip'
-Move-Item -Path 'C:\Scripts\tcse-deploy\*' -Destination 'C:\Scripts'
-Remove-Item -Path 'C:\Scripts\tcse-deploy\'
+timeout /t 30
 		</File>
-		<File path="C:\Windows\Setup\Scripts\unattend-03.cmd" transformation="Text">
+		<File path="C:\Windows\Setup\Scripts\unattend-03.ps1" transformation="Text">
+Move-Item -Path 'C:\Scripts\tcse-deploy\*' -Destination 'C:\Scripts'
+timeout /t 15
+Remove-Item -Path 'C:\Scripts\tcse-deploy\'
+Remove-Item -Path 'C:\Scripts.zip'
+		</File>
+		<File path="C:\Windows\Setup\Scripts\unattend-04.cmd" transformation="Text">
 C:\Scripts\TCSE-Computer-Deploy.bat
 		</File>
 		<File path="C:\Windows\Setup\Scripts\Specialize.ps1" transformation="Text">
@@ -564,6 +576,11 @@ $scripts = @(
 	{
 		net.exe accounts /maxpwage:UNLIMITED;
 	};
+	{
+		reg.exe add "HKLM\Software\Policies\Microsoft\Windows\Explorer" /v "StartLayoutFile" /t REG_SZ /d "C:\Windows\Setup\Scripts\TaskbarLayoutModification.xml" /f;
+		reg.exe add "HKLM\Software\Policies\Microsoft\Windows\Explorer" /v "LockedStartLayout" /t REG_DWORD /d 1 /f;
+		reg.exe add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v "DisableCloudOptimizedContent" /t REG_DWORD /d 1 /f;
+	};
 	{
 		Set-ExecutionPolicy -Scope 'LocalMachine' -ExecutionPolicy 'RemoteSigned' -Force;
 	};
@@ -599,9 +616,6 @@ $scripts = @(
 	{
 		Get-AppxPackage -Name 'Microsoft.Windows.Ai.Copilot.Provider' | Remove-AppxPackage;
 	};
-	{
-		Get-Content -LiteralPath 'C:\Windows\Setup\Scripts\TaskbarIcons.ps1' -Raw | Invoke-Expression;
-	};
 	{
 		Set-ItemProperty -LiteralPath 'Registry::HKCU\Software\Microsoft\Windows\CurrentVersion\Search' -Name 'SearchboxTaskbarMode' -Type 'DWord' -Value 1;
 	};
@@ -704,7 +718,10 @@ $scripts = @(
 		Get-Content -LiteralPath 'C:\Windows\Setup\Scripts\unattend-02.ps1' -Raw | Invoke-Expression;
 	};
 	{
-		C:\Windows\Setup\Scripts\unattend-03.cmd;
+		Get-Content -LiteralPath 'C:\Windows\Setup\Scripts\unattend-03.ps1' -Raw | Invoke-Expression;
+	};
+	{
+		C:\Windows\Setup\Scripts\unattend-04.cmd;
 	};
 );
 
diff --git a/Autounattend/Laptop/autounattend.xml b/Autounattend/Laptop/autounattend.xml
index 6c1756b..b153aa4 100644
--- a/Autounattend/Laptop/autounattend.xml
+++ b/Autounattend/Laptop/autounattend.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State">
-	<!--https://schneegans.de/windows/unattend-generator/?LanguageMode=Unattended&UILanguage=en-US&Locale=en-US&Keyboard=00000409&GeoLocation=244&ProcessorArchitecture=amd64&BypassRequirementsCheck=true&BypassNetworkCheck=true&ComputerNameMode=Script&ComputerNameScript=return+Read-Host+-Prompt+%27Enter+computer+name%27%3B&CompactOsMode=Default&TimeZoneMode=Explicit&TimeZone=Central+Standard+Time&PartitionMode=Unattended&PartitionLayout=GPT&EspSize=600&RecoveryMode=Partition&RecoverySize=1500&WindowsEditionMode=Unattended&WindowsEdition=pro&UserAccountMode=Unattended&AccountName0=Tech&AccountPassword0=SandlotSlickBoat%2325&AccountGroup0=Administrators&AccountName1=&AccountName2=&AccountName3=&AccountName4=&AutoLogonMode=Own&PasswordExpirationMode=Unlimited&LockoutMode=Default&HideFiles=Hidden&TaskbarSearch=Icon&ShowFileExtensions=true&DisableWidgets=true&LeftTaskbar=true&DeleteTaskbarIcons=true&HideTaskViewButton=true&DisableBingResults=true&AllowPowerShellScripts=true&DisableAppSuggestions=true&PreventDeviceEncryption=true&HideEdgeFre=true&WifiMode=Unattended&WifiName=Tricounty&WifiAuthentication=WPA2PSK&WifiPassword=TCSEwifi19%21&ExpressSettings=DisableAll&KeysMode=Skip&ColorMode=Custom&SystemColorTheme=Light&AppsColorTheme=Light&AccentColor=%230078d4&WallpaperMode=Solid&WallpaperColor=%230978d3&Remove3DViewer=true&RemoveBingSearch=true&RemoveCalculator=true&RemoveCamera=true&RemoveClipchamp=true&RemoveClock=true&RemoveCopilot=true&RemoveCortana=true&RemoveDevHome=true&RemoveFamily=true&RemoveFeedbackHub=true&RemoveGetHelp=true&RemoveHandwriting=true&RemoveInternetExplorer=true&RemoveMailCalendar=true&RemoveMaps=true&RemoveMathInputPanel=true&RemoveMediaFeatures=true&RemoveMixedReality=true&RemoveZuneVideo=true&RemoveNews=true&RemoveOffice365=true&RemoveOneDrive=true&RemoveOneNote=true&RemoveOneSync=true&RemoveOpenSSHClient=true&RemoveOutlook=true&RemovePaint3D=true&RemovePeople=true&RemovePhotos=true&RemovePowerAutomate=true&RemovePowerShell2=true&RemovePowerShellISE=true&RemoveQuickAssist=true&RemoveRecall=true&RemoveRdpClient=true&RemoveSkype=true&RemoveSolitaire=true&RemoveSpeech=true&RemoveStepsRecorder=true&RemoveStickyNotes=true&RemoveTeams=true&RemoveGetStarted=true&RemoveToDo=true&RemoveVoiceRecorder=true&RemoveWallet=true&RemoveWeather=true&RemoveFaxAndScan=true&RemoveWindowsHello=true&RemoveWindowsMediaPlayer=true&RemoveZuneMusic=true&RemoveWordPad=true&RemoveXboxApps=true&RemoveYourPhone=true&StartTilesMode=Default&StartPinsMode=Empty&FirstLogonScript0=curl+-L+https%3A%2F%2Fgitea.tcse.us%2Ftricounty%2Ftcse-deploy%2Farchive%2Fmain.zip+%2D%2Doutput+C%3A%5CScripts.zip&FirstLogonScriptType0=Cmd&FirstLogonScript1=Expand-Archive+-Path+%27C%3A%5CScripts.zip%27+-DestinationPath+%27C%3A%5CScripts%27%0D%0ARemove-Item+-Path+%27C%3A%5CScripts.zip%27%0D%0AMove-Item+-Path+%27C%3A%5CScripts%5Ctcse-deploy%5C*%27+-Destination+%27C%3A%5CScripts%27%0D%0ARemove-Item+-Path+%27C%3A%5CScripts%5Ctcse-deploy%5C%27&FirstLogonScriptType1=Ps1&FirstLogonScript2=C%3A%5CScripts%5CTCSE-Computer-Deploy.bat&FirstLogonScriptType2=Cmd&WdacMode=Skip-->
+	<!--https://schneegans.de/windows/unattend-generator/?LanguageMode=Unattended&UILanguage=en-US&Locale=en-US&Keyboard=00000409&GeoLocation=244&ProcessorArchitecture=amd64&BypassRequirementsCheck=true&BypassNetworkCheck=true&ComputerNameMode=Script&ComputerNameScript=return+Read-Host+-Prompt+%27Enter+computer+name%27%3B&CompactOsMode=Default&TimeZoneMode=Explicit&TimeZone=Central+Standard+Time&PartitionMode=Unattended&PartitionLayout=GPT&EspSize=600&RecoveryMode=Partition&RecoverySize=1500&WindowsEditionMode=Generic&WindowsEdition=pro&UserAccountMode=Unattended&AccountName0=Tech&AccountPassword0=SandlotSlickBoat%2325&AccountGroup0=Administrators&AccountName1=&AccountName2=&AccountName3=&AccountName4=&AutoLogonMode=Own&PasswordExpirationMode=Unlimited&LockoutMode=Default&HideFiles=Hidden&ShowFileExtensions=true&TaskbarSearch=Icon&TaskbarIconsMode=Empty&DisableWidgets=true&LeftTaskbar=true&HideTaskViewButton=true&DisableBingResults=true&StartTilesMode=Default&StartPinsMode=Empty&AllowPowerShellScripts=true&DisableAppSuggestions=true&PreventDeviceEncryption=true&HideEdgeFre=true&WifiMode=Unattended&WifiName=Tricounty&WifiAuthentication=WPA2PSK&WifiPassword=TCSEwifi19%21&ExpressSettings=DisableAll&KeysMode=Skip&ColorMode=Custom&SystemColorTheme=Light&AppsColorTheme=Light&AccentColor=%230078d4&WallpaperMode=Solid&WallpaperColor=%230978d3&Remove3DViewer=true&RemoveBingSearch=true&RemoveCalculator=true&RemoveCamera=true&RemoveClipchamp=true&RemoveClock=true&RemoveCopilot=true&RemoveCortana=true&RemoveDevHome=true&RemoveFamily=true&RemoveFeedbackHub=true&RemoveGetHelp=true&RemoveHandwriting=true&RemoveInternetExplorer=true&RemoveMailCalendar=true&RemoveMaps=true&RemoveMathInputPanel=true&RemoveMediaFeatures=true&RemoveMixedReality=true&RemoveZuneVideo=true&RemoveNews=true&RemoveOffice365=true&RemoveOneDrive=true&RemoveOneNote=true&RemoveOneSync=true&RemoveOpenSSHClient=true&RemoveOutlook=true&RemovePaint3D=true&RemovePeople=true&RemovePhotos=true&RemovePowerAutomate=true&RemovePowerShell2=true&RemovePowerShellISE=true&RemoveQuickAssist=true&RemoveRecall=true&RemoveRdpClient=true&RemoveSkype=true&RemoveSolitaire=true&RemoveSpeech=true&RemoveStepsRecorder=true&RemoveStickyNotes=true&RemoveTeams=true&RemoveGetStarted=true&RemoveToDo=true&RemoveVoiceRecorder=true&RemoveWallet=true&RemoveWeather=true&RemoveFaxAndScan=true&RemoveWindowsHello=true&RemoveWindowsMediaPlayer=true&RemoveZuneMusic=true&RemoveWordPad=true&RemoveXboxApps=true&RemoveYourPhone=true&FirstLogonScript0=curl+-L+https%3A%2F%2Fgitea.tcse.us%2Ftricounty%2Ftcse-deploy%2Farchive%2Fmain.zip+%2D%2Doutput+C%3A%5CScripts.zip&FirstLogonScriptType0=Cmd&FirstLogonScript1=Expand-Archive+-Path+%27C%3A%5CScripts.zip%27+-DestinationPath+%27C%3A%5CScripts%27%0D%0Atimeout+%2Ft+30&FirstLogonScriptType1=Ps1&FirstLogonScript2=Move-Item+-Path+%27C%3A%5CScripts%5Ctcse-deploy%5C*%27+-Destination+%27C%3A%5CScripts%27%0D%0Atimeout+%2Ft+15%0D%0ARemove-Item+-Path+%27C%3A%5CScripts%5Ctcse-deploy%5C%27%0D%0ARemove-Item+-Path+%27C%3A%5CScripts.zip%27&FirstLogonScriptType2=Ps1&FirstLogonScript3=C%3A%5CScripts%5CTCSE-Computer-Deploy.bat&FirstLogonScriptType3=Cmd&WdacMode=Skip-->
 	<settings pass="offlineServicing"></settings>
 	<settings pass="windowsPE">
 		<component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
@@ -419,8 +419,16 @@ $logfile = 'C:\Windows\Setup\Scripts\RemoveFeatures.log';
 	&lt;/MSM&gt;
 &lt;/WLANProfile&gt;
 		</File>
-		<File path="C:\Windows\Setup\Scripts\TaskbarIcons.ps1" transformation="Text">
-Remove-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Taskband' -Name '*';
+		<File path="C:\Windows\Setup\Scripts\TaskbarLayoutModification.xml" transformation="Text">
+&lt;LayoutModificationTemplate xmlns="http://schemas.microsoft.com/Start/2014/LayoutModification" xmlns:defaultlayout="http://schemas.microsoft.com/Start/2014/FullDefaultLayout" xmlns:start="http://schemas.microsoft.com/Start/2014/StartLayout" xmlns:taskbar="http://schemas.microsoft.com/Start/2014/TaskbarLayout" Version="1"&gt;
+  &lt;CustomTaskbarLayoutCollection PinListPlacement="Replace"&gt;
+    &lt;defaultlayout:TaskbarLayout&gt;
+      &lt;taskbar:TaskbarPinList&gt;
+        &lt;taskbar:DesktopApp DesktopApplicationLinkPath="#leaveempty" /&gt;
+      &lt;/taskbar:TaskbarPinList&gt;
+    &lt;/defaultlayout:TaskbarLayout&gt;
+  &lt;/CustomTaskbarLayoutCollection&gt;
+&lt;/LayoutModificationTemplate&gt;
 		</File>
 		<File path="C:\Windows\Setup\Scripts\SetStartPins.ps1" transformation="Text">
 $json = '{"pinnedList":[]}';
@@ -546,11 +554,15 @@ curl -L https://gitea.tcse.us/tricounty/tcse-deploy/archive/main.zip --output C:
 		</File>
 		<File path="C:\Windows\Setup\Scripts\unattend-02.ps1" transformation="Text">
 Expand-Archive -Path 'C:\Scripts.zip' -DestinationPath 'C:\Scripts'
-Remove-Item -Path 'C:\Scripts.zip'
-Move-Item -Path 'C:\Scripts\tcse-deploy\*' -Destination 'C:\Scripts'
-Remove-Item -Path 'C:\Scripts\tcse-deploy\'
+timeout /t 30
 		</File>
-		<File path="C:\Windows\Setup\Scripts\unattend-03.cmd" transformation="Text">
+		<File path="C:\Windows\Setup\Scripts\unattend-03.ps1" transformation="Text">
+Move-Item -Path 'C:\Scripts\tcse-deploy\*' -Destination 'C:\Scripts'
+timeout /t 15
+Remove-Item -Path 'C:\Scripts\tcse-deploy\'
+Remove-Item -Path 'C:\Scripts.zip'
+		</File>
+		<File path="C:\Windows\Setup\Scripts\unattend-04.cmd" transformation="Text">
 C:\Scripts\TCSE-Computer-Deploy.bat
 		</File>
 		<File path="C:\Windows\Setup\Scripts\Specialize.ps1" transformation="Text">
@@ -597,6 +609,11 @@ $scripts = @(
 	{
 		net.exe accounts /maxpwage:UNLIMITED;
 	};
+	{
+		reg.exe add "HKLM\Software\Policies\Microsoft\Windows\Explorer" /v "StartLayoutFile" /t REG_SZ /d "C:\Windows\Setup\Scripts\TaskbarLayoutModification.xml" /f;
+		reg.exe add "HKLM\Software\Policies\Microsoft\Windows\Explorer" /v "LockedStartLayout" /t REG_DWORD /d 1 /f;
+		reg.exe add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v "DisableCloudOptimizedContent" /t REG_DWORD /d 1 /f;
+	};
 	{
 		Set-ExecutionPolicy -Scope 'LocalMachine' -ExecutionPolicy 'RemoteSigned' -Force;
 	};
@@ -632,9 +649,6 @@ $scripts = @(
 	{
 		Get-AppxPackage -Name 'Microsoft.Windows.Ai.Copilot.Provider' | Remove-AppxPackage;
 	};
-	{
-		Get-Content -LiteralPath 'C:\Windows\Setup\Scripts\TaskbarIcons.ps1' -Raw | Invoke-Expression;
-	};
 	{
 		Set-ItemProperty -LiteralPath 'Registry::HKCU\Software\Microsoft\Windows\CurrentVersion\Search' -Name 'SearchboxTaskbarMode' -Type 'DWord' -Value 1;
 	};
@@ -737,7 +751,10 @@ $scripts = @(
 		Get-Content -LiteralPath 'C:\Windows\Setup\Scripts\unattend-02.ps1' -Raw | Invoke-Expression;
 	};
 	{
-		C:\Windows\Setup\Scripts\unattend-03.cmd;
+		Get-Content -LiteralPath 'C:\Windows\Setup\Scripts\unattend-03.ps1' -Raw | Invoke-Expression;
+	};
+	{
+		C:\Windows\Setup\Scripts\unattend-04.cmd;
 	};
 );
 
diff --git a/Patches/Windows/Update-TCSE-Deploy.bat b/Patches/Windows/Update-TCSE-Deploy.bat
new file mode 100644
index 0000000..b6eb6e4
--- /dev/null
+++ b/Patches/Windows/Update-TCSE-Deploy.bat
@@ -0,0 +1,18 @@
+# Download TCSE Deploy Archive
+curl -L https://gitea.tcse.us/tricounty/tcse-deploy/archive/main.zip --output C:\Scripts.zip
+
+# Extract Archive to C:\Scripts & Remove Zip
+powershell Expand-Archive -Path 'C:\Scripts.zip' -DestinationPath 'C:\Scripts'
+timeout /t 30
+
+# Cleanup Archive
+Move-Item -Path 'C:\Scripts\tcse-deploy\*' -Destination 'C:\Scripts'
+timeout /t 15
+
+# Remove Leftovers
+powershell Remove-Item -Path 'C:\Scripts.zip'
+powershell Remove-Item -Path 'C:\Scripts\tcse-deploy'
+powershell Remove-Item -Path 'C:\Scripts\Software\Office2016'
+powershell Remove-Item -Path 'C:\Scripts\Software\RemoteAgent64-TCSE.exe'
+powershell Remove-Item -Path 'C:\Scripts\Software\gcpwstandaloneenterprise64.exe'
+powershell Remove-Item -Path 'C:\Scripts\Autounattend'