diff --git a/vsix/ItemTemplates/BlankPage/cppwinrt_BlankPage.vstemplate b/vsix/ItemTemplates/BlankPage/cppwinrt_BlankPage.vstemplate
index 672d43b2f..bf6c43e9e 100644
--- a/vsix/ItemTemplates/BlankPage/cppwinrt_BlankPage.vstemplate
+++ b/vsix/ItemTemplates/BlankPage/cppwinrt_BlankPage.vstemplate
@@ -4,8 +4,12 @@
     <Name ID="1013" Package="FIXME-PACKAGEGUID" />
     <Description ID="1014" Package="FIXME-PACKAGEGUID" />
     <ProjectType>VC</ProjectType>
-    <SortOrder>10</SortOrder>
+    <SortOrder>40</SortOrder>
     <TemplateID>microsoft.Windows.CppWinRT.BlankPage</TemplateID>
+    <TemplateGroupID>WinRT-Native-UAP</TemplateGroupID>
+    <AppliesTo>VisualC + WindowsXaml</AppliesTo>
+    <NumberOfParentCategoriesToRollUp>0</NumberOfParentCategoriesToRollUp>
+    <ShowByDefault>false</ShowByDefault>
     <Icon>cppwinrt.ico</Icon>
     <PreviewImage>cppwinrt.png</PreviewImage>
   </TemplateData>
diff --git a/vsix/ItemTemplates/BlankUserControl/cppwinrt_BlankUserControl.vstemplate b/vsix/ItemTemplates/BlankUserControl/cppwinrt_BlankUserControl.vstemplate
index e872ae3e0..f457df025 100644
--- a/vsix/ItemTemplates/BlankUserControl/cppwinrt_BlankUserControl.vstemplate
+++ b/vsix/ItemTemplates/BlankUserControl/cppwinrt_BlankUserControl.vstemplate
@@ -4,8 +4,12 @@
     <Name ID="1015" Package="FIXME-PACKAGEGUID" />
     <Description ID="1016" Package="FIXME-PACKAGEGUID" />
     <ProjectType>VC</ProjectType>
-    <SortOrder>10</SortOrder>
+    <SortOrder>41</SortOrder>
     <TemplateID>microsoft.Windows.CppWinRT.BlankUserControl</TemplateID>
+    <TemplateGroupID>WinRT-Native-UAP</TemplateGroupID>
+    <AppliesTo>VisualC + WindowsXaml</AppliesTo>
+    <NumberOfParentCategoriesToRollUp>0</NumberOfParentCategoriesToRollUp>
+    <ShowByDefault>false</ShowByDefault>
     <Icon>cppwinrt.ico</Icon>
     <PreviewImage>cppwinrt.png</PreviewImage>
   </TemplateData>
diff --git a/vsix/ItemTemplates/ViewModel/cppwinrt_ViewModel.vstemplate b/vsix/ItemTemplates/ViewModel/cppwinrt_ViewModel.vstemplate
index 5e5a5dbdd..20d2bcd90 100644
--- a/vsix/ItemTemplates/ViewModel/cppwinrt_ViewModel.vstemplate
+++ b/vsix/ItemTemplates/ViewModel/cppwinrt_ViewModel.vstemplate
@@ -4,8 +4,12 @@
     <Name ID="1017" Package="FIXME-PACKAGEGUID" />
     <Description ID="1018" Package="FIXME-PACKAGEGUID" />
     <ProjectType>VC</ProjectType>
-    <SortOrder>10</SortOrder>
+    <SortOrder>42</SortOrder>
     <TemplateID>microsoft.Windows.CppWinRT.ViewModel</TemplateID>
+    <TemplateGroupID>WinRT-Native-UAP</TemplateGroupID>
+    <AppliesTo>VisualC + WindowsXaml</AppliesTo>
+    <NumberOfParentCategoriesToRollUp>0</NumberOfParentCategoriesToRollUp>
+    <ShowByDefault>false</ShowByDefault>
     <Icon>cppwinrt.ico</Icon>
     <PreviewImage>cppwinrt.png</PreviewImage>
   </TemplateData>