diff --git a/Microsoft.Toolkit.Uwp.DeveloperTools/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.DeveloperTools/VisualStudioToolsManifest.xml
index 5b0b0159144..e56db5f37b0 100644
--- a/Microsoft.Toolkit.Uwp.DeveloperTools/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.DeveloperTools/VisualStudioToolsManifest.xml
@@ -1,8 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.DeveloperTools.dll">
     <ToolboxItems UIFramework="UAP"
-        VSCategory="Windows Community Toolkit"
-        BlendCategory="Windows Community Toolkit">
+        VSCategory="Windows Toolkit | Design"
+        BlendCategory="Windows Toolkit | Design">
       <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 031faeee520..8680d8a6293 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
@@ -1,8 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Core.dll">
     <ToolboxItems UIFramework="UAP"
-        VSCategory="Windows Community Toolkit"
-        BlendCategory="Windows Community Toolkit">
+        VSCategory="Windows Toolkit | Common"
+        BlendCategory="Windows Toolkit | Common">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.CameraPreview" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DropShadowPanel" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageEx" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/VisualStudioToolsManifest.xml
index 0eef95ce961..008737b0ee4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/VisualStudioToolsManifest.xml
@@ -1,8 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.dll">
     <ToolboxItems UIFramework="UAP"
-        VSCategory="Windows Community Toolkit"
-        BlendCategory="Windows Community Toolkit">
+        VSCategory="Windows Toolkit | DataGrid"
+        BlendCategory="Windows Toolkit | DataGrid">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGrid" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridCell" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DataGridCellsPresenter" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml
index 4d21f08c983..fd5dab59163 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml
@@ -1,8 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Input.dll">
     <ToolboxItems UIFramework="UAP"
-        VSCategory="Windows Community Toolkit"
-        BlendCategory="Windows Community Toolkit">
+        VSCategory="Windows Toolkit | Input"
+        BlendCategory="Windows Toolkit | Input">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ColorPicker" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerButton" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerSlider" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml
index 0e6a134c524..d8e5e0a2387 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml
@@ -1,8 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Layout.dll">
     <ToolboxItems UIFramework="UAP"
-        VSCategory="Windows Community Toolkit"
-        BlendCategory="Windows Community Toolkit">
+        VSCategory="Windows Toolkit | Layout"
+        BlendCategory="Windows Toolkit | Layout">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeItem" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeView" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Carousel" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml
index 1e886827d3b..06dc7f8f361 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml
@@ -1,8 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Markdown.dll">
     <ToolboxItems UIFramework="UAP"
-        VSCategory="Windows Community Toolkit"
-        BlendCategory="Windows Community Toolkit">
+        VSCategory="Windows Toolkit | Markdown"
+        BlendCategory="Windows Toolkit | Markdown">
       <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 21e6e3e8248..7d98ece936d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
@@ -1,8 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Media.dll">
     <ToolboxItems UIFramework="UAP"
-        VSCategory="Windows Community Toolkit"
-        BlendCategory="Windows Community Toolkit">
+        VSCategory="Windows Toolkit | Media"
+        BlendCategory="Windows Toolkit | Media">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Eyedropper" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.EyedropperToolButton" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageCropper" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
index 74a5a2b4a8a..b21502f983a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
@@ -1,8 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Primitives.dll">
     <ToolboxItems UIFramework="UAP"
-        VSCategory="Windows Community Toolkit"
-        BlendCategory="Windows Community Toolkit">
+        VSCategory="Windows Toolkit | Basics"
+        BlendCategory="Windows Toolkit | Basics">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.AdaptiveGridView" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DockPanel" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.StaggeredLayout" />