From 952803933450c4a266b192f97c71084d5cd52577 Mon Sep 17 00:00:00 2001
From: Mysterious_Dev <mysteriousdevs@gmail.com>
Date: Thu, 26 Oct 2023 16:40:57 +0200
Subject: [PATCH 1/6] Begin work for menu commands

---
 .../Commands/TemplateStudioForWinuiPackage.vsct            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct b/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
index 5dbb839ece..de899db889 100644
--- a/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
+++ b/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
@@ -3,6 +3,7 @@
 
 	<Extern href="stdidcmd.h"/>
 	<Extern href="vsshlids.h"/>
+    <Include href="KnownImageIds.vsct"/>
 
 	<Commands package="guidTemplateStudioForWinUICsPackage">
 		<Groups>
@@ -51,7 +52,8 @@
 				<CommandFlag>DefaultDisabled</CommandFlag>
 				<CommandFlag>DefaultInvisible</CommandFlag>
 				<CommandFlag>DynamicVisibility</CommandFlag>
-				<Icon guid="guidImages" id="bmpTesting" />
+                <CommandFlag>IconIsMoniker</CommandFlag>
+                <Icon guid="ImageCatalogGuid" id="AddTest" />
 				<Strings>
 					<ButtonText>New Test Project...</ButtonText>
 				</Strings>
@@ -60,7 +62,8 @@
 				<CommandFlag>DefaultDisabled</CommandFlag>
 				<CommandFlag>DefaultInvisible</CommandFlag>
 				<CommandFlag>DynamicVisibility</CommandFlag>
-				<Icon guid="guidImages" id="bmpOpenTemp" />
+                <CommandFlag>IconIsMoniker</CommandFlag>
+                <Icon guid="ImageCatalogGuid" id="OpenFolder" />
 				<Strings>
 					<ButtonText>Open Generation Folder</ButtonText>
 				</Strings>

From 0b575c65fd78e3ff45a784d40f7b72af733fd81b Mon Sep 17 00:00:00 2001
From: Mysterious_Dev <mysteriousdevs@gmail.com>
Date: Thu, 26 Oct 2023 17:12:08 +0200
Subject: [PATCH 2/6] Move New Page & Feature command

---
 .../Commands/TemplateStudioForWinuiPackage.vsct            | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct b/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
index de899db889..94e4c313ee 100644
--- a/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
+++ b/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
@@ -25,7 +25,8 @@
 				<CommandFlag>DefaultDisabled</CommandFlag>
 				<CommandFlag>DefaultInvisible</CommandFlag>
 				<CommandFlag>DynamicVisibility</CommandFlag>
-				<Icon guid="guidImages" id="bmpPage1" />
+				<CommandFlag>IconIsMoniker</CommandFlag>
+                <Icon guid="ImageCatalogGuid" id="NewDocument" />
 				<Strings>
 					<ButtonText>New Page...</ButtonText>
 				</Strings>
@@ -33,8 +34,8 @@
 			<Button guid="guidTemplateStudioForWinUICsPackageCmdSet" id="AddFeatureCommand" priority="0x0200" type="Button">
 				<CommandFlag>DefaultDisabled</CommandFlag>
 				<CommandFlag>DefaultInvisible</CommandFlag>
-				<CommandFlag>DynamicVisibility</CommandFlag>
-				<Icon guid="guidImages" id="bmpFeature1" />
+				<CommandFlag>IconIsMoniker</CommandFlag>
+                <Icon guid="ImageCatalogGuid" id="NewItem" />
 				<Strings>
 					<ButtonText>New Feature...</ButtonText>
 				</Strings>

From 68c86db09b11b5515046befe291c286eb3702dc8 Mon Sep 17 00:00:00 2001
From: Mysterious_Dev <mysteriousdevs@gmail.com>
Date: Sat, 4 Nov 2023 14:52:16 +0100
Subject: [PATCH 3/6] Change icon for new test project

---
 .../Commands/TemplateStudioForWinuiPackage.vsct                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct b/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
index 94e4c313ee..9e583cdf1b 100644
--- a/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
+++ b/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
@@ -54,7 +54,7 @@
 				<CommandFlag>DefaultInvisible</CommandFlag>
 				<CommandFlag>DynamicVisibility</CommandFlag>
                 <CommandFlag>IconIsMoniker</CommandFlag>
