diff --git a/quickget b/quickget
index 47c68df..cd562b9 100755
--- a/quickget
+++ b/quickget
@@ -462,54 +462,79 @@ function unattended_windows() {
       processorArchitecture="amd64"
       publicKeyToken="31bf3856ad364e35"
       language="neutral"
-      versionScope="nonSxS">
+      versionScope="nonSxS"
+      xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
       <DiskConfiguration>
         <Disk wcm:action="add">
           <DiskID>0</DiskID>
           <WillWipeDisk>true</WillWipeDisk>
           <CreatePartitions>
+            <!-- Windows RE Tools partition -->
             <CreatePartition wcm:action="add">
               <Order>1</Order>
-              <Type>EFI</Type>
-              <Size>100</Size>
+              <Type>Primary</Type>
+              <Size>256</Size>
             </CreatePartition>
+            <!-- System partition (ESP) -->
             <CreatePartition wcm:action="add">
               <Order>2</Order>
-              <Type>MSR</Type>
-              <Size>512</Size>
+              <Type>EFI</Type>
+              <Size>128</Size>
             </CreatePartition>
+            <!-- Microsoft reserved partition (MSR) -->
             <CreatePartition wcm:action="add">
               <Order>3</Order>
+              <Type>MSR</Type>
+              <Size>128</Size>
+            </CreatePartition>
+            <!-- Windows partition -->
+            <CreatePartition wcm:action="add">
+              <Order>4</Order>
               <Type>Primary</Type>
               <Extend>true</Extend>
             </CreatePartition>
           </CreatePartitions>
           <ModifyPartitions>
+            <!-- Windows RE Tools partition -->
             <ModifyPartition wcm:action="add">
               <Order>1</Order>
               <PartitionID>1</PartitionID>
+              <Label>WINRE</Label>
+              <Format>NTFS</Format>
+              <TypeID>DE94BBA4-06D1-4D40-A16A-BFD50179D6AC</TypeID>
+            </ModifyPartition>
+            <!-- System partition (ESP) -->
+            <ModifyPartition wcm:action="add">
+              <Order>2</Order>
+              <PartitionID>2</PartitionID>
               <Label>System</Label>
               <Format>FAT32</Format>
             </ModifyPartition>
+            <!-- MSR partition does not need to be modified -->
             <ModifyPartition wcm:action="add">
-              <Order>2</Order>
+              <Order>3</Order>
               <PartitionID>3</PartitionID>
+            </ModifyPartition>
+            <!-- Windows partition -->
+              <ModifyPartition wcm:action="add">
+              <Order>4</Order>
+              <PartitionID>4</PartitionID>
               <Label>Windows</Label>
               <Letter>C</Letter>
               <Format>NTFS</Format>
             </ModifyPartition>
           </ModifyPartitions>
         </Disk>
-        <WillShowUI>OnError</WillShowUI>
       </DiskConfiguration>
       <ImageInstall>
         <OSImage>
-          <WillShowUI>OnError</WillShowUI>
           <InstallTo>
             <DiskID>0</DiskID>
-            <PartitionID>3</PartitionID>
+            <PartitionID>4</PartitionID>
           </InstallTo>
-          </OSImage>
+          <InstallToAvailablePartition>false</InstallToAvailablePartition>
+        </OSImage>
       </ImageInstall>
       <UserData>
         <AcceptEula>true</AcceptEula>