diff --git a/windows/configuration/kiosk/quickstart-assigned-access-kiosk.md b/windows/configuration/kiosk/assigned-access-quickstart-kiosk.md
similarity index 79%
rename from windows/configuration/kiosk/quickstart-assigned-access-kiosk.md
rename to windows/configuration/kiosk/assigned-access-quickstart-kiosk.md
index ec351b7e17..f8689449ef 100644
--- a/windows/configuration/kiosk/quickstart-assigned-access-kiosk.md
+++ b/windows/configuration/kiosk/assigned-access-quickstart-kiosk.md
@@ -73,47 +73,17 @@ $assignedAccessConfiguration = @"
 <AssignedAccessConfiguration
     xmlns="http://schemas.microsoft.com/AssignedAccess/2017/config"
     xmlns:rs5="http://schemas.microsoft.com/AssignedAccess/201810/config"
-    xmlns:v3="http://schemas.microsoft.com/AssignedAccess/2020/config"
-    xmlns:v5="http://schemas.microsoft.com/AssignedAccess/2022/config"
+    xmlns:v4="http://schemas.microsoft.com/AssignedAccess/2021/config"
     >
     <Profiles>
         <Profile Id="{9A2A490F-10F6-4764-974A-43B19E722C23}">
-            <AllAppsList>
-                <AllowedApps>
-                    <App AppUserModelId="Microsoft.WindowsCalculator_8wekyb3d8bbwe!App" />
-                    <App AppUserModelId="Microsoft.Windows.Photos_8wekyb3d8bbwe!App" />
-                    <App AppUserModelId="Microsoft.BingWeather_8wekyb3d8bbwe!App" />
-                    <App DesktopAppPath="%windir%\System32\cmd.exe" />
-                    <App DesktopAppPath="%windir%\System32\WindowsPowerShell\v1.0\Powershell.exe" />
-                    <App DesktopAppPath="%windir%\explorer.exe" />
-                    <App AppUserModelId="windows.immersivecontrolpanel_cw5n1h2txyewy!microsoft.windows.immersivecontrolpanel" />
-                    <App AppUserModelId="%ProgramFiles(x86)%\Microsoft\Edge\Application\msedge.exe" />
-                </AllowedApps>
-            </AllAppsList>
-            <rs5:FileExplorerNamespaceRestrictions>
-                <rs5:AllowedNamespace Name="Downloads"/>
-                <v3:AllowRemovableDrives/>
-            </rs5:FileExplorerNamespaceRestrictions>
-            <v5:StartPins>
-                <![CDATA[{
-                    "pinnedList":[
-                        {"packagedAppId":"Microsoft.WindowsCalculator_8wekyb3d8bbwe!App"},
-                        {"packagedAppId":"Microsoft.Windows.Photos_8wekyb3d8bbwe!App"},
-                        {"packagedAppId":"Microsoft.BingWeather_8wekyb3d8bbwe!App"},
-                        {"desktopAppLink":"%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\System Tools\\Command Prompt.lnk"},
-                        {"desktopAppLink":"%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\Windows PowerShell\\Windows PowerShell.lnk"},
-                        {"desktopAppLink":"%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\File Explorer.lnk"},
-                        {"packagedAppId": "windows.immersivecontrolpanel_cw5n1h2txyewy!microsoft.windows.immersivecontrolpanel"},
-                        {"desktopAppLink": "%ALLUSERSPROFILE%\\Microsoft\\Windows\\Start Menu\\Programs\\Microsoft Edge.lnk"}
-                    ]
-                }]]>
-            </v5:StartPins>
-            <Taskbar ShowTaskbar="true"/>
+            <KioskModeApp v4:ClassicAppPath="%ProgramFiles(x86)%\Microsoft\Edge\Application\msedge.exe" v4:ClassicAppArguments="--kiosk https://maps.cltairport.com/ --edge-kiosk-type=fullscreen --kiosk-idle-timeout-minutes=2" />
+            <v4:BreakoutSequence Key="Ctrl+A"/>
         </Profile>
     </Profiles>
     <Configs>
         <Config>
-            <AutoLogonAccount rs5:DisplayName="Library Kiosk"/>
+            <AutoLogonAccount rs5:DisplayName="Airport Kiosk"/>
             <DefaultProfile Id="{9A2A490F-10F6-4764-974A-43B19E722C23}"/>
         </Config>
     </Configs>
