diff --git a/AIDevGallery/Controls/ModelPicker/ModelPickerViews/OnnxPickerView.xaml b/AIDevGallery/Controls/ModelPicker/ModelPickerViews/OnnxPickerView.xaml
index 86617537..52f5b8a5 100644
--- a/AIDevGallery/Controls/ModelPicker/ModelPickerViews/OnnxPickerView.xaml
+++ b/AIDevGallery/Controls/ModelPicker/ModelPickerViews/OnnxPickerView.xaml
@@ -41,7 +41,7 @@
                         Grid.Row="1"
                         TextWrapping="Wrap" 
                         Text="To use a custom model, convert it to a WindowsML-compatible format using the AI Toolkit conversion tool. Note: Currently, only select models are supported for conversion in AI Toolkit, with additional models coming soon." />
-                        <controls:WrapPanel Orientation="Horizontal" HorizontalSpacing="12" VerticalSpacing="12">
+                        <controls:WrapPanel Orientation="Horizontal" ItemSpacing="12" LineSpacing="12">
                             <Button
                             x:Name="OpenAIToolkitButton"
                             Click="OpenAIToolkitButton_Click"
diff --git a/AIDevGallery/MainWindow.xaml.cs b/AIDevGallery/MainWindow.xaml.cs
index c5d43337..f9ea27b1 100644
--- a/AIDevGallery/MainWindow.xaml.cs
+++ b/AIDevGallery/MainWindow.xaml.cs
@@ -11,7 +11,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
-using Microsoft.Windows.AI.Search.Experimental.AppContentIndex;
+using Microsoft.Windows.Search.AppContentIndex;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
diff --git a/AIDevGallery/Pages/APIs/APIOverview.xaml b/AIDevGallery/Pages/APIs/APIOverview.xaml
index 3f0299f1..766e472f 100644
--- a/AIDevGallery/Pages/APIs/APIOverview.xaml
+++ b/AIDevGallery/Pages/APIs/APIOverview.xaml
@@ -118,7 +118,7 @@
                         ItemsSource="{x:Bind wcrAPIs, Mode=OneWay}"
                         SelectionMode="None">
                         <ItemsView.Layout>
-                            <FlowLayout MinColumnSpacing="12" MinRowSpacing="12" />
+                            <FlowLayout MinItemSpacing="12" LineSpacing="12" />
                         </ItemsView.Layout>
                         <ItemsView.ItemTemplate>
                             <DataTemplate x:DataType="models:ApiDefinition">
diff --git a/AIDevGallery/Samples/WCRAPIs/AppIndexCapability.xaml.cs b/AIDevGallery/Samples/WCRAPIs/AppIndexCapability.xaml.cs
index bd5c2d62..fe619e20 100644
--- a/AIDevGallery/Samples/WCRAPIs/AppIndexCapability.xaml.cs
+++ b/AIDevGallery/Samples/WCRAPIs/AppIndexCapability.xaml.cs
@@ -4,7 +4,7 @@
 using AIDevGallery.Models;
 using AIDevGallery.Samples.Attributes;
 using Microsoft.UI.Xaml.Navigation;
-using Microsoft.Windows.AI.Search.Experimental.AppContentIndex;
+using Microsoft.Windows.Search.AppContentIndex;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/AIDevGallery/Samples/WCRAPIs/KnowledgeRetrieval.xaml.cs b/AIDevGallery/Samples/WCRAPIs/KnowledgeRetrieval.xaml.cs
index a3eef942..af8f5aaf 100644
--- a/AIDevGallery/Samples/WCRAPIs/KnowledgeRetrieval.xaml.cs
+++ b/AIDevGallery/Samples/WCRAPIs/KnowledgeRetrieval.xaml.cs
@@ -10,7 +10,7 @@
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
-using Microsoft.Windows.AI.Search.Experimental.AppContentIndex;
+using Microsoft.Windows.Search.AppContentIndex;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/AIDevGallery/Samples/WCRAPIs/SemanticSearch.xaml.cs b/AIDevGallery/Samples/WCRAPIs/SemanticSearch.xaml.cs
index ebc6be47..125aaa34 100644
--- a/AIDevGallery/Samples/WCRAPIs/SemanticSearch.xaml.cs
+++ b/AIDevGallery/Samples/WCRAPIs/SemanticSearch.xaml.cs
@@ -8,7 +8,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Imaging;
 using Microsoft.UI.Xaml.Navigation;
-using Microsoft.Windows.AI.Search.Experimental.AppContentIndex;
+using Microsoft.Windows.Search.AppContentIndex;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 37932ffc..f53efcac 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -31,7 +31,7 @@
     <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
     <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.2.250402" />
     <PackageVersion Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="2.0.0-experimental3" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="2.0.0-experimental5" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6584" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.205" />
     <PackageVersion Include="System.Drawing.Common" Version="9.0.9" />