Skip to content

Portable Tool for an Ideal Windows Setup

ref. reorganized project structure for better clarity

Greedeks6b601ffad3ff
diff --git a/.Source/GTweak/App.xaml b/.Source/GTweak/App.xaml
index 6cc7f9a4..bb6b4b49 100644
--- a/.Source/GTweak/App.xaml
+++ b/.Source/GTweak/App.xaml
@@ -18,7 +18,7 @@
<ResourceDictionary Source="Assets/DrawingImages/TitleBar.xaml" />
<ResourceDictionary Source="Assets/DrawingImages/SettingsPanel.xaml" />
<ResourceDictionary Source="Assets/DrawingImages/SystemInfo.xaml" />
- <ResourceDictionary Source="Assets/Images.xaml" />
+ <ResourceDictionary Source="Assets/Images/ImageResources.xaml" />
<ResourceDictionary Source="Styles/Themes/Dark/Colors.xaml" />
<ResourceDictionary Source="Styles/Buttons/Buttons.xaml" />
<ResourceDictionary Source="Styles/Buttons/RadioButtons.xaml" />
diff --git a/.Source/GTweak/Assets/ImageAddonsFiles/BatFile.png b/.Source/GTweak/Assets/Images/AddonsFiles/BatFile.png
similarity index 100%
rename from .Source/GTweak/Assets/ImageAddonsFiles/BatFile.png
rename to .Source/GTweak/Assets/Images/AddonsFiles/BatFile.png
diff --git a/.Source/GTweak/Assets/ImageAddonsFiles/CmdFile.png b/.Source/GTweak/Assets/Images/AddonsFiles/CmdFile.png
similarity index 100%
rename from .Source/GTweak/Assets/ImageAddonsFiles/CmdFile.png
rename to .Source/GTweak/Assets/Images/AddonsFiles/CmdFile.png
diff --git a/.Source/GTweak/Assets/ImageAddonsFiles/PowershellFile.png b/.Source/GTweak/Assets/Images/AddonsFiles/PowershellFile.png
similarity index 100%
rename from .Source/GTweak/Assets/ImageAddonsFiles/PowershellFile.png
rename to .Source/GTweak/Assets/Images/AddonsFiles/PowershellFile.png
diff --git a/.Source/GTweak/Assets/ImageAddonsFiles/RegistryFile.png b/.Source/GTweak/Assets/Images/AddonsFiles/RegistryFile.png
similarity index 100%
rename from .Source/GTweak/Assets/ImageAddonsFiles/RegistryFile.png
rename to .Source/GTweak/Assets/Images/AddonsFiles/RegistryFile.png
diff --git a/.Source/GTweak/Assets/Images.xaml b/.Source/GTweak/Assets/Images/ImageResources.xaml
similarity index 55%
rename from .Source/GTweak/Assets/Images.xaml
rename to .Source/GTweak/Assets/Images/ImageResources.xaml
index 04ae5ca0..020e15ce 100644
--- a/.Source/GTweak/Assets/Images.xaml
+++ b/.Source/GTweak/Assets/Images/ImageResources.xaml
@@ -1,84 +1,84 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
- <BitmapImage x:Key="Img_BatFile" UriSource="/GTweak;component/Assets/ImageAddonsFiles/BatFile.png"/>
- <BitmapImage x:Key="Img_CmdFile" UriSource="/GTweak;component/Assets/ImageAddonsFiles/CmdFile.png"/>
- <BitmapImage x:Key="Img_PowershellFile" UriSource="/GTweak;component/Assets/ImageAddonsFiles/PowershellFile.png"/>
- <BitmapImage x:Key="Img_RegistryFile" UriSource="/GTweak;component/Assets/ImageAddonsFiles/RegistryFile.png"/>
+ <BitmapImage x:Key="Img_BatFile" UriSource="/GTweak;component/Assets/Images/AddonsFiles/BatFile.png"/>
+ <BitmapImage x:Key="Img_CmdFile" UriSource="/GTweak;component/Assets/Images/AddonsFiles/CmdFile.png"/>
+ <BitmapImage x:Key="Img_PowershellFile" UriSource="/GTweak;component/Assets/Images/AddonsFiles/PowershellFile.png"/>
+ <BitmapImage x:Key="Img_RegistryFile" UriSource="/GTweak;component/Assets/Images/AddonsFiles/RegistryFile.png"/>
- <BitmapImage x:Key="Img_SandTimer" UriSource="/GTweak;component/Assets/ImagePackages/SandTimer.png"/>
+ <BitmapImage x:Key="Img_SandTimer" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/SandTimer.png"/>
- <BitmapImage x:Key="Img_3DBuilder" UriSource="/GTweak;component/Assets/ImagePackages/3DBuilder.png"/>
- <BitmapImage x:Key="Img_Alarms" UriSource="/GTweak;component/Assets/ImagePackages/Alarms.png"/>
- <BitmapImage x:Key="Img_BingFinance" UriSource="/GTweak;component/Assets/ImagePackages/BingFinance.png"/>
- <BitmapImage x:Key="Img_BingNews" UriSource="/GTweak;component/Assets/ImagePackages/BingNews.png"/>
- <BitmapImage x:Key="Img_BingSearch" UriSource="/GTweak;component/Assets/ImagePackages/BingSearch.png"/>
- <BitmapImage x:Key="Img_BingSports" UriSource="/GTweak;component/Assets/ImagePackages/BingSports.png"/>
- <BitmapImage x:Key="Img_BingWeather" UriSource="/GTweak;component/Assets/ImagePackages/BingWeather.png"/>
- <BitmapImage x:Key="Img_Calculator" UriSource="/GTweak;component/Assets/ImagePackages/Calculator.png"/>
- <BitmapImage x:Key="Img_Camera" UriSource="/GTweak;component/Assets/ImagePackages/Camera.png"/>
- <BitmapImage x:Key="Img_Clipchamp" UriSource="/GTweak;component/Assets/ImagePackages/Clipchamp.png"/>
- <BitmapImage x:Key="Img_Copilot" UriSource="/GTweak;component/Assets/ImagePackages/Copilot.png"/>
- <BitmapImage x:Key="Img_Cortana" UriSource="/GTweak;component/Assets/ImagePackages/Cortana.png"/>
- <BitmapImage x:Key="Img_DevHome" UriSource="/GTweak;component/Assets/ImagePackages/DevHome.png"/>
- <BitmapImage x:Key="Img_Disney" UriSource="/GTweak;component/Assets/ImagePackages/Disney.png"/>
- <BitmapImage x:Key="Img_DolbyAccess" UriSource="/GTweak;component/Assets/ImagePackages/DolbyAccess.png"/>
- <BitmapImage x:Key="Img_Edge" UriSource="/GTweak;component/Assets/ImagePackages/Edge.png"/>
- <BitmapImage x:Key="Img_Facebook" UriSource="/GTweak;component/Assets/ImagePackages/Facebook.png"/>
- <BitmapImage x:Key="Img_FeedbackHub" UriSource="/GTweak;component/Assets/ImagePackages/FeedbackHub.png"/>
- <BitmapImage x:Key="Img_GetHelp" UriSource="/GTweak;component/Assets/ImagePackages/GetHelp.png"/>
- <BitmapImage x:Key="Img_Hulu" UriSource="/GTweak;component/Assets/ImagePackages/Hulu.png"/>
- <BitmapImage x:Key="Img_iHeartRadio" UriSource="/GTweak;component/Assets/ImagePackages/iHeartRadio.png"/>
- <BitmapImage x:Key="Img_Instagram" UriSource="/GTweak;component/Assets/ImagePackages/Instagram.png"/>
- <BitmapImage x:Key="Img_Linkedin" UriSource="/GTweak;component/Assets/ImagePackages/Linkedin.png"/>
- <BitmapImage x:Key="Img_Mail" UriSource="/GTweak;component/Assets/ImagePackages/Mail.png"/>
- <BitmapImage x:Key="Img_Maps" UriSource="/GTweak;component/Assets/ImagePackages/Maps.png"/>
- <BitmapImage x:Key="Img_Messaging" UriSource="/GTweak;component/Assets/ImagePackages/Messaging.png"/>
- <BitmapImage x:Key="Img_Microsoft3DViewer" UriSource="/GTweak;component/Assets/ImagePackages/Microsoft3DViewer.png"/>
- <BitmapImage x:Key="Img_MicrosoftFamilySafety" UriSource="/GTweak;component/Assets/ImagePackages/MicrosoftFamilySafety.png"/>
- <BitmapImage x:Key="Img_MicrosoftOfficeHub" UriSource="/GTweak;component/Assets/ImagePackages/MicrosoftOfficeHub.png"/>
- <BitmapImage x:Key="Img_MicrosoftPowerAutomate" UriSource="/GTweak;component/Assets/ImagePackages/MicrosoftPowerAutomate.png"/>
- <BitmapImage x:Key="Img_MicrosoftSolitaireCollection" UriSource="/GTweak;component/Assets/ImagePackages/MicrosoftSolitaireCollection.png"/>
- <BitmapImage x:Key="Img_MicrosoftStickyNotes" UriSource="/GTweak;component/Assets/ImagePackages/MicrosoftStickyNotes.png"/>
- <BitmapImage x:Key="Img_MicrosoftStore" UriSource="/GTweak;component/Assets/ImagePackages/MicrosoftStore.png"/>
- <BitmapImage x:Key="Img_MicrosoftSway" UriSource="/GTweak;component/Assets/ImagePackages/MicrosoftSway.png"/>
- <BitmapImage x:Key="Img_MicrosoftTeams" UriSource="/GTweak;component/Assets/ImagePackages/MicrosoftTeams.png"/>
- <BitmapImage x:Key="Img_MixedReality" UriSource="/GTweak;component/Assets/ImagePackages/MixedReality.png"/>
- <BitmapImage x:Key="Img_MobilePlanOneConnect" UriSource="/GTweak;component/Assets/ImagePackages/MobilePlanOneConnect.png"/>
- <BitmapImage x:Key="Img_Music" UriSource="/GTweak;component/Assets/ImagePackages/Music.png"/>
- <BitmapImage x:Key="Img_Netflix" UriSource="/GTweak;component/Assets/ImagePackages/Netflix.png"/>
- <BitmapImage x:Key="Img_Notepad" UriSource="/GTweak;component/Assets/ImagePackages/Notepad.png"/>
- <BitmapImage x:Key="Img_OneDrive" UriSource="/GTweak;component/Assets/ImagePackages/OneDrive.png"/>
- <BitmapImage x:Key="Img_OneNote" UriSource="/GTweak;component/Assets/ImagePackages/OneNote.png"/>
- <BitmapImage x:Key="Img_Outlook" UriSource="/GTweak;component/Assets/ImagePackages/Outlook.png"/>
- <BitmapImage x:Key="Img_Paint" UriSource="/GTweak;component/Assets/ImagePackages/Paint.png"/>
- <BitmapImage x:Key="Img_Paint3D" UriSource="/GTweak;component/Assets/ImagePackages/Paint3D.png"/>
- <BitmapImage x:Key="Img_Pandora" UriSource="/GTweak;component/Assets/ImagePackages/Pandora.png"/>
- <BitmapImage x:Key="Img_People" UriSource="/GTweak;component/Assets/ImagePackages/People.png"/>
- <BitmapImage x:Key="Img_Phone" UriSource="/GTweak;component/Assets/ImagePackages/Phone.png"/>
- <BitmapImage x:Key="Img_Photos" UriSource="/GTweak;component/Assets/ImagePackages/Photos.png"/>
- <BitmapImage x:Key="Img_Picsart" UriSource="/GTweak;component/Assets/ImagePackages/Picsart.png"/>
- <BitmapImage x:Key="Img_Plex" UriSource="/GTweak;component/Assets/ImagePackages/Plex.png"/>
- <BitmapImage x:Key="Img_PrimeVideo" UriSource="/GTweak;component/Assets/ImagePackages/PrimeVideo.png"/>
- <BitmapImage x:Key="Img_QuickAssist" UriSource="/GTweak;component/Assets/ImagePackages/QuickAssist.png"/>
- <BitmapImage x:Key="Img_ScreenSketch" UriSource="/GTweak;component/Assets/ImagePackages/ScreenSketch.png"/>
- <BitmapImage x:Key="Img_Shazam" UriSource="/GTweak;component/Assets/ImagePackages/Shazam.png"/>
- <BitmapImage x:Key="Img_SkypeApp" UriSource="/GTweak;component/Assets/ImagePackages/SkypeApp.png"/>
- <BitmapImage x:Key="Img_SoundRecorder" UriSource="/GTweak;component/Assets/ImagePackages/SoundRecorder.png"/>
- <BitmapImage x:Key="Img_Spotify" UriSource="/GTweak;component/Assets/ImagePackages/Spotify.png"/>
- <BitmapImage x:Key="Img_Terminal" UriSource="/GTweak;component/Assets/ImagePackages/Terminal.png"/>
- <BitmapImage x:Key="Img_TikTok" UriSource="/GTweak;component/Assets/ImagePackages/TikTok.png"/>
- <BitmapImage x:Key="Img_Todos" UriSource="/GTweak;component/Assets/ImagePackages/Todos.png"/>
- <BitmapImage x:Key="Img_TuneInRadio" UriSource="/GTweak;component/Assets/ImagePackages/TuneInRadio.png"/>
- <BitmapImage x:Key="Img_TwitterX" UriSource="/GTweak;component/Assets/ImagePackages/TwitterX.png"/>
- <BitmapImage x:Key="Img_Video" UriSource="/GTweak;component/Assets/ImagePackages/Video.png"/>
- <BitmapImage x:Key="Img_Viber" UriSource="/GTweak;component/Assets/ImagePackages/Viber.png"/>
- <BitmapImage x:Key="Img_WebMediaExtensions" UriSource="/GTweak;component/Assets/ImagePackages/WebMediaExtensions.png"/>
- <BitmapImage x:Key="Img_Widgets" UriSource="/GTweak;component/Assets/ImagePackages/Widgets.png"/>
- <BitmapImage x:Key="Img_WhiteBoard" UriSource="/GTweak;component/Assets/ImagePackages/WhiteBoard.png"/>
- <BitmapImage x:Key="Img_Wallet" UriSource="/GTweak;component/Assets/ImagePackages/Wallet.png"/>
- <BitmapImage x:Key="Img_WhatsApp" UriSource="/GTweak;component/Assets/ImagePackages/WhatsApp.png"/>
- <BitmapImage x:Key="Img_Xbox" UriSource="/GTweak;component/Assets/ImagePackages/Xbox.png"/>
- <BitmapImage x:Key="Img_YandexMusic" UriSource="/GTweak;component/Assets/ImagePackages/YandexMusic.png"/>
+ <BitmapImage x:Key="Img_3DBuilder" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/3DBuilder.png"/>
+ <BitmapImage x:Key="Img_Alarms" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Alarms.png"/>
+ <BitmapImage x:Key="Img_BingFinance" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/BingFinance.png"/>
+ <BitmapImage x:Key="Img_BingNews" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/BingNews.png"/>
+ <BitmapImage x:Key="Img_BingSearch" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/BingSearch.png"/>
+ <BitmapImage x:Key="Img_BingSports" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/BingSports.png"/>
+ <BitmapImage x:Key="Img_BingWeather" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/BingWeather.png"/>
+ <BitmapImage x:Key="Img_Calculator" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Calculator.png"/>
+ <BitmapImage x:Key="Img_Camera" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Camera.png"/>
+ <BitmapImage x:Key="Img_Clipchamp" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Clipchamp.png"/>
+ <BitmapImage x:Key="Img_Copilot" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Copilot.png"/>
+ <BitmapImage x:Key="Img_Cortana" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Cortana.png"/>
+ <BitmapImage x:Key="Img_DevHome" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/DevHome.png"/>
+ <BitmapImage x:Key="Img_Disney" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Disney.png"/>
+ <BitmapImage x:Key="Img_DolbyAccess" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/DolbyAccess.png"/>
+ <BitmapImage x:Key="Img_Edge" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Edge.png"/>
+ <BitmapImage x:Key="Img_Facebook" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Facebook.png"/>
+ <BitmapImage x:Key="Img_FeedbackHub" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/FeedbackHub.png"/>
+ <BitmapImage x:Key="Img_GetHelp" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/GetHelp.png"/>
+ <BitmapImage x:Key="Img_Hulu" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Hulu.png"/>
+ <BitmapImage x:Key="Img_iHeartRadio" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/iHeartRadio.png"/>
+ <BitmapImage x:Key="Img_Instagram" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Instagram.png"/>
+ <BitmapImage x:Key="Img_Linkedin" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Linkedin.png"/>
+ <BitmapImage x:Key="Img_Mail" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Mail.png"/>
+ <BitmapImage x:Key="Img_Maps" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Maps.png"/>
+ <BitmapImage x:Key="Img_Messaging" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Messaging.png"/>
+ <BitmapImage x:Key="Img_Microsoft3DViewer" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Microsoft3DViewer.png"/>
+ <BitmapImage x:Key="Img_MicrosoftFamilySafety" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/MicrosoftFamilySafety.png"/>
+ <BitmapImage x:Key="Img_MicrosoftOfficeHub" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/MicrosoftOfficeHub.png"/>
+ <BitmapImage x:Key="Img_MicrosoftPowerAutomate" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/MicrosoftPowerAutomate.png"/>
+ <BitmapImage x:Key="Img_MicrosoftSolitaireCollection" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/MicrosoftSolitaireCollection.png"/>
+ <BitmapImage x:Key="Img_MicrosoftStickyNotes" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/MicrosoftStickyNotes.png"/>
+ <BitmapImage x:Key="Img_MicrosoftStore" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/MicrosoftStore.png"/>
+ <BitmapImage x:Key="Img_MicrosoftSway" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/MicrosoftSway.png"/>
+ <BitmapImage x:Key="Img_MicrosoftTeams" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/MicrosoftTeams.png"/>
+ <BitmapImage x:Key="Img_MixedReality" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/MixedReality.png"/>
+ <BitmapImage x:Key="Img_MobilePlanOneConnect" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/MobilePlanOneConnect.png"/>
+ <BitmapImage x:Key="Img_Music" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Music.png"/>
+ <BitmapImage x:Key="Img_Netflix" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Netflix.png"/>
+ <BitmapImage x:Key="Img_Notepad" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Notepad.png"/>
+ <BitmapImage x:Key="Img_OneDrive" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/OneDrive.png"/>
+ <BitmapImage x:Key="Img_OneNote" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/OneNote.png"/>
+ <BitmapImage x:Key="Img_Outlook" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Outlook.png"/>
+ <BitmapImage x:Key="Img_Paint" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Paint.png"/>
+ <BitmapImage x:Key="Img_Paint3D" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Paint3D.png"/>
+ <BitmapImage x:Key="Img_Pandora" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Pandora.png"/>
+ <BitmapImage x:Key="Img_People" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/People.png"/>
+ <BitmapImage x:Key="Img_Phone" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Phone.png"/>
+ <BitmapImage x:Key="Img_Photos" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Photos.png"/>
+ <BitmapImage x:Key="Img_Picsart" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Picsart.png"/>
+ <BitmapImage x:Key="Img_Plex" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Plex.png"/>
+ <BitmapImage x:Key="Img_PrimeVideo" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/PrimeVideo.png"/>
+ <BitmapImage x:Key="Img_QuickAssist" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/QuickAssist.png"/>
+ <BitmapImage x:Key="Img_ScreenSketch" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/ScreenSketch.png"/>
+ <BitmapImage x:Key="Img_Shazam" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Shazam.png"/>
+ <BitmapImage x:Key="Img_SkypeApp" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/SkypeApp.png"/>
+ <BitmapImage x:Key="Img_SoundRecorder" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/SoundRecorder.png"/>
+ <BitmapImage x:Key="Img_Spotify" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Spotify.png"/>
+ <BitmapImage x:Key="Img_Terminal" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Terminal.png"/>
+ <BitmapImage x:Key="Img_TikTok" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/TikTok.png"/>
+ <BitmapImage x:Key="Img_Todos" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Todos.png"/>
+ <BitmapImage x:Key="Img_TuneInRadio" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/TuneInRadio.png"/>
+ <BitmapImage x:Key="Img_TwitterX" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/TwitterX.png"/>
+ <BitmapImage x:Key="Img_Video" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Video.png"/>
+ <BitmapImage x:Key="Img_Viber" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Viber.png"/>
+ <BitmapImage x:Key="Img_WebMediaExtensions" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/WebMediaExtensions.png"/>
+ <BitmapImage x:Key="Img_Widgets" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Widgets.png"/>
+ <BitmapImage x:Key="Img_WhiteBoard" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/WhiteBoard.png"/>
+ <BitmapImage x:Key="Img_Wallet" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Wallet.png"/>
+ <BitmapImage x:Key="Img_WhatsApp" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/WhatsApp.png"/>
+ <BitmapImage x:Key="Img_Xbox" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/Xbox.png"/>
+ <BitmapImage x:Key="Img_YandexMusic" UriSource="/GTweak;component/Assets/Images/PreinstalledApps/YandexMusic.png"/>
</ResourceDictionary>
\ No newline at end of file
diff --git a/.Source/GTweak/Assets/ImagePackages/3DBuilder.png b/.Source/GTweak/Assets/Images/PreinstalledApps/3DBuilder.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/3DBuilder.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/3DBuilder.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Alarms.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Alarms.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Alarms.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Alarms.png
diff --git a/.Source/GTweak/Assets/ImagePackages/BingFinance.png b/.Source/GTweak/Assets/Images/PreinstalledApps/BingFinance.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/BingFinance.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/BingFinance.png
diff --git a/.Source/GTweak/Assets/ImagePackages/BingNews.png b/.Source/GTweak/Assets/Images/PreinstalledApps/BingNews.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/BingNews.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/BingNews.png
diff --git a/.Source/GTweak/Assets/ImagePackages/BingSearch.png b/.Source/GTweak/Assets/Images/PreinstalledApps/BingSearch.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/BingSearch.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/BingSearch.png
diff --git a/.Source/GTweak/Assets/ImagePackages/BingSports.png b/.Source/GTweak/Assets/Images/PreinstalledApps/BingSports.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/BingSports.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/BingSports.png
diff --git a/.Source/GTweak/Assets/ImagePackages/BingWeather.png b/.Source/GTweak/Assets/Images/PreinstalledApps/BingWeather.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/BingWeather.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/BingWeather.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Calculator.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Calculator.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Calculator.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Calculator.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Camera.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Camera.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Camera.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Camera.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Clipchamp.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Clipchamp.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Clipchamp.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Clipchamp.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Copilot.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Copilot.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Copilot.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Copilot.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Cortana.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Cortana.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Cortana.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Cortana.png
diff --git a/.Source/GTweak/Assets/ImagePackages/DevHome.png b/.Source/GTweak/Assets/Images/PreinstalledApps/DevHome.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/DevHome.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/DevHome.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Disney.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Disney.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Disney.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Disney.png
diff --git a/.Source/GTweak/Assets/ImagePackages/DolbyAccess.png b/.Source/GTweak/Assets/Images/PreinstalledApps/DolbyAccess.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/DolbyAccess.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/DolbyAccess.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Edge.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Edge.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Edge.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Edge.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Facebook.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Facebook.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Facebook.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Facebook.png
diff --git a/.Source/GTweak/Assets/ImagePackages/FeedbackHub.png b/.Source/GTweak/Assets/Images/PreinstalledApps/FeedbackHub.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/FeedbackHub.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/FeedbackHub.png
diff --git a/.Source/GTweak/Assets/ImagePackages/GetHelp.png b/.Source/GTweak/Assets/Images/PreinstalledApps/GetHelp.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/GetHelp.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/GetHelp.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Hulu.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Hulu.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Hulu.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Hulu.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Instagram.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Instagram.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Instagram.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Instagram.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Linkedin.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Linkedin.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Linkedin.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Linkedin.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Mail.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Mail.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Mail.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Mail.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Maps.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Maps.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Maps.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Maps.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Messaging.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Messaging.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Messaging.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Messaging.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Microsoft3DViewer.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Microsoft3DViewer.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Microsoft3DViewer.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Microsoft3DViewer.png
diff --git a/.Source/GTweak/Assets/ImagePackages/MicrosoftFamilySafety.png b/.Source/GTweak/Assets/Images/PreinstalledApps/MicrosoftFamilySafety.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/MicrosoftFamilySafety.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/MicrosoftFamilySafety.png
diff --git a/.Source/GTweak/Assets/ImagePackages/MicrosoftOfficeHub.png b/.Source/GTweak/Assets/Images/PreinstalledApps/MicrosoftOfficeHub.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/MicrosoftOfficeHub.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/MicrosoftOfficeHub.png
diff --git a/.Source/GTweak/Assets/ImagePackages/MicrosoftPowerAutomate.png b/.Source/GTweak/Assets/Images/PreinstalledApps/MicrosoftPowerAutomate.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/MicrosoftPowerAutomate.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/MicrosoftPowerAutomate.png
diff --git a/.Source/GTweak/Assets/ImagePackages/MicrosoftSolitaireCollection.png b/.Source/GTweak/Assets/Images/PreinstalledApps/MicrosoftSolitaireCollection.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/MicrosoftSolitaireCollection.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/MicrosoftSolitaireCollection.png
diff --git a/.Source/GTweak/Assets/ImagePackages/MicrosoftStickyNotes.png b/.Source/GTweak/Assets/Images/PreinstalledApps/MicrosoftStickyNotes.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/MicrosoftStickyNotes.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/MicrosoftStickyNotes.png
diff --git a/.Source/GTweak/Assets/ImagePackages/MicrosoftStore.png b/.Source/GTweak/Assets/Images/PreinstalledApps/MicrosoftStore.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/MicrosoftStore.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/MicrosoftStore.png
diff --git a/.Source/GTweak/Assets/ImagePackages/MicrosoftSway.png b/.Source/GTweak/Assets/Images/PreinstalledApps/MicrosoftSway.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/MicrosoftSway.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/MicrosoftSway.png
diff --git a/.Source/GTweak/Assets/ImagePackages/MicrosoftTeams.png b/.Source/GTweak/Assets/Images/PreinstalledApps/MicrosoftTeams.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/MicrosoftTeams.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/MicrosoftTeams.png
diff --git a/.Source/GTweak/Assets/ImagePackages/MixedReality.png b/.Source/GTweak/Assets/Images/PreinstalledApps/MixedReality.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/MixedReality.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/MixedReality.png
diff --git a/.Source/GTweak/Assets/ImagePackages/MobilePlanOneConnect.png b/.Source/GTweak/Assets/Images/PreinstalledApps/MobilePlanOneConnect.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/MobilePlanOneConnect.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/MobilePlanOneConnect.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Music.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Music.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Music.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Music.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Netflix.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Netflix.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Netflix.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Netflix.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Notepad.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Notepad.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Notepad.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Notepad.png
diff --git a/.Source/GTweak/Assets/ImagePackages/OneDrive.png b/.Source/GTweak/Assets/Images/PreinstalledApps/OneDrive.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/OneDrive.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/OneDrive.png
diff --git a/.Source/GTweak/Assets/ImagePackages/OneNote.png b/.Source/GTweak/Assets/Images/PreinstalledApps/OneNote.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/OneNote.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/OneNote.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Outlook.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Outlook.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Outlook.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Outlook.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Paint.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Paint.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Paint.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Paint.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Paint3D.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Paint3D.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Paint3D.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Paint3D.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Pandora.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Pandora.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Pandora.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Pandora.png
diff --git a/.Source/GTweak/Assets/ImagePackages/People.png b/.Source/GTweak/Assets/Images/PreinstalledApps/People.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/People.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/People.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Phone.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Phone.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Phone.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Phone.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Photos.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Photos.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Photos.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Photos.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Picsart.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Picsart.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Picsart.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Picsart.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Plex.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Plex.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Plex.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Plex.png
diff --git a/.Source/GTweak/Assets/ImagePackages/PrimeVideo.png b/.Source/GTweak/Assets/Images/PreinstalledApps/PrimeVideo.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/PrimeVideo.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/PrimeVideo.png
diff --git a/.Source/GTweak/Assets/ImagePackages/QuickAssist.png b/.Source/GTweak/Assets/Images/PreinstalledApps/QuickAssist.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/QuickAssist.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/QuickAssist.png
diff --git a/.Source/GTweak/Assets/ImagePackages/SandTimer.png b/.Source/GTweak/Assets/Images/PreinstalledApps/SandTimer.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/SandTimer.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/SandTimer.png
diff --git a/.Source/GTweak/Assets/ImagePackages/ScreenSketch.png b/.Source/GTweak/Assets/Images/PreinstalledApps/ScreenSketch.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/ScreenSketch.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/ScreenSketch.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Shazam.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Shazam.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Shazam.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Shazam.png
diff --git a/.Source/GTweak/Assets/ImagePackages/SkypeApp.png b/.Source/GTweak/Assets/Images/PreinstalledApps/SkypeApp.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/SkypeApp.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/SkypeApp.png
diff --git a/.Source/GTweak/Assets/ImagePackages/SoundRecorder.png b/.Source/GTweak/Assets/Images/PreinstalledApps/SoundRecorder.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/SoundRecorder.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/SoundRecorder.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Spotify.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Spotify.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Spotify.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Spotify.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Terminal.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Terminal.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Terminal.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Terminal.png
diff --git a/.Source/GTweak/Assets/ImagePackages/TikTok.png b/.Source/GTweak/Assets/Images/PreinstalledApps/TikTok.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/TikTok.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/TikTok.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Todos.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Todos.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Todos.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Todos.png
diff --git a/.Source/GTweak/Assets/ImagePackages/TuneInRadio.png b/.Source/GTweak/Assets/Images/PreinstalledApps/TuneInRadio.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/TuneInRadio.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/TuneInRadio.png
diff --git a/.Source/GTweak/Assets/ImagePackages/TwitterX.png b/.Source/GTweak/Assets/Images/PreinstalledApps/TwitterX.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/TwitterX.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/TwitterX.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Viber.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Viber.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Viber.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Viber.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Video.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Video.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Video.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Video.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Wallet.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Wallet.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Wallet.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Wallet.png
diff --git a/.Source/GTweak/Assets/ImagePackages/WebMediaExtensions.png b/.Source/GTweak/Assets/Images/PreinstalledApps/WebMediaExtensions.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/WebMediaExtensions.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/WebMediaExtensions.png
diff --git a/.Source/GTweak/Assets/ImagePackages/WhatsApp.png b/.Source/GTweak/Assets/Images/PreinstalledApps/WhatsApp.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/WhatsApp.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/WhatsApp.png
diff --git a/.Source/GTweak/Assets/ImagePackages/WhiteBoard.png b/.Source/GTweak/Assets/Images/PreinstalledApps/WhiteBoard.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/WhiteBoard.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/WhiteBoard.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Widgets.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Widgets.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Widgets.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Widgets.png
diff --git a/.Source/GTweak/Assets/ImagePackages/Xbox.png b/.Source/GTweak/Assets/Images/PreinstalledApps/Xbox.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/Xbox.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/Xbox.png
diff --git a/.Source/GTweak/Assets/ImagePackages/YandexMusic.png b/.Source/GTweak/Assets/Images/PreinstalledApps/YandexMusic.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/YandexMusic.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/YandexMusic.png
diff --git a/.Source/GTweak/Assets/ImagePackages/iHeartRadio.png b/.Source/GTweak/Assets/Images/PreinstalledApps/iHeartRadio.png
similarity index 100%
rename from .Source/GTweak/Assets/ImagePackages/iHeartRadio.png
rename to .Source/GTweak/Assets/Images/PreinstalledApps/iHeartRadio.png
diff --git a/.Source/GTweak/Assets/UserControls/ColorWheelPicker/ColorWheelEffect.cs b/.Source/GTweak/Assets/ShaderEffects/ColorWheelEffect.cs
similarity index 78%
rename from .Source/GTweak/Assets/UserControls/ColorWheelPicker/ColorWheelEffect.cs
rename to .Source/GTweak/Assets/ShaderEffects/ColorWheelEffect.cs
index 2dd4c753..125ca8b5 100644
--- a/.Source/GTweak/Assets/UserControls/ColorWheelPicker/ColorWheelEffect.cs
+++ b/.Source/GTweak/Assets/ShaderEffects/ColorWheelEffect.cs
@@ -3,13 +3,13 @@ using System.Windows;
using System.Windows.Media;
using System.Windows.Media.Effects;
-namespace GTweak.Assets.UserControls.ColorWheelPicker
+namespace GTweak.Assets.ShaderEffects
{
public class ColorWheelEffect : ShaderEffect
{
private static readonly PixelShader _shader = new PixelShader()
{
- UriSource = new Uri("pack://application:,,,/GTweak;component/Assets/UserControls/ColorWheelPicker/ColorWheelEffect.ps")
+ UriSource = new Uri("/GTweak;component/Assets/ShaderEffects/ColorWheelEffect.ps", UriKind.Relative)
};
public ColorWheelEffect()
diff --git a/.Source/GTweak/Assets/UserControls/ColorWheelPicker/ColorWheelEffect.ps b/.Source/GTweak/Assets/ShaderEffects/ColorWheelEffect.ps
similarity index 100%
rename from .Source/GTweak/Assets/UserControls/ColorWheelPicker/ColorWheelEffect.ps
rename to .Source/GTweak/Assets/ShaderEffects/ColorWheelEffect.ps
diff --git a/.Source/GTweak/Assets/UserControls/ColorWheelPicker/ColorPicker.xaml b/.Source/GTweak/Assets/UserControls/ColorPicker.xaml
similarity index 97%
rename from .Source/GTweak/Assets/UserControls/ColorWheelPicker/ColorPicker.xaml
rename to .Source/GTweak/Assets/UserControls/ColorPicker.xaml
index 64b42758..4acd4af8 100644
--- a/.Source/GTweak/Assets/UserControls/ColorWheelPicker/ColorPicker.xaml
+++ b/.Source/GTweak/Assets/UserControls/ColorPicker.xaml
@@ -1,9 +1,10 @@
-<UserControl x:Class="GTweak.Assets.UserControls.ColorWheelPicker.ColorPicker"
+<UserControl x:Class="GTweak.Assets.UserControls.ColorPicker"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:local="clr-namespace:GTweak.Assets.UserControls.ColorWheelPicker"
+ xmlns:local="clr-namespace:GTweak.Assets.UserControls"
+ xmlns:effects="clr-namespace:GTweak.Assets.ShaderEffects"
mc:Ignorable="d"
d:DesignHeight="40" d:DesignWidth="140" UseLayoutRounding="True" SnapsToDevicePixels="True" KeyboardNavigation.TabNavigation="None" IsTabStop="False">
<Grid>
@@ -90,7 +91,7 @@
<Canvas Grid.Column="0" Width="150" Height="150">
<Rectangle x:Name="PART_Wheel" Width="150" Height="150" Fill="Transparent" MouseDown="ColorWheel_MouseDown" MouseMove="ColorWheel_MouseMove" MouseUp="ColorWheel_MouseUp">
<Rectangle.Effect>
- <local:ColorWheelEffect />
+ <effects:ColorWheelEffect />
</Rectangle.Effect>
<Rectangle.Clip>
<EllipseGeometry Center="75,75" RadiusX="75" RadiusY="75"/>
diff --git a/.Source/GTweak/Assets/UserControls/ColorWheelPicker/ColorPicker.xaml.cs b/.Source/GTweak/Assets/UserControls/ColorPicker.xaml.cs
similarity index 98%
rename from .Source/GTweak/Assets/UserControls/ColorWheelPicker/ColorPicker.xaml.cs
rename to .Source/GTweak/Assets/UserControls/ColorPicker.xaml.cs
index 61ea05e7..9f3bd143 100644
--- a/.Source/GTweak/Assets/UserControls/ColorWheelPicker/ColorPicker.xaml.cs
+++ b/.Source/GTweak/Assets/UserControls/ColorPicker.xaml.cs
@@ -8,19 +8,11 @@ using System.Windows.Media;
using GTweak.Utilities.Animation;
using GTweak.Utilities.Controls;
-namespace GTweak.Assets.UserControls.ColorWheelPicker
+namespace GTweak.Assets.UserControls
{
public partial class ColorPicker
{
- private const double WheelSize = 150.0;
- private const double WheelRadius = WheelSize / 2.0;
-
- private bool _isWheelBeingDragged, _isValueBeingDragged, _isInitialized, _isUpdatingFromProperty, _isUpdatingHexValue;
- private double _selectedWheelX, _selectedWheelY, _currentHue, _currentSaturation, _currentValue = 1.0;
- private Color _colorOnOpen;
-
- internal event EventHandler<Color> ColorPicked;
- internal event EventHandler PickerClosed;
+ internal event EventHandler ColorPicked, PickerClosed;
internal static readonly DependencyProperty SelectedColorProperty =
DependencyProperty.Register(nameof(SelectedColor), typeof(Color), typeof(ColorPicker), new FrameworkPropertyMetadata(Colors.White, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedColorChanged));
@@ -50,29 +42,12 @@ namespace GTweak.Assets.UserControls.ColorWheelPicker
set => SetValue(SelectedColorStringProperty, value);
}
- private static void OnSelectedColorStringChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
- {
- ColorPicker picker = (ColorPicker)d;
- string newValue = e.NewValue as string;
-
- if (!string.IsNullOrWhiteSpace(newValue) && !picker._isUpdatingFromProperty)
- {
- try
- {
- string[] components = newValue.Split(new[] { ' ', ',', ';' }, StringSplitOptions.RemoveEmptyEntries);
- if (components.Length == 3)
- {
- Color newColor = Color.FromRgb(byte.Parse(components[0]), byte.Parse(components[1]), byte.Parse(components[2]));
+ private const double WheelSize = 150.0;
+ private const double WheelRadius = WheelSize / 2.0;
- picker._isUpdatingFromProperty = true;
- picker.SelectedColor = newColor;
- picker.UpdateInternalStateFromColor(newColor);
- picker._isUpdatingFromProperty = false;
- }
- }
- catch (Exception ex) { ErrorLogging.LogDebug(ex); }
- }
- }
+ private bool _isWheelBeingDragged, _isValueBeingDragged, _isInitialized, _isUpdatingFromProperty, _isUpdatingHexValue;
+ private double _selectedWheelX, _selectedWheelY, _currentHue, _currentSaturation, _currentValue = 1.0;
+ private Color _colorOnOpen;
public ColorPicker()
{
@@ -107,13 +82,37 @@ namespace GTweak.Assets.UserControls.ColorWheelPicker
}
}
+ private static void OnSelectedColorStringChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ ColorPicker picker = (ColorPicker)d;
+ string newValue = e.NewValue as string;
+
+ if (!string.IsNullOrWhiteSpace(newValue) && !picker._isUpdatingFromProperty)
+ {
+ try
+ {
+ string[] components = newValue.Split(new[] { ' ', ',', ';' }, StringSplitOptions.RemoveEmptyEntries);
+ if (components.Length == 3)
+ {
+ Color newColor = Color.FromRgb(byte.Parse(components[0]), byte.Parse(components[1]), byte.Parse(components[2]));
+
+ picker._isUpdatingFromProperty = true;
+ picker.SelectedColor = newColor;
+ picker.UpdateInternalStateFromColor(newColor);
+ picker._isUpdatingFromProperty = false;
+ }
+ }
+ catch (Exception ex) { ErrorLogging.LogDebug(ex); }
+ }
+ }
+
private void NotifyColorChanged(Color newColor)
{
_isUpdatingFromProperty = true;
SelectedColor = newColor;
SelectedColorString = $"{newColor.R} {newColor.G} {newColor.B}";
_isUpdatingFromProperty = false;
- ColorPicked?.Invoke(this, newColor);
+ ColorPicked?.Invoke(this, EventArgs.Empty);
}
private void PART_ToggleButton_Checked(object sender, RoutedEventArgs e) => ColorPopup.IsOpen = true;
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csproj
index e18efd7a..d2abd710 100644
--- a/.Source/GTweak/GTweak.csproj
+++ b/.Source/GTweak/GTweak.csproj
@@ -131,10 +131,10 @@
<Compile Include="Assets\UserControls\Card.xaml.cs">
<DependentUpon>Card.xaml</DependentUpon>
</Compile>
- <Compile Include="Assets\UserControls\ColorWheelPicker\ColorPicker.xaml.cs">
+ <Compile Include="Assets\UserControls\ColorPicker.xaml.cs">
<DependentUpon>ColorPicker.xaml</DependentUpon>
</Compile>
- <Compile Include="Assets\UserControls\ColorWheelPicker\ColorWheelEffect.cs" />
+ <Compile Include="Assets\ShaderEffects\ColorWheelEffect.cs" />
<Compile Include="Assets\UserControls\DescriptionBlock.xaml.cs">
<DependentUpon>DescriptionBlock.xaml</DependentUpon>
</Compile>
@@ -234,7 +234,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
- <Page Include="Assets\Images.xaml">
+ <Page Include="Assets\Images\ImageResources.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -242,7 +242,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Assets\UserControls\ColorWheelPicker\ColorPicker.xaml">
+ <Page Include="Assets\UserControls\ColorPicker.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -487,7 +487,7 @@
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include=".editorconfig" />
- <Resource Include="Assets\UserControls\ColorWheelPicker\ColorWheelEffect.ps" />
+ <Resource Include="Assets\ShaderEffects\ColorWheelEffect.ps" />
<None Include="Resources\Blank.gz" />
<None Include="Resources\DisablingWD.gz" />
<None Include="Resources\hosts.gz" />
@@ -520,84 +520,84 @@
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
- <Resource Include="Assets\ImagePackages\BingSearch.png" />
- <Resource Include="Assets\ImagePackages\Alarms.png" />
- <Resource Include="Assets\ImagePackages\BingFinance.png" />
- <Resource Include="Assets\ImagePackages\BingNews.png" />
- <Resource Include="Assets\ImagePackages\BingWeather.png" />
- <Resource Include="Assets\ImagePackages\Camera.png" />
- <Resource Include="Assets\ImagePackages\Clipchamp.png" />
- <Resource Include="Assets\ImagePackages\Cortana.png" />
- <Resource Include="Assets\ImagePackages\DevHome.png" />
- <Resource Include="Assets\ImagePackages\Edge.png" />
- <Resource Include="Assets\ImagePackages\FeedbackHub.png" />
- <Resource Include="Assets\ImagePackages\GetHelp.png" />
- <Resource Include="Assets\ImagePackages\Linkedin.png" />
- <Resource Include="Assets\ImagePackages\Mail.png" />
- <Resource Include="Assets\ImagePackages\Maps.png" />
- <Resource Include="Assets\ImagePackages\Microsoft3DViewer.png" />
- <Resource Include="Assets\ImagePackages\MicrosoftFamilySafety.png" />
- <Resource Include="Assets\ImagePackages\MicrosoftOfficeHub.png" />
- <Resource Include="Assets\ImagePackages\MicrosoftPowerAutomate.png" />
- <Resource Include="Assets\ImagePackages\MicrosoftSolitaireCollection.png" />
- <Resource Include="Assets\ImagePackages\MicrosoftStickyNotes.png" />
- <Resource Include="Assets\ImagePackages\MicrosoftStore.png" />
- <Resource Include="Assets\ImagePackages\MicrosoftTeams.png" />
- <Resource Include="Assets\ImagePackages\MixedReality.png" />
- <Resource Include="Assets\ImagePackages\MobilePlanOneConnect.png" />
- <Resource Include="Assets\ImagePackages\Music.png" />
- <Resource Include="Assets\ImagePackages\OneDrive.png" />
- <Resource Include="Assets\ImagePackages\OneNote.png" />
- <Resource Include="Assets\ImagePackages\Outlook.png" />
- <Resource Include="Assets\ImagePackages\Paint3D.png" />
- <Resource Include="Assets\ImagePackages\People.png" />
- <Resource Include="Assets\ImagePackages\Phone.png" />
- <Resource Include="Assets\ImagePackages\Photos.png" />
- <Resource Include="Assets\ImagePackages\QuickAssist.png" />
- <Resource Include="Assets\ImagePackages\ScreenSketch.png" />
- <Resource Include="Assets\ImagePackages\SkypeApp.png" />
- <Resource Include="Assets\ImagePackages\SoundRecorder.png" />
- <Resource Include="Assets\ImagePackages\Terminal.png" />
- <Resource Include="Assets\ImagePackages\Todos.png" />
- <Resource Include="Assets\ImagePackages\Video.png" />
- <Resource Include="Assets\ImagePackages\WebMediaExtensions.png" />
- <Resource Include="Assets\ImagePackages\Widgets.png" />
- <Resource Include="Assets\ImagePackages\Xbox.png" />
- <Resource Include="Assets\ImagePackages\SandTimer.png" />
- <Resource Include="Assets\ImagePackages\BingSports.png" />
- <Resource Include="Assets\ImagePackages\Calculator.png" />
- <Resource Include="Assets\ImagePackages\Copilot.png" />
- <Resource Include="Assets\ImagePackages\Notepad.png" />
- <Resource Include="Assets\ImagePackages\Spotify.png" />
- <Resource Include="Assets\ImagePackages\Wallet.png" />
- <Resource Include="Assets\ImagePackages\WhatsApp.png" />
- <Resource Include="Assets\ImagePackages\WhiteBoard.png" />
<Resource Include="GTweak.ico" />
- <Resource Include="Assets\ImageAddonsFiles\BatFile.png" />
- <Resource Include="Assets\ImageAddonsFiles\CmdFile.png" />
- <Resource Include="Assets\ImageAddonsFiles\PowershellFile.png" />
- <Resource Include="Assets\ImageAddonsFiles\RegistryFile.png" />
- <Resource Include="Assets\ImagePackages\3DBuilder.png" />
- <Resource Include="Assets\ImagePackages\Disney.png" />
- <Resource Include="Assets\ImagePackages\Facebook.png" />
- <Resource Include="Assets\ImagePackages\Hulu.png" />
- <Resource Include="Assets\ImagePackages\Instagram.png" />
- <Resource Include="Assets\ImagePackages\MicrosoftSway.png" />
- <Resource Include="Assets\ImagePackages\Netflix.png" />
- <Resource Include="Assets\ImagePackages\TikTok.png" />
- <Resource Include="Assets\ImagePackages\TwitterX.png" />
- <Resource Include="Assets\ImagePackages\YandexMusic.png" />
- <Resource Include="Assets\ImagePackages\iHeartRadio.png" />
- <Resource Include="Assets\ImagePackages\Messaging.png" />
- <Resource Include="Assets\ImagePackages\Picsart.png" />
- <Resource Include="Assets\ImagePackages\Plex.png" />
- <Resource Include="Assets\ImagePackages\PrimeVideo.png" />
- <Resource Include="Assets\ImagePackages\Shazam.png" />
- <Resource Include="Assets\ImagePackages\TuneInRadio.png" />
- <Resource Include="Assets\ImagePackages\Viber.png" />
- <Resource Include="Assets\ImagePackages\Pandora.png" />
- <Resource Include="Assets\ImagePackages\DolbyAccess.png" />
- <Resource Include="Assets\ImagePackages\Paint.png" />
+ <Resource Include="Assets\Images\AddonsFiles\BatFile.png" />
+ <Resource Include="Assets\Images\AddonsFiles\CmdFile.png" />
+ <Resource Include="Assets\Images\AddonsFiles\PowershellFile.png" />
+ <Resource Include="Assets\Images\AddonsFiles\RegistryFile.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\3DBuilder.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Alarms.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\BingFinance.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\BingNews.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\BingSearch.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\BingSports.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\BingWeather.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Calculator.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Camera.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Clipchamp.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Copilot.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Cortana.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\DevHome.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Disney.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\DolbyAccess.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Edge.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Facebook.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\FeedbackHub.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\GetHelp.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Hulu.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\iHeartRadio.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Instagram.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Linkedin.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Mail.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Maps.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Messaging.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Microsoft3DViewer.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\MicrosoftFamilySafety.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\MicrosoftOfficeHub.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\MicrosoftPowerAutomate.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\MicrosoftSolitaireCollection.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\MicrosoftStickyNotes.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\MicrosoftStore.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\MicrosoftSway.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\MicrosoftTeams.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\MixedReality.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\MobilePlanOneConnect.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Music.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Netflix.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Notepad.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\OneDrive.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\OneNote.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Outlook.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Paint.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Paint3D.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Pandora.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\People.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Phone.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Photos.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Picsart.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Plex.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\PrimeVideo.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\QuickAssist.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\SandTimer.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\ScreenSketch.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Shazam.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\SkypeApp.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\SoundRecorder.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Spotify.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Terminal.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\TikTok.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Todos.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\TuneInRadio.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\TwitterX.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Viber.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Video.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Wallet.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\WebMediaExtensions.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\WhatsApp.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\WhiteBoard.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Widgets.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\Xbox.png" />
+ <Resource Include="Assets\Images\PreinstalledApps\YandexMusic.png" />
<Content Include="Properties\AssemblyInfo.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>AssemblyInfo.cs</LastGenOutput>
diff --git a/.Source/GTweak/View/InterfaceView.xaml b/.Source/GTweak/View/InterfaceView.xaml
index d037964c..3f2a4290 100644
--- a/.Source/GTweak/View/InterfaceView.xaml
+++ b/.Source/GTweak/View/InterfaceView.xaml
@@ -5,7 +5,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:vm="clr-namespace:GTweak.Core.ViewModel"
xmlns:uc="clr-namespace:GTweak.Assets.UserControls"
- xmlns:cp="clr-namespace:GTweak.Assets.UserControls.ColorWheelPicker"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:local="clr-namespace:GTweak.View"
mc:Ignorable="d" d:Width="1014" Style="{StaticResource LaunchPage}">
@@ -35,12 +34,12 @@
<StackPanel Orientation="Vertical" Margin="0,-10,0,-10">
<StackPanel Orientation="Horizontal" Height="45" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ToolTip="{DynamicResource color1_desc_intf}" ToolTipService.IsEnabled="False">
<TextBlock Style="{StaticResource TextDefault}" VerticalAlignment="Center" Text="{DynamicResource color1_intf}"/>
- <cp:ColorPicker x:Name="ColorPicker1" SelectedColorString="{Binding [ColorPicker1].Value}" DefaultColor="#0077D4" Margin="7,5,5,0" Height="32" VerticalAlignment="Center" ColorPicked="ColorPicker_ColorPicked" PickerClosed="ColorPicker_PickerClosed"/>
+ <uc:ColorPicker x:Name="ColorPicker1" SelectedColorString="{Binding [ColorPicker1].Value}" DefaultColor="#0077D4" Margin="7,5,5,0" Height="32" VerticalAlignment="Center" ColorPicked="ColorPicker_ColorPicked" PickerClosed="ColorPicker_PickerClosed"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Height="45" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ToolTip="{DynamicResource color2_desc_intf}" ToolTipService.IsEnabled="False">
<TextBlock Style="{StaticResource TextDefault}" VerticalAlignment="Center" Text="{DynamicResource color2_intf}"/>
- <cp:ColorPicker x:Name="ColorPicker2" SelectedColorString="{Binding [ColorPicker2].Value}" DefaultColor="#FFFFE1" Margin="7,5,5,0" Height="32" VerticalAlignment="Center" ColorPicked="ColorPicker_ColorPicked" PickerClosed="ColorPicker_PickerClosed"/>
+ <uc:ColorPicker x:Name="ColorPicker2" SelectedColorString="{Binding [ColorPicker2].Value}" DefaultColor="#FFFFE1" Margin="7,5,5,0" Height="32" VerticalAlignment="Center" ColorPicked="ColorPicker_ColorPicked" PickerClosed="ColorPicker_PickerClosed"/>
</StackPanel>
</StackPanel>
diff --git a/.Source/GTweak/View/InterfaceView.xaml.cs b/.Source/GTweak/View/InterfaceView.xaml.cs
index 3a24d0ac..33982267 100644
--- a/.Source/GTweak/View/InterfaceView.xaml.cs
+++ b/.Source/GTweak/View/InterfaceView.xaml.cs
@@ -2,9 +2,7 @@ using System;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
-using System.Windows.Media;
using GTweak.Assets.UserControls;
-using GTweak.Assets.UserControls.ColorWheelPicker;
using GTweak.Utilities.Maintenance;
using GTweak.Utilities.Managers;
using GTweak.Utilities.Tweaks;
@@ -48,7 +46,7 @@ namespace GTweak.View
}
private void Tweak_MouseLeave(object sender, MouseEventArgs e) => DescBlock.Text = DescBlock.DefaultText;
- private void ColorPicker_ColorPicked(object sender, Color e)
+ private void ColorPicker_ColorPicked(object sender, EventArgs e)
{
ColorPicker colorPicker = (ColorPicker)sender;
_intfTweaks.ApplyTweaksColor(colorPicker.Name, colorPicker.SelectedColorString);
diff --git a/Assets/Cards/Backup.svg b/Assets/DrawingImages/Cards/Backup.svg
similarity index 100%
rename from Assets/Cards/Backup.svg
rename to Assets/DrawingImages/Cards/Backup.svg
diff --git a/Assets/Cards/BackupState.svg b/Assets/DrawingImages/Cards/BackupState.svg
similarity index 100%
rename from Assets/Cards/BackupState.svg
rename to Assets/DrawingImages/Cards/BackupState.svg
diff --git a/Assets/Cards/LicenseWindows.svg b/Assets/DrawingImages/Cards/LicenseWindows.svg
similarity index 100%
rename from Assets/Cards/LicenseWindows.svg
rename to Assets/DrawingImages/Cards/LicenseWindows.svg
diff --git a/Assets/Cards/Ntfs.svg b/Assets/DrawingImages/Cards/Ntfs.svg
similarity index 100%
rename from Assets/Cards/Ntfs.svg
rename to Assets/DrawingImages/Cards/Ntfs.svg
diff --git a/Assets/Cards/Registry.svg b/Assets/DrawingImages/Cards/Registry.svg
similarity index 100%
rename from Assets/Cards/Registry.svg
rename to Assets/DrawingImages/Cards/Registry.svg
diff --git a/Assets/Cards/Trash.svg b/Assets/DrawingImages/Cards/Trash.svg
similarity index 100%
rename from Assets/Cards/Trash.svg
rename to Assets/DrawingImages/Cards/Trash.svg
diff --git a/Assets/SettingsPanel/Export.svg b/Assets/DrawingImages/SettingsPanel/Export.svg
similarity index 100%
rename from Assets/SettingsPanel/Export.svg
rename to Assets/DrawingImages/SettingsPanel/Export.svg
diff --git a/Assets/SettingsPanel/Git.svg b/Assets/DrawingImages/SettingsPanel/Git.svg
similarity index 100%
rename from Assets/SettingsPanel/Git.svg
rename to Assets/DrawingImages/SettingsPanel/Git.svg
diff --git a/Assets/SettingsPanel/Import.svg b/Assets/DrawingImages/SettingsPanel/Import.svg
similarity index 100%
rename from Assets/SettingsPanel/Import.svg
rename to Assets/DrawingImages/SettingsPanel/Import.svg
diff --git a/Assets/SettingsPanel/SelfRemoval.svg b/Assets/DrawingImages/SettingsPanel/SelfRemoval.svg
similarity index 100%
rename from Assets/SettingsPanel/SelfRemoval.svg
rename to Assets/DrawingImages/SettingsPanel/SelfRemoval.svg
diff --git a/Assets/SettingsPanel/Steam.svg b/Assets/DrawingImages/SettingsPanel/Steam.svg
similarity index 100%
rename from Assets/SettingsPanel/Steam.svg
rename to Assets/DrawingImages/SettingsPanel/Steam.svg
diff --git a/Assets/SettingsPanel/Telegram.svg b/Assets/DrawingImages/SettingsPanel/Telegram.svg
similarity index 100%
rename from Assets/SettingsPanel/Telegram.svg
rename to Assets/DrawingImages/SettingsPanel/Telegram.svg
diff --git a/Assets/SettingsPanel/Volume.svg b/Assets/DrawingImages/SettingsPanel/Volume.svg
similarity index 100%
rename from Assets/SettingsPanel/Volume.svg
rename to Assets/DrawingImages/SettingsPanel/Volume.svg
diff --git a/Assets/SettingsPanel/VolumeMute.svg b/Assets/DrawingImages/SettingsPanel/VolumeMute.svg
similarity index 100%
rename from Assets/SettingsPanel/VolumeMute.svg
rename to Assets/DrawingImages/SettingsPanel/VolumeMute.svg
diff --git a/Assets/SystemInfo/Bios.svg b/Assets/DrawingImages/SystemInfo/Bios.svg
similarity index 100%
rename from Assets/SystemInfo/Bios.svg
rename to Assets/DrawingImages/SystemInfo/Bios.svg
diff --git a/Assets/SystemInfo/IPaddress.svg b/Assets/DrawingImages/SystemInfo/IPaddress.svg
similarity index 100%
rename from Assets/SystemInfo/IPaddress.svg
rename to Assets/DrawingImages/SystemInfo/IPaddress.svg
diff --git a/Assets/SystemInfo/LogoWin.svg b/Assets/DrawingImages/SystemInfo/LogoWin.svg
similarity index 100%
rename from Assets/SystemInfo/LogoWin.svg
rename to Assets/DrawingImages/SystemInfo/LogoWin.svg
diff --git a/Assets/SystemInfo/Memory.svg b/Assets/DrawingImages/SystemInfo/Memory.svg
similarity index 100%
rename from Assets/SystemInfo/Memory.svg
rename to Assets/DrawingImages/SystemInfo/Memory.svg
diff --git a/Assets/SystemInfo/Motherboard.svg b/Assets/DrawingImages/SystemInfo/Motherboard.svg
similarity index 100%
rename from Assets/SystemInfo/Motherboard.svg
rename to Assets/DrawingImages/SystemInfo/Motherboard.svg
diff --git a/Assets/SystemInfo/Network.svg b/Assets/DrawingImages/SystemInfo/Network.svg
similarity index 100%
rename from Assets/SystemInfo/Network.svg
rename to Assets/DrawingImages/SystemInfo/Network.svg
diff --git a/Assets/SystemInfo/No vision.svg b/Assets/DrawingImages/SystemInfo/No vision.svg
similarity index 100%
rename from Assets/SystemInfo/No vision.svg
rename to Assets/DrawingImages/SystemInfo/No vision.svg
diff --git a/Assets/SystemInfo/Processor.svg b/Assets/DrawingImages/SystemInfo/Processor.svg
similarity index 100%
rename from Assets/SystemInfo/Processor.svg
rename to Assets/DrawingImages/SystemInfo/Processor.svg
diff --git a/Assets/SystemInfo/SoundDevices.svg b/Assets/DrawingImages/SystemInfo/SoundDevices.svg
similarity index 100%
rename from Assets/SystemInfo/SoundDevices.svg
rename to Assets/DrawingImages/SystemInfo/SoundDevices.svg
diff --git a/Assets/SystemInfo/Storage.svg b/Assets/DrawingImages/SystemInfo/Storage.svg
similarity index 100%
rename from Assets/SystemInfo/Storage.svg
rename to Assets/DrawingImages/SystemInfo/Storage.svg
diff --git a/Assets/SystemInfo/VideoCard.svg b/Assets/DrawingImages/SystemInfo/VideoCard.svg
similarity index 100%
rename from Assets/SystemInfo/VideoCard.svg
rename to Assets/DrawingImages/SystemInfo/VideoCard.svg
diff --git a/Assets/SystemInfo/Vision.svg b/Assets/DrawingImages/SystemInfo/Vision.svg
similarity index 100%
rename from Assets/SystemInfo/Vision.svg
rename to Assets/DrawingImages/SystemInfo/Vision.svg
diff --git a/Assets/TitleBar/AvatarProfile.svg b/Assets/DrawingImages/TitleBar/AvatarProfile.svg
similarity index 100%
rename from Assets/TitleBar/AvatarProfile.svg
rename to Assets/DrawingImages/TitleBar/AvatarProfile.svg
diff --git a/Assets/TitleBar/Close.svg b/Assets/DrawingImages/TitleBar/Close.svg
similarity index 100%
rename from Assets/TitleBar/Close.svg
rename to Assets/DrawingImages/TitleBar/Close.svg
diff --git a/Assets/TitleBar/Maximize.svg b/Assets/DrawingImages/TitleBar/Maximize.svg
similarity index 100%
rename from Assets/TitleBar/Maximize.svg
rename to Assets/DrawingImages/TitleBar/Maximize.svg
diff --git a/Assets/TitleBar/MaximizeRestore.svg b/Assets/DrawingImages/TitleBar/MaximizeRestore.svg
similarity index 100%
rename from Assets/TitleBar/MaximizeRestore.svg
rename to Assets/DrawingImages/TitleBar/MaximizeRestore.svg
diff --git a/Assets/TitleBar/Minimize.svg b/Assets/DrawingImages/TitleBar/Minimize.svg
similarity index 100%
rename from Assets/TitleBar/Minimize.svg
rename to Assets/DrawingImages/TitleBar/Minimize.svg
diff --git a/Assets/TitleBar/Moon.svg b/Assets/DrawingImages/TitleBar/Moon.svg
similarity index 100%
rename from Assets/TitleBar/Moon.svg
rename to Assets/DrawingImages/TitleBar/Moon.svg
diff --git a/Assets/TitleBar/Settings.svg b/Assets/DrawingImages/TitleBar/Settings.svg
similarity index 100%
rename from Assets/TitleBar/Settings.svg
rename to Assets/DrawingImages/TitleBar/Settings.svg
diff --git a/Assets/TitleBar/Sun.svg b/Assets/DrawingImages/TitleBar/Sun.svg
similarity index 100%
rename from Assets/TitleBar/Sun.svg
rename to Assets/DrawingImages/TitleBar/Sun.svg
diff --git a/Assets/ImagesAddons/BatFile.png b/Assets/Images/AddonsFiles/BatFile.png
similarity index 100%
rename from Assets/ImagesAddons/BatFile.png
rename to Assets/Images/AddonsFiles/BatFile.png
diff --git a/Assets/ImagesAddons/CmdFile.png b/Assets/Images/AddonsFiles/CmdFile.png
similarity index 100%
rename from Assets/ImagesAddons/CmdFile.png
rename to Assets/Images/AddonsFiles/CmdFile.png
diff --git a/Assets/ImagesAddons/PowershellFile.png b/Assets/Images/AddonsFiles/PowershellFile.png
similarity index 100%
rename from Assets/ImagesAddons/PowershellFile.png
rename to Assets/Images/AddonsFiles/PowershellFile.png
diff --git a/Assets/ImagesAddons/RegistryFile.png b/Assets/Images/AddonsFiles/RegistryFile.png
similarity index 100%
rename from Assets/ImagesAddons/RegistryFile.png
rename to Assets/Images/AddonsFiles/RegistryFile.png
diff --git a/Assets/ImagesPkgs/3DBuilder.png b/Assets/Images/PreinstalledApps/3DBuilder.png
similarity index 100%
rename from Assets/ImagesPkgs/3DBuilder.png
rename to Assets/Images/PreinstalledApps/3DBuilder.png
diff --git a/Assets/ImagesPkgs/Alarms.png b/Assets/Images/PreinstalledApps/Alarms.png
similarity index 100%
rename from Assets/ImagesPkgs/Alarms.png
rename to Assets/Images/PreinstalledApps/Alarms.png
diff --git a/Assets/ImagesPkgs/BingFinance.png b/Assets/Images/PreinstalledApps/BingFinance.png
similarity index 100%
rename from Assets/ImagesPkgs/BingFinance.png
rename to Assets/Images/PreinstalledApps/BingFinance.png
diff --git a/Assets/ImagesPkgs/BingNews.png b/Assets/Images/PreinstalledApps/BingNews.png
similarity index 100%
rename from Assets/ImagesPkgs/BingNews.png
rename to Assets/Images/PreinstalledApps/BingNews.png
diff --git a/Assets/ImagesPkgs/BingSearch.png b/Assets/Images/PreinstalledApps/BingSearch.png
similarity index 100%
rename from Assets/ImagesPkgs/BingSearch.png
rename to Assets/Images/PreinstalledApps/BingSearch.png
diff --git a/Assets/ImagesPkgs/BingSports.png b/Assets/Images/PreinstalledApps/BingSports.png
similarity index 100%
rename from Assets/ImagesPkgs/BingSports.png
rename to Assets/Images/PreinstalledApps/BingSports.png
diff --git a/Assets/ImagesPkgs/BingWeather.png b/Assets/Images/PreinstalledApps/BingWeather.png
similarity index 100%
rename from Assets/ImagesPkgs/BingWeather.png
rename to Assets/Images/PreinstalledApps/BingWeather.png
diff --git a/Assets/ImagesPkgs/Calculator.png b/Assets/Images/PreinstalledApps/Calculator.png
similarity index 100%
rename from Assets/ImagesPkgs/Calculator.png
rename to Assets/Images/PreinstalledApps/Calculator.png
diff --git a/Assets/ImagesPkgs/Camera.png b/Assets/Images/PreinstalledApps/Camera.png
similarity index 100%
rename from Assets/ImagesPkgs/Camera.png
rename to Assets/Images/PreinstalledApps/Camera.png
diff --git a/Assets/ImagesPkgs/Clipchamp.png b/Assets/Images/PreinstalledApps/Clipchamp.png
similarity index 100%
rename from Assets/ImagesPkgs/Clipchamp.png
rename to Assets/Images/PreinstalledApps/Clipchamp.png
diff --git a/Assets/ImagesPkgs/Copilot.png b/Assets/Images/PreinstalledApps/Copilot.png
similarity index 100%
rename from Assets/ImagesPkgs/Copilot.png
rename to Assets/Images/PreinstalledApps/Copilot.png
diff --git a/Assets/ImagesPkgs/Cortana.png b/Assets/Images/PreinstalledApps/Cortana.png
similarity index 100%
rename from Assets/ImagesPkgs/Cortana.png
rename to Assets/Images/PreinstalledApps/Cortana.png
diff --git a/Assets/ImagesPkgs/DevHome.png b/Assets/Images/PreinstalledApps/DevHome.png
similarity index 100%
rename from Assets/ImagesPkgs/DevHome.png
rename to Assets/Images/PreinstalledApps/DevHome.png
diff --git a/Assets/ImagesPkgs/Disney.png b/Assets/Images/PreinstalledApps/Disney.png
similarity index 100%
rename from Assets/ImagesPkgs/Disney.png
rename to Assets/Images/PreinstalledApps/Disney.png
diff --git a/Assets/ImagesPkgs/DolbyAccess.png b/Assets/Images/PreinstalledApps/DolbyAccess.png
similarity index 100%
rename from Assets/ImagesPkgs/DolbyAccess.png
rename to Assets/Images/PreinstalledApps/DolbyAccess.png
diff --git a/Assets/ImagesPkgs/Edge.png b/Assets/Images/PreinstalledApps/Edge.png
similarity index 100%
rename from Assets/ImagesPkgs/Edge.png
rename to Assets/Images/PreinstalledApps/Edge.png
diff --git a/Assets/ImagesPkgs/Facebook.png b/Assets/Images/PreinstalledApps/Facebook.png
similarity index 100%
rename from Assets/ImagesPkgs/Facebook.png
rename to Assets/Images/PreinstalledApps/Facebook.png
diff --git a/Assets/ImagesPkgs/FeedbackHub.png b/Assets/Images/PreinstalledApps/FeedbackHub.png
similarity index 100%
rename from Assets/ImagesPkgs/FeedbackHub.png
rename to Assets/Images/PreinstalledApps/FeedbackHub.png
diff --git a/Assets/ImagesPkgs/GetHelp.png b/Assets/Images/PreinstalledApps/GetHelp.png
similarity index 100%
rename from Assets/ImagesPkgs/GetHelp.png
rename to Assets/Images/PreinstalledApps/GetHelp.png
diff --git a/Assets/ImagesPkgs/Hulu.png b/Assets/Images/PreinstalledApps/Hulu.png
similarity index 100%
rename from Assets/ImagesPkgs/Hulu.png
rename to Assets/Images/PreinstalledApps/Hulu.png
diff --git a/Assets/ImagesPkgs/Instagram.png b/Assets/Images/PreinstalledApps/Instagram.png
similarity index 100%
rename from Assets/ImagesPkgs/Instagram.png
rename to Assets/Images/PreinstalledApps/Instagram.png
diff --git a/Assets/ImagesPkgs/Linkedin.png b/Assets/Images/PreinstalledApps/Linkedin.png
similarity index 100%
rename from Assets/ImagesPkgs/Linkedin.png
rename to Assets/Images/PreinstalledApps/Linkedin.png
diff --git a/Assets/ImagesPkgs/Mail.png b/Assets/Images/PreinstalledApps/Mail.png
similarity index 100%
rename from Assets/ImagesPkgs/Mail.png
rename to Assets/Images/PreinstalledApps/Mail.png
diff --git a/Assets/ImagesPkgs/Maps.png b/Assets/Images/PreinstalledApps/Maps.png
similarity index 100%
rename from Assets/ImagesPkgs/Maps.png
rename to Assets/Images/PreinstalledApps/Maps.png
diff --git a/Assets/ImagesPkgs/Messaging.png b/Assets/Images/PreinstalledApps/Messaging.png
similarity index 100%
rename from Assets/ImagesPkgs/Messaging.png
rename to Assets/Images/PreinstalledApps/Messaging.png
diff --git a/Assets/ImagesPkgs/Microsoft3DViewer.png b/Assets/Images/PreinstalledApps/Microsoft3DViewer.png
similarity index 100%
rename from Assets/ImagesPkgs/Microsoft3DViewer.png
rename to Assets/Images/PreinstalledApps/Microsoft3DViewer.png
diff --git a/Assets/ImagesPkgs/MicrosoftFamilySafety.png b/Assets/Images/PreinstalledApps/MicrosoftFamilySafety.png
similarity index 100%
rename from Assets/ImagesPkgs/MicrosoftFamilySafety.png
rename to Assets/Images/PreinstalledApps/MicrosoftFamilySafety.png
diff --git a/Assets/ImagesPkgs/MicrosoftOfficeHub.png b/Assets/Images/PreinstalledApps/MicrosoftOfficeHub.png
similarity index 100%
rename from Assets/ImagesPkgs/MicrosoftOfficeHub.png
rename to Assets/Images/PreinstalledApps/MicrosoftOfficeHub.png
diff --git a/Assets/ImagesPkgs/MicrosoftPowerAutomate.png b/Assets/Images/PreinstalledApps/MicrosoftPowerAutomate.png
similarity index 100%
rename from Assets/ImagesPkgs/MicrosoftPowerAutomate.png
rename to Assets/Images/PreinstalledApps/MicrosoftPowerAutomate.png
diff --git a/Assets/ImagesPkgs/MicrosoftSolitaireCollection.png b/Assets/Images/PreinstalledApps/MicrosoftSolitaireCollection.png
similarity index 100%
rename from Assets/ImagesPkgs/MicrosoftSolitaireCollection.png
rename to Assets/Images/PreinstalledApps/MicrosoftSolitaireCollection.png
diff --git a/Assets/ImagesPkgs/MicrosoftStickyNotes.png b/Assets/Images/PreinstalledApps/MicrosoftStickyNotes.png
similarity index 100%
rename from Assets/ImagesPkgs/MicrosoftStickyNotes.png
rename to Assets/Images/PreinstalledApps/MicrosoftStickyNotes.png
diff --git a/Assets/ImagesPkgs/MicrosoftStore.png b/Assets/Images/PreinstalledApps/MicrosoftStore.png
similarity index 100%
rename from Assets/ImagesPkgs/MicrosoftStore.png
rename to Assets/Images/PreinstalledApps/MicrosoftStore.png
diff --git a/Assets/ImagesPkgs/MicrosoftSway.png b/Assets/Images/PreinstalledApps/MicrosoftSway.png
similarity index 100%
rename from Assets/ImagesPkgs/MicrosoftSway.png
rename to Assets/Images/PreinstalledApps/MicrosoftSway.png
diff --git a/Assets/ImagesPkgs/MicrosoftTeams.png b/Assets/Images/PreinstalledApps/MicrosoftTeams.png
similarity index 100%
rename from Assets/ImagesPkgs/MicrosoftTeams.png
rename to Assets/Images/PreinstalledApps/MicrosoftTeams.png
diff --git a/Assets/ImagesPkgs/MixedReality.png b/Assets/Images/PreinstalledApps/MixedReality.png
similarity index 100%
rename from Assets/ImagesPkgs/MixedReality.png
rename to Assets/Images/PreinstalledApps/MixedReality.png
diff --git a/Assets/ImagesPkgs/MobilePlanOneConnect.png b/Assets/Images/PreinstalledApps/MobilePlanOneConnect.png
similarity index 100%
rename from Assets/ImagesPkgs/MobilePlanOneConnect.png
rename to Assets/Images/PreinstalledApps/MobilePlanOneConnect.png
diff --git a/Assets/ImagesPkgs/Music.png b/Assets/Images/PreinstalledApps/Music.png
similarity index 100%
rename from Assets/ImagesPkgs/Music.png
rename to Assets/Images/PreinstalledApps/Music.png
diff --git a/Assets/ImagesPkgs/Netflix.png b/Assets/Images/PreinstalledApps/Netflix.png
similarity index 100%
rename from Assets/ImagesPkgs/Netflix.png
rename to Assets/Images/PreinstalledApps/Netflix.png
diff --git a/Assets/ImagesPkgs/Notepad.png b/Assets/Images/PreinstalledApps/Notepad.png
similarity index 100%
rename from Assets/ImagesPkgs/Notepad.png
rename to Assets/Images/PreinstalledApps/Notepad.png
diff --git a/Assets/ImagesPkgs/OneDrive.png b/Assets/Images/PreinstalledApps/OneDrive.png
similarity index 100%
rename from Assets/ImagesPkgs/OneDrive.png
rename to Assets/Images/PreinstalledApps/OneDrive.png
diff --git a/Assets/ImagesPkgs/OneNote.png b/Assets/Images/PreinstalledApps/OneNote.png
similarity index 100%
rename from Assets/ImagesPkgs/OneNote.png
rename to Assets/Images/PreinstalledApps/OneNote.png
diff --git a/Assets/ImagesPkgs/Outlook.png b/Assets/Images/PreinstalledApps/Outlook.png
similarity index 100%
rename from Assets/ImagesPkgs/Outlook.png
rename to Assets/Images/PreinstalledApps/Outlook.png
diff --git a/Assets/ImagesPkgs/Paint.png b/Assets/Images/PreinstalledApps/Paint.png
similarity index 100%
rename from Assets/ImagesPkgs/Paint.png
rename to Assets/Images/PreinstalledApps/Paint.png
diff --git a/Assets/ImagesPkgs/Paint3D.png b/Assets/Images/PreinstalledApps/Paint3D.png
similarity index 100%
rename from Assets/ImagesPkgs/Paint3D.png
rename to Assets/Images/PreinstalledApps/Paint3D.png
diff --git a/Assets/ImagesPkgs/Pandora.png b/Assets/Images/PreinstalledApps/Pandora.png
similarity index 100%
rename from Assets/ImagesPkgs/Pandora.png
rename to Assets/Images/PreinstalledApps/Pandora.png
diff --git a/Assets/ImagesPkgs/People.png b/Assets/Images/PreinstalledApps/People.png
similarity index 100%
rename from Assets/ImagesPkgs/People.png
rename to Assets/Images/PreinstalledApps/People.png
diff --git a/Assets/ImagesPkgs/Phone.png b/Assets/Images/PreinstalledApps/Phone.png
similarity index 100%
rename from Assets/ImagesPkgs/Phone.png
rename to Assets/Images/PreinstalledApps/Phone.png
diff --git a/Assets/ImagesPkgs/Photos.png b/Assets/Images/PreinstalledApps/Photos.png
similarity index 100%
rename from Assets/ImagesPkgs/Photos.png
rename to Assets/Images/PreinstalledApps/Photos.png
diff --git a/Assets/ImagesPkgs/Picsart.png b/Assets/Images/PreinstalledApps/Picsart.png
similarity index 100%
rename from Assets/ImagesPkgs/Picsart.png
rename to Assets/Images/PreinstalledApps/Picsart.png
diff --git a/Assets/ImagesPkgs/Plex.png b/Assets/Images/PreinstalledApps/Plex.png
similarity index 100%
rename from Assets/ImagesPkgs/Plex.png
rename to Assets/Images/PreinstalledApps/Plex.png
diff --git a/Assets/ImagesPkgs/PrimeVideo.png b/Assets/Images/PreinstalledApps/PrimeVideo.png
similarity index 100%
rename from Assets/ImagesPkgs/PrimeVideo.png
rename to Assets/Images/PreinstalledApps/PrimeVideo.png
diff --git a/Assets/ImagesPkgs/QuickAssist.png b/Assets/Images/PreinstalledApps/QuickAssist.png
similarity index 100%
rename from Assets/ImagesPkgs/QuickAssist.png
rename to Assets/Images/PreinstalledApps/QuickAssist.png
diff --git a/Assets/ImagesPkgs/SandTimer.png b/Assets/Images/PreinstalledApps/SandTimer.png
similarity index 100%
rename from Assets/ImagesPkgs/SandTimer.png
rename to Assets/Images/PreinstalledApps/SandTimer.png
diff --git a/Assets/ImagesPkgs/ScreenSketch.png b/Assets/Images/PreinstalledApps/ScreenSketch.png
similarity index 100%
rename from Assets/ImagesPkgs/ScreenSketch.png
rename to Assets/Images/PreinstalledApps/ScreenSketch.png
diff --git a/Assets/ImagesPkgs/Shazam.png b/Assets/Images/PreinstalledApps/Shazam.png
similarity index 100%
rename from Assets/ImagesPkgs/Shazam.png
rename to Assets/Images/PreinstalledApps/Shazam.png
diff --git a/Assets/ImagesPkgs/SkypeApp.png b/Assets/Images/PreinstalledApps/SkypeApp.png
similarity index 100%
rename from Assets/ImagesPkgs/SkypeApp.png
rename to Assets/Images/PreinstalledApps/SkypeApp.png
diff --git a/Assets/ImagesPkgs/SoundRecorder.png b/Assets/Images/PreinstalledApps/SoundRecorder.png
similarity index 100%
rename from Assets/ImagesPkgs/SoundRecorder.png
rename to Assets/Images/PreinstalledApps/SoundRecorder.png
diff --git a/Assets/ImagesPkgs/Spotify.png b/Assets/Images/PreinstalledApps/Spotify.png
similarity index 100%
rename from Assets/ImagesPkgs/Spotify.png
rename to Assets/Images/PreinstalledApps/Spotify.png
diff --git a/Assets/ImagesPkgs/Terminal.png b/Assets/Images/PreinstalledApps/Terminal.png
similarity index 100%
rename from Assets/ImagesPkgs/Terminal.png
rename to Assets/Images/PreinstalledApps/Terminal.png
diff --git a/Assets/ImagesPkgs/TikTok.png b/Assets/Images/PreinstalledApps/TikTok.png
similarity index 100%
rename from Assets/ImagesPkgs/TikTok.png
rename to Assets/Images/PreinstalledApps/TikTok.png
diff --git a/Assets/ImagesPkgs/Todos.png b/Assets/Images/PreinstalledApps/Todos.png
similarity index 100%
rename from Assets/ImagesPkgs/Todos.png
rename to Assets/Images/PreinstalledApps/Todos.png
diff --git a/Assets/ImagesPkgs/TuneInRadio.png b/Assets/Images/PreinstalledApps/TuneInRadio.png
similarity index 100%
rename from Assets/ImagesPkgs/TuneInRadio.png
rename to Assets/Images/PreinstalledApps/TuneInRadio.png
diff --git a/Assets/ImagesPkgs/TwitterX.png b/Assets/Images/PreinstalledApps/TwitterX.png
similarity index 100%
rename from Assets/ImagesPkgs/TwitterX.png
rename to Assets/Images/PreinstalledApps/TwitterX.png
diff --git a/Assets/ImagesPkgs/Viber.png b/Assets/Images/PreinstalledApps/Viber.png
similarity index 100%
rename from Assets/ImagesPkgs/Viber.png
rename to Assets/Images/PreinstalledApps/Viber.png
diff --git a/Assets/ImagesPkgs/Video.png b/Assets/Images/PreinstalledApps/Video.png
similarity index 100%
rename from Assets/ImagesPkgs/Video.png
rename to Assets/Images/PreinstalledApps/Video.png
diff --git a/Assets/ImagesPkgs/Wallet.png b/Assets/Images/PreinstalledApps/Wallet.png
similarity index 100%
rename from Assets/ImagesPkgs/Wallet.png
rename to Assets/Images/PreinstalledApps/Wallet.png
diff --git a/Assets/ImagesPkgs/WebMediaExtensions.png b/Assets/Images/PreinstalledApps/WebMediaExtensions.png
similarity index 100%
rename from Assets/ImagesPkgs/WebMediaExtensions.png
rename to Assets/Images/PreinstalledApps/WebMediaExtensions.png
diff --git a/Assets/ImagesPkgs/WhatsApp.png b/Assets/Images/PreinstalledApps/WhatsApp.png
similarity index 100%
rename from Assets/ImagesPkgs/WhatsApp.png
rename to Assets/Images/PreinstalledApps/WhatsApp.png
diff --git a/Assets/ImagesPkgs/WhiteBoard.png b/Assets/Images/PreinstalledApps/WhiteBoard.png
similarity index 100%
rename from Assets/ImagesPkgs/WhiteBoard.png
rename to Assets/Images/PreinstalledApps/WhiteBoard.png
diff --git a/Assets/ImagesPkgs/Widgets.png b/Assets/Images/PreinstalledApps/Widgets.png
similarity index 100%
rename from Assets/ImagesPkgs/Widgets.png
rename to Assets/Images/PreinstalledApps/Widgets.png
diff --git a/Assets/ImagesPkgs/Xbox.png b/Assets/Images/PreinstalledApps/Xbox.png
similarity index 100%
rename from Assets/ImagesPkgs/Xbox.png
rename to Assets/Images/PreinstalledApps/Xbox.png
diff --git a/Assets/ImagesPkgs/YandexMusic.png b/Assets/Images/PreinstalledApps/YandexMusic.png
similarity index 100%
rename from Assets/ImagesPkgs/YandexMusic.png
rename to Assets/Images/PreinstalledApps/YandexMusic.png
diff --git a/Assets/ImagesPkgs/iHeartRadio.png b/Assets/Images/PreinstalledApps/iHeartRadio.png
similarity index 100%
rename from Assets/ImagesPkgs/iHeartRadio.png
rename to Assets/Images/PreinstalledApps/iHeartRadio.png