diff --git a/windows/configuration/kiosk/quickstart-assigned-access-restricted-experience.md b/windows/configuration/kiosk/assigned-access-quickstart-restricted-experience.md
similarity index 100%
rename from windows/configuration/kiosk/quickstart-assigned-access-restricted-experience.md
rename to windows/configuration/kiosk/assigned-access-quickstart-restricted-experience.md
diff --git a/windows/configuration/kiosk/assigned-access-xsd.md b/windows/configuration/kiosk/assigned-access-xsd.md
index 060972f45f..03e835baa3 100644
--- a/windows/configuration/kiosk/assigned-access-xsd.md
+++ b/windows/configuration/kiosk/assigned-access-xsd.md
@@ -210,43 +210,50 @@ The following is the XSD for Assigned Access in Windows 11:
 </xs:schema>
 ```
 
-## Windows 10, version 1809 XSD additions
+## Windows 11 additions
 
-The following is the XSD for Assigned Access features added in Windows 10, version 1809:
+The following is the XSD for Assigned Access features added in Windows 11:
 
 ```xml
-<xs:schema elementFormDefault="qualified"
+<xs:schema
+    elementFormDefault="qualified"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns="http://schemas.microsoft.com/AssignedAccess/201810/config"
-    xmlns:default="http://schemas.microsoft.com/AssignedAccess/201810/config"
-    xmlns:v3="http://schemas.microsoft.com/AssignedAccess/2020/config" targetNamespace="http://schemas.microsoft.com/AssignedAccess/201810/config">
+    xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
+    vc:minVersion="1.1"
+    xmlns="http://schemas.microsoft.com/AssignedAccess/2022/config"
+    xmlns:default="http://schemas.microsoft.com/AssignedAccess/2022/config"
+    targetNamespace="http://schemas.microsoft.com/AssignedAccess/2022/config"
+    >
 
-    <xs:import namespace="http://schemas.microsoft.com/AssignedAccess/2020/config"/>
+    <xs:element name = "StartPins" type = "xs:string"/>
+    <xs:element name = "TaskbarLayout" type="xs:string"/>
+</xs:schema>
+```
 
-    <xs:complexType name="fileExplorerNamespaceRestrictions_t">
-        <xs:choice>
-            <xs:sequence minOccurs="0">
-                <xs:element name="AllowedNamespace" type="allowedFileExplorerNamespace_t" minOccurs="0"/>
-                <xs:element ref="v3:AllowRemovableDrives" minOccurs="0" maxOccurs="1"/>
-            </xs:sequence>
-            <xs:element ref="v3:NoRestriction" minOccurs="0" maxOccurs="1" />
-        </xs:choice>
+## Windows 10, version 21H2 additions
+
+The following is the XSD for Assigned Access features added in Windows 10, version 21H2:
+
+```xml
+<xs:schema
+    elementFormDefault="qualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
+    vc:minVersion="1.1"
+    xmlns="http://schemas.microsoft.com/AssignedAccess/2021/config"
+    xmlns:default="http://schemas.microsoft.com/AssignedAccess/2021/config"
+    targetNamespace="http://schemas.microsoft.com/AssignedAccess/2021/config"
+    >
+
+    <xs:attribute name="ClassicAppPath" type="xs:string"/>
+    <xs:attribute name="ClassicAppArguments" type="xs:string"/>
+
+    <xs:element name="BreakoutSequence" type="BreakoutSequence_t" />
+
+    <xs:complexType name="BreakoutSequence_t">
+        <xs:attribute name="Key" type="xs:string" use="required"/>
     </xs:complexType>
 
-    <xs:complexType name="allowedFileExplorerNamespace_t">
-        <xs:attribute name="Name" type="allowedFileExplorerNamespaceValues_t" use="required"/>
-    </xs:complexType>
-
-    <xs:simpleType name="allowedFileExplorerNamespaceValues_t">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="Downloads"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:element name="FileExplorerNamespaceRestrictions" type="fileExplorerNamespaceRestrictions_t" />
-    <xs:attribute name="AutoLaunch" type="xs:boolean"/>
-    <xs:attribute name="AutoLaunchArguments" type="xs:string"/>
-    <xs:attribute name="DisplayName" type="xs:string"/>
 </xs:schema>
 ```
 
@@ -284,49 +291,42 @@ The following is the XSD for Assigned Access features added in Windows 10, versi
 </xs:schema>
 ```
 
-## Windows 10, version 21H2 additions
+## Windows 10, version 1809 additions
 
