diff --git a/Microsoft.Toolkit.Uwp.DeveloperTools/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.DeveloperTools/VisualStudioToolsManifest.xml
index 2c51528df63..5b0b0159144 100644
--- a/Microsoft.Toolkit.Uwp.DeveloperTools/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.DeveloperTools/VisualStudioToolsManifest.xml
@@ -1,6 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.DeveloperTools.dll">
-    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+    <ToolboxItems UIFramework="UAP"
+        VSCategory="Windows Community Toolkit"
+        BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.DeveloperTools.AlignmentGrid" />
       <Item Type="Microsoft.Toolkit.Uwp.DeveloperTools.FocusTracker" />
     </ToolboxItems>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
index 161131ea6dd..031faeee520 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
@@ -1,6 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Core.dll">
-    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+    <ToolboxItems UIFramework="UAP"
+        VSCategory="Windows Community Toolkit"
+        BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.CameraPreview" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DropShadowPanel" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageEx" />
@@ -13,6 +15,7 @@
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ScrollHeader" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TabbedCommandBar" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TabbedCommandBarItem" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TextToolbar" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TileControl" />
     </ToolboxItems>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/VisualStudioToolsManifest.xml
index 761934998a6..0eef95ce961 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/VisualStudioToolsManifest.xml
@@ -1,7 +1,26 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.dll">
-    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+    <ToolboxItems UIFramework="UAP"
+        VSCategory="Windows Community Toolkit"
+        BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGrid" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridCell" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridCellsPresenter" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridColumn" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridBoundColumn" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridFillerColumn" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridCheckBoxColumn" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridComboBoxColumn" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridColumnHeader" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridColumnHeadersPresenter" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridDetailsPresenter" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridFrozenGrid" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridRow" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridRowHeader" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridRowGroupHeader" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridRowsPresenter" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridTemplateColumn" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridTextColumn" />
     </ToolboxItems>
   </File>
 </FileList>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml
index c6f210468c2..4d21f08c983 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml
@@ -1,8 +1,16 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Input.dll">
-    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+    <ToolboxItems UIFramework="UAP"
+        VSCategory="Windows Community Toolkit"
+        BlendCategory="Windows Community Toolkit">
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ColorPicker" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerButton" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerSlider" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RadialGauge" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RangeSelector" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RemoteDevicePicker" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TokenizingTextBox" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TokenizingTextBoxItem" />
     </ToolboxItems>
   </File>
 </FileList>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml
index f8ae329c03d..0e6a134c524 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml
@@ -1,9 +1,12 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Layout.dll">
-    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+    <ToolboxItems UIFramework="UAP"
+        VSCategory="Windows Community Toolkit"
+        BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeItem" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeView" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Carousel" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.CarouselItem" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.CarouselPanel" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Expander" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.GridSplitter" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml
index ce34feb76a6..1e886827d3b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml
@@ -1,6 +1,8 @@
 <FileList>
-  <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.MarkdownTextBlock.dll">
-    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+  <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Markdown.dll">
+    <ToolboxItems UIFramework="UAP"
+        VSCategory="Windows Community Toolkit"
+        BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.MarkdownTextBlock" />
     </ToolboxItems>
   </File>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
index 31b1259a180..21e6e3e8248 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
@@ -1,9 +1,14 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Media.dll">
-    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+    <ToolboxItems UIFramework="UAP"
+        VSCategory="Windows Community Toolkit"
+        BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Eyedropper" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.EyedropperToolButton" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageCropper" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageCropperThumb" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.InfiniteCanvas" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.InfiniteCanvasTextBox" />
     </ToolboxItems>
   </File>
 </FileList>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
index da08ea53fd9..74a5a2b4a8a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
@@ -1,11 +1,15 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Primitives.dll">
-    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+    <ToolboxItems UIFramework="UAP"
+        VSCategory="Windows Community Toolkit"
+        BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.AdaptiveGridView" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DockPanel" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.StaggeredLayout" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.StaggeredPanel" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.SwitchPresenter" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.UniformGrid" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.WrapLayout" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.WrapPanel" />
     </ToolboxItems>
   </File>