-                <Icon guid="ImageCatalogGuid" id="AddTest" />
+                <Icon guid="ImageCatalogGuid" id="NewTest" />
 				<Strings>
 					<ButtonText>New Test Project...</ButtonText>
 				</Strings>

From f79e107749351bbae4b98a0fb68c14748e8c55ee Mon Sep 17 00:00:00 2001
From: Mysterious_Dev <mysteriousdevs@gmail.com>
Date: Sat, 4 Nov 2023 15:07:21 +0100
Subject: [PATCH 4/6] Delete useless symbols

---
 .../Commands/TemplateStudioForWinuiPackage.vsct           | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct b/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
index 9e583cdf1b..f9df90f19b 100644
--- a/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
+++ b/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
@@ -146,15 +146,7 @@
 		</GuidSymbol>
 
 		<GuidSymbol name="guidImages" value="{4060629C-FD00-4D0F-8C97-92747BFB7F28}" >
-			<IDSymbol name="bmpFeature1" value="1" />
-			<IDSymbol name="bmpFeature2" value="2" />
-			<IDSymbol name="bmpFeature3" value="3" />
-			<IDSymbol name="bmpFeature4" value="4" />
-			<IDSymbol name="bmpPage1" value="5" />
-			<IDSymbol name="bmpWTS" value="6" />
-			<IDSymbol name="bmpOpenTemp" value="7" />
 			<IDSymbol name="bmpService" value="8" />
-			<IDSymbol name="bmpTesting" value="9" />
 		</GuidSymbol>
 	</Symbols>
 </CommandTable>

From 83c3388171e3ceb9feae82c341046f8e6835dd25 Mon Sep 17 00:00:00 2001
From: Mysterious_Dev <mysteriousdevs@gmail.com>
Date: Sat, 4 Nov 2023 17:10:18 +0100
Subject: [PATCH 5/6] Icon for service

---
 .../Commands/TemplateStudioForWinuiPackage.vsct                | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct b/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
index f9df90f19b..0f4fd62e6d 100644
--- a/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
+++ b/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
@@ -44,7 +44,8 @@
 				<CommandFlag>DefaultDisabled</CommandFlag>
 				<CommandFlag>DefaultInvisible</CommandFlag>
 				<CommandFlag>DynamicVisibility</CommandFlag>
-				<Icon guid="guidImages" id="bmpService" />
+				<CommandFlag>IconIsMoniker</CommandFlag>
+                <Icon guid="ImageCatalogGuid" id="NewItem" />
 				<Strings>
 					<ButtonText>New Service...</ButtonText>
 				</Strings>

From 64f810d363bce73d5fc1fdf1baf187252d6bf114 Mon Sep 17 00:00:00 2001
From: Mysterious_Dev <mysteriousdevs@gmail.com>
Date: Sat, 4 Nov 2023 17:14:11 +0100
Subject: [PATCH 6/6] Cleanup

---
 .../Commands/TemplateStudioForWinuiPackage.vsct           | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct b/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
index 0f4fd62e6d..2dba06b0ed 100644
--- a/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
+++ b/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
@@ -71,10 +71,6 @@
 				</Strings>
 			</Button>
 		</Buttons>
-
-		<Bitmaps>
-			<Bitmap guid="guidImages" href="Resources\TemplateStudioCommand.png" usedList="bmpFeature1, bmpFeature2, bmpFeature3, bmpFeature4, bmpPage1, bmpWTS, bmpOpenTemp, bmpService, bmpTesting" />
-		</Bitmaps>
 	</Commands>
     <VisibilityConstraints>
         <VisibilityItem guid="guidTemplateStudioForWinUICsPackageCmdSet"
@@ -145,9 +141,5 @@
 			<IDSymbol name="AddTestingCommand" value="0x0700"/>
 			<IDSymbol name="OpenTempFolder" value="0x0800"/>
 		</GuidSymbol>
-
-		<GuidSymbol name="guidImages" value="{4060629C-FD00-4D0F-8C97-92747BFB7F28}" >
-			<IDSymbol name="bmpService" value="8" />
-		</GuidSymbol>
 	</Symbols>
 </CommandTable>