-The following is the XSD for Assigned Access features added in Windows 10, version 21H2:
+The following is the XSD for Assigned Access features added in Windows 10, version 1809:
 
 ```xml
-<xs:schema
-    elementFormDefault="qualified"
+<xs:schema elementFormDefault="qualified"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
-    vc:minVersion="1.1"
-    xmlns="http://schemas.microsoft.com/AssignedAccess/2021/config"
-    xmlns:default="http://schemas.microsoft.com/AssignedAccess/2021/config"
-    targetNamespace="http://schemas.microsoft.com/AssignedAccess/2021/config"
-    >
+    xmlns="http://schemas.microsoft.com/AssignedAccess/201810/config"
+    xmlns:default="http://schemas.microsoft.com/AssignedAccess/201810/config"
+    xmlns:v3="http://schemas.microsoft.com/AssignedAccess/2020/config" targetNamespace="http://schemas.microsoft.com/AssignedAccess/201810/config">
 
-    <xs:attribute name="ClassicAppPath" type="xs:string"/>
-    <xs:attribute name="ClassicAppArguments" type="xs:string"/>
+    <xs:import namespace="http://schemas.microsoft.com/AssignedAccess/2020/config"/>
 
-    <xs:element name="BreakoutSequence" type="BreakoutSequence_t" />
-
-    <xs:complexType name="BreakoutSequence_t">
-        <xs:attribute name="Key" type="xs:string" use="required"/>
+    <xs:complexType name="fileExplorerNamespaceRestrictions_t">
+        <xs:choice>
+            <xs:sequence minOccurs="0">
+                <xs:element name="AllowedNamespace" type="allowedFileExplorerNamespace_t" minOccurs="0"/>
+                <xs:element ref="v3:AllowRemovableDrives" minOccurs="0" maxOccurs="1"/>
+            </xs:sequence>
+            <xs:element ref="v3:NoRestriction" minOccurs="0" maxOccurs="1" />
+        </xs:choice>
     </xs:complexType>
 
+    <xs:complexType name="allowedFileExplorerNamespace_t">
+        <xs:attribute name="Name" type="allowedFileExplorerNamespaceValues_t" use="required"/>
+    </xs:complexType>
+
+    <xs:simpleType name="allowedFileExplorerNamespaceValues_t">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Downloads"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:element name="FileExplorerNamespaceRestrictions" type="fileExplorerNamespaceRestrictions_t" />
+    <xs:attribute name="AutoLaunch" type="xs:boolean"/>
+    <xs:attribute name="AutoLaunchArguments" type="xs:string"/>
+    <xs:attribute name="DisplayName" type="xs:string"/>
 </xs:schema>
-```
-
-## Windows 11 additions
-
-The following is the XSD for Assigned Access features added in Windows 11:
-
-```xml
-<xs:schema
-    elementFormDefault="qualified"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
-    vc:minVersion="1.1"
-    xmlns="http://schemas.microsoft.com/AssignedAccess/2022/config"
-    xmlns:default="http://schemas.microsoft.com/AssignedAccess/2022/config"
-    targetNamespace="http://schemas.microsoft.com/AssignedAccess/2022/config"
-    >
-
-    <xs:element name = "StartPins" type = "xs:string"/>
-    <xs:element name = "TaskbarLayout" type="xs:string"/>
-</xs:schema>
-```
+```
\ No newline at end of file
diff --git a/windows/configuration/kiosk/reference.md b/windows/configuration/kiosk/reference.md
deleted file mode 100644
index 9eb0e9327c..0000000000
--- a/windows/configuration/kiosk/reference.md
+++ /dev/null
@@ -1,226 +0,0 @@
----
-title: Assigned Access reference
-description: Learn how to configure Shell Launcher to change the default Windows shell when a user signs in to a device.
-ms.topic: reference
-ms.date: 12/31/2017
----
-
-# Assigned Access reference
-
-## XML namespaces
-
-| Namespace alias | Namespace |
-|-|-|
-|default|`http://schemas.microsoft.com/AssignedAccess/2017/config`|
-|rs5|`http://schemas.microsoft.com/AssignedAccess/201810/config`|
-|V2|`http://schemas.microsoft.com/ShellLauncher/2019/Configuration`|
-|v3|`http://schemas.microsoft.com/AssignedAccess/2020/config`|
-|v4 >> Windows 10 21H2|`http://schemas.microsoft.com/AssignedAccess/2021/config`|
-|v5 >> Windows 11 22H2|`http://schemas.microsoft.com/AssignedAccess/2022/config`|
-
-## default schema
-
-### Profile
-
-```xml
-<xs:complexType name="profile_t">
-        <xs:choice>
-            <xs:sequence minOccurs="1" maxOccurs="1">
-                <xs:element name="AllAppsList" type="allappslist_t" minOccurs="1" maxOccurs="1"/>
-                <xs:element ref="rs5:FileExplorerNamespaceRestrictions" minOccurs="0" maxOccurs="1"/>
-                <xs:element name="StartLayout" type="xs:string" minOccurs="0" maxOccurs="1"/>
-                <xs:element ref="v5:StartPins" minOccurs="0" maxOccurs="1"/>
-                <xs:element name="Taskbar" type="taskbar_t" minOccurs="1" maxOccurs="1"/>
-                <xs:element ref="v5:TaskbarLayout" minOccurs="0" maxOccurs="1"/>
-            </xs:sequence>
-            <xs:sequence minOccurs="1" maxOccurs="1">
-                <xs:element name="KioskModeApp" type="kioskmodeapp_t" minOccurs="1" maxOccurs="1">
-                    <xs:key name="mutualExclusionAumidOrClassicAppPath">
-                        <xs:selector xpath="."/>
-                        <xs:field xpath="@AppUserModelId|@v4:ClassicAppPath"/>
-                    </xs:key>
-                    <xs:unique name="mutualExclusionAumidOrClassicAppArgumentsOptional">
-                        <xs:selector xpath="."/>
-                        <xs:field xpath="@AppUserModelId|@v4:ClassicAppArguments"/>
-                    </xs:unique>
-                </xs:element>
-                <xs:element ref="v4:BreakoutSequence" minOccurs="0" maxOccurs="1"/>
-            </xs:sequence>
-        </xs:choice>
-        <xs:attribute name="Id" type="guid_t" use="required"/>
-        <xs:attribute name="Name" type="xs:string" use="optional"/>
-        <xs:attribute name="ShowTaskbar" type="xs:boolean" use="required"/>
-    </xs:complexType>
-
-```
-
-#### AllAppList
-
-```xml
-<xs:complexType name="allappslist_t">
-    <xs:sequence minOccurs="1" >
-        <xs:element name="AllowedApps" type="allowedapps_t" minOccurs="1" maxOccurs="1">
-            <xs:unique name="ForbidDupApps">
-                <xs:selector xpath="default:App"/>
-                <xs:field xpath="@AppUserModelId|@DesktopAppPath"/>
-            </xs:unique>
-            <xs:unique name="OnlyOneAppCanHaveAutoLaunch">
-                <xs:selector xpath="default:App"/>
-                <xs:field xpath="@rs5:AutoLaunch"/>
-            </xs:unique>
-        </xs:element>
-    </xs:sequence>
-</xs:complexType>
-```
-
-```xml
-<xs:complexType name="allowedapps_t">
-    <xs:sequence minOccurs="1" maxOccurs="1">
-        <xs:element name="App" type="app_t" minOccurs="1" maxOccurs="unbounded">
-            <xs:key name="mutexAumidOrDesktopApp">
-                <xs:selector xpath="."/>
-                <xs:field xpath="@AppUserModelId|@DesktopAppPath"/>
-            </xs:key>
-        </xs:element>
-    </xs:sequence>
-</xs:complexType>
-
-<xs:complexType name="app_t">
-    <xs:attribute name="AppUserModelId" type="xs:string"/>
-    <xs:attribute name="DesktopAppPath" type="xs:string"/>
-    <xs:attributeGroup ref="autoLaunch_attributeGroup"/>
-</xs:complexType>
-
-<xs:attributeGroup name="autoLaunch_attributeGroup">
-    <xs:attribute ref="rs5:AutoLaunch"/>
-    <xs:attribute ref="rs5:AutoLaunchArguments" use="optional"/>
-</xs:attributeGroup>
-
-```
-
-### StartLayout
-### Taskbar
-###
-
-### Property
-
-## rs5 schema
-
-```xml
-<xs:schema
-    <xs:element name="FileExplorerNamespaceRestrictions" type="fileExplorerNamespaceRestrictions_t" />
-        <xs:element ref="v3:AllowRemovableDrives" minOccurs="0" maxOccurs="1"/>
-    <xs:attribute name="AutoLaunch" type="xs:boolean"/>
-    <xs:attribute name="AutoLaunchArguments" type="xs:string"/>
-    <xs:attribute name="DisplayName" type="xs:string"/>
-</xs:schema>
-```
-
-### AutoLaunch (rs5)
-
-### AutoLaunchArguments (rs5)
-
-### DisplayName (rs5)
-
-
-
-### FileExplorerNamespaceRestrictions (rs5)
-
-
-## v2 Schema
-
-```xml
-<xs:schema
-    <xs:attribute name="AppType">
-      <xs:simpleType>
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="UWP"/>
-          <xs:enumeration value="Desktop"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-
-    <xs:attribute name="AllAppsFullScreen" type="xs:boolean"/>
-
-</xs:schema>
-```
-
-### AppType (v2)
-
-### AllAppsFullScreen (v2)
-
-
-
-## v3 schema
-
-```xml
-<xs:schema
-    <xs:complexType name="globalProfile_t">
-        <xs:attribute name="Id" type="guid_t" />
-    </xs:complexType>
-    <xs:element name="AllowRemovableDrives"/>
-    <xs:element name="NoRestriction" />
-    <xs:element name="GlobalProfile" type="globalProfile_t" />
-</xs:schema>
-```
-
-### AllowRemovableDrives (v3)
-
-### NoRestriction (v3)
-
-### Globalprofile (v3)
-
-If you want everyone who signs into a specific device to be assigned as an access user, even if there's no dedicated profile for that user. Alternatively, perhaps Assigned Access couldn't identify a profile for the user and you want to have a fallback profile. Global profile is designed for these scenarios.
-
-Usage is demonstrated below, by using the new XML namespace and specifying `GlobalProfile` from that namespace. When you configure `GlobalProfile`, a non-admin account logs in, if this user doesn't have a designated profile in Assigned Access, or Assigned Access fails to determine a profile for current user, a global profile is applied for the user.
-
-> [!NOTE]
-> 1. `GlobalProfile` can only be a multi-app profile.
-> 1. Only one `GlobalProfile` can be used in one `AssignedAccess` configuration XML.
-> 1. `GlobalProfile` can be used as the only config, or it can be used along with regular user or group config.
-
-```xml
-<?xml version="1.0" encoding="utf-8" ?>
-<AssignedAccessConfiguration
-    xmlns="https://schemas.microsoft.com/AssignedAccess/2017/config"
-    xmlns:v3="https://schemas.microsoft.com/AssignedAccess/2020/config"
->
-    <Profiles>
-        <Profile Id="{9A2A490F-10F6-4764-974A-43B19E722C23}">
-            ...
-        </Profile>
-    </Profiles>
-    <Configs>
-        <v3:GlobalProfile Id="{9A2A490F-10F6-4764-974A-43B19E722C23}"/>
-    </Configs>
-</AssignedAccessConfiguration>
-```
-
-## v4 schema
-
-```xml
-<xs:schema
-    <xs:attribute name="ClassicAppPath" type="xs:string"/>
-    <xs:attribute name="ClassicAppArguments" type="xs:string"/>
-    <xs:element name="BreakoutSequence" type="BreakoutSequence_t" />
-    <xs:complexType name="BreakoutSequence_t">
-        <xs:attribute name="Key" type="xs:string" use="required"/>
-    </xs:complexType>
-</xs:schema>
-```
-
-### BreakoutSequence
-
-### ClassicApp
-#### ClassicAppPath
-#### ClassicAppArguments
-
-## v5 schema
-
-### Exclusions
-
-### StartPins
-Type: string
-
-### TaskbarLayout
-Type: string
diff --git a/windows/configuration/kiosk/quickstart-shell-launcher-kiosk.md b/windows/configuration/kiosk/shell-launcher-quickstart-kiosk.md
similarity index 100%
rename from windows/configuration/kiosk/quickstart-shell-launcher-kiosk.md
rename to windows/configuration/kiosk/shell-launcher-quickstart-kiosk.md
diff --git a/windows/configuration/kiosk/toc.yml b/windows/configuration/kiosk/toc.yml
index 80bc2a08c3..ef685e1663 100644
--- a/windows/configuration/kiosk/toc.yml
+++ b/windows/configuration/kiosk/toc.yml
@@ -4,11 +4,11 @@ items:
 - name: Quickstarts
   items:
     - name: Configure a kiosk with Assigned Access
-      href: quickstart-assigned-access-kiosk.md
+      href: assigned-access-quickstart-kiosk.md
     - name: Configure a restricted user experience with Assigned Access
-      href: quickstart-assigned-access-restricted-experience.md
+      href: assigned-access-quickstart-restricted-experience.md
     - name: Configure a kiosk with Shell Launcher
-      href: quickstart-shell-launcher-kiosk.md
+      href: shell-launcher-quickstart-kiosk.md
 - name: Concepts
   items:
     - name: Prepare a device for kiosk configuration