From f2744e2d45331ee10d8a3bf639cd07f8acff3898 Mon Sep 17 00:00:00 2001
From: Johnny Westlake <jmdwestlake@yahoo.co.uk>
Date: Tue, 30 Apr 2024 17:32:38 +0100
Subject: [PATCH 01/15] Minor refactoring

---
 CharacterMap/CharacterMap/CharacterMap.csproj |  1 +
 .../Controls/CreateCollectionDialog.xaml.cs   |  2 +-
 .../CharacterMap/Helpers/FlyoutHelper.cs      | 12 ++---
 .../Models/AddToCollectionResult.cs           |  4 +-
 CharacterMap/CharacterMap/Models/Messages.cs  | 48 ++-----------------
 CharacterMap/CharacterMap/Models/Records.cs   |  3 ++
 .../Services/UserCollectionsService.cs        |  4 +-
 7 files changed, 20 insertions(+), 54 deletions(-)
 create mode 100644 CharacterMap/CharacterMap/Models/Records.cs

diff --git a/CharacterMap/CharacterMap/CharacterMap.csproj b/CharacterMap/CharacterMap/CharacterMap.csproj
index 482c8868..19d76ae6 100644
--- a/CharacterMap/CharacterMap/CharacterMap.csproj
+++ b/CharacterMap/CharacterMap/CharacterMap.csproj
@@ -249,6 +249,7 @@
     <Compile Include="Core\Properties.cs" />
     <Compile Include="Core\SVGPathReciever.cs" />
     <Compile Include="Core\TypographyFeatureInfo.cs" />
+    <Compile Include="Models\Records.cs" />
     <Compile Include="Models\NamedUnicodeRange.cs" />
     <Compile Include="Models\SearchResultsGroup.cs" />
     <Compile Include="Models\UnicodeRangeGroup.cs" />
diff --git a/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml.cs b/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml.cs
index 855758e8..a2216482 100644
--- a/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml.cs
+++ b/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml.cs
@@ -76,7 +76,7 @@ private async void ContentDialog_PrimaryButtonClick(ContentDialog sender, Conten
 
             if (this.DataContext is InstalledFont font)
                 result = await collections.AddToCollectionAsync(font, collection);
-            else if (this.DataContext is IList<InstalledFont> fonts)
+            else if (this.DataContext is IReadOnlyList<InstalledFont> fonts)
                 result = await collections.AddToCollectionAsync(fonts, collection);
             else if (this.DataContext is null)
                 result = new AddToCollectionResult(true, null, collection);
diff --git a/CharacterMap/CharacterMap/Helpers/FlyoutHelper.cs b/CharacterMap/CharacterMap/Helpers/FlyoutHelper.cs
index cd86bb12..da813f4a 100644
--- a/CharacterMap/CharacterMap/Helpers/FlyoutHelper.cs
+++ b/CharacterMap/CharacterMap/Helpers/FlyoutHelper.cs
@@ -354,7 +354,7 @@ async void RemoveFrom_Click(object sender, RoutedEventArgs e)
                     await _collections.RemoveFromCollectionAsync(fnt, collection);
                     WeakReferenceMessenger.Default.Send(
                         new AppNotificationMessage(true,
-                            new CollectionUpdatedArgs(new List<InstalledFont> { fnt }, collection, false)));
+                            new CollectionUpdatedArgs([fnt], collection, false)));
                     WeakReferenceMessenger.Default.Send(new CollectionsUpdatedMessage { SourceCollection = collection });
                 }
             }
@@ -368,13 +368,13 @@ async void RemoveFrom_Click(object sender, RoutedEventArgs e)
     /// <param name="menu"></param>
     /// <param name="font"></param>
     /// <returns></returns>
-    public static MenuFlyoutSubItem AddCollectionItems(MenuFlyout menu, InstalledFont font, IList<InstalledFont> fonts, string key = null, FlyoutArgs args = null)
+    public static MenuFlyoutSubItem AddCollectionItems(MenuFlyout menu, InstalledFont font, IReadOnlyList<InstalledFont> fonts, string key = null, FlyoutArgs args = null)
     {
         #region Event Handlers
 
         static async void AddToSymbolFonts_Click(object sender, RoutedEventArgs e)
         {
-            if (sender is FrameworkElement f && f.DataContext is IList<InstalledFont> fnts)
+            if (sender is FrameworkElement f && f.DataContext is IReadOnlyList<InstalledFont> fnts)
             {
                 var result = await _collections.AddToCollectionAsync(
                     fnts,
@@ -391,7 +391,7 @@ static async void AddToSymbolFonts_Click(object sender, RoutedEventArgs e)
 
         static void CreateCollection_Click(object sender, RoutedEventArgs e)
         {
-            var d = new CreateCollectionDialog
+            CreateCollectionDialog d = new ()
             {
                 DataContext = (sender as FrameworkElement)?.DataContext
             };
@@ -402,7 +402,7 @@ static void CreateCollection_Click(object sender, RoutedEventArgs e)
         #endregion
 
         bool multiMode = font is null && fonts is not null;
-        IList<InstalledFont> items = fonts ?? new List<InstalledFont> { font };
+        IReadOnlyList<InstalledFont> items = fonts ?? [font];
         Style style = ResourceHelper.Get<Style>("ThemeMenuFlyoutItemStyle");
         Style substyle = ResourceHelper.Get<Style>("ThemeMenuFlyoutSubItemStyle");
 
@@ -470,7 +470,7 @@ static void CreateCollection_Click(object sender, RoutedEventArgs e)
                         m.Click += async (s, a) =>
                         {
                             if (s is FrameworkElement f
-                                && f.DataContext is IList<InstalledFont> fnts
+                                && f.DataContext is IReadOnlyList<InstalledFont> fnts
                                 && f.Tag is UserFontCollection clct)
                             {
                                 AddToCollectionResult result = await _collections.AddToCollectionAsync(fnts, clct);
diff --git a/CharacterMap/CharacterMap/Models/AddToCollectionResult.cs b/CharacterMap/CharacterMap/Models/AddToCollectionResult.cs
index dbdfb43d..1216b958 100644
--- a/CharacterMap/CharacterMap/Models/AddToCollectionResult.cs
+++ b/CharacterMap/CharacterMap/Models/AddToCollectionResult.cs
@@ -2,7 +2,7 @@
 
 public class AddToCollectionResult
 {
-    public AddToCollectionResult(bool success, IList<InstalledFont> fonts, UserFontCollection collection)
+    public AddToCollectionResult(bool success, IReadOnlyList<InstalledFont> fonts, UserFontCollection collection)
     {
         Success = success;
         Fonts = fonts;
@@ -12,7 +12,7 @@ public AddToCollectionResult(bool success, IList<InstalledFont> fonts, UserFontC
     }
 
     public InstalledFont Font { get; }
-    public IList<InstalledFont> Fonts { get; }
+    public IReadOnlyList<InstalledFont> Fonts { get; }
     public bool Success { get; }
     public UserFontCollection Collection { get; }
 
diff --git a/CharacterMap/CharacterMap/Models/Messages.cs b/CharacterMap/CharacterMap/Models/Messages.cs
index e96a42fe..74379c8d 100644
--- a/CharacterMap/CharacterMap/Models/Messages.cs
+++ b/CharacterMap/CharacterMap/Models/Messages.cs
@@ -2,19 +2,8 @@
 
 public class ModalClosedMessage { }
 
-public class CollectionUpdatedArgs
+public record class CollectionUpdatedArgs(IReadOnlyList<InstalledFont> Fonts, UserFontCollection Collection, bool IsAdd)
 {
-    public IList<InstalledFont> Fonts { get; }
-    public UserFontCollection Collection { get; }
-    public bool IsAdd { get; }
-
-    public CollectionUpdatedArgs(IList<InstalledFont> fonts, UserFontCollection collection, bool isAdd)
-    {
-        Fonts = fonts;
-        Collection = collection;
-        IsAdd = isAdd;
-    }
-
     public string GetTitle()
     {
         if (Fonts.Count == 1 && Fonts[0] is InstalledFont font)
@@ -45,15 +34,7 @@ public string GetMessage()
 
 public class FontListCreatedMessage { }
 
-public class ImportMessage
-{
-    public ImportMessage(FontImportResult result)
-    {
-        Result = result;
-    }
-
-    public FontImportResult Result { get; }
-}
+public record class ImportMessage(FontImportResult Result);
 
 public class CollectionsUpdatedMessage
 {
@@ -84,29 +65,10 @@ public class AdvancedOptionsRequested { }
 
 public class ToggleCompactOverlayMessage { }
 
-public class AppSettingsChangedMessage
-{
-    public AppSettingsChangedMessage(string propertyName)
-    {
-        PropertyName = propertyName;
-    }
-
-    public string PropertyName { get; }
-}
+public record class AppSettingsChangedMessage(string PropertyName);
 
-public class AppNotificationMessage
-{
-    public AppNotificationMessage(bool local, object data, int durationMs = 0)
-    {
-        Local = local;
-        Data = data;
-        DurationInMilliseconds = durationMs;
-    }
-
-    public bool Local { get; }
-    public object Data { get; }
-    public int DurationInMilliseconds { get; }
-}
+public record class AppNotificationMessage(bool Local, object Data, int DurationInMilliseconds = 0);
+   
 
 public enum DevValueType
 {
diff --git a/CharacterMap/CharacterMap/Models/Records.cs b/CharacterMap/CharacterMap/Models/Records.cs
new file mode 100644
index 00000000..86542343
--- /dev/null
+++ b/CharacterMap/CharacterMap/Models/Records.cs
@@ -0,0 +1,3 @@
+namespace CharacterMap.Models;
+
+public record class FontQueryResults(IEnumerable<InstalledFont> FontList, string FilterTitle, bool ResultsFiltered);
diff --git a/CharacterMap/CharacterMap/Services/UserCollectionsService.cs b/CharacterMap/CharacterMap/Services/UserCollectionsService.cs
index f1881cb9..84934745 100644
--- a/CharacterMap/CharacterMap/Services/UserCollectionsService.cs
+++ b/CharacterMap/CharacterMap/Services/UserCollectionsService.cs
@@ -115,7 +115,7 @@ public Task<AddToCollectionResult> AddToCollectionAsync(InstalledFont font, User
         return AddToCollectionAsync(new List<InstalledFont> { font }, collection);
     }
 
-    public async Task<AddToCollectionResult> AddToCollectionAsync(IList<InstalledFont> fonts, UserFontCollection collection, Action onChanged = null)
+    public async Task<AddToCollectionResult> AddToCollectionAsync(IReadOnlyList<InstalledFont> fonts, UserFontCollection collection, Action onChanged = null)
     {
         bool changed = false;
 
@@ -140,7 +140,7 @@ public Task RemoveFromCollectionAsync(InstalledFont font, UserFontCollection col
         return RemoveFromCollectionAsync(new List<InstalledFont> { font }, collection);
     }
 
-    public Task RemoveFromCollectionAsync(IList<InstalledFont> fonts, UserFontCollection collection)
+    public Task RemoveFromCollectionAsync(IReadOnlyList<InstalledFont> fonts, UserFontCollection collection)
     {
         bool removed = false;
         foreach (var font in fonts)

From e7578d9a0f73b7bf39671cdaadd36db9016b561f Mon Sep 17 00:00:00 2001
From: Johnny Westlake <jmdwestlake@yahoo.co.uk>
Date: Tue, 30 Apr 2024 17:33:31 +0100
Subject: [PATCH 02/15] Unify font query paths, allow querying by installing
 file path/type, designer and manufacturer

---
 CharacterMap/CharacterMap/Core/FontFinder.cs  | 68 +++++++++++++++++++
 CharacterMap/CharacterMap/Core/FontVariant.cs |  4 ++
 .../CharacterMap/Models/BasicFontFilter.cs    | 18 ++++-
 .../CollectionManagementViewModel.cs          |  7 +-
 .../CharacterMap/ViewModels/MainViewModel.cs  | 21 +-----
 5 files changed, 96 insertions(+), 22 deletions(-)

diff --git a/CharacterMap/CharacterMap/Core/FontFinder.cs b/CharacterMap/CharacterMap/Core/FontFinder.cs
index dc81e991..dfc2b2c3 100644
--- a/CharacterMap/CharacterMap/Core/FontFinder.cs
+++ b/CharacterMap/CharacterMap/Core/FontFinder.cs
@@ -640,4 +640,72 @@ public static bool IsMDL2(FontVariant variant) => variant != null && (
 
     public static bool IsSystemSymbolFamily(FontVariant variant) => variant != null && (
         variant.FamilyName.Equals("Segoe MDL2 Assets") || variant.FamilyName.Equals("Segoe Fluent Icons"));
+
+
+    public static FontQueryResults QueryFontList(
+        string query, 
+        IEnumerable<InstalledFont> fontList, 
+        UserCollectionsService fontCollections,
+        UserFontCollection collection = null,
+        BasicFontFilter filter = null)
+    {
+        filter ??= BasicFontFilter.All;
+        string filterTitle = null;
+
+        static bool Is(string q, string i, out string o)
+        {
+            if (q.StartsWith(i, StringComparison.OrdinalIgnoreCase)
+                && q.Remove(0, i.Length).Trim() is string t
+                && !string.IsNullOrWhiteSpace(t))
+            {
+                o = t;
+                return true;
+            }
+
+            o = null;
+            return false;
+        }
+
+        if (!string.IsNullOrWhiteSpace(query))
+        {
+            string q;
+            if (Is(query, "char:", out q))
+            {
+                foreach (var ch in q)
+                {
+                    if (ch == ' ')
+                        continue;
+                    fontList = BasicFontFilter.ForChar(new(ch)).Query(fontList, fontCollections);
+                }
+                filterTitle = $"{filter.FilterTitle} \"{q}\"";
+            }
+            else if (Is(query, "filepath:", out q))
+            {
+                fontList = BasicFontFilter.ForFilePath(q).Query(fontList, fontCollections);
+                filterTitle = $"{filter.FilterTitle} \"{q}\"";
+
+            }
+            else if (Is(query, "foundry:", out q))
+            {
+                fontList = BasicFontFilter.ForFontInfo(q, Microsoft.Graphics.Canvas.Text.CanvasFontInformation.Manufacturer).Query(fontList, fontCollections);
+                filterTitle = $"{filter.FilterTitle} \"{q}\"";
+            }
+            else if (Is(query, "designer:", out q))
+            {
+                fontList = BasicFontFilter.ForFontInfo(q, Microsoft.Graphics.Canvas.Text.CanvasFontInformation.Designer).Query(fontList, fontCollections);
+                filterTitle = $"{filter.FilterTitle} \"{q}\"";
+            }
+            else
+            {
+                fontList = fontList.Where(f => f.Name.Contains(query, StringComparison.OrdinalIgnoreCase));
+                string prefix = filter == BasicFontFilter.All ? "" : filter.FilterTitle + " ";
+                filterTitle = $"{(collection != null ? collection.Name + " " : prefix)}\"{query}\"";
+            }
+
+
+            return new(fontList, filterTitle, true);
+        }
+        
+        return new(fontList, null, false);
+    }
 }
\ No newline at end of file
diff --git a/CharacterMap/CharacterMap/Core/FontVariant.cs b/CharacterMap/CharacterMap/Core/FontVariant.cs
index 409c5ccd..ad0d8eb7 100644
--- a/CharacterMap/CharacterMap/Core/FontVariant.cs
+++ b/CharacterMap/CharacterMap/Core/FontVariant.cs
@@ -110,6 +110,8 @@ public string GetProviderName()
         if (IsImported)
             return Localization.Get("InstallTypeImported");
 
+
+
         return Localization.Get($"DWriteSource{DirectWriteProperties.Source}");
     }
 
@@ -153,6 +155,8 @@ public IReadOnlyList<Character> GetCharacters()
 
     public FontAnalysis GetAnalysis() => _analysis ??= TypographyAnalyzer.Analyze(this);
 
+    public string QuickFilePath => GetAnalysisInternal().FilePath;
+
     /// <summary>
     /// Load an analysis without a glyph search map. Callers later using the cached analysis and expecting a search map should
     /// take care to ensure it's created by manually calling <see cref="TypographyAnalyzer.PrepareSearchMap(FontVariant, FontAnalysis)"/>
diff --git a/CharacterMap/CharacterMap/Models/BasicFontFilter.cs b/CharacterMap/CharacterMap/Models/BasicFontFilter.cs
index c79251ef..aa71b0f4 100644
--- a/CharacterMap/CharacterMap/Models/BasicFontFilter.cs
+++ b/CharacterMap/CharacterMap/Models/BasicFontFilter.cs
@@ -1,4 +1,7 @@
-namespace CharacterMap.Models;
+using Microsoft.Graphics.Canvas.Text;
+
+namespace CharacterMap.Models;
+
 
 public partial class BasicFontFilter
 {
@@ -30,6 +33,19 @@ public static BasicFontFilter ForNamedRange(NamedUnicodeRange range)
             true);
     }
 
+    public static BasicFontFilter ForFilePath(string path)
+    {
+        return new BasicFontFilter((f, c) => f.Where(v => v.Variants.Any(
+            v => v.QuickFilePath.Contains(path, StringComparison.InvariantCultureIgnoreCase))), null, true);
+    }
+
+    public static BasicFontFilter ForFontInfo(string query, CanvasFontInformation info)
+    {
+        return new BasicFontFilter((f, c) => f.Where(v => v.Variants.Any(
+            v => v.TryGetInfo(info)?.Value is string f
+            && f.Contains(query, StringComparison.InvariantCultureIgnoreCase))), null, true);
+    }
+
     public static BasicFontFilter ForChar(Character ch)
     {
         return new BasicFontFilter((f, c) => f.Where(v => v.Variants.Any(
diff --git a/CharacterMap/CharacterMap/ViewModels/CollectionManagementViewModel.cs b/CharacterMap/CharacterMap/ViewModels/CollectionManagementViewModel.cs
index 85c50e15..a66cbffd 100644
--- a/CharacterMap/CharacterMap/ViewModels/CollectionManagementViewModel.cs
+++ b/CharacterMap/CharacterMap/ViewModels/CollectionManagementViewModel.cs
@@ -91,10 +91,11 @@ public void RefreshFontLists()
 
     void RefreshFontList()
     {
+        // 1. Filter fonts
         var systemFonts = string.IsNullOrWhiteSpace(Query) 
-            ? _systemFontList
-            : _systemFontList.Where(f => f.Name.Contains(Query, StringComparison.InvariantCultureIgnoreCase)).ToList();
-
+            ?_systemFontList.AsEnumerable()
+            : FontFinder.QueryFontList(Query, _systemFontList, CollectionService).FontList;
+        
         // 2. Create binding lists
         FontList = new(systemFonts);
     }
diff --git a/CharacterMap/CharacterMap/ViewModels/MainViewModel.cs b/CharacterMap/CharacterMap/ViewModels/MainViewModel.cs
index d75ec435..12e9ca72 100644
--- a/CharacterMap/CharacterMap/ViewModels/MainViewModel.cs
+++ b/CharacterMap/CharacterMap/ViewModels/MainViewModel.cs
@@ -309,24 +309,9 @@ public async void RefreshFontList(UserFontCollection collection = null)
 
             if (!string.IsNullOrWhiteSpace(FontSearch))
             {
-                if (FontSearch.StartsWith("char:", StringComparison.OrdinalIgnoreCase)
-                    && FontSearch.Remove(0, 5).Trim() is string q
-                    && !string.IsNullOrWhiteSpace(q))
-                {
-                    foreach (var ch in q)
-                    {
-                        if (ch == ' ')
-                            continue;
-                        fontList = BasicFontFilter.ForChar(new(ch)).Query(fontList, FontCollections);
-                    }
-                    FilterTitle = $"{FontListFilter.FilterTitle} \"{q}\"";
-                }
-                else
-                {
-                    fontList = fontList.Where(f => f.Name.Contains(FontSearch, StringComparison.OrdinalIgnoreCase));
-                    string prefix = FontListFilter == BasicFontFilter.All ? "" : FontListFilter.FilterTitle + " ";
-                    FilterTitle = $"{(collection != null ? collection.Name + " " : prefix)}\"{FontSearch}\"";
-                }
+                var results = FontFinder.QueryFontList(FontSearch, fontList, FontCollections, collection, FontListFilter);
+                fontList = results.FontList;
+                FilterTitle = results.FilterTitle;
                 IsSearchResults = true;
             }
             else

From aaf27e423a865b9a3c3a463108329f147bc6bbaa Mon Sep 17 00:00:00 2001
From: Johnny Westlake <jmdwestlake@yahoo.co.uk>
Date: Wed, 1 May 2024 10:10:24 +0100
Subject: [PATCH 03/15] Missing Translations #261

---
 CharacterMap/CharacterMap/Core/FontVariant.cs | 15 ++++----
 .../CharacterMap/Strings/en-US/Resources.resw | 37 +++++++++++++++++++
 CharacterMap/CharacterMap/Views/MainPage.xaml |  2 +-
 3 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/CharacterMap/CharacterMap/Core/FontVariant.cs b/CharacterMap/CharacterMap/Core/FontVariant.cs
index ad0d8eb7..c0b65ae8 100644
--- a/CharacterMap/CharacterMap/Core/FontVariant.cs
+++ b/CharacterMap/CharacterMap/Core/FontVariant.cs
@@ -14,7 +14,7 @@ public record FaceMetadataInfo(string Key, string[] Values, CanvasFontInformatio
 public partial class FontVariant : IDisposable
 {
     /* Using a character cache avoids a lot of unnecessary allocations */
-    private static Dictionary<int, Character> _characters { get; } = new();
+    private static Dictionary<int, Character> _characters { get; } = [];
 
     private IReadOnlyList<NamedUnicodeRange> _ranges = null;
     private IReadOnlyList<FaceMetadataInfo> _fontInformation = null;
@@ -110,8 +110,6 @@ public string GetProviderName()
         if (IsImported)
             return Localization.Get("InstallTypeImported");
 
-
-
         return Localization.Get($"DWriteSource{DirectWriteProperties.Source}");
     }
 
@@ -125,7 +123,7 @@ public IReadOnlyList<Character> GetCharacters()
     {
         if (Characters == null)
         {
-            List<Character> characters = new();
+            List<Character> characters = [];
             foreach (var range in UnicodeRanges)
             {
                 CharacterHash += range.First;
@@ -254,15 +252,16 @@ private FaceMetadataInfo ReadInfoKey(CanvasFontInformation info)
         if (infos.Count == 0)
             return null;
 
-        var name = info == CanvasFontInformation.DesignScriptLanguageTag
-            ? Localization.Get($"CanvasFontInformation{info}")
-            : info.Humanise();
+        // Get localised field name
+        var name = Localization.Get($"CanvasFontInformation{info}") ?? info.Humanise();
 
+        // Get localised value name
         var dic = infos.ToDictionary(k => k.Key, k => k.Value);
         if (infos.TryGetValue(CultureInfo.CurrentCulture.Name, out string value)
             || infos.TryGetValue("en-us", out value))
             return new(name, new string[1] { value }, info);
 
+        // For design tag, cache the full language names (metadata only stores short tags)
         if (info is CanvasFontInformation.DesignScriptLanguageTag
             && _designLangRawSearch is null)
         {
@@ -319,7 +318,7 @@ public static FontVariant CreateDefault(DWriteFontFace face)
         return new FontVariant(face, null)
         {
             PreferredName = "",
-            Characters = new List<Character> { new(0) }
+            Characters = [ new(0) ]
         };
     }
 
diff --git a/CharacterMap/CharacterMap/Strings/en-US/Resources.resw b/CharacterMap/CharacterMap/Strings/en-US/Resources.resw
index b4955f5f..e1c4de37 100644
--- a/CharacterMap/CharacterMap/Strings/en-US/Resources.resw
+++ b/CharacterMap/CharacterMap/Strings/en-US/Resources.resw
@@ -1681,4 +1681,41 @@ Otherwise, "All Fonts" is selected by default on every launch.</value>
   <data name="FileNameWriterFontVerDesc" xml:space="preserve">
     <value>Font version number, if applicable</value>
   </data>
+  <data name="CanvasFontInformationCopyrightNotice" xml:space="preserve">
+    <value>Copyright Notice</value>
+  </data>
+  <data name="CanvasFontInformationDescription" xml:space="preserve">
+    <value>Description</value>
+  </data>
+  <data name="CanvasFontInformationDesigner" xml:space="preserve">
+    <value>Designer</value>
+  </data>
+  <data name="CanvasFontInformationDesignerUrl" xml:space="preserve">
+    <value>Designer URL</value>
+  </data>
+  <data name="CanvasFontInformationFontVendorUrl" xml:space="preserve">
+    <value>Font Vendor URL</value>
+  </data>
+  <data name="CanvasFontInformationFullName" xml:space="preserve">
+    <value>Full Name</value>
+  </data>
+  <data name="CanvasFontInformationLicenseDescription" xml:space="preserve">
+    <value>License</value>
+  </data>
+  <data name="CanvasFontInformationLicenseInfoUrl" xml:space="preserve">
+    <value>License URL</value>
+  </data>
+  <data name="CanvasFontInformationManufacturer" xml:space="preserve">
+    <value>Manufacturer</value>
+  </data>
+  <data name="CanvasFontInformationTrademark" xml:space="preserve">
+    <value>Trademark</value>
+  </data>
+  <data name="CanvasFontInformationVersionStrings" xml:space="preserve">
+    <value>Version Strings</value>
+  </data>
+  <data name="RestoreLabel.Text" xml:space="preserve">
+    <value>Restore</value>
+    <comment>Opposite of Fullscreen</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/CharacterMap/CharacterMap/Views/MainPage.xaml b/CharacterMap/CharacterMap/Views/MainPage.xaml
index f10d54a0..b0717910 100644
--- a/CharacterMap/CharacterMap/Views/MainPage.xaml
+++ b/CharacterMap/CharacterMap/Views/MainPage.xaml
@@ -1382,7 +1382,7 @@
                     <VisualState.Setters>
                         <Setter Target="ToggleFullscreenIcon.Glyph" Value="&#xE1D8;" />
                         <Setter Target="FullscreenLabel.Glyph" Value="&#xE1D8;" />
-                        <Setter Target="FullscreenLabel.Title" Value="Restore" />
+                        <Setter Target="FullscreenLabel.Title" Value="{core:Localizer Key='RestoreLabel/Text'}" />
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>

From bdf63bcf3d8f6156ac2bc234de2f15eadbed8c6b Mon Sep 17 00:00:00 2001
From: Johnny Westlake <jmdwestlake@yahoo.co.uk>
Date: Wed, 1 May 2024 13:33:57 +0100
Subject: [PATCH 04/15] PoC Smart Collections implementation

---
 CharacterMap/CharacterMap.CX/DWriteFontFace.h |    1 -
 CharacterMap/CharacterMap.CX/FontAnalysis.h   |   66 +-
 .../Common/GeneratorExtensions.cs             |    2 +-
 .../Readers/AttachedPropertyReader.cs         |  131 ++
 .../SourceGenerator.cs                        |    3 +
 .../Controls/CreateCollectionDialog.xaml      |   92 +-
 .../Controls/CreateCollectionDialog.xaml.cs   |  113 +-
 .../Controls/FilterFlyout.xaml.cs             |    5 +-
 .../CharacterMap/Core/ExportManager.Font.cs   |    2 +-
 CharacterMap/CharacterMap/Core/FontFinder.cs  |    3 +-
 CharacterMap/CharacterMap/Core/Properties.cs  | 1672 ++++++-----------
 .../CharacterMap/Helpers/Extensions.cs        |   18 +
 .../CharacterMap/Helpers/FlyoutHelper.cs      |    4 +-
 .../Provider/SQLiteCollectionProvider.cs      |   47 +-
 .../Services/UserCollectionsService.cs        |  107 +-
 .../Services/UserFontCollection.cs            |   91 +-
 .../Themes/FluentThemeStyles.xaml             |   12 +
 .../CharacterMap/ViewModels/MainViewModel.cs  |   10 +-
 .../ViewModels/QuickCompareViewModel.cs       |   16 +-
 .../CharacterMap/Views/MainPage.xaml.cs       |    2 +-
 20 files changed, 1226 insertions(+), 1171 deletions(-)
 create mode 100644 CharacterMap/CharacterMap.Generators/Readers/AttachedPropertyReader.cs

diff --git a/CharacterMap/CharacterMap.CX/DWriteFontFace.h b/CharacterMap/CharacterMap.CX/DWriteFontFace.h
index ad67f3c0..d879b042 100644
--- a/CharacterMap/CharacterMap.CX/DWriteFontFace.h
+++ b/CharacterMap/CharacterMap.CX/DWriteFontFace.h
@@ -129,7 +129,6 @@ namespace CharacterMapCX
 		{
 			m_font = font;
 			m_dwProperties = properties;
-
 		};
 
 		ComPtr<IDWriteFontCollection3> GetFontCollection()
diff --git a/CharacterMap/CharacterMap.CX/FontAnalysis.h b/CharacterMap/CharacterMap.CX/FontAnalysis.h
index e3ca1fcc..79538cb6 100644
--- a/CharacterMap/CharacterMap.CX/FontAnalysis.h
+++ b/CharacterMap/CharacterMap.CX/FontAnalysis.h
@@ -18,21 +18,21 @@ namespace CharacterMapCX
 	{
 	public:
 
-		property bool HasBitmapGlyphs { bool get() { return m_hasBitmap; } }
+		property bool HasBitmapGlyphs { bool get() { ReadTables(); return m_hasBitmap; } }
 
-		property bool HasCOLRGlyphs { bool get() { return m_hasCOLR; } }
+		property bool HasCOLRGlyphs { bool get() { ReadTables(); return m_hasCOLR; } }
 
-		property bool HasSVGGlyphs { bool get() { return m_hasSVG; } }
+		property bool HasSVGGlyphs { bool get() { ReadTables(); return m_hasSVG; } }
 
-		property bool ContainsVectorColorGlyphs { bool get() { return m_hasSVG || m_hasCOLR; } }
+		property bool ContainsVectorColorGlyphs { bool get() { ReadTables(); return m_hasSVG || m_hasCOLR; } }
 		
-		property bool HasGlyphNames { bool get() { return m_hasGlyphNames; } }
+		property bool HasGlyphNames { bool get() { ReadTables(); return m_hasGlyphNames; } }
 
-		property int COLRVersion { int get() { return m_colrVersion; } }
+		property int COLRVersion { int get() { ReadTables(); return m_colrVersion; } }
 
-		property bool SupportsCOLRv1 { bool get() { return m_colrVersion >= 1; } }
+		property bool SupportsCOLRv1 { bool get() { ReadTables(); return m_colrVersion >= 1; } }
 
-		property bool HasVariationAxis { bool get() { return m_variableAxis != nullptr && m_variableAxis->Size > 0; } }
+		property bool HasVariationAxis { bool get() { GetVariableProperties(); return m_variableAxis != nullptr && m_variableAxis->Size > 0; } }
 
 		property bool IsRemote { bool get() { return m_isRemote; } }
 
@@ -52,16 +52,19 @@ namespace CharacterMapCX
 
 		property IVectorView<DWriteFontAxis^>^ Axis
 		{
-			IVectorView<DWriteFontAxis^>^ get() { return m_axis; }
+			IVectorView<DWriteFontAxis^>^ get() { GetVariableProperties(); return m_axis; }
 		}
 
 		property IVectorView<DWriteFontAxis^>^ VariableAxis
 		{
-			IVectorView<DWriteFontAxis^>^ get() { return m_variableAxis; }
+			IVectorView<DWriteFontAxis^>^ get() { GetVariableProperties(); return m_variableAxis; }
 		}
 
 		void ResetVariableAxis()
 		{
+			if (m_variableAxis == nullptr)
+				return;
+
 			for each (auto a in m_variableAxis)
 				a->Value = a->DefaultValue; 
 		}
@@ -69,16 +72,15 @@ namespace CharacterMapCX
 		/// <summary>
 		/// Mappings of glyph index to font-provided glyph names
 		/// </summary>
-		property IMapView<int, String^>^ GlyphNameMappings;
+		property IMapView<int, String^>^ GlyphNameMappings { IMapView<int, String^>^ get() { ReadTables(); return m_mappings; } }
 
 
 		FontAnalysis() { }
 
 		FontAnalysis(DWriteFontFace^ fontFace)
 		{
-			ComPtr<IDWriteFontFaceReference> ref = fontFace->GetReference();
-			AnalyseTables(ref);
-			GetFileProperties(ref);
+			m_ref = fontFace->GetReference();
+			GetFileProperties(m_ref);
 		}
 
 	private:
@@ -97,9 +99,30 @@ namespace CharacterMapCX
 		IVectorView<DWriteFontAxis^>^ m_variableAxis;
 		IVectorView<DWriteFontAxis^>^ m_axis;
 
-		void GetFileProperties(ComPtr<IDWriteFontFaceReference> faceRef)
+		IMapView<int, String^>^ m_mappings;
+		ComPtr<IDWriteFontFaceReference> m_ref;
+
+		bool m_tables = false;
+		bool m_var = false;
+
+		void ReadTables()
 		{
-			m_axis = DirectWrite::GetAxis(faceRef);
+			if (m_tables)
+				return;
+
+			m_tables = true;
+			AnalyseTables();
+		}
+
+
+		void GetVariableProperties()
+		{
+			if (m_var)
+				return;
+
+			m_var = true;
+
+			m_axis = DirectWrite::GetAxis(m_ref);
 
 			// Check for variable font axis
 			Vector<DWriteFontAxis^>^ variable = ref new Vector<DWriteFontAxis^>();
@@ -109,7 +132,10 @@ namespace CharacterMapCX
 					variable->Append(a);
 			}
 			m_variableAxis = variable->GetView();
+		}
 
+		void GetFileProperties(ComPtr<IDWriteFontFaceReference> faceRef)
+		{
 			// Get File Size
 			m_fileSize = faceRef->GetFileSize();
 
@@ -138,6 +164,8 @@ namespace CharacterMapCX
 							{
 								m_filePath = ref new Platform::String(buffer);
 							}
+
+							delete[] buffer;
 						}
 					}
 				}
@@ -148,10 +176,10 @@ namespace CharacterMapCX
 			}
 		}
 
-		void AnalyseTables(ComPtr<IDWriteFontFaceReference> faceRef)
+		void AnalyseTables()
 		{
 			ComPtr<IDWriteFontFace3> f3;
-			faceRef->CreateFontFace(&f3);
+			m_ref->CreateFontFace(&f3);
 
 			ComPtr<IDWriteFontFace5> face;
 			f3.As(&face);
@@ -228,7 +256,7 @@ namespace CharacterMapCX
 			if (exists)
 			{
 				auto reader = ref new PostTableReader(tableData, tableSize);
-				GlyphNameMappings = reader->Mapping;
+				m_mappings = reader->Mapping;
 				m_hasGlyphNames = GlyphNameMappings != nullptr && GlyphNameMappings->Size > 0;
 				delete reader;
 			}
diff --git a/CharacterMap/CharacterMap.Generators/Common/GeneratorExtensions.cs b/CharacterMap/CharacterMap.Generators/Common/GeneratorExtensions.cs
index 3ca1c546..037430ec 100644
--- a/CharacterMap/CharacterMap.Generators/Common/GeneratorExtensions.cs
+++ b/CharacterMap/CharacterMap.Generators/Common/GeneratorExtensions.cs
@@ -13,7 +13,7 @@ public static class GeneratorExtensions
 
     public static AttributeArgumentSyntax GetArgument(this AttributeSyntax attribute, string name)
     {
-        return attribute.ArgumentList.Arguments.FirstOrDefault(a => a.NameEquals?.Name.Identifier.ValueText == name);
+        return attribute.ArgumentList?.Arguments.FirstOrDefault(a => a.NameEquals?.Name?.Identifier.ValueText == name);
     }
 
     public static PropertyDeclarationSyntax GetProperty(this AttributeSyntax attribute, string name)
diff --git a/CharacterMap/CharacterMap.Generators/Readers/AttachedPropertyReader.cs b/CharacterMap/CharacterMap.Generators/Readers/AttachedPropertyReader.cs
new file mode 100644
index 00000000..3a422646
--- /dev/null
+++ b/CharacterMap/CharacterMap.Generators/Readers/AttachedPropertyReader.cs
@@ -0,0 +1,131 @@
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace CharacterMap.Generators.Readers;
+
+public class AttachedPropertyReader : SyntaxReader
+{
+    //string TEMPLATE =
+    //    "    public static {2} {0}\r\n" +
+    //    "    {{\r\n" +
+    //    "        get {{ return ({2})GetValue({0}Property); }}\r\n" +
+    //    "        set {{ SetValue({0}Property, value); }}\r\n" +
+    //    "    }}\r\n\r\n" +
+    //    "    public static readonly DependencyProperty {0}Property =\r\n" +
+    //    "        DependencyProperty.RegisterAttached(nameof({0}), typeof({2}), typeof({1}), new PropertyMetadata({3}, (d, e) =>\r\n" +
+    //    "        {{\r\n" +
+    //    "            if (d is {1} o && e.NewValue is {2} i)\r\n" +
+    //    //"            {{\r\n" +
+    //    "                o.On{0}Changed(e.OldValue as {4}, i);\r\n" +
+    //    // "            }}\r\n" +
+    //    "        }}));\r\n\r\n" +
+    //    "    partial static void On{0}Changed({4} oldValue, {2} newValue);\r\n";
+
+    string TEMPLATE =
+        "    public static {2} Get{0}(DependencyObject obj) => ({2})obj.GetValue({0}Property);\r\n\r\n" +
+        "    public static void Set{0}(DependencyObject obj, {2} value) => obj.SetValue({0}Property, value);\r\n\r\n" +
+        "    public static readonly DependencyProperty {0}Property =\r\n" +
+        "        DependencyProperty.RegisterAttached(\"{0}\", typeof({2}), typeof({1}), new PropertyMetadata({3}, (d,e) => On{0}Changed(d,e)));\r\n\r\n" +
+        "    static partial void On{0}Changed(DependencyObject d, DependencyPropertyChangedEventArgs e);\r\n";
+
+    record class APData
+    {
+        public string Default { get; init; }
+        public string Container { get; init; }
+        public string Type { get; init; }
+        public string Name { get; init; }
+        public string TypeNamespace { get; init; }
+
+        public string ParentClass { get; init; }
+        public string ParentNamespace { get; init; }
+        public List<string> Usings { get; init; }
+
+        public string GetCastType() => IsPrimitive(Type) ? $"{Type}?" : Type;
+
+        // Terrible way of doing this
+        private bool IsPrimitive(string type)
+        {
+            return type is "bool" or "int" or "double" or "float"
+                    or "Visibility" or "CornerRadius" or "CharacterCasing"
+                    or "FlowDirection" or "ContentPlacement" or "GridLength"
+                    or "Orientation" or "GlyphAnnotation" or "FlyoutPlacementMode";
+        }
+    }
+
+    List<APData> data = [];
+
+    public override void Read(IEnumerable<SyntaxNode> nodes)
+    {
+        foreach (var n in nodes.OfType<ClassDeclarationSyntax>()
+                               .Where(c => c.HasGenericAttribute("AttachedProperty")))
+        {
+            APData src = new()
+            {
+                ParentClass = n.Identifier.ValueText,
+                ParentNamespace = n.GetNamespace(),
+                Usings = (n.Parent?.Parent as CompilationUnitSyntax)?.Usings.Select(u => $"using {u.Name.ToString()};")?.ToList() ?? new()
+            };
+
+            foreach (var a in n.AttributeLists
+                               .SelectMany(s => s.Attributes)
+                               .Where(a => a.Name.ToString().StartsWith("AttachedProperty")))
+            {
+                string type = null;
+                if (a.Name is GenericNameSyntax gen)
+                    type = gen.TypeArgumentList.Arguments[0].ToString();
+
+                var d = a.GetArgument("Name") is { } na && na.NameEquals is { } ne // Attribute property path,
+                    ? src with
+                    {
+                        Name = a.GetArgument("Name")?.GetValue(),
+                        Default = a.GetArgument("Default")?.GetValue() ?? "default",
+                        Type = type ?? a.GetArgument("Type")?.GetValue()?.Replace("typeof(", string.Empty).Replace(")", string.Empty) ?? "object"
+                    }
+                    : src with // Constructor path - preferred
+                    {
+                        Name = a.ArgumentList?.Arguments[0].GetValue() ?? type,
+                        Type = type ?? "object",
+                        Default = a.ArgumentList?.Arguments.Skip(1)?.FirstOrDefault()?.GetValue() ?? "default"
+                    };
+
+
+                data.Add(d);
+            }
+        }
+    }
+
+    public override void Write(GeneratorExecutionContext context)
+    {
+        if (data.Count == 0)
+            return;
+
+        foreach (var group in data.GroupBy(d => $"{d.ParentNamespace}.{d.ParentClass}.g.ap.cs"))
+        {
+            string file = group.Key;
+            string ns = group.First().ParentNamespace;
+            string target = group.First().ParentClass;
+            List<string> usings = group.First().Usings;
+
+            StringBuilder sb = new();
+
+            foreach (APData dp in group)
+                sb.AppendLine(
+                    string.Format(TEMPLATE, dp.Name, dp.ParentClass, dp.Type, dp.Default, dp.GetCastType()));
+
+            var s = sb.ToString();
+            context.AddSource(file, SourceText.From(
+$@"{string.Join("\r\n", usings)}
+
+namespace {ns};
+
+partial class {target}
+{{
+{sb}
+}}", Encoding.UTF8));
+        }
+    }
+}
\ No newline at end of file
diff --git a/CharacterMap/CharacterMap.Generators/SourceGenerator.cs b/CharacterMap/CharacterMap.Generators/SourceGenerator.cs
index ff0b1289..1a9afc9c 100644
--- a/CharacterMap/CharacterMap.Generators/SourceGenerator.cs
+++ b/CharacterMap/CharacterMap.Generators/SourceGenerator.cs
@@ -25,6 +25,9 @@ public void Execute(GeneratorExecutionContext context)
 
                 // 3. Create Dependency Properties
                 new DependencyPropertyReader().Process(tree, context);
+
+                // 4. Create Attached Properties
+                new AttachedPropertyReader().Process(tree, context);
             }
         }
         catch (Exception)
diff --git a/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml b/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml
index 0e6049b7..03c5c600 100644
--- a/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml
+++ b/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml
@@ -2,6 +2,7 @@
     x:Class="CharacterMap.Controls.CreateCollectionDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:core="using:CharacterMap.Core"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     x:Uid="DigCreateCollection"
@@ -14,10 +15,91 @@
     Style="{StaticResource DefaultThemeContentDialogStyle}"
     mc:Ignorable="d">
 
-    <TextBox
-        x:Name="InputBox"
-        x:Uid="CreateCollectionEntryBox"
-        DataContext="{x:Bind TemplateSettings}"
-        Text="{Binding CollectionTitle, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+    <StackPanel DataContext="{x:Bind TemplateSettings}">
+        <TextBox
+            x:Name="InputBox"
+            x:Uid="CreateCollectionEntryBox"
+            Text="{Binding CollectionTitle, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+        <CheckBox
+            x:Name="SmartCollectionCheckbox"
+            x:Load="{x:Bind core:Converters.False(IsEditMode)}"
+            Content="Is Smart Collection"
+            IsChecked="{x:Bind TemplateSettings.IsSmartCollection, Mode=TwoWay}"
+            Style="{StaticResource DefaultThemeCheckBoxStyle}" />
+
+        <StackPanel
+            x:Name="SmartFilters"
+            x:Load="{x:Bind TemplateSettings.IsSmartCollection, Mode=OneWay}"
+            Margin="0 24 0 0"
+            Spacing="12">
+            <TextBox Text="{Binding FilterFilePath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                <TextBox.Header>
+                    <StackPanel
+                        Margin="0 -2"
+                        Orientation="Horizontal"
+                        Spacing="4">
+                        <TextBlock VerticalAlignment="Center" Text="File Path Filter" />
+                        <Border
+                            Padding="4 2"
+                            VerticalAlignment="Center"
+                            Background="{StaticResource CardBackgroundFillColorSecondaryBrush}"
+                            CornerRadius="4">
+                            <TextBlock
+                                FontFamily="Consolas"
+                                FontSize="12"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Text="filepath:" />
+                        </Border>
+                    </StackPanel>
+                </TextBox.Header>
+            </TextBox>
+            <TextBox Text="{Binding FilterFoundry, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                <TextBox.Header>
+                    <StackPanel
+                        Margin="0 -2"
+                        Orientation="Horizontal"
+                        Spacing="4">
+                        <TextBlock VerticalAlignment="Center" Text="Foundry Filter" />
+                        <Border
+                            Padding="4 2"
+                            VerticalAlignment="Center"
+                            Background="{StaticResource CardBackgroundFillColorSecondaryBrush}"
+                            CornerRadius="4">
+                            <TextBlock
+                                FontFamily="Consolas"
+                                FontSize="12"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Text="foundry:" />
+                        </Border>
+                    </StackPanel>
+                </TextBox.Header>
+            </TextBox>
+            <TextBox Text="{Binding FilterDesigner, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                <TextBox.Header>
+                    <StackPanel
+                        Margin="0 -2"
+                        Orientation="Horizontal"
+                        Spacing="4">
+                        <TextBlock VerticalAlignment="Center" Text="Designer Filter" />
+                        <Border
+                            Padding="4 2"
+                            VerticalAlignment="Center"
+                            Background="{StaticResource CardBackgroundFillColorSecondaryBrush}"
+                            CornerRadius="4">
+                            <TextBlock
+                                FontFamily="Consolas"
+                                FontSize="12"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Text="designer:" />
+                        </Border>
+                    </StackPanel>
+                </TextBox.Header>
+            </TextBox>
+        </StackPanel>
+
+
+    </StackPanel>
+
 
 </ContentDialog>
diff --git a/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml.cs b/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml.cs
index a2216482..77da15c5 100644
--- a/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml.cs
+++ b/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml.cs
@@ -2,7 +2,7 @@
 
 namespace CharacterMap.Controls;
 
-public class CreateCollectionDialogTemplateSettings : ViewModelBase
+public partial class CreateCollectionDialogTemplateSettings : ViewModelBase
 {
     private string _collectionTitle;
     public string CollectionTitle
@@ -11,31 +11,70 @@ public string CollectionTitle
         set { if (Set(ref _collectionTitle, value)) OnCollectionTitleChanged(); }
     }
 
-    private bool _isCollectionTitleValid;
-    public bool IsCollectionTitleValid
-    {
-        get => _isCollectionTitleValid;
-        private set => Set(ref _isCollectionTitleValid, value);
-    }
+    [ObservableProperty] bool _isCollectionTitleValid;
+
+    [ObservableProperty] bool _isSmartCollection;
+    [ObservableProperty] string _filterFilePath;
+    [ObservableProperty] string _filterFoundry;
+    [ObservableProperty] string _filterDesigner;
+
 
     private void OnCollectionTitleChanged()
     {
         IsCollectionTitleValid = !string.IsNullOrWhiteSpace(CollectionTitle);
     }
+
+    public void Populate(IFontCollection c)
+    {
+        CollectionTitle = c.Name;
+
+        if (c is SmartFontCollection u)
+        {
+            IsSmartCollection = true;
+
+            Populate("filepath:", s => FilterFilePath = s);
+            Populate("foundry:", s => FilterFoundry = s);
+            Populate("designer:", s => FilterDesigner = s);
+
+            void Populate(string id, Action<string> set)
+            {
+                foreach (var s in u.Filters)
+                {
+                    if (s.StartsWith(id))
+                        set(s.Replace(id, string.Empty).Trim());
+                }
+            }
+        }
+    }
+
+    public List<String> GetFilterList()
+    {
+        List<String> filters = [];
+        Add("filepath:", _filterFilePath);
+        Add("foundry:", _filterFoundry);
+        Add("designer:", _filterDesigner);
+        return filters;
+
+        void Add(string id, string field)
+        {
+            if (!String.IsNullOrWhiteSpace(field))
+                filters.Add($"{id} {field.Replace(id, string.Empty).Trim()}");
+        }
+    }
 }
 
 public sealed partial class CreateCollectionDialog : ContentDialog
 {
     public CreateCollectionDialogTemplateSettings TemplateSettings { get; }
 
-    public bool IsRenameMode { get; }
+    public bool IsEditMode { get; }
 
     public object Result { get; private set; }
 
 
-    private UserFontCollection _collection = null;
+    private IFontCollection _collection = null;
 
-    public CreateCollectionDialog(UserFontCollection collection = null)
+    public CreateCollectionDialog(IFontCollection collection = null)
     {
         _collection = collection;
         TemplateSettings = new CreateCollectionDialogTemplateSettings();
@@ -43,10 +82,10 @@ public CreateCollectionDialog(UserFontCollection collection = null)
 
         if (_collection != null)
         {
-            IsRenameMode = true;
+            IsEditMode = true;
             this.Title = Localization.Get("DigRenameCollection/Title");
             this.PrimaryButtonText = Localization.Get("DigRenameCollection/PrimaryButtonText");
-            TemplateSettings.CollectionTitle = _collection.Name;
+            TemplateSettings.Populate(_collection);
         }
     }
 
@@ -57,13 +96,18 @@ private async void ContentDialog_PrimaryButtonClick(ContentDialog sender, Conten
 
         var collections = Ioc.Default.GetService<UserCollectionsService>();
 
-        if (IsRenameMode)
+        if (IsEditMode)
         {
             this.IsPrimaryButtonEnabled = false;
             this.IsSecondaryButtonEnabled = false;
             InputBox.IsEnabled = false;
 
-            await collections.RenameCollectionAsync(TemplateSettings.CollectionTitle, _collection);
+            _collection.Name = TemplateSettings.CollectionTitle;
+
+            if (_collection is SmartFontCollection s)
+                s.Filters = TemplateSettings.GetFilterList();
+
+            await collections.UpdateCollectionAsync(_collection);
             d.Complete();
 
             await Task.Yield();
@@ -72,21 +116,34 @@ private async void ContentDialog_PrimaryButtonClick(ContentDialog sender, Conten
         else
         {
             AddToCollectionResult result = null;
-            UserFontCollection collection = await collections.CreateCollectionAsync(TemplateSettings.CollectionTitle);
-
-            if (this.DataContext is InstalledFont font)
-                result = await collections.AddToCollectionAsync(font, collection);
-            else if (this.DataContext is IReadOnlyList<InstalledFont> fonts)
-                result = await collections.AddToCollectionAsync(fonts, collection);
-            else if (this.DataContext is null)
-                result = new AddToCollectionResult(true, null, collection);
-            
-            Result = result;
-            d.Complete();
-            await Task.Yield();
-            if (result is not null && result.Success && result.Fonts is not null)
-                WeakReferenceMessenger.Default.Send(new AppNotificationMessage(true, result));
 
+            // Check if we are creating a Smart Filter
+            if (TemplateSettings.GetFilterList() is { Count: > 0} filters)
+            {
+                SmartFontCollection collection = await collections.CreateSmartCollectionAsync(
+                    TemplateSettings.CollectionTitle,
+                    filters);
+
+                d.Complete();
+            }
+            else
+            {
+                UserFontCollection collection = await collections.CreateCollectionAsync(TemplateSettings.CollectionTitle);
+
+                if (this.DataContext is InstalledFont font)
+                    result = await collections.AddToCollectionAsync(font, collection);
+                else if (this.DataContext is IReadOnlyList<InstalledFont> fonts)
+                    result = await collections.AddToCollectionAsync(fonts, collection);
+                else if (this.DataContext is null)
+                    result = new AddToCollectionResult(true, null, collection);
+
+                Result = result;
+                d.Complete();
+                await Task.Yield();
+                if (result is not null && result.Success && result.Fonts is not null)
+                    WeakReferenceMessenger.Default.Send(new AppNotificationMessage(true, result));
+
+            }
         }
     }
 }
diff --git a/CharacterMap/CharacterMap/Controls/FilterFlyout.xaml.cs b/CharacterMap/CharacterMap/Controls/FilterFlyout.xaml.cs
index 4f1dd603..663d221c 100644
--- a/CharacterMap/CharacterMap/Controls/FilterFlyout.xaml.cs
+++ b/CharacterMap/CharacterMap/Controls/FilterFlyout.xaml.cs
@@ -179,7 +179,7 @@ public IEnumerable<MenuFlyoutItemBase> AllMenuItems()
     private void MenuFlyout_Opening(object sender, object e)
     {
         this.AreOpenCloseAnimationsEnabled = ResourceHelper.AllowAnimation;
-        var collections = Ioc.Default.GetService<UserCollectionsService>().Items;
+        var collections = Ioc.Default.GetService<UserCollectionsService>().All;
         Style style = ResourceHelper.Get<Style>("ThemeMenuFlyoutItemStyle");
 
         // Reset to default menu
@@ -197,9 +197,10 @@ private void MenuFlyout_Opening(object sender, object e)
             foreach (var item in collections)
             {
                 MenuFlyoutItem m = new() { DataContext = item, Text = item.Name, Style = style };
+                Properties.SetIconString(m, item.Icon);
                 m.Click += (s, a) =>
                 {
-                    if (m.DataContext is UserFontCollection u)
+                    if (m.DataContext is IFontCollection u)
                         CollectionSelectedCommand?.Execute(u);
                 };
                 Items.Add(m);
diff --git a/CharacterMap/CharacterMap/Core/ExportManager.Font.cs b/CharacterMap/CharacterMap/Core/ExportManager.Font.cs
index 7a267b9c..2546a6ae 100644
--- a/CharacterMap/CharacterMap/Core/ExportManager.Font.cs
+++ b/CharacterMap/CharacterMap/Core/ExportManager.Font.cs
@@ -40,7 +40,7 @@ static List<IGrouping<string, FontVariant>> GetGrouped(IList<FontVariant> fonts)
 
     internal static Task ExportCollectionAsZipAsync(
         IList<InstalledFont> fontList,
-        UserFontCollection selectedCollection,
+        IFontCollection selectedCollection,
         Action<string> callback = null)
     {
         var fonts = fontList.SelectMany(f => f.Variants).ToList();
diff --git a/CharacterMap/CharacterMap/Core/FontFinder.cs b/CharacterMap/CharacterMap/Core/FontFinder.cs
index dfc2b2c3..a6be4675 100644
--- a/CharacterMap/CharacterMap/Core/FontFinder.cs
+++ b/CharacterMap/CharacterMap/Core/FontFinder.cs
@@ -646,7 +646,7 @@ public static FontQueryResults QueryFontList(
         string query, 
         IEnumerable<InstalledFont> fontList, 
         UserCollectionsService fontCollections,
-        UserFontCollection collection = null,
+        IFontCollection collection = null,
         BasicFontFilter filter = null)
     {
         filter ??= BasicFontFilter.All;
@@ -702,7 +702,6 @@ static bool Is(string q, string i, out string o)
                 filterTitle = $"{(collection != null ? collection.Name + " " : prefix)}\"{query}\"";
             }
 
-
             return new(fontList, filterTitle, true);
         }
         
diff --git a/CharacterMap/CharacterMap/Core/Properties.cs b/CharacterMap/CharacterMap/Core/Properties.cs
index 1478bf51..b03bc828 100644
--- a/CharacterMap/CharacterMap/Core/Properties.cs
+++ b/CharacterMap/CharacterMap/Core/Properties.cs
@@ -38,6 +38,22 @@ public DependencyPropertyAttribute(string name, object def)
     }
 }
 
+public class AttachedPropertyAttribute<T> : DependencyPropertyAttribute<T>
+{
+    public AttachedPropertyAttribute() { }
+
+    public AttachedPropertyAttribute(string name)
+    {
+        Name = name;
+    }
+
+    public AttachedPropertyAttribute(string name, object def)
+    {
+        Name = name;
+        Default = def;
+    }
+}
+
 public class DependencyPropertyAttribute : DependencyPropertyAttribute<object> {
     public DependencyPropertyAttribute() { }
     public DependencyPropertyAttribute(string name)
@@ -57,939 +73,667 @@ public DependencyPropertyAttribute(string name, object def)
 /// XAML Attached Properties
 /// </summary>
 [Bindable]
-public class Properties : DependencyObject
+[AttachedProperty<BasicFontFilter>("Filter")]  // Used to apply a filter to MenuFlyoutItem's on the filter list */
+[AttachedProperty<TypographyFeatureInfo>("Typography")] // Helper to apply TypographyFeatureInfo to a TextBlock */
+[AttachedProperty<CharacterRenderingOptions>("Options")] // Applies CharacterRenderingOptions to a DirectText control
+[AttachedProperty<bool>("ClipToBounds")]
+[AttachedProperty<InsetClip>("InsetClip", "new Thickness(0d)")]
+[AttachedProperty<bool>("IsMouseInputEnabled")] // Enables Mouse & Touch input on an InkCanvas
+[AttachedProperty<InkToolbarToolButton>("DefaultTool")] // Sets the default tool for an InkToolbar
+[AttachedProperty<string>("Name")]
+[AttachedProperty<string>("Uppercase", "string.Empty")]
+[AttachedProperty<object>("Footer")]
+[AttachedProperty<string>("StyleKey")]
+[AttachedProperty<string>("IconString")]
+[AttachedProperty<IconElement>("Icon")]
+[AttachedProperty<DevOption>]
+[AttachedProperty<FlyoutBase>("TargetContextFlyout")]  
+[AttachedProperty<TransitionCollection>("ItemContainerTransitions")]  
+[AttachedProperty<TransitionCollection>("ChildrenTransitions")]  
+[AttachedProperty<bool>("UseAttachedStates")] // Allows an element to run Storyboards from it's own resources on VisualState events
+[AttachedProperty<bool>("SetContainerBackgroundTransition")] // Helper property for ItemContainerBackgroundTransition
+[AttachedProperty<BrushTransition>("ItemContainerBackgroundTransition")] // When attached to a ListView, automatically sets ItemContainer BackgroundTransitions
+[AttachedProperty<FrameworkElement>("PopupRoot")]
+[AttachedProperty<bool>("SupportAnimatedIcon")] // Enables automated AnimatedIcon support
+[AttachedProperty<bool>("UseStandardReposition")] // Enables automatic layout translation animations
+[AttachedProperty<double>("ClickAnimationOffset", -2d)] // Enables pointer animations
+[AttachedProperty<string>("ClickAnimation")] // Enables pointer animations
+[AttachedProperty<double>("PointerAnimationOffset", -2d)] // Enables pointer animations
+[AttachedProperty<string>("PointerOverAnimation")] // Enables pointer animations
+[AttachedProperty<string>("PointerPressedAnimation")] // Enables pointer animations
+[AttachedProperty<bool>("UseExpandContractAnimation")] // Enables Expand/Contract animation on Flyout controls
+[AttachedProperty<FlyoutBase>("Flyout")] // Attaches a Flyout on any ButtonBase that opens on click
+[AttachedProperty<bool>("IsCompact")] // Sets a TabViewItem to compact state
+[AttachedProperty<bool>("IsTabOpenAnimationEnabled")] // Sets a tab open animation on a TabView
+[AttachedProperty<bool>("DisableTranslation")] // Fixes flyout animation error
+[AttachedProperty<bool>("RequireOpenTab")] // Sets a require open tab on a TabView
+[AttachedProperty<double>("RenderScale", 1d)] // Sets CompositeTransform ScaleX/Y
+[AttachedProperty<double>("Rotation", 0d)] // Sets RotationAngleInDegrees on elements handout visual
+[AttachedProperty<KeyTime>("RotationTransition", "KeyTime.FromTimeSpan(TimeSpan.Zero)")] // Sets transition duration for changes to elements handout visual RotationAngleInDegrees property
+
+public partial class Properties : DependencyObject
 {
     #region FILTER 
 
-    /* Used to apply a filter to MenuFlyoutItem's on the filter list */
-
-    public static BasicFontFilter GetFilter(DependencyObject obj)
-    {
-        return (BasicFontFilter)obj.GetValue(FilterProperty);
-    }
-
-    public static void SetFilter(DependencyObject obj, BasicFontFilter value)
+    static partial void OnFilterChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        obj.SetValue(FilterProperty, value);
-    }
-
-    public static readonly DependencyProperty FilterProperty =
-        DependencyProperty.RegisterAttached("Filter", typeof(BasicFontFilter), typeof(Properties), new PropertyMetadata(null, (d, e) =>
+        if (d is MenuFlyoutItem item && e.NewValue is BasicFontFilter f)
         {
-            if (d is MenuFlyoutItem item && e.NewValue is BasicFontFilter f)
-            {
-                item.CommandParameter = f;
-                item.Text = f.DisplayTitle;
-            }
-        }));
+            item.CommandParameter = f;
+            item.Text = f.DisplayTitle;
+        }
+    }
 
     #endregion
 
     #region TYPOGRAPHY
 
-    /* Helper to apply TypographyFeatureInfo to a TextBlock */
-
-    public static TypographyFeatureInfo GetTypography(DependencyObject obj)
-    {
-        return (TypographyFeatureInfo)obj.GetValue(TypographyProperty);
-    }
-
-    public static void SetTypography(DependencyObject obj, TypographyFeatureInfo value)
+    static partial void OnTypographyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        obj.SetValue(TypographyProperty, value);
-    }
-
-    public static readonly DependencyProperty TypographyProperty =
-        DependencyProperty.RegisterAttached("Typography", typeof(TypographyFeatureInfo), typeof(Properties), new PropertyMetadata(null, (d, e) =>
+        if (d is TextBlock t)
         {
-            if (d is TextBlock t)
-            {
-                TypographyFeatureInfo i = e.NewValue as TypographyFeatureInfo;
-                var x = XamlDirect.GetDefault();
-                IXamlDirectObject p = x.GetXamlDirectObject(t);
-                CharacterGridView.UpdateTypography(x, p, i);
-            }
-        }));
+            TypographyFeatureInfo i = e.NewValue as TypographyFeatureInfo;
+            var x = XamlDirect.GetDefault();
+            IXamlDirectObject p = x.GetXamlDirectObject(t);
+            CharacterGridView.UpdateTypography(x, p, i);
+        }
+    }
 
     #endregion
 
     #region CLIP TO BOUNDS
 
-    public static bool GetClipToBounds(DependencyObject obj)
+    static partial void OnClipToBoundsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        return (bool)obj.GetValue(ClipToBoundsProperty);
-    }
-
-    public static void SetClipToBounds(DependencyObject obj, bool value)
-    {
-        obj.SetValue(ClipToBoundsProperty, value);
-    }
-
-    public static readonly DependencyProperty ClipToBoundsProperty =
-        DependencyProperty.RegisterAttached("ClipToBounds", typeof(bool), typeof(Properties), new PropertyMetadata(false, (d, e) =>
+        if (d is FrameworkElement f)
         {
-            if (d is FrameworkElement f)
-            {
-                var v = f.GetElementVisual();
-                if (e.NewValue is true)
-                    v.Clip = v.Compositor.CreateInsetClip();
-                else
-                    v.Clip = null;
-
-            }
-        }));
-
-    #endregion
-
-    #region ICON
-
-    public static IconElement GetIcon(DependencyObject obj)
-    {
-        return (IconElement)obj.GetValue(IconProperty);
-    }
-
-    public static void SetIcon(DependencyObject obj, IconElement value)
-    {
-        obj.SetValue(IconProperty, value);
-    }
-
-    public static readonly DependencyProperty IconProperty =
-        DependencyProperty.RegisterAttached("Icon", typeof(IconElement), typeof(Properties), new PropertyMetadata(null));
-
-    #endregion
-
-    #region PopupRoot
-
-    public static FrameworkElement GetPopupRoot(DependencyObject obj)
-    {
-        return (FrameworkElement)obj.GetValue(PopupRootProperty);
-    }
-
-    public static void SetPopupRoot(DependencyObject obj, FrameworkElement value)
-    {
-        obj.SetValue(PopupRootProperty, value);
-    }
-
-    public static readonly DependencyProperty PopupRootProperty =
-        DependencyProperty.RegisterAttached("PopupRoot", typeof(FrameworkElement), typeof(Properties), new PropertyMetadata(0));
-
-    #endregion
-
-    #region DEVOPTION
-
-    public static DevOption GetDevOption(DependencyObject obj)
-    {
-        return (DevOption)obj.GetValue(DevOptionProperty);
-    }
-
-    public static void SetDevOption(DependencyObject obj, DevOption value)
-    {
-        obj.SetValue(DevOptionProperty, value);
+            var v = f.GetElementVisual();
+            if (e.NewValue is true)
+                v.Clip = v.Compositor.CreateInsetClip();
+            else
+                v.Clip = null;
+        }
     }
 
-    public static readonly DependencyProperty DevOptionProperty =
-        DependencyProperty.RegisterAttached("DevOption", typeof(DevOption), typeof(Properties), new PropertyMetadata(null));
-
-
     #endregion
 
-    #region StyleKey
-
-
-    public static string GetStyleKey(DependencyObject obj)
-    {
-        return (string)obj.GetValue(StyleKeyProperty);
-    }
+    #region InsetClip
 
-    public static void SetStyleKey(DependencyObject obj, string value)
+    static partial void OnInsetClipChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        obj.SetValue(StyleKeyProperty, value);
+        if (d is FrameworkElement f && e.NewValue is Thickness t)
+        {
+            Visual v = f.GetElementVisual();
+            if (t.Left > 0 || t.Right > 0 || t.Top > 0 || t.Bottom > 0)
+                v.Clip = v.Compositor.CreateInsetClip((float)t.Left, (float)t.Top, (float)t.Right, (float)t.Bottom);
+            else
+                v.Clip = null;
+        }
     }
 
-    public static readonly DependencyProperty StyleKeyProperty =
-        DependencyProperty.RegisterAttached("StyleKey", typeof(string), typeof(Properties), new PropertyMetadata(null));
-
     #endregion
 
     #region IsMouseInputEnabled
 
-    /// Enables Mouse & Touch input on an InkCanvas
-
-    public static bool GetIsMouseInputEnabled(DependencyObject obj)
-    {
-        return (bool)obj.GetValue(IsMouseInputEnabledProperty);
-    }
-
-    public static void SetIsMouseInputEnabled(DependencyObject obj, bool value)
+    static partial void OnIsMouseInputEnabledChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        obj.SetValue(IsMouseInputEnabledProperty, value);
-    }
-
-    public static readonly DependencyProperty IsMouseInputEnabledProperty =
-        DependencyProperty.RegisterAttached("IsMouseInputEnabled", typeof(bool), typeof(Properties), new PropertyMetadata(false, (d, e) =>
+        if (d is InkCanvas c)
         {
-            if (d is InkCanvas c)
-            {
-                if (e.NewValue is bool b && b)
-                    c.InkPresenter.InputDeviceTypes =
-                        CoreInputDeviceTypes.Mouse |
-                        CoreInputDeviceTypes.Touch |
-                        CoreInputDeviceTypes.Pen;
-                else
-                    c.InkPresenter.InputDeviceTypes = CoreInputDeviceTypes.Pen;
-            }
-        }));
+            if (e.NewValue is bool b && b)
+                c.InkPresenter.InputDeviceTypes =
+                    CoreInputDeviceTypes.Mouse |
+                    CoreInputDeviceTypes.Touch |
+                    CoreInputDeviceTypes.Pen;
+            else
+                c.InkPresenter.InputDeviceTypes = CoreInputDeviceTypes.Pen;
+        }
+    }
 
     #endregion
 
     #region DirectText Options
 
-    // Applies CharacterRenderingOptions to a DirectText control
-
-    public static CharacterRenderingOptions GetOptions(DependencyObject obj)
-    {
-        return (CharacterRenderingOptions)obj.GetValue(OptionsProperty);
-    }
-
-    /// <summary>
-    /// Applies <see cref="CharacterRenderingOptions"/> to a <see cref="DirectText"/> control
-    /// </summary>
-    public static void SetOptions(DependencyObject obj, CharacterRenderingOptions value)
+    static partial void OnOptionsChanged(DependencyObject s, DependencyPropertyChangedEventArgs e)
     {
-        obj.SetValue(OptionsProperty, value);
-    }
-
-    /// <summary>
-    /// Applies <see cref="CharacterRenderingOptions"/> to a <see cref="DirectText"/> or <see cref="TextBlock"/> control
-    /// </summary>
-    public static readonly DependencyProperty OptionsProperty =
-        DependencyProperty.RegisterAttached("Options", typeof(CharacterRenderingOptions), typeof(Properties), new PropertyMetadata(null, (s, e) =>
+        if (s is DirectText d)
+        {
+            if (e.NewValue is CharacterRenderingOptions o)
+            {
+                d.Axis = o.Axis;
+                d.FallbackFont = Converters.GetFontFallback();
+                d.FontFace = o.Variant.Face;
+                d.FontFamily = (FontFamily)XamlBindingHelper.ConvertValue(typeof(FontFamily), o.Variant.Source);
+                d.FontStretch = o.Variant.DirectWriteProperties.Stretch;
+                d.FontStyle = o.Variant.DirectWriteProperties.Style;
+                d.FontWeight = o.Variant.DirectWriteProperties.Weight;
+                d.IsColorFontEnabled = o.IsColourFontEnabled;
+                d.Typography = o.DXTypography;
+            }
+            else
+            {
+                d.ClearValue(DirectText.AxisProperty);
+                d.ClearValue(DirectText.FallbackFontProperty);
+                d.ClearValue(DirectText.FontFaceProperty);
+                d.ClearValue(DirectText.FontFamilyProperty);
+                d.ClearValue(DirectText.FontStretchProperty);
+                d.ClearValue(DirectText.FontStyleProperty);
+                d.ClearValue(DirectText.FontWeightProperty);
+                d.ClearValue(DirectText.IsColorFontEnabledProperty);
+                d.ClearValue(DirectText.TypographyProperty);
+            }
+        }
+        else if (s is TextBlock t)
         {
-            if (s is DirectText d)
+            if (e.NewValue is CharacterRenderingOptions o)
             {
-                if (e.NewValue is CharacterRenderingOptions o)
-                {
-                    d.Axis = o.Axis;
-                    d.FallbackFont = Converters.GetFontFallback();
-                    d.FontFace = o.Variant.Face;
-                    d.FontFamily = (FontFamily)XamlBindingHelper.ConvertValue(typeof(FontFamily), o.Variant.Source);
-                    d.FontStretch = o.Variant.DirectWriteProperties.Stretch;
-                    d.FontStyle = o.Variant.DirectWriteProperties.Style;
-                    d.FontWeight = o.Variant.DirectWriteProperties.Weight;
-                    d.IsColorFontEnabled = o.IsColourFontEnabled;
-                    d.Typography = o.DXTypography;
-                }
-                else
-                {
-                    d.ClearValue(DirectText.AxisProperty);
-                    d.ClearValue(DirectText.FallbackFontProperty);
-                    d.ClearValue(DirectText.FontFaceProperty);
-                    d.ClearValue(DirectText.FontFamilyProperty);
-                    d.ClearValue(DirectText.FontStretchProperty);
-                    d.ClearValue(DirectText.FontStyleProperty);
-                    d.ClearValue(DirectText.FontWeightProperty);
-                    d.ClearValue(DirectText.IsColorFontEnabledProperty);
-                    d.ClearValue(DirectText.TypographyProperty);
-                }
+                t.FontFamily = (FontFamily)XamlBindingHelper.ConvertValue(typeof(FontFamily), o.Variant.DisplaySource);
+                t.FontStretch = o.Variant.DirectWriteProperties.Stretch;
+                t.FontStyle = o.Variant.DirectWriteProperties.Style;
+                t.FontWeight = o.Variant.DirectWriteProperties.Weight;
+                t.IsColorFontEnabled = o.IsColourFontEnabled;
+                SetTypography(t, o.DefaultTypography);
             }
-            else if (s is TextBlock t)
+            else
             {
-                if (e.NewValue is CharacterRenderingOptions o)
-                {
-                    t.FontFamily = (FontFamily)XamlBindingHelper.ConvertValue(typeof(FontFamily), o.Variant.DisplaySource);
-                    t.FontStretch = o.Variant.DirectWriteProperties.Stretch;
-                    t.FontStyle = o.Variant.DirectWriteProperties.Style;
-                    t.FontWeight = o.Variant.DirectWriteProperties.Weight;
-                    t.IsColorFontEnabled = o.IsColourFontEnabled;
-                    SetTypography(t, o.DefaultTypography);
-                }
-                else
-                {
-                    t.ClearValue(Properties.TypographyProperty);
-                    t.ClearValue(TextBlock.FontFamilyProperty);
-                    t.ClearValue(TextBlock.FontStretchProperty);
-                    t.ClearValue(TextBlock.FontStyleProperty);
-                    t.ClearValue(TextBlock.FontWeightProperty);
-                    t.ClearValue(TextBlock.IsColorFontEnabledProperty);
-                }
+                t.ClearValue(Properties.TypographyProperty);
+                t.ClearValue(TextBlock.FontFamilyProperty);
+                t.ClearValue(TextBlock.FontStretchProperty);
+                t.ClearValue(TextBlock.FontStyleProperty);
+                t.ClearValue(TextBlock.FontWeightProperty);
+                t.ClearValue(TextBlock.IsColorFontEnabledProperty);
             }
-        }));
+        }
+    }
 
     #endregion
 
     #region DEFAULT TOOL
 
-    /// Sets the default tool for an InkToolbar
-
-    public static InkToolbarToolButton GetDefaultTool(DependencyObject obj)
-    {
-        return (InkToolbarToolButton)obj.GetValue(DefaultToolProperty);
-    }
-
-    public static void SetDefaultTool(DependencyObject obj, InkToolbarToolButton value)
+    static partial void OnDefaultToolChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        obj.SetValue(DefaultToolProperty, value);
+        if (d is InkToolbar t && e.NewValue is InkToolbarToolButton b)
+            t.ActiveTool = b;
     }
-
-    public static readonly DependencyProperty DefaultToolProperty =
-        DependencyProperty.RegisterAttached("DefaultTool", typeof(InkToolbarToolButton), typeof(Properties), new PropertyMetadata(null, (d, e) =>
-        {
-            if (d is InkToolbar t)
-            {
-                if (e.NewValue is InkToolbarToolButton b)
-                    t.ActiveTool = b;
-            }
-        }));
-
+    
     #endregion
 
-    #region InsetClip
+    #region TabViewItem IsCompact
 
-    public static Thickness GetInsetClip(DependencyObject obj)
+    static partial void OnIsCompactChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        return (Thickness)obj.GetValue(InsetClipProperty);
-    }
+        if (d is TabViewItem item && e.NewValue is bool b)
+        {
+            VisualStateManager.GoToState(item, b ? "CollapsedTabState" : "FullTabState", ResourceHelper.AllowAnimation);
 
-    public static void SetInsetClip(DependencyObject obj, Thickness value)
-    {
-        obj.SetValue(InsetClipProperty, value);
+            if (b)
+                item.MaxWidth = 60;
+            else
+                item.ClearValue(TabViewItem.MaxWidthProperty);
+        }
     }
 
-    public static readonly DependencyProperty InsetClipProperty =
-        DependencyProperty.RegisterAttached("InsetClip", typeof(Thickness), typeof(Properties), new PropertyMetadata(new Thickness(0d), (d, e) =>
-        {
-            if (d is FrameworkElement f && e.NewValue is Thickness t)
-            {
-                Visual v = f.GetElementVisual();
-                if (t.Left > 0 || t.Right > 0 || t.Top > 0 || t.Bottom > 0)
-                    v.Clip = v.Compositor.CreateInsetClip((float)t.Left, (float)t.Top, (float)t.Right, (float)t.Bottom);
-                else
-                    v.Clip = null;
-            }
-        }));
-
     #endregion
 
-    #region TabViewItem IsCompact
-
-    public static bool GetIsCompact(DependencyObject obj)
-    {
-        return (bool)obj.GetValue(IsCompactProperty);
-    }
+    #region IsTabOpenAnimationEnabled
 
-    public static void SetIsCompact(DependencyObject obj, bool value)
+    static partial void OnIsTabOpenAnimationEnabledChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        obj.SetValue(IsCompactProperty, value);
-    }
-
-    public static readonly DependencyProperty IsCompactProperty =
-        DependencyProperty.RegisterAttached("IsCompact", typeof(bool), typeof(Properties), new PropertyMetadata(false, (d, e) =>
+        if (d is TabView tabs && e.NewValue is bool b)
         {
-            if (d is TabViewItem item && e.NewValue is bool b)
+            // We can only configure animation if the TabView template is loaded.
+            // Check that it is, or wait until it is.
+            if (tabs.GetFirstDescendantOfType<TabViewListView>() is ListView list)
+                ConfigureAnimations(tabs, b);
+            else
             {
-                VisualStateManager.GoToState(item, b ? "CollapsedTabState" : "FullTabState", ResourceHelper.AllowAnimation);
-
-                if (b)
-                    item.MaxWidth = 60;
-                else
-                    item.ClearValue(TabViewItem.MaxWidthProperty);
+                tabs.Loaded -= Tabs_Loaded;
+                tabs.Loaded += Tabs_Loaded;
             }
-        }));
 
-    #endregion
-
-    #region IsTabOpenAnimationEnabled
-
-    public static bool GetIsTabOpenAnimationEnabled(DependencyObject obj)
-    {
-        return (bool)obj.GetValue(IsTabOpenAnimationEnabledProperty);
-    }
+            static void Tabs_Loaded(object sender, RoutedEventArgs e)
+            {
+                if (sender is TabView t)
+                    ConfigureAnimations(t, Properties.GetIsTabOpenAnimationEnabled(t));
+            }
 
-    public static void SetIsTabOpenAnimationEnabled(DependencyObject obj, bool value)
-    {
-        obj.SetValue(IsTabOpenAnimationEnabledProperty, value);
-    }
 
-    public static readonly DependencyProperty IsTabOpenAnimationEnabledProperty =
-        DependencyProperty.RegisterAttached("IsTabOpenAnimationEnabled", typeof(bool), typeof(Properties), new PropertyMetadata(false, (d, e) =>
-        {
-            if (d is TabView tabs && e.NewValue is bool b)
+            static void ConfigureAnimations(TabView view, bool enabled)
             {
-                // We can only configure animation if the TabView template is loaded.
-                // Check that it is, or wait until it is.
-                if (tabs.GetFirstDescendantOfType<TabViewListView>() is ListView list)
-                    ConfigureAnimations(tabs, b);
-                else
-                {
-                    tabs.Loaded -= Tabs_Loaded;
-                    tabs.Loaded += Tabs_Loaded;
-                }
+                view.Loaded -= Tabs_Loaded;
 
-                static void Tabs_Loaded(object sender, RoutedEventArgs e)
-                {
-                    if (sender is TabView t)
-                        ConfigureAnimations(t, Properties.GetIsTabOpenAnimationEnabled(t));
-                }
+                List<WeakReference> _tooAdd = new();
 
-
-                static void ConfigureAnimations(TabView view, bool enabled)
+                if (view.GetFirstDescendantOfType<TabViewListView>() is ListView list)
                 {
-                    view.Loaded -= Tabs_Loaded;
+                    list.Items.VectorChanged -= Items_VectorChanged;
+                    list.ContainerContentChanging -= List_ContainerContentChanging;
 
-                    List<WeakReference> _tooAdd = new();
+                    if (enabled)
+                    {
+                        list.Items.VectorChanged += Items_VectorChanged;
+                        list.ContainerContentChanging += List_ContainerContentChanging;
+                    }
 
-                    if (view.GetFirstDescendantOfType<TabViewListView>() is ListView list)
+                    void Items_VectorChanged(IObservableVector<object> sender, IVectorChangedEventArgs eargs)
                     {
-                        list.Items.VectorChanged -= Items_VectorChanged;
-                        list.ContainerContentChanging -= List_ContainerContentChanging;
+                        if (ResourceHelper.AllowAnimation is false)
+                            return;
 
-                        if (enabled)
-                        {
-                            list.Items.VectorChanged += Items_VectorChanged;
-                            list.ContainerContentChanging += List_ContainerContentChanging;
-                        }
+                        // TabView sometimes decides to give new item containers to existing items already 
+                        // in view, and we want to make sure to only animate items that a re new, so make
+                        // a record of them.
+                        if (eargs.CollectionChange == CollectionChange.ItemInserted)
+                            _tooAdd.Add(new WeakReference(sender[(int)eargs.Index]));
+                    }
 
-                        void Items_VectorChanged(IObservableVector<object> sender, IVectorChangedEventArgs eargs)
+                    void List_ContainerContentChanging(ListViewBase sender, ContainerContentChangingEventArgs args)
+                    {
+                        // Manually trigger the animation every time the tab content changes
+                        if (args.Item is not null
+                            && args.ItemContainer is not null
+                            && ResourceHelper.AllowAnimation
+                            && _tooAdd.FirstOrDefault(r => r.IsAlive && r.Target == args.Item) is WeakReference itemRef)
                         {
-                            if (ResourceHelper.AllowAnimation is false)
-                                return;
-
-                            // TabView sometimes decides to give new item containers to existing items already 
-                            // in view, and we want to make sure to only animate items that a re new, so make
-                            // a record of them.
-                            if (eargs.CollectionChange == CollectionChange.ItemInserted)
-                                _tooAdd.Add(new WeakReference(sender[(int)eargs.Index]));
-                        }
+                            _tooAdd.Remove(itemRef);
 
-                        void List_ContainerContentChanging(ListViewBase sender, ContainerContentChangingEventArgs args)
-                        {
-                            // Manually trigger the animation every time the tab content changes
-                            if (args.Item is not null
-                                && args.ItemContainer is not null
-                                && ResourceHelper.AllowAnimation
-                                && _tooAdd.FirstOrDefault(r => r.IsAlive && r.Target == args.Item) is WeakReference itemRef)
+                            // We animate the first child because if we animate the TabItem itself hit-testing
+                            // will break.
+                            var child = args.ItemContainer.GetFirstDescendantOfType<FrameworkElement>();
+                            Visual v = child.EnableCompositionTranslation().GetElementVisual();
+
+                            // Get the animation from cache
+                            v.StartAnimation(v.GetCached("_tbopai", () =>
                             {
-                                _tooAdd.Remove(itemRef);
-
-                                // We animate the first child because if we animate the TabItem itself hit-testing
-                                // will break.
-                                var child = args.ItemContainer.GetFirstDescendantOfType<FrameworkElement>();
-                                Visual v = child.EnableCompositionTranslation().GetElementVisual();
-
-                                // Get the animation from cache
-                                v.StartAnimation(v.GetCached("_tbopai", () =>
-                                {
-                                    return v.CreateVector3KeyFrameAnimation(CompositionFactory.TRANSLATION)
-                                                .SetDelayBehavior(AnimationDelayBehavior.SetInitialValueBeforeDelay)
-                                                .SetDelayTime(0.05)
-                                                .AddKeyFrame(0, 0, 60)
-                                                .AddKeyFrame(1, 0, 0)
-                                                .SetDuration(0.325);
-                                }));
-                            }
-
-                            // Clean up WeakReferences
-                            foreach (var item in _tooAdd.ToList())
-                                if (item.IsAlive is false)
-                                    _tooAdd.Remove(item);
-
-                            // Quick hack to apply GetRequireOpenTab states if only one tab is open by default
-                            if (args.ItemContainer is not null
-                                && sender.Items.Count == 1
-                                && GetRequireOpenTab(view))
-                                VisualStateManager.GoToState(args.ItemContainer, "CloseButtonDisabledState", ResourceHelper.AllowAnimation);
+                                return v.CreateVector3KeyFrameAnimation(CompositionFactory.TRANSLATION)
+                                            .SetDelayBehavior(AnimationDelayBehavior.SetInitialValueBeforeDelay)
+                                            .SetDelayTime(0.05)
+                                            .AddKeyFrame(0, 0, 60)
+                                            .AddKeyFrame(1, 0, 0)
+                                            .SetDuration(0.325);
+                            }));
                         }
+
+                        // Clean up WeakReferences
+                        foreach (var item in _tooAdd.ToList())
+                            if (item.IsAlive is false)
+                                _tooAdd.Remove(item);
+
+                        // Quick hack to apply GetRequireOpenTab states if only one tab is open by default
+                        if (args.ItemContainer is not null
+                            && sender.Items.Count == 1
+                            && GetRequireOpenTab(view))
+                            VisualStateManager.GoToState(args.ItemContainer, "CloseButtonDisabledState", ResourceHelper.AllowAnimation);
                     }
                 }
             }
-        }));
+        }
+    }
+
 
     #endregion
 
     #region RequireOpenTab
 
-    public static bool GetRequireOpenTab(DependencyObject obj)
+    static partial void OnRequireOpenTabChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        return (bool)obj.GetValue(RequireOpenTabProperty);
-    }
-
-    public static void SetRequireOpenTab(DependencyObject obj, bool value)
-    {
-        obj.SetValue(RequireOpenTabProperty, value);
-    }
+        if (d is TabView tabs)
+        {
+            tabs.TabItemsChanged -= TabItemsChanged;
+            tabs.TabItemsChanged += TabItemsChanged;
+        }
 
-    public static readonly DependencyProperty RequireOpenTabProperty =
-        DependencyProperty.RegisterAttached("RequireOpenTab", typeof(bool), typeof(Properties), new PropertyMetadata(false, (d, e) =>
+        static void TabItemsChanged(TabView sender, IVectorChangedEventArgs args)
         {
-            if (d is TabView tabs)
+            var items = sender.GetFirstLevelDescendantsOfType<TabViewItem>().ToList();
+            if (GetRequireOpenTab(sender) && sender.TabItems.Count == 1)
             {
-                tabs.TabItemsChanged -= TabItemsChanged;
-                tabs.TabItemsChanged += TabItemsChanged;
+                foreach (var item in items)
+                    VisualStateManager.GoToState(item, "CloseButtonDisabledState", ResourceHelper.AllowAnimation);
             }
-
-            static void TabItemsChanged(TabView sender, IVectorChangedEventArgs args)
+            else
             {
-                var items = sender.GetFirstLevelDescendantsOfType<TabViewItem>().ToList();
-                if (GetRequireOpenTab(sender) && sender.TabItems.Count == 1)
-                {
-                    foreach (var item in items)
-                        VisualStateManager.GoToState(item, "CloseButtonDisabledState", ResourceHelper.AllowAnimation);
-                }
-                else
-                {
-                    foreach (var item in items)
-                        VisualStateManager.GoToState(item, "CloseButtonEnabledState", ResourceHelper.AllowAnimation);
-                }
+                foreach (var item in items)
+                    VisualStateManager.GoToState(item, "CloseButtonEnabledState", ResourceHelper.AllowAnimation);
             }
-        }));
+        }
+    }
 
     #endregion
 
     #region TargetContextFlyout
 
-    public static FlyoutBase GetTargetContextFlyout(DependencyObject obj)
+    static partial void OnTargetContextFlyoutChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        return (FlyoutBase)obj.GetValue(TargetContextFlyoutProperty);
-    }
-
-    public static void SetTargetContextFlyout(DependencyObject obj, FlyoutBase value)
-    {
-        obj.SetValue(TargetContextFlyoutProperty, value);
-    }
-
-    public static readonly DependencyProperty TargetContextFlyoutProperty =
-        DependencyProperty.RegisterAttached("TargetContextFlyout", typeof(FlyoutBase), typeof(Properties), new PropertyMetadata(null, (d, e) =>
+        if (d is FrameworkElement f)
         {
-            if (d is FrameworkElement f)
-            {
-                f.ContextRequested -= ContextRequested;
-                f.ContextRequested += ContextRequested;
-            }
+            f.ContextRequested -= ContextRequested;
+            f.ContextRequested += ContextRequested;
+        }
 
-            static void ContextRequested(UIElement sender, Windows.UI.Xaml.Input.ContextRequestedEventArgs args)
+        static void ContextRequested(UIElement sender, Windows.UI.Xaml.Input.ContextRequestedEventArgs args)
+        {
+            if (GetTargetContextFlyout(sender) is FlyoutBase f)
             {
-                if (GetTargetContextFlyout(sender) is FlyoutBase f)
-                {
-                    args.TryGetPosition(sender, out Windows.Foundation.Point p);
-                    f.ShowAt(sender, new() { Position = p });
-                }
+                args.TryGetPosition(sender, out Windows.Foundation.Point p);
+                f.ShowAt(sender, new() { Position = p });
             }
-        }));
+        }
+    }
 
     #endregion
 
     #region UseExpandContractAnimation
 
-    public static bool GetUseExpandContractAnimation(DependencyObject obj)
+    static partial void OnUseExpandContractAnimationChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        return (bool)obj.GetValue(UseExpandContractAnimationProperty);
-    }
-
-    public static void SetUseExpandContractAnimation(DependencyObject obj, bool value)
-    {
-        obj.SetValue(UseExpandContractAnimationProperty, value);
-    }
-
-    public static readonly DependencyProperty UseExpandContractAnimationProperty =
-        DependencyProperty.RegisterAttached("UseExpandContractAnimation", typeof(bool), typeof(Properties), new PropertyMetadata(null, (d, e) =>
+        if (d is FlyoutBase f)
         {
-            if (d is FlyoutBase f)
-            {
-                f.Opened -= F_Opened;
-                f.Opened += F_Opened;
+            f.Opened -= F_Opened;
+            f.Opened += F_Opened;
 
-                f.Closing -= F_Closing;
-                f.Closing += F_Closing;
+            f.Closing -= F_Closing;
+            f.Closing += F_Closing;
 
-                if (e.NewValue is bool b)
-                    f.AreOpenCloseAnimationsEnabled = false;
-            }
+            if (e.NewValue is bool b)
+                f.AreOpenCloseAnimationsEnabled = false;
+        }
 
-            /* 
-             * N.B: Ideally these animations would be implemented using UIElement.SetShowAnimation(...)
-             *      and UIElement.SetHideAnimation(...), however this can cause an infinite loop lockup
-             *      at the kernel level for some reason so we must manually play and control the animations.
-             */
+        /* 
+         * N.B: Ideally these animations would be implemented using UIElement.SetShowAnimation(...)
+         *      and UIElement.SetHideAnimation(...), however this can cause an infinite loop lock-up
+         *      at the kernel level for some reason so we must manually play and control the animations.
+         */
 
-            static void F_Closing(FlyoutBase sender, FlyoutBaseClosingEventArgs args)
-            {
-                FrameworkElement p = sender.GetPresenter();
+        static void F_Closing(FlyoutBase sender, FlyoutBaseClosingEventArgs args)
+        {
+            FrameworkElement p = sender.GetPresenter();
 
-                // 1. Check if we actually need to start an animation
-                if (p is null
-                    || ResourceHelper.AllowAnimation is false
-                    || (p.Tag is string t && t == "Closed"))
-                    return;
+            // 1. Check if we actually need to start an animation
+            if (p is null
+                || ResourceHelper.AllowAnimation is false
+                || (p.Tag is string t && t == "Closed"))
+                return;
 
-                args.Cancel = true;
+            args.Cancel = true;
 
-                // 2. If already closing, let the existing animation finish
-                if (p.Tag is string tg && tg == "Closing")
-                    return;
+            // 2. If already closing, let the existing animation finish
+            if (p.Tag is string tg && tg == "Closing")
+                return;
 
-                p.Tag = "Closing";
+            p.Tag = "Closing";
 
-                Visual v = p.GetElementVisual();
+            Visual v = p.GetElementVisual();
 
-                v.Compositor.CreateScopedBatch(CompositionBatchTypes.Animation,
-                    b =>
+            v.Compositor.CreateScopedBatch(CompositionBatchTypes.Animation,
+                b =>
+                {
+                    var popClose = v.GetCached("UECPopupContract", () =>
                     {
-                        var popClose = v.GetCached("UECPopupContract", () =>
-                        {
-                            var ease = v.GetCached("ExitEase",
-                                () => v.Compositor.CreateCubicBezierEasingFunction(0.7f, 0.0f, 1.0f, 0.5f));
+                        var ease = v.GetCached("ExitEase",
+                            () => v.Compositor.CreateCubicBezierEasingFunction(0.7f, 0.0f, 1.0f, 0.5f));
 
-                            var scale = v.CreateVector3KeyFrameAnimation(nameof(Visual.Scale))
-                                            .AddScaleKeyFrame(0, 1)
-                                            .AddKeyFrame(1.0f, "Vector3(Min(0.01, 20.0 / this.Target.Size.X), Min(0.01, 20.0 / this.Target.Size.Y), 1.0)", ease)
-                                            .SetDuration(0.15);
+                        var scale = v.CreateVector3KeyFrameAnimation(nameof(Visual.Scale))
+                                        .AddScaleKeyFrame(0, 1)
+                                        .AddKeyFrame(1.0f, "Vector3(Min(0.01, 20.0 / this.Target.Size.X), Min(0.01, 20.0 / this.Target.Size.Y), 1.0)", ease)
+                                        .SetDuration(0.15);
 
-                            var step = v.Compositor.CreateStepEasingFunction();
-                            step.IsFinalStepSingleFrame = true;
+                        var step = v.Compositor.CreateStepEasingFunction();
+                        step.IsFinalStepSingleFrame = true;
 
-                            var op = v.CreateScalarKeyFrameAnimation(nameof(Visual.Opacity))
-                                        .AddKeyFrame(1, 0, step)
-                                        .SetDuration(0.13);
+                        var op = v.CreateScalarKeyFrameAnimation(nameof(Visual.Opacity))
+                                    .AddKeyFrame(1, 0, step)
+                                    .SetDuration(0.13);
 
-                            return v.Compositor.CreateAnimationGroup(scale, op);
-                        });
-
-                        v.StartAnimation(popClose);
-                    },
-                    b =>
-                    {
-                        if ((string)p.Tag == "Closing")
-                        {
-                            p.Tag = "Closed";
-                            sender.Hide();
-                        }
+                        return v.Compositor.CreateAnimationGroup(scale, op);
                     });
-            }
-
-            static void F_Opened(object sender, object e)
-            {
-                if ((sender is FlyoutBase flyout
-                    && flyout.GetPresenter() is FrameworkElement presenter) is false)
-                    return;
 
-                Visual v = presenter.GetElementVisual();
-                presenter.Tag = "Opening";
-
-                // 1. Disable animation if turned off
-                if (GetUseExpandContractAnimation(flyout) is false
-                    || ResourceHelper.AllowAnimation is false)
-                {
-                    presenter.SetHideAnimation(null);
-                    v.Scale = new(1f);
-                    v.Opacity = 1;
-                    presenter.Tag = "Open";
-                    return;
-                }
-
-                // 2. Set scale origin
-                if (v.Scale.X == 1) // If animation has played previously scale will not be 1
+                    v.StartAnimation(popClose);
+                },
+                b =>
                 {
-                    if (presenter.RenderTransformOrigin.X != 0 || presenter.RenderTransformOrigin.Y != 0)
+                    if ((string)p.Tag == "Closing")
                     {
-                        CompositionFactory.StartCentering(
-                            v, (float)presenter.RenderTransformOrigin.X, (float)presenter.RenderTransformOrigin.Y);
+                        p.Tag = "Closed";
+                        sender.Hide();
                     }
-                }
+                });
+        }
 
-                // 3. Create Expand animation and play it
-                var popOpen = v.GetCached("UECPopupExpand", () =>
-                {
-                    var scale = v.CreateVector3KeyFrameAnimation(nameof(Visual.Scale))
-                            .AddKeyFrame(0.0f, "Vector3(Min(0.01, 20.0 / this.Target.Size.X), Min(0.01, 20.0 / this.Target.Size.Y), 1.0)")
-                            .AddScaleKeyFrame(1, 1, v.Compositor.GetCachedEntranceEase())
-                            .SetDuration(0.3);
+        static void F_Opened(object sender, object e)
+        {
+            if ((sender is FlyoutBase flyout
+                && flyout.GetPresenter() is FrameworkElement presenter) is false)
+                return;
 
-                    var op = v.CreateScalarKeyFrameAnimation(nameof(Visual.Opacity))
-                        .SetDuration(0.1)
-                        .AddKeyFrame(0, 1)
-                        .AddKeyFrame(1, 1);
+            Visual v = presenter.GetElementVisual();
+            presenter.Tag = "Opening";
 
-                    return v.Compositor.CreateAnimationGroup(scale, op);
-                });
+            // 1. Disable animation if turned off
+            if (GetUseExpandContractAnimation(flyout) is false
+                || ResourceHelper.AllowAnimation is false)
+            {
+                presenter.SetHideAnimation(null);
+                v.Scale = new(1f);
+                v.Opacity = 1;
+                presenter.Tag = "Open";
+                return;
+            }
 
-                v.StartAnimation(popOpen);
+            // 2. Set scale origin
+            if (v.Scale.X == 1) // If animation has played previously scale will not be 1
+            {
+                if (presenter.RenderTransformOrigin.X != 0 || presenter.RenderTransformOrigin.Y != 0)
+                {
+                    CompositionFactory.StartCentering(
+                        v, (float)presenter.RenderTransformOrigin.X, (float)presenter.RenderTransformOrigin.Y);
+                }
             }
-        }));
 
-    #endregion
+            // 3. Create Expand animation and play it
+            var popOpen = v.GetCached("UECPopupExpand", () =>
+            {
+                var scale = v.CreateVector3KeyFrameAnimation(nameof(Visual.Scale))
+                        .AddKeyFrame(0.0f, "Vector3(Min(0.01, 20.0 / this.Target.Size.X), Min(0.01, 20.0 / this.Target.Size.Y), 1.0)")
+                        .AddScaleKeyFrame(1, 1, v.Compositor.GetCachedEntranceEase())
+                        .SetDuration(0.3);
 
-    #region UseStandardReposition
+                var op = v.CreateScalarKeyFrameAnimation(nameof(Visual.Opacity))
+                    .SetDuration(0.1)
+                    .AddKeyFrame(0, 1)
+                    .AddKeyFrame(1, 1);
 
-    public static bool GetUseStandardReposition(DependencyObject obj)
-    {
-        return (bool)obj.GetValue(UseStandardRepositionProperty);
-    }
+                return v.Compositor.CreateAnimationGroup(scale, op);
+            });
 
-    public static void SetUseStandardReposition(DependencyObject obj, bool value)
-    {
-        obj.SetValue(UseStandardRepositionProperty, value);
+            v.StartAnimation(popOpen);
+        }
     }
 
-    public static readonly DependencyProperty UseStandardRepositionProperty =
-        DependencyProperty.RegisterAttached("UseStandardReposition", typeof(bool), typeof(Properties), new PropertyMetadata(false, (d, e) =>
-        {
-            if (d is FrameworkElement f && e.NewValue is bool b)
-            {
-                if (b)
-                    CompositionFactory.SetStandardReposition(f);
-                else
-                    CompositionFactory.DisableStandardReposition(f);
-            }
-        }));
-
     #endregion
 
-    #region ItemContainerTransitions
+    #region Flyout
 
-    public static TransitionCollection GetItemContainerTransitions(DependencyObject obj)
+    static partial void OnFlyoutChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        return (TransitionCollection)obj.GetValue(ItemContainerTransitionsProperty);
-    }
+        if (d is ButtonBase b)
+        {
+            b.Click -= ButtonFlyoutClick;
+            b.Click += ButtonFlyoutClick;
+        }
 
-    public static void SetItemContainerTransitions(DependencyObject obj, TransitionCollection value)
-    {
-        obj.SetValue(ItemContainerTransitionsProperty, value);
+        static void ButtonFlyoutClick(object sender, RoutedEventArgs e)
+        {
+            if (sender is ButtonBase b && GetFlyout(b) is FlyoutBase fly)
+                fly.ShowAt(b);
+        }
     }
 
-    public static readonly DependencyProperty ItemContainerTransitionsProperty =
-        DependencyProperty.RegisterAttached("ItemContainerTransitions", typeof(TransitionCollection), typeof(Properties), new PropertyMetadata(null));
-
     #endregion
 
-    #region ChildrenTransitions
-
-    public static TransitionCollection GetChildrenTransitions(DependencyObject obj)
-    {
-        return (TransitionCollection)obj.GetValue(ChildrenTransitionsProperty);
-    }
+    #region UseStandardReposition
 
-    public static void SetChildrenTransitions(DependencyObject obj, TransitionCollection value)
+    static partial void OnUseStandardRepositionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        obj.SetValue(ChildrenTransitionsProperty, value);
+        if (d is FrameworkElement f && e.NewValue is bool b)
+        {
+            if (b)
+                CompositionFactory.SetStandardReposition(f);
+            else
+                CompositionFactory.DisableStandardReposition(f);
+        }
     }
 
-    public static readonly DependencyProperty ChildrenTransitionsProperty =
-        DependencyProperty.RegisterAttached("ChildrenTransitions", typeof(TransitionCollection), typeof(Properties), new PropertyMetadata(null));
-
     #endregion
 
     #region SupportAnimatedIcon
 
-    public static bool GetSupportAnimatedIcon(DependencyObject obj)
-    {
-        return (bool)obj.GetValue(SupportAnimatedIconProperty);
-    }
-
-    public static void SetSupportAnimatedIcon(DependencyObject obj, bool value)
+    static partial void OnSupportAnimatedIconChanged(DependencyObject d, DependencyPropertyChangedEventArgs a)
     {
-        obj.SetValue(SupportAnimatedIconProperty, value);
-    }
-
-    public static readonly DependencyProperty SupportAnimatedIconProperty =
-        DependencyProperty.RegisterAttached("SupportAnimatedIcon", typeof(bool), typeof(Properties), new PropertyMetadata(false, (d, a) =>
+        if (d is FrameworkElement e)
         {
-            if (d is FrameworkElement e)
-            {
-                AnimatedIcon.SetState(e, "Normal");
+            AnimatedIcon.SetState(e, "Normal");
 
-                e.RemoveHandler(UIElement.PointerPressedEvent, (PointerEventHandler)PointerPressed);
-                e.RemoveHandler(UIElement.PointerReleasedEvent, (PointerEventHandler)PointerReleased);
+            e.RemoveHandler(UIElement.PointerPressedEvent, (PointerEventHandler)PointerPressed);
+            e.RemoveHandler(UIElement.PointerReleasedEvent, (PointerEventHandler)PointerReleased);
 
-                e.PointerEntered -= PointerEntered;
-                e.PointerExited -= PointerReleased;
+            e.PointerEntered -= PointerEntered;
+            e.PointerExited -= PointerReleased;
 
-                if (a.NewValue is bool b && b)
-                {
-                    e.AddHandler(FrameworkElement.PointerPressedEvent, new PointerEventHandler(PointerPressed), true);
-                    e.AddHandler(FrameworkElement.PointerReleasedEvent, new PointerEventHandler(PointerReleased), true);
+            if (a.NewValue is bool b && b)
+            {
+                e.AddHandler(FrameworkElement.PointerPressedEvent, new PointerEventHandler(PointerPressed), true);
+                e.AddHandler(FrameworkElement.PointerReleasedEvent, new PointerEventHandler(PointerReleased), true);
 
-                    e.PointerEntered += PointerEntered;
-                    e.PointerExited += PointerReleased;
-                }
+                e.PointerEntered += PointerEntered;
+                e.PointerExited += PointerReleased;
             }
+        }
 
-            static void PointerPressed(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
-            {
-                if (ResourceHelper.AllowAnimation)
-                    AnimatedIcon.SetState((FrameworkElement)sender, "Pressed");
-            }
+        static void PointerPressed(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
+        {
+            if (ResourceHelper.AllowAnimation)
+                AnimatedIcon.SetState((FrameworkElement)sender, "Pressed");
+        }
 
-            static void PointerEntered(object sender, PointerRoutedEventArgs e)
-            {
-                if (ResourceHelper.AllowAnimation)
-                    AnimatedIcon.SetState((FrameworkElement)sender, "PointerOver");
-            }
+        static void PointerEntered(object sender, PointerRoutedEventArgs e)
+        {
+            if (ResourceHelper.AllowAnimation)
+                AnimatedIcon.SetState((FrameworkElement)sender, "PointerOver");
+        }
 
-            static void PointerReleased(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
-            {
-                AnimatedIcon.SetState((FrameworkElement)sender, "Normal");
-            }
-        }));
+        static void PointerReleased(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
+        {
+            AnimatedIcon.SetState((FrameworkElement)sender, "Normal");
+        }
+    }
 
     #endregion
 
     #region AttachedStates
 
-    public static bool GetUseAttachedStates(DependencyObject obj)
-    {
-        return (bool)obj.GetValue(UseAttachedStatesProperty);
-    }
-
-    public static void SetUseAttachedStates(DependencyObject obj, bool value)
+    static partial void OnUseAttachedStatesChanged(DependencyObject d, DependencyPropertyChangedEventArgs a)
     {
-        obj.SetValue(UseAttachedStatesProperty, value);
-    }
-
-    public static readonly DependencyProperty UseAttachedStatesProperty =
-        DependencyProperty.RegisterAttached("UseAttachedStates", typeof(bool), typeof(Properties), new PropertyMetadata(false, (d, a) =>
+        if (d is FrameworkElement e)
         {
-            if (d is FrameworkElement e)
-            {
-                e.RemoveHandler(UIElement.PointerPressedEvent, (PointerEventHandler)PointerPressed);
-                e.RemoveHandler(UIElement.PointerReleasedEvent, (PointerEventHandler)PointerReleased);
+            e.RemoveHandler(UIElement.PointerPressedEvent, (PointerEventHandler)PointerPressed);
+            e.RemoveHandler(UIElement.PointerReleasedEvent, (PointerEventHandler)PointerReleased);
 
-                e.PointerEntered -= PointerEntered;
-                e.PointerExited -= PointerExited;
+            e.PointerEntered -= PointerEntered;
+            e.PointerExited -= PointerExited;
 
-                if (a.NewValue is bool b && b)
-                {
-                    e.AddHandler(FrameworkElement.PointerPressedEvent, new PointerEventHandler(PointerPressed), true);
-                    e.AddHandler(FrameworkElement.PointerReleasedEvent, new PointerEventHandler(PointerReleased), true);
-
-                    e.PointerEntered += PointerEntered;
-                    e.PointerExited += PointerExited;
-                }
-
-                static bool TryStartState(FrameworkElement e, string key)
-                {
-                    if (ResourceHelper.Get<Storyboard>(e, key) is Storyboard state)
-                    {
-                        state.Begin();
-                        if (ResourceHelper.AllowAnimation is false)
-                            state.SkipToFill();
-                        return true;
-                    }
-
-                    return false;
-                }
-
-                static void PointerPressed(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs _)
-                {
-                    if (sender is FrameworkElement e && Properties.GetUseAttachedStates(e))
-                        TryStartState(e, "Pressed");
-                }
+            if (a.NewValue is bool b && b)
+            {
+                e.AddHandler(FrameworkElement.PointerPressedEvent, new PointerEventHandler(PointerPressed), true);
+                e.AddHandler(FrameworkElement.PointerReleasedEvent, new PointerEventHandler(PointerReleased), true);
 
-                static void PointerEntered(object sender, PointerRoutedEventArgs _)
-                {
-                    if (sender is FrameworkElement e && Properties.GetUseAttachedStates(e))
-                        TryStartState(e, "PointerOver");
-                }
+                e.PointerEntered += PointerEntered;
+                e.PointerExited += PointerExited;
+            }
 
-                static void PointerReleased(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs _)
+            static bool TryStartState(FrameworkElement e, string key)
+            {
+                if (ResourceHelper.Get<Storyboard>(e, key) is Storyboard state)
                 {
-                    if (sender is FrameworkElement e && Properties.GetUseAttachedStates(e))
-                        TryStartState(e, "Released");
+                    state.Begin();
+                    if (ResourceHelper.AllowAnimation is false)
+                        state.SkipToFill();
+                    return true;
                 }
 
-                static void PointerExited(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs _)
-                {
-                    if (sender is FrameworkElement e && Properties.GetUseAttachedStates(e))
-                        TryStartState(e, "Normal");
-                }
+                return false;
             }
-        }));
 
+            static void PointerPressed(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs _)
+            {
+                if (sender is FrameworkElement e && Properties.GetUseAttachedStates(e))
+                    TryStartState(e, "Pressed");
+            }
 
+            static void PointerEntered(object sender, PointerRoutedEventArgs _)
+            {
+                if (sender is FrameworkElement e && Properties.GetUseAttachedStates(e))
+                    TryStartState(e, "PointerOver");
+            }
 
-    public static string GetName(DependencyObject obj)
-    {
-        return (string)obj.GetValue(NameProperty);
-    }
+            static void PointerReleased(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs _)
+            {
+                if (sender is FrameworkElement e && Properties.GetUseAttachedStates(e))
+                    TryStartState(e, "Released");
+            }
 
-    public static void SetName(DependencyObject obj, string value)
-    {
-        obj.SetValue(NameProperty, value);
+            static void PointerExited(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs _)
+            {
+                if (sender is FrameworkElement e && Properties.GetUseAttachedStates(e))
+                    TryStartState(e, "Normal");
+            }
+        }
     }
 
-    public static readonly DependencyProperty NameProperty =
-        DependencyProperty.RegisterAttached("Name", typeof(string), typeof(Properties), new PropertyMetadata(null));
-
-
-
     #endregion
 
     #region UseClickAnimation
 
-    public static string GetClickAnimation(DependencyObject obj)
+    static partial void OnClickAnimationChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        return (string)obj.GetValue(ClickAnimationProperty);
-    }
-
-    public static void SetClickAnimation(DependencyObject obj, string value)
-    {
-        obj.SetValue(ClickAnimationProperty, value);
-    }
-
-    public static readonly DependencyProperty ClickAnimationProperty =
-        DependencyProperty.RegisterAttached("ClickAnimation", typeof(string), typeof(Properties), new PropertyMetadata(null, (d, e) =>
+        if (d is FrameworkElement f)
         {
-            if (d is FrameworkElement f)
-            {
-                // 1. Remove old handlers
-                if (f is ButtonBase b)
-                    b.Click -= OnClick;
+            // 1. Remove old handlers
+            if (f is ButtonBase b)
+                b.Click -= OnClick;
 
-                f.RemoveHandler(UIElement.PointerReleasedEvent, (PointerEventHandler)Clicky);
-
-                // 2. Add new handlers
-                if (e.NewValue is string s && !string.IsNullOrWhiteSpace(s))
-                {
-                    if (f is ButtonBase bu)
-                        bu.Click += OnClick;
-                    else
-                        f.AddHandler(FrameworkElement.PointerReleasedEvent, new PointerEventHandler(Clicky), true);
-                }
+            f.RemoveHandler(UIElement.PointerReleasedEvent, (PointerEventHandler)Clicky);
 
-                static void Clicky(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs _)
-                {
-                    if (sender is FrameworkElement e
-                        && ResourceHelper.AllowAnimation
-                        && ResourceHelper.SupportFluentAnimation
-                        && Properties.GetClickAnimation(e) is string s
-                        && !string.IsNullOrWhiteSpace(s))
-                        CompButtonAnimate(e, s, GetClickAnimationOffset(e));
-                }
-
-                static void OnClick(object sender, RoutedEventArgs _)
-                {
-                    if (sender is FrameworkElement e
-                         && ResourceHelper.AllowAnimation
-                         && ResourceHelper.SupportFluentAnimation
-                         && Properties.GetClickAnimation(e) is string s
-                         && !string.IsNullOrWhiteSpace(s))
-                        CompButtonAnimate(e, s, GetClickAnimationOffset(e));
-                }
+            // 2. Add new handlers
+            if (e.NewValue is string s && !string.IsNullOrWhiteSpace(s))
+            {
+                if (f is ButtonBase bu)
+                    bu.Click += OnClick;
+                else
+                    f.AddHandler(FrameworkElement.PointerReleasedEvent, new PointerEventHandler(Clicky), true);
             }
-        }));
 
-    public static Double GetClickAnimationOffset(DependencyObject obj)
-    {
-        return (Double)obj.GetValue(ClickAnimationOffsetProperty);
-    }
+            static void Clicky(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs _)
+            {
+                if (sender is FrameworkElement e
+                    && ResourceHelper.AllowAnimation
+                    && ResourceHelper.SupportFluentAnimation
+                    && Properties.GetClickAnimation(e) is string s
+                    && !string.IsNullOrWhiteSpace(s))
+                    CompButtonAnimate(e, s, GetClickAnimationOffset(e));
+            }
 
-    public static void SetClickAnimationOffset(DependencyObject obj, Double value)
-    {
-        obj.SetValue(ClickAnimationOffsetProperty, value);
+            static void OnClick(object sender, RoutedEventArgs _)
+            {
+                if (sender is FrameworkElement e
+                     && ResourceHelper.AllowAnimation
+                     && ResourceHelper.SupportFluentAnimation
+                     && Properties.GetClickAnimation(e) is string s
+                     && !string.IsNullOrWhiteSpace(s))
+                    CompButtonAnimate(e, s, GetClickAnimationOffset(e));
+            }
+        }
     }
 
-    public static readonly DependencyProperty ClickAnimationOffsetProperty =
-        DependencyProperty.RegisterAttached("ClickAnimationOffset", typeof(Double), typeof(Properties), new PropertyMetadata(-2d));
-
     #endregion
 
     #region PointerOverAnimation
@@ -1039,349 +783,207 @@ static void CompButtonAnimate(FrameworkElement source, string key, double offset
        
     }
 
-    public static string GetPointerOverAnimation(DependencyObject obj)
-    {
-        return (string)obj.GetValue(PointerOverAnimationProperty);
-    }
-
-    public static void SetPointerOverAnimation(DependencyObject obj, string value)
+    static partial void OnPointerOverAnimationChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        obj.SetValue(PointerOverAnimationProperty, value);
-    }
-
-    public static readonly DependencyProperty PointerOverAnimationProperty =
-        DependencyProperty.RegisterAttached("PointerOverAnimation", typeof(string), typeof(Properties), new PropertyMetadata(null, (d, e) =>
+        if (d is FrameworkElement f)
         {
-            if (d is FrameworkElement f)
-            {
-                // 1. Remove old handlers
-                f.RemoveHandler(UIElement.PointerEnteredEvent, (PointerEventHandler)PointerOverEntered);
-                f.RemoveHandler(UIElement.PointerExitedEvent, (PointerEventHandler)PointerOverExited);
-                f.RemoveHandler(UIElement.PointerCaptureLostEvent, (PointerEventHandler)PointerOverExited);
-
-                // 2. Add new handlers
-                if (e.NewValue is string s && !string.IsNullOrWhiteSpace(s))
-                {
-                    f.AddHandler(FrameworkElement.PointerEnteredEvent, new PointerEventHandler(PointerOverEntered), true);
-                    f.AddHandler(FrameworkElement.PointerExitedEvent, new PointerEventHandler(PointerOverExited), true);
-                    f.AddHandler(FrameworkElement.PointerCaptureLostEvent, new PointerEventHandler(PointerOverExited), true);
+            // 1. Remove old handlers
+            f.RemoveHandler(UIElement.PointerEnteredEvent, (PointerEventHandler)PointerOverEntered);
+            f.RemoveHandler(UIElement.PointerExitedEvent, (PointerEventHandler)PointerOverExited);
+            f.RemoveHandler(UIElement.PointerCaptureLostEvent, (PointerEventHandler)PointerOverExited);
 
-                }
-
-                static void PointerOverEntered(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs _)
-                {
-                    if (sender is FrameworkElement e
-                        && ResourceHelper.AllowAnimation
-                        && ResourceHelper.SupportFluentAnimation
-                        && ResourceHelper.UsePointerOverAnimations
-                        && Properties.GetPointerOverAnimation(e) is string s
-                        && !string.IsNullOrWhiteSpace(s))
-                        CompButtonAnimate(e, s, GetPointerAnimationOffset(e), true);
-                }
+            // 2. Add new handlers
+            if (e.NewValue is string s && !string.IsNullOrWhiteSpace(s))
+            {
+                f.AddHandler(FrameworkElement.PointerEnteredEvent, new PointerEventHandler(PointerOverEntered), true);
+                f.AddHandler(FrameworkElement.PointerExitedEvent, new PointerEventHandler(PointerOverExited), true);
+                f.AddHandler(FrameworkElement.PointerCaptureLostEvent, new PointerEventHandler(PointerOverExited), true);
 
-                static void PointerOverExited(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs _)
-                {
-                    if (sender is FrameworkElement e
-                        && ResourceHelper.AllowAnimation
-                        && ResourceHelper.SupportFluentAnimation
-                        && ResourceHelper.UsePointerOverAnimations
-                        && Properties.GetPointerOverAnimation(e) is string s
-                        && !string.IsNullOrWhiteSpace(s))
-                        CompButtonAnimate(e, s, 0, true);
-                }
             }
-        }));
 
-    public static double GetPointerAnimationOffset(DependencyObject obj)
-    {
-        return (double)obj.GetValue(PointerAnimationOffsetProperty);
-    }
+            static void PointerOverEntered(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs _)
+            {
+                if (sender is FrameworkElement e
+                    && ResourceHelper.AllowAnimation
+                    && ResourceHelper.SupportFluentAnimation
+                    && ResourceHelper.UsePointerOverAnimations
+                    && Properties.GetPointerOverAnimation(e) is string s
+                    && !string.IsNullOrWhiteSpace(s))
+                    CompButtonAnimate(e, s, GetPointerAnimationOffset(e), true);
+            }
 
-    public static void SetPointerAnimationOffset(DependencyObject obj, double value)
-    {
-        obj.SetValue(PointerAnimationOffsetProperty, value);
+            static void PointerOverExited(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs _)
+            {
+                if (sender is FrameworkElement e
+                    && ResourceHelper.AllowAnimation
+                    && ResourceHelper.SupportFluentAnimation
+                    && ResourceHelper.UsePointerOverAnimations
+                    && Properties.GetPointerOverAnimation(e) is string s
+                    && !string.IsNullOrWhiteSpace(s))
+                    CompButtonAnimate(e, s, 0, true);
+            }
+        }
     }
 
-    public static readonly DependencyProperty PointerAnimationOffsetProperty =
-        DependencyProperty.RegisterAttached("PointerAnimationOffset", typeof(double), typeof(Properties), new PropertyMetadata(-2d));
-
     #endregion
 
     #region PointerPressedAnimation
 
-    public static string GetPointerPressedAnimation(DependencyObject obj)
+    static partial void OnPointerPressedAnimationChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        return (string)obj.GetValue(PointerPressedAnimationProperty);
-    }
-
-    public static void SetPointerPressedAnimation(DependencyObject obj, string value)
-    {
-        obj.SetValue(PointerPressedAnimationProperty, value);
-    }
-
-    public static readonly DependencyProperty PointerPressedAnimationProperty =
-        DependencyProperty.RegisterAttached("PointerPressedAnimation", typeof(string), typeof(Properties), new PropertyMetadata(null, (d, e) =>
+        if (d is FrameworkElement f)
         {
-            if (d is FrameworkElement f)
+            // 1. Remove old handlers
+            f.RemoveHandler(UIElement.PointerPressedEvent, (PointerEventHandler)PointerPressed);
+            f.RemoveHandler(UIElement.PointerExitedEvent, (PointerEventHandler)PointerExited);
+
+            // 2. Add new handlers
+            if (e.NewValue is string s && !string.IsNullOrWhiteSpace(s))
             {
-                // 1. Remove old handlers
-                f.RemoveHandler(UIElement.PointerPressedEvent, (PointerEventHandler)PointerPressed);
-                f.RemoveHandler(UIElement.PointerExitedEvent, (PointerEventHandler)PointerExited);
+                f.AddHandler(FrameworkElement.PointerPressedEvent, new PointerEventHandler(PointerPressed), true);
+                f.AddHandler(FrameworkElement.PointerExitedEvent, new PointerEventHandler(PointerExited), true);
+            }
 
-                // 2. Add new handlers
-                if (e.NewValue is string s && !string.IsNullOrWhiteSpace(s))
-                {
-                    f.AddHandler(FrameworkElement.PointerPressedEvent, new PointerEventHandler(PointerPressed), true);
-                    f.AddHandler(FrameworkElement.PointerExitedEvent, new PointerEventHandler(PointerExited), true);
-                }
+            static void PointerPressed(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs _)
+            {
+                if (sender is FrameworkElement e
+                    && ResourceHelper.AllowAnimation
+                    && ResourceHelper.SupportFluentAnimation
+                    && Properties.GetPointerPressedAnimation(e) is string s
+                    && !string.IsNullOrWhiteSpace(s))
+                    DoAnimate(e, s, GetClickAnimationOffset(e));
+            }
 
-                static void PointerPressed(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs _)
-                {
-                    if (sender is FrameworkElement e
-                        && ResourceHelper.AllowAnimation
-                        && ResourceHelper.SupportFluentAnimation
-                        && Properties.GetPointerPressedAnimation(e) is string s
-                        && !string.IsNullOrWhiteSpace(s))
-                        DoAnimate(e, s, GetClickAnimationOffset(e));
-                }
+            static void PointerExited(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs _)
+            {
+                if (sender is FrameworkElement e
+                    && ResourceHelper.AllowAnimation
+                    && ResourceHelper.SupportFluentAnimation
+                    && Properties.GetPointerPressedAnimation(e) is string s
+                    && !string.IsNullOrWhiteSpace(s))
+                    RestoreAnimate(e, s);
+            }
 
-                static void PointerExited(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs _)
+            static void RestoreAnimate(FrameworkElement source, string key)
+            {
+                var parts = key.Split("|");
+                if (source.GetDescendantsOfType<FrameworkElement>()
+                    .FirstOrDefault(fe => fe.Name == parts[0]) is FrameworkElement target)
                 {
-                    if (sender is FrameworkElement e
-                        && ResourceHelper.AllowAnimation
-                        && ResourceHelper.SupportFluentAnimation
-                        && Properties.GetPointerPressedAnimation(e) is string s
-                        && !string.IsNullOrWhiteSpace(s))
-                        RestoreAnimate(e, s);
-                }
+                    double duration = 0.35;
 
-                static void RestoreAnimate(FrameworkElement source, string key)
-                {
-                    var parts = key.Split("|");
-                    if (source.GetDescendantsOfType<FrameworkElement>()
-                        .FirstOrDefault(fe => fe.Name == parts[0]) is FrameworkElement target)
+                    if (parts.Length > 1 && parts[1] == "Scale")
                     {
-                        double duration = 0.35;
-
-                        if (parts.Length > 1 && parts[1] == "Scale")
-                        {
-                            Visual v = target.GetElementVisual();
-                            v.StartAnimation(FluentAnimationHelper.CreatePointerUp(v));
-                        }
-                        else
-                        {
-                            Storyboard sb = new();
-                            var ease = new BackEase { Amplitude = 0.5, EasingMode = EasingMode.EaseOut };
-                            // Create translate animation
-                            var t = sb.CreateTimeline<DoubleAnimationUsingKeyFrames>(target, TargetProperty.CompositeTransform.TranslateY)
-                                .AddKeyFrame(duration, 0, ease);
-                            sb.Begin();
+                        Visual v = target.GetElementVisual();
+                        v.StartAnimation(FluentAnimationHelper.CreatePointerUp(v));
+                    }
+                    else
+                    {
+                        Storyboard sb = new();
+                        var ease = new BackEase { Amplitude = 0.5, EasingMode = EasingMode.EaseOut };
+                        // Create translate animation
+                        var t = sb.CreateTimeline<DoubleAnimationUsingKeyFrames>(target, TargetProperty.CompositeTransform.TranslateY)
+                            .AddKeyFrame(duration, 0, ease);
+                        sb.Begin();
 
-                        }
                     }
                 }
+            }
 
-                static void DoAnimate(FrameworkElement source, string key, double offset)
+            static void DoAnimate(FrameworkElement source, string key, double offset)
+            {
+                var parts = key.Split("|");
+                if (source.GetDescendantsOfType<FrameworkElement>()
+                    .FirstOrDefault(fe => fe.Name == parts[0]) is FrameworkElement target)
                 {
-                    var parts = key.Split("|");
-                    if (source.GetDescendantsOfType<FrameworkElement>()
-                        .FirstOrDefault(fe => fe.Name == parts[0]) is FrameworkElement target)
-                    {
 
-                        if (parts.Length > 1 && parts[1] == "Scale")
-                        {
-                            Visual v = target.GetElementVisual();
-                            v.StartAnimation(FluentAnimationHelper.CreatePointerDown(v, (float)offset));
-                        }
-                        else
-                        {
-                            // Create translate animation
-                            Storyboard sb = new();
-                            var ease = new BackEase { Amplitude = 0.5, EasingMode = EasingMode.EaseOut };
-                            sb.CreateTimeline<DoubleAnimationUsingKeyFrames>(target, TargetProperty.CompositeTransform.TranslateY)
-                                .AddKeyFrame(0.15, offset)
-                                .AddKeyFrame(0.5, 0, ease);
-
-                            sb.Begin();
-                        }
+                    if (parts.Length > 1 && parts[1] == "Scale")
+                    {
+                        Visual v = target.GetElementVisual();
+                        v.StartAnimation(FluentAnimationHelper.CreatePointerDown(v, (float)offset));
+                    }
+                    else
+                    {
+                        // Create translate animation
+                        Storyboard sb = new();
+                        var ease = new BackEase { Amplitude = 0.5, EasingMode = EasingMode.EaseOut };
+                        sb.CreateTimeline<DoubleAnimationUsingKeyFrames>(target, TargetProperty.CompositeTransform.TranslateY)
+                            .AddKeyFrame(0.15, offset)
+                            .AddKeyFrame(0.5, 0, ease);
+
+                        sb.Begin();
                     }
                 }
             }
-        }));
+        }
+    }
 
     #endregion
 
     #region ItemContainerBackgroundTransition
 
-    private static bool GetSetContainerBackgroundTransition(DependencyObject obj)
-    {
-        return (bool)obj.GetValue(SetContainerBackgroundTransitionProperty);
-    }
-
-    private static void SetSetContainerBackgroundTransition(DependencyObject obj, bool value)
+    static partial void OnItemContainerBackgroundTransitionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        obj.SetValue(SetContainerBackgroundTransitionProperty, value);
-    }
-
-    public static readonly DependencyProperty SetContainerBackgroundTransitionProperty =
-        DependencyProperty.RegisterAttached("SetContainerBackgroundTransition", typeof(bool), typeof(Properties), new PropertyMetadata(false));
-
-
-    public static BrushTransition GetItemContainerBackgroundTransition(DependencyObject obj)
-    {
-        return (BrushTransition)obj.GetValue(ItemContainerBackgroundTransitionProperty);
-    }
-
-    public static void SetItemContainerBackgroundTransition(DependencyObject obj, BrushTransition value)
-    {
-        obj.SetValue(ItemContainerBackgroundTransitionProperty, value);
-    }
-
-    public static readonly DependencyProperty ItemContainerBackgroundTransitionProperty =
-        DependencyProperty.RegisterAttached("ItemContainerBackgroundTransition", typeof(BrushTransition), typeof(Properties), new PropertyMetadata(null, (d, e) =>
+        if (d is ListViewBase b)
         {
-            if (d is ListViewBase b)
-            {
-                b.ContainerContentChanging -= ContainerContentChanging;
-                b.ContainerContentChanging += ContainerContentChanging;
-            }
+            b.ContainerContentChanging -= ContainerContentChanging;
+            b.ContainerContentChanging += ContainerContentChanging;
+        }
 
-            static void ContainerContentChanging(ListViewBase sender, ContainerContentChangingEventArgs args)
+        static void ContainerContentChanging(ListViewBase sender, ContainerContentChangingEventArgs args)
+        {
+            if (args.ItemContainer is not null
+                && GetSetContainerBackgroundTransition(args.ItemContainer) is false
+                && args.ItemContainer.ContentTemplateRoot is not null)
             {
-                if (args.ItemContainer is not null
-                    && GetSetContainerBackgroundTransition(args.ItemContainer) is false
-                    && args.ItemContainer.ContentTemplateRoot is not null)
-                {
-                    SetSetContainerBackgroundTransition(args.ItemContainer, true);
+                SetSetContainerBackgroundTransition(args.ItemContainer, true);
 
-                    var c = VisualTreeHelper.GetChild(args.ItemContainer, 0);
-                    var b = VisualTreeHelper.GetChild(c, 0);
-                    if (b is Border br && br.BackgroundTransition is null)
-                        br.BackgroundTransition = ResourceHelper.AllowAnimation ? GetItemContainerBackgroundTransition(sender) as BrushTransition : null;
-                }
+                var c = VisualTreeHelper.GetChild(args.ItemContainer, 0);
+                var b = VisualTreeHelper.GetChild(c, 0);
+                if (b is Border br && br.BackgroundTransition is null)
+                    br.BackgroundTransition = ResourceHelper.AllowAnimation ? GetItemContainerBackgroundTransition(sender) as BrushTransition : null;
             }
-        }));
+        }
+    }
 
     #endregion
 
     #region Uppercase
 
-    public static string GetUppercase(DependencyObject obj)
+    static partial void OnUppercaseChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        return (string)obj.GetValue(UppercaseProperty);
+        if (d is TextBlock t && e.NewValue is string s)
+            t.Text = (s ?? string.Empty).ToUpper();
     }
 
-    public static void SetUppercase(DependencyObject obj, string value)
-    {
-        obj.SetValue(UppercaseProperty, value);
-    }
-
-    public static readonly DependencyProperty UppercaseProperty =
-        DependencyProperty.RegisterAttached("Uppercase", typeof(string), typeof(Properties), new PropertyMetadata(string.Empty, (d, e) =>
-        {
-            if (d is TextBlock t && e.NewValue is string s)
-                t.Text = (s ?? string.Empty).ToUpper();
-        }));
-
     #endregion
 
     #region DisableTranslation 
 
-    public static bool GetDisableTranslation(DependencyObject obj)
+    static partial void OnDisableTranslationChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        return (bool)obj.GetValue(DisableTranslationProperty);
-    }
-
-    public static void SetDisableTranslation(DependencyObject obj, bool value)
-    {
-        obj.SetValue(DisableTranslationProperty, value);
-    }
-
-    public static readonly DependencyProperty DisableTranslationProperty =
-        DependencyProperty.RegisterAttached("DisableTranslation", typeof(bool), typeof(Properties), new PropertyMetadata(false, (d, e) =>
+        // Fix offset ComboBox's caused by global PerspectiveTransform3D
+        if (d is Popup popup && e.NewValue is bool s && s)
         {
-            // Fix offset ComboBox's caused by global PerspectiveTransform3D
-            if (d is Popup popup && e.NewValue is bool s && s)
+            popup.Opened += async (src, arg) =>
             {
-                popup.Opened += async (src, arg) =>
-                {
-                    //await Task.Delay(32);
-                    if (src is Popup pp && pp.Child?.GetFirstDescendantOfType<Border>() is Border b)
-                        b.Translation = new();
-                };
-            }
-        }));
-    #endregion
-
-    #region Footer
-
-    public static object GetFooter(DependencyObject obj)
-    {
-        return (object)obj.GetValue(FooterProperty);
-    }
-
-    public static void SetFooter(DependencyObject obj, object value)
-    {
-        obj.SetValue(FooterProperty, value);
+                //await Task.Delay(32);
+                if (src is Popup pp && pp.Child?.GetFirstDescendantOfType<Border>() is Border b)
+                    b.Translation = new();
+            };
+        }
     }
 
-    public static readonly DependencyProperty FooterProperty =
-        DependencyProperty.RegisterAttached("Footer", typeof(object), typeof(Properties), new PropertyMetadata(null));
-
     #endregion
 
     #region RenderScale
 
-    public static double GetRenderScale(DependencyObject obj)
-    {
-        return (double)obj.GetValue(RenderScaleProperty);
-    }
-
-    public static void SetRenderScale(DependencyObject obj, double value)
-    {
-        obj.SetValue(RenderScaleProperty, value);
-    }
-
-    // Using a DependencyProperty as the backing store for RenderScale.  This enables animation, styling, binding, etc...
-    public static readonly DependencyProperty RenderScaleProperty =
-        DependencyProperty.RegisterAttached("RenderScale", typeof(double), typeof(Properties), new PropertyMetadata(1d, (d, e) =>
-        {
-            if (d is FrameworkElement f && e.NewValue is double s)
-            {
-                var ct = f.GetCompositeTransform();
-                ct.ScaleX = ct.ScaleY = s;
-            }
-        }));
-
-    #endregion
-
-    #region Flyout
-
-    public static FlyoutBase GetFlyout(DependencyObject obj)
-    {
-        return (FlyoutBase)obj.GetValue(FlyoutProperty);
-    }
-
-    public static void SetFlyout(DependencyObject obj, FlyoutBase value)
-    {
-        obj.SetValue(FlyoutProperty, value);
-    }
-
-    public static readonly DependencyProperty FlyoutProperty =
-        DependencyProperty.RegisterAttached("Flyout", typeof(FlyoutBase), typeof(Properties), new PropertyMetadata(null, (d, e) =>
-        {
-            if (d is ButtonBase b)
-            {
-                b.Click -= ButtonFlyoutClick;
-                b.Click += ButtonFlyoutClick;
-            }
-        }));
-
-    private static void ButtonFlyoutClick(object sender, RoutedEventArgs e)
+    static partial void OnRenderScaleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        if (sender is ButtonBase b && GetFlyout(b) is FlyoutBase fly)
+        if (d is FrameworkElement f && e.NewValue is double s)
         {
-            fly.ShowAt(b);
+            var ct = f.GetCompositeTransform();
+            ct.ScaleX = ct.ScaleY = s;
         }
     }
 
@@ -1389,53 +991,29 @@ private static void ButtonFlyoutClick(object sender, RoutedEventArgs e)
 
     #region Rotation
 
-    public static double GetRotation(DependencyObject obj)
-    {
-        return (double)obj.GetValue(RotationProperty);
-    }
-
-    public static void SetRotation(DependencyObject obj, double value)
+    static partial void OnRotationChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        obj.SetValue(RotationProperty, value);
-    }
-
-    public static readonly DependencyProperty RotationProperty =
-        AP<double, Properties>(0d, (d, e) =>
+        if (d is FrameworkElement f && f.GetElementVisual() is { } v && e.NewValue is double n)
         {
-            if (d is FrameworkElement f && f.GetElementVisual() is { } v && e.NewValue is double n)
-            {
-                v.CenterPoint = new(v.Size / 2f, 0f);
-                v.RotationAxis = Vector3.UnitZ;
-                v.RotationAngleInDegrees = (float)n;
-            }
-        });
-
-    public static KeyTime GetRotationTransition(DependencyObject obj)
-    {
-        return (KeyTime)obj.GetValue(RotationTransitionProperty);
+            v.CenterPoint = new(v.Size / 2f, 0f);
+            v.RotationAxis = Vector3.UnitZ;
+            v.RotationAngleInDegrees = (float)n;
+        }
     }
 
-    public static void SetRotationTransition(DependencyObject obj, KeyTime value)
+    static partial void OnRotationTransitionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        obj.SetValue(RotationTransitionProperty, value);
-    }
-
-    public static readonly DependencyProperty RotationTransitionProperty =
-        AP<KeyTime, Properties>(KeyTime.FromTimeSpan(TimeSpan.Zero), (d, e) =>
+        if (d is FrameworkElement f
+                 && f.GetElementVisual() is { } v
+                 && e.NewValue is KeyTime n)
         {
-            if (d is FrameworkElement f
-                && f.GetElementVisual() is { } v 
-                && e.NewValue is KeyTime n)
-            {
-                v.SetImplicitAnimation(nameof(Visual.RotationAngleInDegrees),
-                    v.CreateScalarKeyFrameAnimation(nameof(Visual.RotationAngleInDegrees))
-                    .AddKeyFrame(0, CompositionFactory.STARTING_VALUE)
-                    .AddKeyFrame(1, CompositionFactory.FINAL_VALUE)
-                    .SetDuration(n.TimeSpan));
-            }
-        });
+            v.SetImplicitAnimation(nameof(Visual.RotationAngleInDegrees),
+                v.CreateScalarKeyFrameAnimation(nameof(Visual.RotationAngleInDegrees))
+                .AddKeyFrame(0, CompositionFactory.STARTING_VALUE)
+                .AddKeyFrame(1, CompositionFactory.FINAL_VALUE)
+                .SetDuration(n.TimeSpan));
+        }
+    }
 
     #endregion
-
-
 }
diff --git a/CharacterMap/CharacterMap/Helpers/Extensions.cs b/CharacterMap/CharacterMap/Helpers/Extensions.cs
index 65d98088..34f8c4fb 100644
--- a/CharacterMap/CharacterMap/Helpers/Extensions.cs
+++ b/CharacterMap/CharacterMap/Helpers/Extensions.cs
@@ -195,4 +195,22 @@ public static List<SQLiteFontCollection> AsFontCollections(this SQLiteCommand cm
         return results;
     }
 
+    public static List<SQLiteSmartFontCollection> AsSmartFontCollections(this SQLiteCommand cmd)
+    {
+        using var statement = cmd.Prepare();
+
+        List<SQLiteSmartFontCollection> results = [];
+        while (SQLite3.Step(statement) == SQLite3.Result.Row)
+        {
+            results.Add(new()
+            {
+                Id = SQLite3.ColumnInt(statement, 0),
+                Name = SQLite3.ColumnString(statement, 1),
+                Filters = SQLite3.ColumnString(statement, 2)
+            });
+        }
+
+        return results;
+    }
+
 }
diff --git a/CharacterMap/CharacterMap/Helpers/FlyoutHelper.cs b/CharacterMap/CharacterMap/Helpers/FlyoutHelper.cs
index da813f4a..d2cd0f00 100644
--- a/CharacterMap/CharacterMap/Helpers/FlyoutHelper.cs
+++ b/CharacterMap/CharacterMap/Helpers/FlyoutHelper.cs
@@ -323,9 +323,9 @@ public static T SetAnimation<T>(this T item) where T : MenuFlyoutItemBase
         return item;
     }
 
-    public static void TryAddRemoveFromCollection(MenuFlyout menu, InstalledFont font, UserFontCollection collection, BasicFontFilter filter)
+    public static void TryAddRemoveFromCollection(MenuFlyout menu, InstalledFont font, IFontCollection col, BasicFontFilter filter)
     {
-        if (collection is null)
+        if (col is not UserFontCollection collection)
             return;
 
         if ((collection != null || (filter == BasicFontFilter.SymbolFonts && !font.IsSymbolFont))
diff --git a/CharacterMap/CharacterMap/Provider/SQLiteCollectionProvider.cs b/CharacterMap/CharacterMap/Provider/SQLiteCollectionProvider.cs
index b033ccfb..f9f89f61 100644
--- a/CharacterMap/CharacterMap/Provider/SQLiteCollectionProvider.cs
+++ b/CharacterMap/CharacterMap/Provider/SQLiteCollectionProvider.cs
@@ -7,17 +7,27 @@ public class SQLiteCollectionProvider : ICollectionProvider
     private SQLiteConnection _conn { get; set; }
 
     private PreparedSqlLiteInsertCommand _ins { get; set; }
+    private PreparedSqlLiteInsertCommand _smins { get; set; }
 
-    public Task<List<UserFontCollection>> LoadCollectionsAsync()
+    private PreparedSqlLiteInsertCommand GetInsert(IFontCollection c) => c is UserFontCollection ? _ins : _smins;
+    private string GetTable(IFontCollection c) => c is UserFontCollection ? "Collections" : "SmartCollections";
+    private string GetArgs(IFontCollection c) => c is UserFontCollection ? "Fonts" : "Filters";
+
+
+    public Task<IReadOnlyList<IFontCollection>> LoadCollectionsAsync()
     {
         PrepareConnection();
-        List<UserFontCollection> collections = new();
+        List<IFontCollection> collections = [];
 
         try
         {
             var cols = _conn.CreateCommand("SELECT * FROM \"Collections\" ORDER BY Name").AsFontCollections();
             foreach (var c in cols)
                 collections.Add(c.AsUserFontCollection());
+
+            var smarts = _conn.CreateCommand("SELECT * FROM \"SmartCollections\" ORDER BY Name").AsSmartFontCollections();
+            foreach (var c in smarts)
+                collections.Add(c.AsSmartFontCollection());
         }
         catch (Exception ex) when (ex.Message.StartsWith("no such table"))
         {
@@ -27,13 +37,14 @@ public Task<List<UserFontCollection>> LoadCollectionsAsync()
             return LoadCollectionsAsync();
         }
 
-        return Task.FromResult(collections);
+        return Task.FromResult((IReadOnlyList<IFontCollection>)collections);
     }
 
-    public async Task<bool> DeleteCollectionAsync(UserFontCollection collection)
+    public async Task<bool> DeleteCollectionAsync(IFontCollection collection)
     {
         PrepareConnection();
-        if (1 == _conn.Execute($"DELETE FROM \"Collections\" WHERE Id = ?", collection.Id))
+
+        if (1 == _conn.Execute($"DELETE FROM \"{GetTable(collection)}\" WHERE Id = ?", collection.Id))
         {
             await VacuumAsync();
             return true;
@@ -42,26 +53,30 @@ public async Task<bool> DeleteCollectionAsync(UserFontCollection collection)
         return false;
     }
 
-    public Task SaveCollectionAsync(UserFontCollection collection)
+    
+
+    public Task SaveCollectionAsync(IFontCollection c)
     {
         return Task.Run(() =>
         {
             PrepareConnection();
 
-            if (collection.Id == 0)
+            // If Id == 0 we create a new collection
+            if (c.Id == 0)
             {
                 var obs = new object[2];
-                obs[0] = collection.Name;
-                obs[1] = collection.GetFlatFonts();
+                obs[0] = c.Name;
+                obs[1] = c.GetFlatArgs();
 
-                _ins.ExecuteNonQuery(obs);
-                collection.Id = SQLite3.LastInsertRowid(_conn.Handle);
+                GetInsert(c).ExecuteNonQuery(obs);
+                c.Id = SQLite3.LastInsertRowid(_conn.Handle);
             }
             else
             {
-                var cmd = _conn.CreateCommand("UPDATE \"Collections\" Set Name = ?, Fonts = ? WHERE Id = ?",
-                    collection.Name, collection.GetFlatFonts(), collection.Id);
-                cmd.ExecuteNonQuery();
+                // Otherwise update existing collection
+                _conn.CreateCommand(
+                         $"UPDATE \"{GetTable(c)}\" Set Name = ?, {GetArgs(c)} = ? WHERE Id = ?", c.Name, c.GetFlatArgs(), c.Id)
+                     .ExecuteNonQuery();
             }
         });
     }
@@ -70,6 +85,9 @@ private void CreateCollectionsTable()
     {
         string create = "CREATE TABLE IF NOT EXISTS \"Collections\" (\r\n\"Id\" integer primary key autoincrement not null ,\r\n\"Name\" varchar ,\r\n\"Fonts\" varchar )";
         _conn.Execute(create);
+
+        string create2 = "CREATE TABLE IF NOT EXISTS \"SmartCollections\" (\r\n\"Id\" integer primary key autoincrement not null ,\r\n\"Name\" varchar ,\r\n\"Filters\" varchar )";
+        _conn.Execute(create2);
     }
 
     public Task StoreMigrationAsync(List<UserFontCollection> collections)
@@ -106,6 +124,7 @@ private void PrepareConnection()
                 .SetSynchronousNormal();
 
             _ins = new(_conn, "INSERT INTO \"Collections\" (Name, Fonts) VALUES (?, ?)");
+            _smins = new(_conn, "INSERT INTO \"SmartCollections\" (Name, Filters) VALUES (?, ?)");
         }
     }
 
diff --git a/CharacterMap/CharacterMap/Services/UserCollectionsService.cs b/CharacterMap/CharacterMap/Services/UserCollectionsService.cs
index 84934745..db7494c9 100644
--- a/CharacterMap/CharacterMap/Services/UserCollectionsService.cs
+++ b/CharacterMap/CharacterMap/Services/UserCollectionsService.cs
@@ -7,9 +7,9 @@ public interface ICollectionProvider
     /// Returns an ordered List of collection
     /// </summary>
     /// <returns></returns>
-    Task<List<UserFontCollection>> LoadCollectionsAsync();
-    Task SaveCollectionAsync(UserFontCollection collection);
-    Task<bool> DeleteCollectionAsync(UserFontCollection collection);
+    Task<IReadOnlyList<IFontCollection>> LoadCollectionsAsync();
+    Task SaveCollectionAsync(IFontCollection collection);
+    Task<bool> DeleteCollectionAsync(IFontCollection collection);
     Task FlushAsync();
 }
 
@@ -22,7 +22,10 @@ public UserFontCollection SymbolCollection
         set { value.IsSystemSymbolCollection = true; _symbolCollection = value; }
     }
 
-    public List<UserFontCollection> Items { get; private set; } = new();
+    public IReadOnlyList<IFontCollection> All { get; private set; } = [];
+
+    public List<UserFontCollection> Items { get; private set; } = [];
+    public List<SmartFontCollection> SmartCollections { get; private set; } = [];
 
     private ICollectionProvider _provider { get; }
 
@@ -49,17 +52,26 @@ public async Task LoadCollectionsAsync()
         if (ResourceHelper.AppSettings.HasSQLiteCollections is false)
             await UpgradeToSQLiteAsync().ConfigureAwait(false);
 
-        List<UserFontCollection> collections = new();
+        List<UserFontCollection> collections = [];
+        List<SmartFontCollection> smart = [];
 
         await Task.Run(async () =>
         {
             var cols = await _provider.LoadCollectionsAsync().ConfigureAwait(false);
-            foreach (var c in cols)
+            foreach (var col in cols)
             {
-                if (c.Name == "Symbol")
-                    SymbolCollection = c;
-                else
-                    collections.Add(c);
+                if (col is UserFontCollection c)
+                {
+                    if (c.Name == "Symbol")
+                        SymbolCollection = c;
+                    else
+                        collections.Add(c);
+                }
+                else if (col is SmartFontCollection s)
+                {
+                    smart.Add(s);
+                }
+                
             }
 
             if (SymbolCollection == null)
@@ -68,11 +80,46 @@ await Task.Run(async () =>
 
         Items.Clear();
         Items.AddRange(collections);
+
+        SmartCollections.Clear();
+        SmartCollections.AddRange(smart);
+
+        // Populates "All" list
+        Add(null);
     }
 
-    public UserFontCollection TryGetCollection(string name)
+    //public UserFontCollection TryGetCollection(string name)
+    //{
+    //    return Items.FirstOrDefault(i => string.CompareOrdinal(i.Name, name) > 0);
+    //}
+
+    public async Task<SmartFontCollection> CreateSmartCollectionAsync(string name, IReadOnlyList<string> filters)
     {
-        return Items.FirstOrDefault(i => string.CompareOrdinal(i.Name, name) > 0);
+        if (name == "Symbol") name = "My Symbols";
+
+        SmartFontCollection collection = new() { Name = name, Filters = filters.ToList() };
+        await SaveCollectionAsync(collection).ConfigureAwait(false);
+        collection.UpdateFonts();
+
+        Add(collection);
+
+        return collection;
+    }
+
+    internal void Add(IFontCollection c)
+    {
+        if (c is UserFontCollection u)
+        {
+            Items.Add(u);
+            Items = Items.OrderBy(i => i.Name).ToList();
+        }
+        else if (c is SmartFontCollection s)
+        {
+            SmartCollections.Add(s);
+            SmartCollections = SmartCollections.OrderBy(i => i.Name).ToList();
+        }
+
+        All = Items.Cast<IFontCollection>().Concat(SmartCollections).OrderBy(c => c.Name).ToList();
     }
 
     public async Task<UserFontCollection> CreateCollectionAsync(string name, bool symbol = false)
@@ -84,35 +131,45 @@ public async Task<UserFontCollection> CreateCollectionAsync(string name, bool sy
         await SaveCollectionAsync(collection).ConfigureAwait(false);
 
         if (!symbol)
-        {
-            Items.Add(collection);
-            Items = Items.OrderBy(i => i.Name).ToList();
-        }
+            Add(collection);
 
         return collection;
     }
 
-    public async Task DeleteCollectionAsync(UserFontCollection collection)
+    void Remove(IFontCollection collection)
+    {
+        if (collection is UserFontCollection u)
+            Items.Remove(u);
+        else if (collection is SmartFontCollection s)
+            SmartCollections.Remove(s);
+
+        Add(null);
+    }
+
+    public async Task DeleteCollectionAsync(IFontCollection collection)
     {
         if (await _provider.DeleteCollectionAsync(collection))
-            Items.Remove(collection);
+            Remove(collection);
     }
 
-    public async Task RenameCollectionAsync(string name, UserFontCollection collection)
+    public async Task UpdateCollectionAsync(IFontCollection collection)
     {
-        collection.Name = name;
         await SaveCollectionAsync(collection).ConfigureAwait(false);
-        Items = Items.OrderBy(i => i.Name).ToList();
+
+        if (collection is SmartFontCollection smart)
+            smart.UpdateFonts();
+
+        Add(null);
     }
 
-    public Task SaveCollectionAsync(UserFontCollection collection)
+    public Task SaveCollectionAsync(IFontCollection collection)
     {
         return _provider.SaveCollectionAsync(collection);
     }
 
     public Task<AddToCollectionResult> AddToCollectionAsync(InstalledFont font, UserFontCollection collection)
     {
-        return AddToCollectionAsync(new List<InstalledFont> { font }, collection);
+        return AddToCollectionAsync([font], collection);
     }
 
     public async Task<AddToCollectionResult> AddToCollectionAsync(IReadOnlyList<InstalledFont> fonts, UserFontCollection collection, Action onChanged = null)
@@ -174,6 +231,8 @@ public async Task RemoveFromAllCollectionsAsync(InstalledFont font)
     //
     //------------------------------------------------------
 
+    #region Legacy
+
     [Obsolete]
     private IAsyncOperation<StorageFolder> GetCollectionsFolderAsync()
     {
@@ -296,4 +355,6 @@ private async Task<UserFontCollection> ConvertFromLegacyFormatAsync(StorageFile
         await file.DeleteAsync().AsTask().ConfigureAwait(false);
         return collection;
     }
+
+    #endregion
 }
diff --git a/CharacterMap/CharacterMap/Services/UserFontCollection.cs b/CharacterMap/CharacterMap/Services/UserFontCollection.cs
index 5b067c7e..ab0de2cb 100644
--- a/CharacterMap/CharacterMap/Services/UserFontCollection.cs
+++ b/CharacterMap/CharacterMap/Services/UserFontCollection.cs
@@ -1,22 +1,21 @@
 namespace CharacterMap.Models;
 
-[DebuggerDisplay("({Id}) Name: {Name}, {Fonts.Count} Fonts")]
-public class UserFontCollection
+public interface IFontCollection
 {
-    public bool IsSystemSymbolCollection { get; set; }
-    public long Id { get; set; }
-    public string Name { get; set; }
-    public HashSet<string> Fonts { get; set; } = new();
+    long Id { get; set; }
 
-    internal string GetFlatFonts()
-    {
-        return string.Join('', Fonts);
-    }
+    string Name { get; set; }
+
+    string GetFlatArgs();
+
+    bool ContainsFamily(string fontName);
+
+    string Icon { get; }
 }
 
 public class SQLiteFontCollection
 {
-    public int Id { get; set; }
+    public long Id { get; set; }
     public string Name { get; set; }
     public string Fonts { get; set; }
 
@@ -30,3 +29,73 @@ public UserFontCollection AsUserFontCollection()
         };
     }
 }
+
+public class SQLiteSmartFontCollection
+{
+    public long Id { get; set; }
+    public string Name { get; set; }
+    public string Filters { get; set; }
+
+    public SmartFontCollection AsSmartFontCollection()
+    {
+        return new SmartFontCollection
+        {
+            Id = Id,
+            Name = Name,
+            Filters = Filters.Split("\r\n", StringSplitOptions.RemoveEmptyEntries).ToList()
+        };
+    }
+}
+
+
+[DebuggerDisplay("({Id}) Name: {Name}, {Fonts.Count} Fonts")]
+public class UserFontCollection : IFontCollection
+{
+    public bool IsSystemSymbolCollection { get; set; }
+    public long Id { get; set; }
+    public string Name { get; set; }
+    public HashSet<string> Fonts { get; set; } = new();
+
+    public string GetFlatArgs() => string.Join('', Fonts);
+
+    public bool ContainsFamily(string fontName) => Fonts.Contains(fontName);
+
+    public string Icon => null;
+}
+
+[DebuggerDisplay("({Id}) Name: {Name}, {Filters.Count} Filters")]
+public class SmartFontCollection : IFontCollection
+{
+    static string ICON { get; } = new string('\uE945', 1);
+
+    public long Id { get; set; }
+    public string Name { get; set; }
+    public List<string> Filters { get; set; }
+    public HashSet<string> FontNames { get; set; }
+
+    public IReadOnlyList<InstalledFont> Fonts { get; private set; } = [];
+
+    public IReadOnlyList<InstalledFont> UpdateFonts()
+    { 
+        var fonts = FontFinder.Fonts.AsEnumerable();
+
+        foreach (var filter in Filters)
+            fonts = FontFinder.QueryFontList(filter, fonts, null).FontList;
+
+        Fonts = fonts.ToList();
+        FontNames = Fonts.Select(f => f.Name).ToHashSet();
+        return Fonts;
+    }
+
+    public string GetFlatArgs() => string.Join("\r\n", Filters);
+
+    public bool ContainsFamily(string fontName)
+    {
+        if (FontNames is null)
+            UpdateFonts();
+
+        return FontNames.Contains(fontName);
+    }
+
+    public string Icon => ICON;
+}
\ No newline at end of file
diff --git a/CharacterMap/CharacterMap/Themes/FluentThemeStyles.xaml b/CharacterMap/CharacterMap/Themes/FluentThemeStyles.xaml
index f39d128f..03d310c9 100644
--- a/CharacterMap/CharacterMap/Themes/FluentThemeStyles.xaml
+++ b/CharacterMap/CharacterMap/Themes/FluentThemeStyles.xaml
@@ -969,6 +969,18 @@
                                 Style="{ThemeResource CaptionTextBlockStyle}"
                                 Text="{TemplateBinding KeyboardAcceleratorTextOverride}"
                                 Visibility="Collapsed" />
+
+                            <TextBlock
+                                Grid.Column="1"
+                                Margin="24,0,0,0"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                Foreground="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                                HorizontalTextAlignment="Right"
+                                Opacity="0.7"
+                                Style="{ThemeResource CaptionTextBlockStyle}"
+                                Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(core:Properties.IconString)}" />
                         </Grid>
 
                     </Border>
diff --git a/CharacterMap/CharacterMap/ViewModels/MainViewModel.cs b/CharacterMap/CharacterMap/ViewModels/MainViewModel.cs
index 12e9ca72..2ad5d730 100644
--- a/CharacterMap/CharacterMap/ViewModels/MainViewModel.cs
+++ b/CharacterMap/CharacterMap/ViewModels/MainViewModel.cs
@@ -58,13 +58,13 @@ public partial class MainViewModel : ViewModelBase
     public FontItem CurrentFont => Fonts.Count > 0 && TabIndex < Fonts.Count && TabIndex > -1
         ? Fonts[TabIndex] : null;
 
-    private UserFontCollection _selectedCollection;
-    public UserFontCollection SelectedCollection
+    private IFontCollection _selectedCollection;
+    public IFontCollection SelectedCollection
     {
         get => _selectedCollection;
         set
         {
-            if (value != null && value.IsSystemSymbolCollection)
+            if (value is UserFontCollection c && c.IsSystemSymbolCollection)
             {
                 FontListFilter = BasicFontFilter.SymbolFonts;
                 return;
@@ -274,7 +274,7 @@ object GetLastUsedCollection()
         return FilterFlyout.AllFilters.FirstOrDefault(f => f.DisplayTitle == Settings.LastSelectedCollection);
     }
 
-    public async void RefreshFontList(UserFontCollection collection = null)
+    public async void RefreshFontList(IFontCollection collection = null)
     {
         if (CanFilter == false)
             return;
@@ -285,7 +285,7 @@ public async void RefreshFontList(UserFontCollection collection = null)
             if (collection != null)
             {
                 FilterTitle = collection.Name;
-                fontList = fontList.Where(f => collection.Fonts.Contains(f.Name));
+                fontList = fontList.Where(f => collection.ContainsFamily(f.Name));
             }
             else
             {
diff --git a/CharacterMap/CharacterMap/ViewModels/QuickCompareViewModel.cs b/CharacterMap/CharacterMap/ViewModels/QuickCompareViewModel.cs
index 885cf724..6c385511 100644
--- a/CharacterMap/CharacterMap/ViewModels/QuickCompareViewModel.cs
+++ b/CharacterMap/CharacterMap/ViewModels/QuickCompareViewModel.cs
@@ -14,7 +14,7 @@ public class QuickCompareArgs
 
     public bool IsFolderView => Folder is not null;
 
-    public UserFontCollection SelectedCollection { get; init; }
+    public IFontCollection SelectedCollection { get; init; }
 
     public QuickCompareArgs(bool isQuickCompare, FolderContents folder = null)
     {
@@ -51,13 +51,13 @@ public BasicFontFilter FontListFilter
 
     public ObservableCollection<CharacterRenderingOptions> QuickFonts { get; }
 
-    private UserFontCollection _selectedCollection;
-    public UserFontCollection SelectedCollection
+    private IFontCollection _selectedCollection;
+    public IFontCollection SelectedCollection
     {
         get => _selectedCollection;
         set
         {
-            if (value != null && value.IsSystemSymbolCollection)
+            if (value is UserFontCollection u && u.IsSystemSymbolCollection)
             {
                 FontListFilter = BasicFontFilter.SymbolFonts;
                 return;
@@ -127,9 +127,7 @@ public QuickCompareViewModel(QuickCompareArgs args)
             RefreshFontList(SelectedCollection);
 
             FilterCommand = new RelayCommand<object>(e => OnFilterClick(e));
-            CollectionSelectedCommand = new RelayCommand<object>(e => SelectedCollection = e as UserFontCollection);
-
-
+            CollectionSelectedCommand = new RelayCommand<object>(e => SelectedCollection = e as IFontCollection);
         }
 
         UpdateTextOptions();
@@ -178,7 +176,7 @@ private void OnFilterClick(object e)
         }
     }
 
-    internal void RefreshFontList(UserFontCollection collection = null)
+    internal void RefreshFontList(IFontCollection collection = null)
     {
         try
         {
@@ -187,7 +185,7 @@ internal void RefreshFontList(UserFontCollection collection = null)
             if (collection != null)
             {
                 FilterTitle = collection.Name;
-                fontList = fontList.Where(f => collection.Fonts.Contains(f.Name));
+                fontList = fontList.Where(f => collection.ContainsFamily(f.Name));
             }
             else
             {
diff --git a/CharacterMap/CharacterMap/Views/MainPage.xaml.cs b/CharacterMap/CharacterMap/Views/MainPage.xaml.cs
index 5fb4fd25..066ca8f5 100644
--- a/CharacterMap/CharacterMap/Views/MainPage.xaml.cs
+++ b/CharacterMap/CharacterMap/Views/MainPage.xaml.cs
@@ -109,7 +109,7 @@ public MainPage(MainViewModelArgs args)
             if (!FontsSemanticZoom.IsZoomedInViewActive)
                 FontsSemanticZoom.IsZoomedInViewActive = true;
 
-            ViewModel.SelectedCollection = e as UserFontCollection;
+            ViewModel.SelectedCollection = e as IFontCollection;
         });
     }
 

From 704b5e317ba7f1397536f2459b1fb89c7ea51c97 Mon Sep 17 00:00:00 2001
From: Johnny Westlake <jmdwestlake@yahoo.co.uk>
Date: Fri, 17 May 2024 13:48:24 +0100
Subject: [PATCH 05/15] Fix #326

---
 .../CharacterMap/Controls/CharacterGridView.cs   | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/CharacterMap/CharacterMap/Controls/CharacterGridView.cs b/CharacterMap/CharacterMap/Controls/CharacterGridView.cs
index e921b1a5..d4d333e0 100644
--- a/CharacterMap/CharacterMap/Controls/CharacterGridView.cs
+++ b/CharacterMap/CharacterMap/Controls/CharacterGridView.cs
@@ -64,17 +64,11 @@ partial void OnEnableResizeAnimationChanged(bool? oldValue, bool n)
         UpdateAnimation(n);
     }
 
-    //public GlyphAnnotation ItemAnnotation
-    //{
-    //    get { return (GlyphAnnotation)GetValue(ItemAnnotationProperty); }
-    //    set { SetValue(ItemAnnotationProperty, value); }
-    //}
-
-    //public static readonly DP ItemAnnotationProperty = DP<GlyphAnnotation, CharacterGridView>(GlyphAnnotation.None, (d, o, n) =>
-    //{
-    //    d._templateSettings.Annotation = n;
-    //    d.UpdateUnicode(n);
-    //});
+    partial void OnItemAnnotationChanged(GlyphAnnotation o, GlyphAnnotation n)
+    {
+        _templateSettings.Annotation = n;
+        UpdateUnicode(n);
+    }
 
     #endregion
 

From 479c541eec3220c0de7574128283474d0071eea7 Mon Sep 17 00:00:00 2001
From: Johnny Westlake <jmdwestlake@yahoo.co.uk>
Date: Fri, 17 May 2024 13:48:57 +0100
Subject: [PATCH 06/15] Update DP generator

---
 .../Readers/AttachedPropertyReader.cs         |  49 +-----
 .../Readers/DependencyPropertyReader.cs       | 114 +++++++++-----
 CharacterMap/CharacterMap/CharacterMap.csproj |   1 +
 .../Controls/CharacterGridView.cs             |   6 +-
 .../Controls/CharacterPickerButton.cs         |   4 +-
 .../CharacterMap/Controls/ExtendedListView.cs |  31 ++--
 .../Controls/ExtendedSplitView.cs             |   4 +-
 .../Controls/FilterFlyout.xaml.cs             |  20 +--
 .../Controls/FlowAwareComboBox.cs             |   2 +-
 .../Controls/ModalPagePresenter.cs            |   4 +-
 .../Controls/SettingsPresenter.cs             |  10 +-
 .../CharacterMap/Controls/SuggestionBox.cs    |   8 +-
 .../CharacterMap/Controls/UXButton.cs         |  20 +--
 .../CharacterMap/Controls/UXComboBox.cs       |   9 +-
 .../CharacterMap/Controls/UXRadioButton.cs    |  12 +-
 .../CharacterMap/Controls/XamlTitleBar.cs     |   4 +-
 .../Core/DependencyPropertyAttribute.cs       |  68 +++++++++
 CharacterMap/CharacterMap/Core/Properties.cs  | 140 +++++++++++-------
 18 files changed, 282 insertions(+), 224 deletions(-)
 create mode 100644 CharacterMap/CharacterMap/Core/DependencyPropertyAttribute.cs

diff --git a/CharacterMap/CharacterMap.Generators/Readers/AttachedPropertyReader.cs b/CharacterMap/CharacterMap.Generators/Readers/AttachedPropertyReader.cs
index 3a422646..dafbe7eb 100644
--- a/CharacterMap/CharacterMap.Generators/Readers/AttachedPropertyReader.cs
+++ b/CharacterMap/CharacterMap.Generators/Readers/AttachedPropertyReader.cs
@@ -9,22 +9,6 @@ namespace CharacterMap.Generators.Readers;
 
 public class AttachedPropertyReader : SyntaxReader
 {
-    //string TEMPLATE =
-    //    "    public static {2} {0}\r\n" +
-    //    "    {{\r\n" +
-    //    "        get {{ return ({2})GetValue({0}Property); }}\r\n" +
-    //    "        set {{ SetValue({0}Property, value); }}\r\n" +
-    //    "    }}\r\n\r\n" +
-    //    "    public static readonly DependencyProperty {0}Property =\r\n" +
-    //    "        DependencyProperty.RegisterAttached(nameof({0}), typeof({2}), typeof({1}), new PropertyMetadata({3}, (d, e) =>\r\n" +
-    //    "        {{\r\n" +
-    //    "            if (d is {1} o && e.NewValue is {2} i)\r\n" +
-    //    //"            {{\r\n" +
-    //    "                o.On{0}Changed(e.OldValue as {4}, i);\r\n" +
-    //    // "            }}\r\n" +
-    //    "        }}));\r\n\r\n" +
-    //    "    partial static void On{0}Changed({4} oldValue, {2} newValue);\r\n";
-
     string TEMPLATE =
         "    public static {2} Get{0}(DependencyObject obj) => ({2})obj.GetValue({0}Property);\r\n\r\n" +
         "    public static void Set{0}(DependencyObject obj, {2} value) => obj.SetValue({0}Property, value);\r\n\r\n" +
@@ -32,38 +16,14 @@ public class AttachedPropertyReader : SyntaxReader
         "        DependencyProperty.RegisterAttached(\"{0}\", typeof({2}), typeof({1}), new PropertyMetadata({3}, (d,e) => On{0}Changed(d,e)));\r\n\r\n" +
         "    static partial void On{0}Changed(DependencyObject d, DependencyPropertyChangedEventArgs e);\r\n";
 
-    record class APData
-    {
-        public string Default { get; init; }
-        public string Container { get; init; }
-        public string Type { get; init; }
-        public string Name { get; init; }
-        public string TypeNamespace { get; init; }
-
-        public string ParentClass { get; init; }
-        public string ParentNamespace { get; init; }
-        public List<string> Usings { get; init; }
-
-        public string GetCastType() => IsPrimitive(Type) ? $"{Type}?" : Type;
-
-        // Terrible way of doing this
-        private bool IsPrimitive(string type)
-        {
-            return type is "bool" or "int" or "double" or "float"
-                    or "Visibility" or "CornerRadius" or "CharacterCasing"
-                    or "FlowDirection" or "ContentPlacement" or "GridLength"
-                    or "Orientation" or "GlyphAnnotation" or "FlyoutPlacementMode";
-        }
-    }
-
-    List<APData> data = [];
+    List<DPData> data = [];
 
     public override void Read(IEnumerable<SyntaxNode> nodes)
     {
         foreach (var n in nodes.OfType<ClassDeclarationSyntax>()
                                .Where(c => c.HasGenericAttribute("AttachedProperty")))
         {
-            APData src = new()
+            DPData src = new()
             {
                 ParentClass = n.Identifier.ValueText,
                 ParentNamespace = n.GetNamespace(),
@@ -92,7 +52,6 @@ public override void Read(IEnumerable<SyntaxNode> nodes)
                         Default = a.ArgumentList?.Arguments.Skip(1)?.FirstOrDefault()?.GetValue() ?? "default"
                     };
 
-
                 data.Add(d);
             }
         }
@@ -112,9 +71,9 @@ public override void Write(GeneratorExecutionContext context)
 
             StringBuilder sb = new();
 
-            foreach (APData dp in group)
+            foreach (DPData dp in group)
                 sb.AppendLine(
-                    string.Format(TEMPLATE, dp.Name, dp.ParentClass, dp.Type, dp.Default, dp.GetCastType()));
+                    string.Format(TEMPLATE, dp.Name, dp.ParentClass, dp.Type, dp.Default, dp.GetCastType("e.OldValue"), dp.GetCastType("e.NewValue")));
 
             var s = sb.ToString();
             context.AddSource(file, SourceText.From(
diff --git a/CharacterMap/CharacterMap.Generators/Readers/DependencyPropertyReader.cs b/CharacterMap/CharacterMap.Generators/Readers/DependencyPropertyReader.cs
index 96d8f417..caf5f54d 100644
--- a/CharacterMap/CharacterMap.Generators/Readers/DependencyPropertyReader.cs
+++ b/CharacterMap/CharacterMap.Generators/Readers/DependencyPropertyReader.cs
@@ -7,6 +7,53 @@
 
 namespace CharacterMap.Generators.Readers;
 
+internal record class DPData
+{
+    public string Default { get; init; }
+    public string Container { get; init; }
+    public string Callback { get; init; }
+    public string Type { get; init; }
+    public string Name { get; init; }
+    public string TypeNamespace { get; init; }
+
+    public string ParentClass { get; init; }
+    public string ParentNamespace { get; init; }
+    public List<string> Usings { get; init; }
+
+    public string GetCastType(string value) => IsPrimitive(Type) ? $"({Type})({value} ?? ({Type})default)" : $"{value} as {Type}";
+
+    public string GetDefault()
+    {
+        if (Type == "string" && Default != null
+            && Default != "null"
+            && Default != "default"
+            && Default.StartsWith("nameof") is false)
+            return $"\"{Default}\"";
+
+        return Default;
+    }
+
+    public string GetCallback()
+    {
+        if (!string.IsNullOrWhiteSpace(Callback) && !Callback.Contains("("))
+            return $"{Callback}()";
+
+        return Callback;
+    }
+
+    // Terrible way of doing this
+    private bool IsPrimitive(string type)
+    {
+        return type is "bool" or "int" or "double" or "float"
+                or "Visibility" or "CornerRadius" or "CharacterCasing"
+                or "FlowDirection" or "ContentPlacement" or "GridLength"
+                or "Orientation" or "GlyphAnnotation" or "FlyoutPlacementMode"
+                or "TextWrapping" or "Stretch" or "Thickness"
+                or "TextAlignment" or "TimeSpan" or "BlendEffectMode" 
+                or "Point" or "TextLineBounds";
+    }
+}
+
 public class DependencyPropertyReader : SyntaxReader
 {
     string TEMPLATE =
@@ -20,36 +67,23 @@ public class DependencyPropertyReader : SyntaxReader
         "        {{\r\n" +
         "            if (d is {1} o && e.NewValue is {2} i)\r\n" +
         //"            {{\r\n" +
-        "                o.On{0}Changed(e.OldValue as {4}, i);\r\n" +
-       // "            }}\r\n" +
+        "                o.On{0}Changed({4}, {5});\r\n" +
+        // "            }}\r\n" +
         "        }}));\r\n\r\n" +
-        "    partial void On{0}Changed({4} oldValue, {2} newValue);\r\n";
-
+        "    partial void On{0}Changed({2} o, {2} n);\r\n";
 
-
-    record class DPData
-    {
-        public string Default { get; init; }
-        public string Container { get; init; }
-        public string Type { get; init; }
-        public string Name { get; init; }
-        public string TypeNamespace { get; init; }
-
-        public string ParentClass { get; init; }
-        public string ParentNamespace { get; init; }
-        public List<string> Usings { get; init; }
-
-        public string GetCastType() => IsPrimitive(Type) ? $"{Type}?" : Type;
-
-        // Terrible way of doing this
-        private bool IsPrimitive(string type)
-        {
-            return type is "bool" or "int" or "double" or "float"
-                    or "Visibility" or "CornerRadius" or "CharacterCasing"
-                    or "FlowDirection" or "ContentPlacement" or "GridLength"
-                    or "Orientation" or "GlyphAnnotation" or "FlyoutPlacementMode";
-        }
-    }
+    string TEMPLATE2 =
+        "    public {2} {0}\r\n" +
+        "    {{\r\n" +
+        "        get {{ return ({2})GetValue({0}Property); }}\r\n" +
+        "        set {{ SetValue({0}Property, value); }}\r\n" +
+        "    }}\r\n\r\n" +
+        "    public static readonly DependencyProperty {0}Property =\r\n" +
+        "        DependencyProperty.Register(nameof({0}), typeof({2}), typeof({1}), new PropertyMetadata({3}, (d, e) =>\r\n" +
+        "        {{\r\n" +
+        "            if (d is {1} o)\r\n" +
+        "                o.{6};\r\n" +
+        "        }}));\r\n\r\n";
 
     List<DPData> data = [];
 
@@ -60,10 +94,11 @@ public override void Read(IEnumerable<SyntaxNode> nodes)
         {
             DPData src = new()
             {
-                 ParentClass = n.Identifier.ValueText,
-                 ParentNamespace = n.GetNamespace(),
-                 Usings = (n.Parent?.Parent as CompilationUnitSyntax)?.Usings.Select(u => $"using {u.Name.ToString()};")?.ToList() ?? new()
-            }; 
+                ParentClass = n.Identifier.ValueText,
+                ParentNamespace = n.GetNamespace(),
+                // Does not support static usings or using alias'
+                Usings = (n.Parent?.Parent as CompilationUnitSyntax)?.Usings.Select(u => $"using {u.Name.ToString()};")?.ToList() ?? new()
+            };
 
             foreach (var a in n.AttributeLists
                                .SelectMany(s => s.Attributes)
@@ -84,9 +119,16 @@ public override void Read(IEnumerable<SyntaxNode> nodes)
                     {
                         Name = a.ArgumentList.Arguments[0].GetValue(),
                         Type = type ?? "object",
-                        Default = a.ArgumentList.Arguments.Skip(1)?.FirstOrDefault()?.GetValue() ?? "default"
+                        Default = a.ArgumentList.Arguments.Skip(1)?.FirstOrDefault()?.GetValue() ?? "default",
+                        Callback = FormatCallback(a.ArgumentList.Arguments.Skip(2)?.FirstOrDefault()?.GetValue() ?? null)
                     };
 
+                static string FormatCallback(string input)
+                {
+                    if (input != null && input.StartsWith("nameof("))
+                        input = input.Remove(0, "nameof(".Length)[0..^1];
+                    return input;
+                }
 
                 data.Add(d);
             }
@@ -105,11 +147,13 @@ public override void Write(GeneratorExecutionContext context)
             string target = group.First().ParentClass;
             List<string> usings = group.First().Usings;
 
-            StringBuilder sb = new ();
+            StringBuilder sb = new();
 
             foreach (DPData dp in group)
                 sb.AppendLine(
-                    string.Format(TEMPLATE, dp.Name, dp.ParentClass, dp.Type, dp.Default, dp.GetCastType()));
+                    string.Format(
+                        string.IsNullOrWhiteSpace(dp.Callback) ? TEMPLATE : TEMPLATE2,
+                        dp.Name, dp.ParentClass, dp.Type, dp.GetDefault(), dp.GetCastType("e.OldValue"), dp.GetCastType("e.NewValue"), dp.GetCallback()));
 
             var s = sb.ToString();
             context.AddSource(file, SourceText.From(
diff --git a/CharacterMap/CharacterMap/CharacterMap.csproj b/CharacterMap/CharacterMap/CharacterMap.csproj
index 19d76ae6..27734822 100644
--- a/CharacterMap/CharacterMap/CharacterMap.csproj
+++ b/CharacterMap/CharacterMap/CharacterMap.csproj
@@ -240,6 +240,7 @@
     <Compile Include="Converters\Converters.cs" />
     <Compile Include="Core\AlphaKeyGroup.cs" />
     <Compile Include="Core\AppSettings.cs" />
+    <Compile Include="Core\DependencyPropertyAttribute.cs" />
     <Compile Include="Core\ExceptionHandlingSynchronizationContext.cs" />
     <Compile Include="Core\ExportManager.Font.cs" />
     <Compile Include="Models\ExportOptions.cs" />
diff --git a/CharacterMap/CharacterMap/Controls/CharacterGridView.cs b/CharacterMap/CharacterMap/Controls/CharacterGridView.cs
index d4d333e0..e1721c26 100644
--- a/CharacterMap/CharacterMap/Controls/CharacterGridView.cs
+++ b/CharacterMap/CharacterMap/Controls/CharacterGridView.cs
@@ -37,7 +37,7 @@ public partial class CharacterGridView : GridView
 
     #region Dependency Properties
 
-    partial void OnItemSizeChanged(double? oldValue, double n) => _templateSettings.Size = n;
+    partial void OnItemSizeChanged(double oldValue, double n) => _templateSettings.Size = n;
 
     partial void OnItemFontFamilyChanged(FontFamily oldValue, FontFamily n) => _templateSettings.FontFamily = n;
 
@@ -52,13 +52,13 @@ partial void OnItemTypographyChanged(TypographyFeatureInfo oldValue, TypographyF
         }
     }
 
-    partial void OnShowColorGlyphsChanged(bool? oldValue, bool n)
+    partial void OnShowColorGlyphsChanged(bool oldValue, bool n)
     {
         _templateSettings.ShowColorGlyphs = n;
         UpdateColorsFonts(n);
     }
 
-    partial void OnEnableResizeAnimationChanged(bool? oldValue, bool n)
+    partial void OnEnableResizeAnimationChanged(bool oldValue, bool n)
     {
         _templateSettings.EnableReposition = n && CompositionFactory.UISettings.AnimationsEnabled;
         UpdateAnimation(n);
diff --git a/CharacterMap/CharacterMap/Controls/CharacterPickerButton.cs b/CharacterMap/CharacterMap/Controls/CharacterPickerButton.cs
index 4668b4d5..bf866cf9 100644
--- a/CharacterMap/CharacterMap/Controls/CharacterPickerButton.cs
+++ b/CharacterMap/CharacterMap/Controls/CharacterPickerButton.cs
@@ -7,7 +7,7 @@ namespace CharacterMap.Controls;
 
 [DependencyProperty<Control>("Target", typeof(Control))]
 [DependencyProperty<CharacterRenderingOptions>("Options", typeof(CharacterRenderingOptions))]
-[DependencyProperty<FlyoutPlacementMode>("Placement", FlyoutPlacementMode.Bottom)]
+[DependencyProperty<FlyoutPlacementMode>("Placement", FlyoutPlacementMode.Bottom, nameof(UpdatePlacement))]
 public sealed partial class CharacterPickerButton : ContentControl
 {
     private static PropertyMetadata NULL_META = new(null);
@@ -19,8 +19,6 @@ public CharacterPickerButton()
         this.DefaultStyleKey = typeof(CharacterPickerButton);
     }
 
-    partial void OnPlacementChanged(FlyoutPlacementMode? o, FlyoutPlacementMode n) => UpdatePlacement();
-
     protected override void OnApplyTemplate()
     {
         base.OnApplyTemplate();
diff --git a/CharacterMap/CharacterMap/Controls/ExtendedListView.cs b/CharacterMap/CharacterMap/Controls/ExtendedListView.cs
index b6c9a125..c1f62805 100644
--- a/CharacterMap/CharacterMap/Controls/ExtendedListView.cs
+++ b/CharacterMap/CharacterMap/Controls/ExtendedListView.cs
@@ -43,7 +43,22 @@ public ExtendedListView()
         this.Unloaded += ExtendedListView_Unloaded;
     }
 
-    partial void OnBindableSelectedItemsChanged(INotifyCollectionChanged o, INotifyCollectionChanged n) => OnSelectedItemsChanged(o, n);
+    partial void OnBindableSelectedItemsChanged(INotifyCollectionChanged o, INotifyCollectionChanged n)
+    {
+        if (o is not null)
+        {
+            o.CollectionChanged -= SelectedItems_CollectionChanged;
+        }
+
+        if (this is null)
+            return;
+
+        if (n is not null)
+        {
+            n.CollectionChanged -= SelectedItems_CollectionChanged;
+            n.CollectionChanged += SelectedItems_CollectionChanged;
+        }
+    }
 
     private void ExtendedListView_Loaded(object sender, RoutedEventArgs e)
     {
@@ -104,19 +119,7 @@ protected void OnAttached()
 
     private void OnSelectedItemsChanged(object old, object nw)
     {
-        if (old is INotifyCollectionChanged c)
-        {
-            c.CollectionChanged -= SelectedItems_CollectionChanged;
-        }
-
-        if (this is null)
-            return;
-
-        if (nw is INotifyCollectionChanged n)
-        {
-            n.CollectionChanged -= SelectedItems_CollectionChanged;
-            n.CollectionChanged += SelectedItems_CollectionChanged;
-        }
+        
     }
 
     void ItemsSourceChanged(DependencyObject source, DependencyProperty property)
diff --git a/CharacterMap/CharacterMap/Controls/ExtendedSplitView.cs b/CharacterMap/CharacterMap/Controls/ExtendedSplitView.cs
index 5e72e430..d1d731b3 100644
--- a/CharacterMap/CharacterMap/Controls/ExtendedSplitView.cs
+++ b/CharacterMap/CharacterMap/Controls/ExtendedSplitView.cs
@@ -3,7 +3,7 @@
 
 namespace CharacterMap.Controls;
 
-[DependencyProperty<bool>("EnableAnimation", true)]
+[DependencyProperty<bool>("EnableAnimation", true, nameof(UpdateAnimationStates))]
 public partial class ExtendedSplitView : SplitView
 {
     FrameworkElement _contentRoot = null;
@@ -16,8 +16,6 @@ public ExtendedSplitView()
         this.Unloaded += ExtendedSplitView_Unloaded;
     }
 
-    partial void OnEnableAnimationChanged(bool? oldValue, bool newValue) => UpdateAnimationStates();
-
     protected override void OnApplyTemplate()
     {
         base.OnApplyTemplate();
diff --git a/CharacterMap/CharacterMap/Controls/FilterFlyout.xaml.cs b/CharacterMap/CharacterMap/Controls/FilterFlyout.xaml.cs
index 663d221c..fabef563 100644
--- a/CharacterMap/CharacterMap/Controls/FilterFlyout.xaml.cs
+++ b/CharacterMap/CharacterMap/Controls/FilterFlyout.xaml.cs
@@ -5,28 +5,12 @@
 
 namespace CharacterMap.Controls;
 
+[DependencyProperty<ICommand>("FilterCommand")]
+[DependencyProperty<ICommand>("CollectionSelectedCommand")]
 public sealed partial class FilterFlyout : MenuFlyout
 {
     private int _defaultCount = 0;
 
-    public ICommand FilterCommand
-    {
-        get { return (ICommand)GetValue(FilterCommandProperty); }
-        set { SetValue(FilterCommandProperty, value); }
-    }
-
-    public static readonly DependencyProperty FilterCommandProperty =
-        DependencyProperty.Register(nameof(FilterCommand), typeof(ICommand), typeof(FilterFlyout), new PropertyMetadata(null));
-
-    public ICommand CollectionSelectedCommand
-    {
-        get { return (ICommand)GetValue(CollectionSelectedCommandProperty); }
-        set { SetValue(CollectionSelectedCommandProperty, value); }
-    }
-
-    public static readonly DependencyProperty CollectionSelectedCommandProperty =
-        DependencyProperty.Register(nameof(CollectionSelectedCommand), typeof(ICommand), typeof(FilterFlyout), new PropertyMetadata(null));
-
     private MenuFlyoutItemBase _variableOption = null;
     private MenuFlyoutItemBase _remoteOption = null;
     private MenuFlyoutItemBase _appxOption = null;
diff --git a/CharacterMap/CharacterMap/Controls/FlowAwareComboBox.cs b/CharacterMap/CharacterMap/Controls/FlowAwareComboBox.cs
index 011cafeb..f5040b88 100644
--- a/CharacterMap/CharacterMap/Controls/FlowAwareComboBox.cs
+++ b/CharacterMap/CharacterMap/Controls/FlowAwareComboBox.cs
@@ -22,7 +22,7 @@ public FlowAwareComboBox()
         _colorFontBinding = new() { Source = this, Path = new(nameof(IsColorFontEnabled)) };
     }
 
-    partial void OnDetectedFlowDirectionChanged(FlowDirection? oldValue, FlowDirection newValue)
+    partial void OnDetectedFlowDirectionChanged(FlowDirection oldValue, FlowDirection newValue)
     {
         DetectedFlowDirectionChanged?.Invoke(this, newValue);
     }
diff --git a/CharacterMap/CharacterMap/Controls/ModalPagePresenter.cs b/CharacterMap/CharacterMap/Controls/ModalPagePresenter.cs
index 32f570ec..7c19f616 100644
--- a/CharacterMap/CharacterMap/Controls/ModalPagePresenter.cs
+++ b/CharacterMap/CharacterMap/Controls/ModalPagePresenter.cs
@@ -5,7 +5,7 @@
 
 namespace CharacterMap.Controls;
 
-[DependencyProperty("TitleBarContent")]
+[DependencyProperty("TitleBarContent", null, nameof(OnTitleContentChanged))]
 [DependencyProperty<bool>("AllowShadows")]
 [DependencyProperty<bool>("IsWindowRoot")]
 [DependencyProperty<string>("Title")]
@@ -23,8 +23,6 @@ public ModalPagePresenter()
         this.DefaultStyleKey = typeof(ModalPagePresenter);
     }
 
-    partial void OnTitleBarContentChanged(object? oldValue, object newValue) => OnTitleContentChanged();
-
     protected override void OnApplyTemplate()
     {
         base.OnApplyTemplate();
diff --git a/CharacterMap/CharacterMap/Controls/SettingsPresenter.cs b/CharacterMap/CharacterMap/Controls/SettingsPresenter.cs
index e1e6a12d..d4de1908 100644
--- a/CharacterMap/CharacterMap/Controls/SettingsPresenter.cs
+++ b/CharacterMap/CharacterMap/Controls/SettingsPresenter.cs
@@ -15,9 +15,9 @@ public enum ContentPlacement
 
 [ContentProperty(Name = nameof(Content))]
 [DependencyProperty("Title")]
-[DependencyProperty("Content")]
-[DependencyProperty("Description")]
-[DependencyProperty("Icon")]
+[DependencyProperty("Content", null, nameof(UpdatePlacementStates))]
+[DependencyProperty("Description", null, nameof(UpdateDescriptionStates))]
+[DependencyProperty("Icon", null, nameof(UpdateIconStates))]
 [DependencyProperty<double>("IconSize", 24d)]
 [DependencyProperty<ContentPlacement>("ContentPlacement", ContentPlacement.Right)]
 [DependencyProperty<bool>("HasItems", typeof(bool))]
@@ -35,10 +35,6 @@ public SettingsPresenter()
         _themer = new ThemeHelper(this);
     }
 
-    partial void OnDescriptionChanged(object o, object n) => UpdateDescriptionStates();
-    partial void OnIconChanged(object o, object n) => UpdateIconStates();
-    partial void OnContentPlacementChanged(ContentPlacement? o, ContentPlacement n) => UpdatePlacementStates();
-
     protected override bool IsItemItsOwnContainerOverride(object item) => false;
 
     protected override void PrepareContainerForItemOverride(DependencyObject element, object item)
diff --git a/CharacterMap/CharacterMap/Controls/SuggestionBox.cs b/CharacterMap/CharacterMap/Controls/SuggestionBox.cs
index 82bb1902..b8b230e2 100644
--- a/CharacterMap/CharacterMap/Controls/SuggestionBox.cs
+++ b/CharacterMap/CharacterMap/Controls/SuggestionBox.cs
@@ -9,7 +9,7 @@ namespace CharacterMap.Controls;
 [DependencyProperty("ItemsSource")]
 [DependencyProperty<string>("Text", "string.Empty")]
 [DependencyProperty<string>("PlaceholderText", "string.Empty")]
-[DependencyProperty<bool>("IsCharacterPickerEnabled", true)]
+[DependencyProperty<bool>("IsCharacterPickerEnabled", true, nameof(UpdatePickerState))]
 [DependencyProperty<CharacterRenderingOptions>("RenderingOptions")]
 [DependencyProperty<FlowDirection>("DetectedFlowDirection")]
 public sealed partial class SuggestionBox : Control
@@ -32,9 +32,7 @@ public SuggestionBox()
         this.DefaultStyleKey = typeof(SuggestionBox);
     }
 
-    partial void OnIsCharacterPickerEnabledChanged(bool? oldValue, bool newValue) => UpdatePickerState(true);
-
-    partial void OnDetectedFlowDirectionChanged(FlowDirection? oldValue, FlowDirection newValue)
+    partial void OnDetectedFlowDirectionChanged(FlowDirection oldValue, FlowDirection newValue)
     {
         DetectedFlowDirectionChanged?.Invoke(this, (FlowDirection)newValue);
     }
@@ -103,7 +101,7 @@ private void SuggestCallback(DependencyObject sender, DependencyProperty dp)
             VisualStateManager.GoToState(_suggestBox, "Opened", ResourceHelper.AllowAnimation);
     }
 
-    void UpdatePickerState(bool animate)
+    void UpdatePickerState(bool animate = true)
     {
         VisualStateManager.GoToState(this, IsCharacterPickerEnabled ? "PickerVisibleState" : "PickerHiddenState", animate);
     }
diff --git a/CharacterMap/CharacterMap/Controls/UXButton.cs b/CharacterMap/CharacterMap/Controls/UXButton.cs
index 54e759aa..034b079d 100644
--- a/CharacterMap/CharacterMap/Controls/UXButton.cs
+++ b/CharacterMap/CharacterMap/Controls/UXButton.cs
@@ -19,23 +19,13 @@ public void Update(string text, CharacterCasing casing)
     }
 }
 
-[DependencyProperty<bool>("IsActive")]
-[DependencyProperty<bool>("IsHintVisible")]
-[DependencyProperty<bool>("IsLabelVisible")]
-[DependencyProperty<string>("Label")]
-[DependencyProperty<CharacterCasing>("LabelCasing")]
+[DependencyProperty<bool>("IsActive", false, nameof(UpdateActive))]
+[DependencyProperty<bool>("IsHintVisible", false, nameof(UpdateHint))]
+[DependencyProperty<bool>("IsLabelVisible", false, nameof(UpdateLabel))]
+[DependencyProperty<string>("Label", null, nameof(UpdateLabelText))]
+[DependencyProperty<CharacterCasing>("LabelCasing", default, nameof(UpdateLabelText))]
 public partial class UXButton : Button//, IThemeableControl
 {
-    partial void OnIsActiveChanged(bool? oldValue, bool newValue) => UpdateActive();
-
-    partial void OnIsHintVisibleChanged(bool? oldValue, bool newValue) => UpdateHint();
-
-    partial void OnIsLabelVisibleChanged(bool? oldValue, bool newValue) => UpdateLabel();
-
-    partial void OnLabelChanged(string oldValue, string newValue) => UpdateLabelText();
-
-    partial void OnLabelCasingChanged(CharacterCasing? oldValue, CharacterCasing newValue) => UpdateLabelText();
-
     public UXButtonTemplateSettings TemplateSettings { get; } = new ();
 
     bool _isTemplateApplied = false;
diff --git a/CharacterMap/CharacterMap/Controls/UXComboBox.cs b/CharacterMap/CharacterMap/Controls/UXComboBox.cs
index 304bf06f..0afb7e88 100644
--- a/CharacterMap/CharacterMap/Controls/UXComboBox.cs
+++ b/CharacterMap/CharacterMap/Controls/UXComboBox.cs
@@ -32,16 +32,11 @@ protected override void OnApplyTemplate()
 
 [DependencyProperty<string>("ToolTipMemberPath")]
 [DependencyProperty<double>("ContentSpacing")]
-[DependencyProperty("PreContent")]
-[DependencyProperty("SecondaryContent")]
+[DependencyProperty("PreContent", null, nameof(UpdateContentStates))]
+[DependencyProperty("SecondaryContent", null, nameof(UpdateContentStates))]
 [DependencyProperty<Orientation>("ContentOrientation")]
 public partial class UXComboBox : ComboBox//, IThemeableControl
 {
-    partial void OnPreContentChanged(object oldValue, object newValue) => UpdateContentStates();
-
-    partial void OnSecondaryContentChanged(object oldValue, object newValue) => UpdateContentStates();
-  
-
     public ThemeHelper _themer;
     bool _isTemplateApplied = false;
     public UXComboBox()
diff --git a/CharacterMap/CharacterMap/Controls/UXRadioButton.cs b/CharacterMap/CharacterMap/Controls/UXRadioButton.cs
index b89576eb..44e2b294 100644
--- a/CharacterMap/CharacterMap/Controls/UXRadioButton.cs
+++ b/CharacterMap/CharacterMap/Controls/UXRadioButton.cs
@@ -3,17 +3,9 @@
 
 namespace CharacterMap.Controls;
 
-public class MenuButton : UXRadioButtonBase
+[DependencyProperty<IconElement>("Icon")]
+public partial class MenuButton : UXRadioButtonBase
 {
-    public IconElement Icon
-    {
-        get { return (IconElement)GetValue(IconProperty); }
-        set { SetValue(IconProperty, value); }
-    }
-
-    public static readonly DependencyProperty IconProperty =
-        DependencyProperty.Register(nameof(Icon), typeof(IconElement), typeof(MenuButton), new PropertyMetadata(null));
-
     public MenuButton()
     {
         Properties.SetStyleKey(this, "DefaultMenuButtonStyle");
diff --git a/CharacterMap/CharacterMap/Controls/XamlTitleBar.cs b/CharacterMap/CharacterMap/Controls/XamlTitleBar.cs
index 68ee53e0..d2ce7c06 100644
--- a/CharacterMap/CharacterMap/Controls/XamlTitleBar.cs
+++ b/CharacterMap/CharacterMap/Controls/XamlTitleBar.cs
@@ -48,7 +48,7 @@ public double Height
 
 [DependencyProperty<bool>("AutoUpdateTitle", true)]
 [DependencyProperty<bool>("IsAutoHeightEnabled", true)]
-[DependencyProperty<bool>("IsDragTarget", true)]
+[DependencyProperty<bool>("IsDragTarget", true, nameof(UpdateStates))]
 public sealed partial class XamlTitleBar : ContentControl
 {
     private UISettings _settings;
@@ -70,8 +70,6 @@ public XamlTitleBar()
         Unloaded += XamlTitleBar_Unloaded;
     }
 
-    partial void OnIsDragTargetChanged(bool? oldValue, bool newValue) => UpdateStates();
-
     private void XamlTitleBar_Loading(FrameworkElement sender, object args)
     {
         // 32px is the default height at default text scaling. 
diff --git a/CharacterMap/CharacterMap/Core/DependencyPropertyAttribute.cs b/CharacterMap/CharacterMap/Core/DependencyPropertyAttribute.cs
new file mode 100644
index 00000000..a59fb416
--- /dev/null
+++ b/CharacterMap/CharacterMap/Core/DependencyPropertyAttribute.cs
@@ -0,0 +1,68 @@
+namespace CharacterMap.Core;
+
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+public class DependencyPropertyAttribute<T> : Attribute
+{
+    public string Name { get; set; }
+    public object Default { get; set; }
+    public string Callback { get; set; }
+    public Type Type => typeof(T);
+
+    public DependencyPropertyAttribute() { }
+
+    public DependencyPropertyAttribute(string name)
+    {
+        Name = name;
+    }
+
+    public DependencyPropertyAttribute(string name, object def)
+    {
+        Name = name;
+        Default = def;
+    }
+
+    public DependencyPropertyAttribute(string name, object def, string callback)
+    {
+        Name = name;
+        Default = def;
+        Callback = callback;
+    }
+}
+
+public class AttachedPropertyAttribute<T> : DependencyPropertyAttribute<T>
+{
+    public AttachedPropertyAttribute() { }
+
+    public AttachedPropertyAttribute(string name)
+    {
+        Name = name;
+    }
+
+    public AttachedPropertyAttribute(string name, object def)
+    {
+        Name = name;
+        Default = def;
+    }
+}
+
+public class DependencyPropertyAttribute : DependencyPropertyAttribute<object>
+{
+    public DependencyPropertyAttribute() { }
+    public DependencyPropertyAttribute(string name)
+    {
+        Name = name;
+    }
+
+    public DependencyPropertyAttribute(string name, object def)
+    {
+        Name = name;
+        Default = def;
+    }
+
+    public DependencyPropertyAttribute(string name, object def, string callback)
+    {
+        Name = name;
+        Default = def;
+        Callback = callback;
+    }
+}
diff --git a/CharacterMap/CharacterMap/Core/Properties.cs b/CharacterMap/CharacterMap/Core/Properties.cs
index b03bc828..e9a39f22 100644
--- a/CharacterMap/CharacterMap/Core/Properties.cs
+++ b/CharacterMap/CharacterMap/Core/Properties.cs
@@ -1,10 +1,12 @@
 using CharacterMap.Controls;
 using CharacterMapCX.Controls;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Windows.Foundation.Collections;
 using Windows.UI.Composition;
 using Windows.UI.Core;
+using Windows.UI.Text;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
@@ -17,58 +19,6 @@
 
 namespace CharacterMap.Core;
 
-[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-public class DependencyPropertyAttribute<T> : Attribute
-{
-    public string Name { get; set; }
-    public object Default { get; set; }
-    public Type Type => typeof(T);
-
-    public DependencyPropertyAttribute() { }
-
-    public DependencyPropertyAttribute(string name)
-    {
-        Name = name;
-    }
-
-    public DependencyPropertyAttribute(string name, object def)
-    {
-        Name = name;
-        Default = def;
-    }
-}
-
-public class AttachedPropertyAttribute<T> : DependencyPropertyAttribute<T>
-{
-    public AttachedPropertyAttribute() { }
-
-    public AttachedPropertyAttribute(string name)
-    {
-        Name = name;
-    }
-
-    public AttachedPropertyAttribute(string name, object def)
-    {
-        Name = name;
-        Default = def;
-    }
-}
-
-public class DependencyPropertyAttribute : DependencyPropertyAttribute<object> {
-    public DependencyPropertyAttribute() { }
-    public DependencyPropertyAttribute(string name)
-    {
-        Name = name;
-    }
-
-    public DependencyPropertyAttribute(string name, object def)
-    {
-        Name = name;
-        Default = def;
-    }
-}
-    
-
 /// <summary>
 /// XAML Attached Properties
 /// </summary>
@@ -110,6 +60,11 @@ public DependencyPropertyAttribute(string name, object def)
 [AttachedProperty<double>("RenderScale", 1d)] // Sets CompositeTransform ScaleX/Y
 [AttachedProperty<double>("Rotation", 0d)] // Sets RotationAngleInDegrees on elements handout visual
 [AttachedProperty<KeyTime>("RotationTransition", "KeyTime.FromTimeSpan(TimeSpan.Zero)")] // Sets transition duration for changes to elements handout visual RotationAngleInDegrees property
+[AttachedProperty<string>("Text")] // Sets the text on a RichEditBox
+[AttachedProperty<FontStretch>("FontStretch", FontStretch.Normal)] // Sets the FontStretch on a RichEditBox
+[AttachedProperty<FontStyle>("FontStyle", FontStyle.Normal)] // Sets the FontStyle on a RichEditBox
+[AttachedProperty<FontWeight>("FontWeight", "FontWeights.Normal")] // Sets the FontWeight on a RichEditBox
+[AttachedProperty<FontFamily>("FontFamily")] // Sets the FontFamily on a RichEditBox
 
 public partial class Properties : DependencyObject
 {
@@ -1016,4 +971,85 @@ static partial void OnRotationTransitionChanged(DependencyObject d, DependencyPr
     }
 
     #endregion
+
+    #region RichEditBox Text, FontStretch, FontWeight, FontStyle
+
+    static partial void OnTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is RichEditBox r)
+        {
+            r.TextChanged -= RichEditBox_TextChanged;
+
+            r.TextDocument.GetText(TextGetOptions.None, out string t);
+
+            if (t.Trim() == ((string)e.NewValue).Trim())
+                return;
+
+            r.TextDocument.SetText(Windows.UI.Text.TextSetOptions.None, e.NewValue as string);
+            UpdateFormat(r);
+            r.TextChanged += RichEditBox_TextChanged;
+        }
+    }
+
+    private static void RichEditBox_TextChanged(object sender, RoutedEventArgs e)
+    {
+        if (sender is RichEditBox r)
+        {
+            r.TextDocument.GetText(TextGetOptions.None, out string t);
+            SetText(r, t.TrimEnd('\r', '\n'));
+        }
+    }
+
+    static partial void OnFontFamilyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is RichEditBox r)
+            UpdateFormat(r);
+    }
+
+    static partial void OnFontStretchChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is RichEditBox r)
+            UpdateFormat(r);
+    }
+
+    static partial void OnFontStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is RichEditBox r)
+            UpdateFormat(r);
+    }
+
+    static partial void OnFontWeightChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is RichEditBox r)
+            UpdateFormat(r);
+    }
+
+    static FontFamily __BLANK { get; } = new FontFamily("ms-appx:///Assets/AdobeBlank.otf");
+
+    static void UpdateFormat(RichEditBox r)
+    {
+        // This is *NOT* good for performance, but RichEditBox has a lot of problems
+        // we need to workaround. It is however the only way we can actually get proper
+        // font display on a TextBox, so we need to deal with it.
+
+        r.UpdateLayout();
+
+        r.TextDocument.BatchDisplayUpdates();
+
+        r.FontFamily = __BLANK;
+
+        ITextCharacterFormat format = r.TextDocument.GetDefaultCharacterFormat();
+        format.FontStyle = GetFontStyle(r);
+        format.FontStretch = GetFontStretch(r);
+        format.Weight = GetFontWeight(r).Weight;
+        r.TextDocument.SetDefaultCharacterFormat(format);
+
+        r.TextDocument.ApplyDisplayUpdates();
+        r.FontFamily = GetFontFamily(r);
+
+        r.UpdateLayout();
+
+    }
+
+    #endregion
 }

From c5897d90b984c092d46a82b7e2a8f6240c456973 Mon Sep 17 00:00:00 2001
From: Johnny Westlake <jmdwestlake@yahoo.co.uk>
Date: Sat, 18 May 2024 16:28:18 +0100
Subject: [PATCH 07/15] Character search can now search Unihan descriptions

---
 .../Readers/SqliteStatementReader.cs          | 193 ++++++++++++++++++
 .../SourceGenerator.cs                        |   3 +
 CharacterMap/CharacterMap/CharacterMap.csproj |   1 +
 .../Controls/CharacterGridView.cs             |   8 +-
 CharacterMap/CharacterMap/Core/FontVariant.cs |  28 ++-
 CharacterMap/CharacterMap/Core/Properties.cs  |  52 ++++-
 CharacterMap/CharacterMap/Helpers/Sqlite.cs   |  85 +-------
 CharacterMap/CharacterMap/Helpers/Unicode.cs  |  11 +
 CharacterMap/CharacterMap/Models/Character.cs |   2 +
 CharacterMap/CharacterMap/Models/Unihan.cs    |   2 +
 .../Provider/SQLiteGlyphProvider.cs           |  49 +++--
 .../CharacterMap/Services/GlyphService.cs     |   4 +-
 .../Services/SQLite3Extensions.cs             |  92 +++++++++
 .../CharacterMap/Styles/ItemTemplates.xaml    |  12 +-
 CharacterMap/CharacterMap/Styles/TextBox.xaml |  74 +------
 .../Themes/FluentThemeStyles.xaml             |   1 +
 .../CharacterMap/Views/FontMapView.xaml       |   5 +
 17 files changed, 425 insertions(+), 197 deletions(-)
 create mode 100644 CharacterMap/CharacterMap.Generators/Readers/SqliteStatementReader.cs
 create mode 100644 CharacterMap/CharacterMap/Services/SQLite3Extensions.cs

diff --git a/CharacterMap/CharacterMap.Generators/Readers/SqliteStatementReader.cs b/CharacterMap/CharacterMap.Generators/Readers/SqliteStatementReader.cs
new file mode 100644
index 00000000..30a23fcf
--- /dev/null
+++ b/CharacterMap/CharacterMap.Generators/Readers/SqliteStatementReader.cs
@@ -0,0 +1,193 @@
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace CharacterMap.Generators.Readers;
+
+internal record class SQLSTData
+{
+    public string Name { get; init; }
+    public string Type { get; init; }
+    public bool Single { get; init; }
+    public IReadOnlyList<(string CastType, string PropertyName, string ReadType, int index)> Columns { get; init; }
+
+}
+public class SqliteStatementReader : SyntaxReader
+{
+    List<SQLSTData> data = [];
+
+    public override void Read(IEnumerable<SyntaxNode> nodes)
+    {
+        static string GetName(string s)
+        {
+            var i = s.IndexOf("(") + 1;
+            if (i > 0)
+            {
+                s = s.Remove(0, i);
+                s = s.Remove(s.LastIndexOf(")"));
+            }
+
+            if (s.Length > 2 && s.LastIndexOf(".") is int d && d > 0)
+                s = s.Remove(0, d + 1);
+
+            return s;
+        }
+
+        foreach (var n in nodes.OfType<ClassDeclarationSyntax>()
+                               .Where(c => c.HasGenericAttribute("SQLReader")))
+        {
+            string type = null; 
+            string name = null;
+            bool single = false;
+
+            // 1. Get the class type
+            foreach (var a in n.AttributeLists
+                               .SelectMany(s => s.Attributes)
+                               .Where(a => a.Name.ToString().StartsWith("SQLReader") && !a.Name.ToString().StartsWith("SQLReaderMapping")))
+            {
+                type = ((GenericNameSyntax)a.Name).TypeArgumentList.Arguments[0].ToString();
+                name = GetName(a.ArgumentList.Arguments[0].GetValue());
+
+                if (a.ArgumentList.Arguments.Skip(1).FirstOrDefault() is AttributeArgumentSyntax v
+                    && v.GetValue() == "true")
+                    single = true;
+            }
+
+            List<(string, string, string, int)> columns = [];
+
+            // 2. Get the column mappings
+            foreach (var a in n.AttributeLists
+                               .SelectMany(s => s.Attributes)
+                               .Where(a => a.Name.ToString().StartsWith("SQLReaderMapping")))
+            {
+                var mappingtype = ((GenericNameSyntax)a.Name).TypeArgumentList.Arguments[0].ToString();
+                var mappingpro = GetName(a.ArgumentList.Arguments[0].GetValue());
+                string t = mappingtype;
+                int i = -1;
+
+                if (a.ArgumentList.Arguments.Skip(1).FirstOrDefault() is AttributeArgumentSyntax v)
+                    t = GetName(v.GetValue());
+
+                if (a.ArgumentList.Arguments.Skip(2).FirstOrDefault() is AttributeArgumentSyntax v2)
+                    i = Convert.ToInt32(v2.GetValue());
+
+                columns.Add((mappingtype, mappingpro, t, i));
+            }
+
+            data.Add(new() { Name = name, Type = type, Single = single, Columns = columns });
+        }
+    }
+
+    string TEMPLATE_0 =
+        "using SQLite;\r\n" +
+        "\r\n" +
+        "namespace CharacterMap.Services;\r\n" +
+        "\r\n" +
+        "public static partial class SQLite3Readers\r\n" +
+        "{{\r\n" +
+        "{0}\r\n" +
+        "}}";
+
+    //string TEMPLATE =
+    //    "    public static List<{0}> ReadAs{1}s(this SQLitePCL.sqlite3_stmt stmt)\r\n" +
+    //    "    {{\r\n" +
+    //    "        List<{0}> data = new();\r\n" +
+    //    "        while (SQLite3.Step(stmt) == SQLite3.Result.Row)\r\n" +
+    //    "        {{\r\n" +
+    //    "            data.Add(\r\n" +
+    //    "                new {0}()\r\n" +
+    //    "                {{\r\n" +
+    //    "{2}\r\n" +
+    //    "                }});\r\n" +
+    //    "        }}\r\n\r\n" +
+    //    "        return data;\r\n" +
+    //    "    }}\r\n";
+
+    string TEMPLATE =
+        "    public static List<{0}> ReadAs{1}s(this SQLiteCommand cmd)\r\n" +
+        "    {{\r\n" +
+        "        var stmt = cmd.Prepare();\r\n" +
+        "\r\n" +
+        "        try\r\n" +
+        "        {{\r\n" +
+        "            List<{0}> data = new();\r\n" +
+        "            while (SQLite3.Step(stmt) == SQLite3.Result.Row)\r\n" +
+        "            {{\r\n" +
+        "                data.Add(\r\n" +
+        "                    new {0}()\r\n" +
+        "                    {{\r\n" +
+        "{2}\r\n" +
+        "                    }});\r\n" +
+        "            }}\r\n" +
+        "            return data;\r\n" +
+        "        }}\r\n" +
+        "        finally\r\n" +
+        "        {{\r\n" +
+        "            stmt.Dispose();\r\n" +
+        "        }}\r\n" +
+        "    }}\r\n";
+
+    string TEMPLATE_S =
+        "    public static {0} ReadAs{1}(this SQLiteCommand cmd)\r\n" +
+        "    {{\r\n" +
+        "        var stmt = cmd.Prepare();\r\n" +
+        "        try\r\n" +
+        "        {{\r\n" +
+        "            while (SQLite3.Step(stmt) == SQLite3.Result.Row)\r\n" +
+        "                return new {0}()\r\n" +
+        "                    {{\r\n" +
+        "{2}\r\n" +
+        "                    }};\r\n" +
+        "        }}\r\n" +
+        "        finally\r\n" +
+        "        {{\r\n" +
+        "            stmt.Dispose();\r\n" +
+        "        }}\r\n" +
+        "        return default;\r\n" +
+        "    }}";
+
+    public override void Write(GeneratorExecutionContext context)
+    {
+        base.Write(context);
+
+        if (data.Count == 0)
+            return;
+
+        StringBuilder main = new ();
+        StringBuilder sb = new ();
+
+        foreach (var item in data)
+        {
+            sb.Clear();
+
+            int i = 0;
+            foreach (var d in item.Columns)
+            {
+                int idx = d.index >= 0 ? d.index : i;
+                var line = $"{d.PropertyName} = ({d.CastType})SQLite3.Column{GetReader(d.ReadType)}(stmt, {idx}),";
+                sb.AppendLine(6, line);
+                i++;
+            }
+
+            main.AppendLine(
+                string.Format(
+                    item.Single ? TEMPLATE_S : TEMPLATE,
+                    item.Type, 
+                    item.Name, 
+                    sb.ToString().TrimEnd().TrimEnd(',')));
+        }
+
+        static string GetReader(string type)
+        {
+            return $"{char.ToUpper(type[0])}{type[1..^0]}";
+        }
+
+
+        context.AddSource("SQLite3Readers.g.cs", 
+            SourceText.From(string.Format(TEMPLATE_0, main.ToString().TrimEnd()), Encoding.UTF8));
+    }
+}
diff --git a/CharacterMap/CharacterMap.Generators/SourceGenerator.cs b/CharacterMap/CharacterMap.Generators/SourceGenerator.cs
index 1a9afc9c..85f9fc4f 100644
--- a/CharacterMap/CharacterMap.Generators/SourceGenerator.cs
+++ b/CharacterMap/CharacterMap.Generators/SourceGenerator.cs
@@ -28,6 +28,9 @@ public void Execute(GeneratorExecutionContext context)
 
                 // 4. Create Attached Properties
                 new AttachedPropertyReader().Process(tree, context);
+
+                // 5. Generate SQLite Readers
+                new SqliteStatementReader().Process(tree, context);
             }
         }
         catch (Exception)
diff --git a/CharacterMap/CharacterMap/CharacterMap.csproj b/CharacterMap/CharacterMap/CharacterMap.csproj
index 27734822..fccce05c 100644
--- a/CharacterMap/CharacterMap/CharacterMap.csproj
+++ b/CharacterMap/CharacterMap/CharacterMap.csproj
@@ -325,6 +325,7 @@
     <Compile Include="Services\IDialogService.cs" />
     <Compile Include="Services\LeakTrackingService.cs" />
     <Compile Include="Provider\SQLiteCollectionProvider.cs" />
+    <Compile Include="Services\SQLite3Extensions.cs" />
     <Compile Include="Services\UserCollectionsService.cs" />
     <Compile Include="Services\GlyphService.cs" />
     <Compile Include="Services\NavigationServiceEx.cs" />
diff --git a/CharacterMap/CharacterMap/Controls/CharacterGridView.cs b/CharacterMap/CharacterMap/Controls/CharacterGridView.cs
index e1721c26..75645d70 100644
--- a/CharacterMap/CharacterMap/Controls/CharacterGridView.cs
+++ b/CharacterMap/CharacterMap/Controls/CharacterGridView.cs
@@ -31,6 +31,7 @@ internal class CharacterGridViewTemplateSettings
 [DependencyProperty<TypographyFeatureInfo>("ItemTypography")]
 [DependencyProperty<FontVariant>("ItemFontVariant")]
 [DependencyProperty<GlyphAnnotation>("ItemAnnotation")]
+[AttachedProperty<ItemTooltipData>("ToolTipData")]
 public partial class CharacterGridView : GridView
 {
     public event EventHandler<Character> ItemDoubleTapped;
@@ -85,7 +86,7 @@ public CharacterGridView()
         this.ChoosingItemContainer += OnChoosingItemContainer;
     }
 
-    private class ItemTooltipData
+    public class ItemTooltipData
     {
         public Character Char { get; set; }
         public FontVariant Variant { get; set; }
@@ -119,7 +120,7 @@ private void OnContainerContentChanging(ListViewBase sender, ContainerContentCha
                     t.Placement = Windows.UI.Xaml.Controls.Primitives.PlacementMode.Top;
                     t.Loaded += (d, e) =>
                     {
-                        if (d is ToolTip tt && tt.Tag is ItemTooltipData data)
+                        if (d is ToolTip tt && CharacterGridView.GetToolTipData(tt) is ItemTooltipData data)
                         {
                             tt.PlacementRect = new(0, 0, data.Container.ActualWidth, data.Container.ActualHeight);
 
@@ -136,7 +137,8 @@ private void OnContainerContentChanging(ListViewBase sender, ContainerContentCha
                     };
                     ToolTipService.SetToolTip(item, t);
                 }
-                t.Tag = new ItemTooltipData { Char = c, Container = item, Variant = ItemFontVariant };
+
+                CharacterGridView.SetToolTipData(t, new ItemTooltipData { Char = c, Container = item, Variant = ItemFontVariant });
             }
         }
 
diff --git a/CharacterMap/CharacterMap/Core/FontVariant.cs b/CharacterMap/CharacterMap/Core/FontVariant.cs
index c0b65ae8..35bcf9bd 100644
--- a/CharacterMap/CharacterMap/Core/FontVariant.cs
+++ b/CharacterMap/CharacterMap/Core/FontVariant.cs
@@ -189,7 +189,16 @@ public bool HasDesignScriptTag(string tag)
         return _designLangRawSearch?.Values.Contains(tag, StringComparer.OrdinalIgnoreCase) ?? false;
     }
 
-    /* SEARCHING */
+    public bool CouldContainUnihan() => UnicodeRanges.Any(r => Unicode.UNIHAN_IDX >= r.First && Unicode.UNIHAN_IDX <= r.Last);
+
+
+
+
+    //------------------------------------------------------
+    //
+    // Searching
+    //
+    //------------------------------------------------------
 
     public Dictionary<Character, string> SearchMap { get; set; }
 
@@ -217,7 +226,11 @@ public string GetDescription(Character c, bool allowUnihan = false)
 
 
 
-    /* INTERNAL  */
+    //------------------------------------------------------
+    //
+    // Internal
+    //
+    //------------------------------------------------------
 
     private IReadOnlyList<TypographyFeatureInfo> LoadTypographyFeatures(bool isXaml = false)
     {
@@ -298,16 +311,9 @@ public FaceMetadataInfo TryGetInfo(CanvasFontInformation cfi)
 
     /* .NET */
 
-    public void Dispose()
-    {
-        FontFace?.Dispose();
-        //FontFace = null;
-    }
+    public void Dispose() => FontFace?.Dispose();
 
-    public override string ToString()
-    {
-        return PreferredName;
-    }
+    public override string ToString() => PreferredName;
 }
 
 
diff --git a/CharacterMap/CharacterMap/Core/Properties.cs b/CharacterMap/CharacterMap/Core/Properties.cs
index e9a39f22..8b932a3c 100644
--- a/CharacterMap/CharacterMap/Core/Properties.cs
+++ b/CharacterMap/CharacterMap/Core/Properties.cs
@@ -65,7 +65,7 @@ namespace CharacterMap.Core;
 [AttachedProperty<FontStyle>("FontStyle", FontStyle.Normal)] // Sets the FontStyle on a RichEditBox
 [AttachedProperty<FontWeight>("FontWeight", "FontWeights.Normal")] // Sets the FontWeight on a RichEditBox
 [AttachedProperty<FontFamily>("FontFamily")] // Sets the FontFamily on a RichEditBox
-
+[AttachedProperty<string>("ToolTipMemberPath")] // PropertyPath on an ItemContainer's Content to use as the ItemContainer's ToolTip
 public partial class Properties : DependencyObject
 {
     #region FILTER 
@@ -1052,4 +1052,54 @@ static void UpdateFormat(RichEditBox r)
     }
 
     #endregion
+
+    #region ToolTipMemberPath
+
+    static partial void OnToolTipMemberPathChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is ListViewBase lvb)
+        {
+            // 1. Ensure content changes during recycling
+            lvb.ContainerContentChanging -= ContainerContentChanging;
+            lvb.ContainerContentChanging += ContainerContentChanging;
+
+            // 2. Update any existing containers
+            if (lvb.ItemsPanelRoot is null)
+                return;
+            string path = e.NewValue.ToString();
+            foreach (var item in lvb.ItemsPanelRoot.Children.Cast<SelectorItem>())
+                if (item.Content is not null)
+                    Set(lvb, item, path);
+
+            static void Set(ListViewBase sender, SelectorItem item, string path = null)
+            {
+                path ??= GetToolTipMemberPath(sender);
+
+                if (string.IsNullOrWhiteSpace(path))
+                    item.ClearValue(ToolTipService.ToolTipProperty);
+                else
+                {
+                    item.SetBinding(ToolTipService.ToolTipProperty, new Binding()
+                    {
+                        Source = item,
+                        Path = new($"Content.{path}")
+                    });
+                }
+            }
+
+            static void ContainerContentChanging(ListViewBase sender, ContainerContentChangingEventArgs args)
+            {
+                if (args.ItemContainer is null)
+                    return;
+
+                string path = GetToolTipMemberPath(sender);
+                if (args.InRecycleQueue || string.IsNullOrWhiteSpace(path))
+                    Set(sender, args.ItemContainer, string.Empty);
+                else
+                    Set(sender, args.ItemContainer, path);
+            }
+        }
+    }
+
+    #endregion
 }
diff --git a/CharacterMap/CharacterMap/Helpers/Sqlite.cs b/CharacterMap/CharacterMap/Helpers/Sqlite.cs
index 9c6c72c0..f418ac15 100644
--- a/CharacterMap/CharacterMap/Helpers/Sqlite.cs
+++ b/CharacterMap/CharacterMap/Helpers/Sqlite.cs
@@ -47,6 +47,7 @@
 using Sqlite3Statement = SQLitePCL.sqlite3_stmt;
 using Sqlite3 = SQLitePCL.raw;
 using SQLitePCL;
+using System.Diagnostics.Contracts;
 #else
 using Sqlite3DatabaseHandle = System.IntPtr;
 using Sqlite3BackupHandle = System.IntPtr;
@@ -353,90 +354,6 @@ public SQLiteConnection Vacuum()
             return this;
         }
 
-        public List<IGlyphData> GetGlyphData(string table, string sql, string query)
-        {
-            var cmd = this.CreateCommand(sql, query);
-            var stmt = cmd.Prepare();
-
-            int columnDesc = table == "UnicodeGlyphData" ? 3 : 2;
-
-            List<IGlyphData> data = new();
-            while (SQLite3.Step(stmt) == SQLite3.Result.Row)
-            {
-                data.Add(new GlyphDescription()
-                {
-                    UnicodeIndex = SQLite3.ColumnInt(stmt, 0),
-                    UnicodeHex = SQLite3.ColumnString(stmt, 1),
-                    Description = SQLite3.ColumnString(stmt, columnDesc)
-                });
-            }
-
-            return data;
-        }
-
-        public List<UnihanReading> GetUnihanReadings(int idx)
-        {
-            var cmd = this.CreateCommand("SELECT * FROM UnihanReading WHERE Ix = ?", idx);
-            var stmt = cmd.Prepare();
-
-            List<UnihanReading> data = new();
-            while (SQLite3.Step(stmt) == SQLite3.Result.Row)
-            {
-                data.Add(
-                    new UnihanReading(
-                            SQLite3.ColumnInt(stmt, 0),
-                            (UnihanFieldType)SQLite3.ColumnInt(stmt, 1),
-                            SQLite3.ColumnString(stmt, 2)));
-            }
-
-            return data;
-        }
-
-        public AdobeGlyphListMapping GetGlyphListMapping(string name)
-        {
-            var cmd = this.CreateCommand("SELECT * FROM AdobeGlyphListMapping WHERE S = ? LIMIT 1", name);
-            var stmt = cmd.Prepare();
-
-            try
-            {
-                if (SQLite3.Step(stmt) == SQLite3.Result.Row)
-                {
-                    return new AdobeGlyphListMapping
-                    {
-                        UnicodeIndex = SQLite3.ColumnInt(stmt, 0),
-                        UnicodeIndex2 = SQLite3.ColumnInt(stmt, 1),
-                        UnicodeIndex3 = SQLite3.ColumnInt(stmt, 2),
-                        UnicodeIndex4 = SQLite3.ColumnInt(stmt, 3),
-                    };
-                }
-            }
-            finally
-            {
-                SQLite3.Finalize(stmt);
-            }
-
-            return null;
-        }
-
-
-        public string GetUnicodeDescription(int index, string table = "UnicodeGlyphData")
-        {
-            var cmd = this.CreateCommand($"SELECT Description FROM \"{table}\" WHERE Ix = ?", index);
-            var stmt = cmd.Prepare();
-
-            try
-            {
-                if (SQLite3.Step(stmt) == SQLite3.Result.Row)
-                    return SQLite3.ColumnString(stmt, 0);
-            }
-            finally
-            {
-                SQLite3.Finalize(stmt);
-            }
-
-            return null;
-        }
-
         /// <summary>
         /// Convert an input string to a quoted SQL string that can be safely used in queries.
         /// </summary>
diff --git a/CharacterMap/CharacterMap/Helpers/Unicode.cs b/CharacterMap/CharacterMap/Helpers/Unicode.cs
index 40cf5310..eaef3cd8 100644
--- a/CharacterMap/CharacterMap/Helpers/Unicode.cs
+++ b/CharacterMap/CharacterMap/Helpers/Unicode.cs
@@ -4,13 +4,20 @@ namespace CharacterMap.Helpers;
 
 public static class Unicode
 {
+    public const uint UNIHAN_IDX = 0x3000;
+
     public static bool IsWhiteSpace(int c)
     {
         return ((c == ' ') || (c >= 0x0009 && c <= 0x000d) || c == 0x00a0 || c == 0x0085);
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool CouldBeUnihan(uint index) => index >= UNIHAN_IDX;
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static string GetHexValue(uint i) => (i <= 0x10FFFF && (i < 0xD800 || i > 0xDFFF)) ? char.ConvertFromUtf32((int)i) : new string((char)i, 1);
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static bool RequiresSurrogates(Character c) => c.UnicodeIndex >= 0x010000;
 
     public static bool IsWhiteSpaceOrControl(uint c)
@@ -23,17 +30,20 @@ or UnicodeGeneralCategory.LineSeparator
             or UnicodeGeneralCategory.ParagraphSeparator;
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static bool ContainsRange(FontVariant v, UnicodeRange range)
     {
         return v.UnicodeRanges.Any(r => r.First <= range.End && range.Start <= r.Last);
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static bool SupportsScript(FontVariant v, UnicodeRange range)
     {
         // Filters out fonts that support less than two glyphs in the script range
         return v.UnicodeRanges.Any(r => r.First <= range.End && range.Start <= r.Last && ((r.Last - r.First) > 1));
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static bool ContainsEmoji(FontVariant v)
     {
         return ContainsRange(v, UnicodeRange.Emoticons)
@@ -41,6 +51,7 @@ public static bool ContainsEmoji(FontVariant v)
             || ContainsEmojiSymbols(v);
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static bool ContainsEmojiSymbols(FontVariant v)
     {
         return ContainsRange(v, UnicodeRange.SymbolsExtended)
diff --git a/CharacterMap/CharacterMap/Models/Character.cs b/CharacterMap/CharacterMap/Models/Character.cs
index c66d66da..ee5f71d4 100644
--- a/CharacterMap/CharacterMap/Models/Character.cs
+++ b/CharacterMap/CharacterMap/Models/Character.cs
@@ -14,6 +14,8 @@ public Character(uint unicodeIndex)
 
     public string UnicodeString => "U+" + UnicodeIndex.ToString("x4").ToUpper();
 
+    public bool CouldBeUnihan => Unicode.CouldBeUnihan(UnicodeIndex);
+
     private NamedUnicodeRange _range;
     public NamedUnicodeRange Range => _range ??= (UnicodeRanges.All.FirstOrDefault(r => r != UnicodeRanges.Unassigned && r.Contains(UnicodeIndex)) ?? UnicodeRanges.Unassigned);
 
diff --git a/CharacterMap/CharacterMap/Models/Unihan.cs b/CharacterMap/CharacterMap/Models/Unihan.cs
index e2c5ddaa..bb6c35d9 100644
--- a/CharacterMap/CharacterMap/Models/Unihan.cs
+++ b/CharacterMap/CharacterMap/Models/Unihan.cs
@@ -75,6 +75,8 @@ private UnihanFieldData(UnihanFieldType type)
 [DebuggerDisplay("{Type} {Description}")]
 public class UnihanReading
 {
+    public UnihanReading() { }
+
     public UnihanReading(int index, UnihanFieldType type, string description)
     {
         Index = index;
diff --git a/CharacterMap/CharacterMap/Provider/SQLiteGlyphProvider.cs b/CharacterMap/CharacterMap/Provider/SQLiteGlyphProvider.cs
index ebe551c0..d10fad3b 100644
--- a/CharacterMap/CharacterMap/Provider/SQLiteGlyphProvider.cs
+++ b/CharacterMap/CharacterMap/Provider/SQLiteGlyphProvider.cs
@@ -1,4 +1,5 @@
 using SQLite;
+using System.Globalization;
 using Windows.ApplicationModel;
 using Windows.UI.Xaml.Controls;
 
@@ -6,7 +7,6 @@ namespace CharacterMap.Provider;
 
 public partial class SQLiteGlyphProvider : IGlyphDataProvider
 {
-
     /* Used for FTS searches */
     internal const string FONTAWESOME_SEARCH_TABLE = "fontawesomesearch";
     internal const string MDL2_SEARCH_TABLE = "mdl2search";
@@ -16,7 +16,7 @@ public partial class SQLiteGlyphProvider : IGlyphDataProvider
     internal const string WINGDINGS2_SEARCH_TABLE = "wng2search";
     internal const string WINGDINGS3_SEARCH_TABLE = "wng3search";
 
-    private int SEARCH_LIMIT => new AppSettings().MaxSearchResult;
+    private int SEARCH_LIMIT => ResourceHelper.AppSettings.MaxSearchResult;
 
     private SQLiteConnection _connection { get; set; }
 
@@ -147,7 +147,7 @@ private Task<IReadOnlyList<IGlyphData>> InternalSearchAsync(string ftsTable, str
              * Step 3: Perform LIKE search if still space for results
              */
 
-          
+
 
             // 1. Decide if hex or FTS4 search
             //    If hex, search the main table (UnicodeIndex column is indexed)
@@ -228,14 +228,6 @@ private Task<IReadOnlyList<IGlyphData>> InternalSearchAsync(string ftsTable, str
             }
             sb.Append(")");
 
-            // 2.1. A helper method to inject the hex result for ambiguous searches
-            List<IGlyphData> InsertHex(List<IGlyphData> list)
-            {
-                if (hexResult != null)
-                    list.Insert(0, hexResult);
-                return list;
-            }
-
             List<IGlyphData> results = new();
 
             // 3. If the font has a local search map, we should do a text search inside that
@@ -250,10 +242,10 @@ List<IGlyphData> InsertHex(List<IGlyphData> list)
             }
 
             if (results.Count == SEARCH_LIMIT)
-                return results;
+                goto End;
 
             // 3.1. Otherwise, perform a multi-step text search. First perform an FTS4 search
-            int limit = results == null ? SEARCH_LIMIT : SEARCH_LIMIT - results.Count;
+            int limit = SEARCH_LIMIT - results.Count;
 
             // 3.2. We need to exclude anything already found above
             string extra = string.Empty;
@@ -295,7 +287,7 @@ List<IGlyphData> InsertHex(List<IGlyphData> list)
 
             // 5. Perform a partial search on non-FTS table. Only search for what we need.
             //    This means limit the amount of results, and exclude anything we've already matched.
-            limit = results == null ? SEARCH_LIMIT : SEARCH_LIMIT - results.Count;
+            limit = SEARCH_LIMIT - results.Count;
             if (limit != SEARCH_LIMIT)
             {
                 // 5.1. We need to exclude anything already found above
@@ -306,14 +298,33 @@ List<IGlyphData> InsertHex(List<IGlyphData> list)
             // 6. Execute on the non FTS tables
             string sql2 = $"SELECT * FROM {table} {sb.ToString()} AND Description LIKE ? LIMIT {limit}";
             var results2 = _connection.GetGlyphData(table, sql2, $"%{query}%");
+            results.AddRange(results2);
+            limit = SEARCH_LIMIT - results.Count;
+
+            if (limit <= 0)
+                goto End;
 
-            if (results != null)
+            // 7. Check Unihan data
+            if (variant.CouldContainUnihan())
             {
-                results.AddRange(results2);
-                return InsertHex(results);
+                string sql3 = $"SELECT * FROM {nameof(UnihanReading)} {sb.ToString()} AND Type == {(int)UnihanFieldType.Definition} AND Description LIKE ? LIMIT {limit}";
+                var results3 = _connection.GetUnihanReadingsByDescription(sql3, $"%{query}%");
+
+                results.AddRange(results3.Select(u =>
+                {
+                    return new GlyphDescription
+                    {
+                        Description = u.Description,
+                        UnicodeIndex = u.Index,
+                        UnicodeHex = u.Index.ToString("X")
+                    };
+                }));
             }
-            else
-                return InsertHex(results2);
+
+        End:
+            if (hexResult is not null)
+                results.Insert(0, hexResult);
+            return results;
         });
     }
 
diff --git a/CharacterMap/CharacterMap/Services/GlyphService.cs b/CharacterMap/CharacterMap/Services/GlyphService.cs
index 36d3ee3c..63187958 100644
--- a/CharacterMap/CharacterMap/Services/GlyphService.cs
+++ b/CharacterMap/CharacterMap/Services/GlyphService.cs
@@ -31,6 +31,8 @@ public class GlyphDescription : IGlyphData
     public string Description { get; set; }
 }
 
+
+
 public class MDL2Glyph : GlyphDescription { }
 public class WebdingsGlyph : GlyphDescription { }
 public class WingdingsGlyph : GlyphDescription { }
@@ -92,7 +94,7 @@ internal static string TryGetAGLFNName(string aglfn)
 
     public static UnihanData GetUnihanData(uint unicodeIndex)
     {
-        if (unicodeIndex >= 0x3000)
+        if (Unicode.CouldBeUnihan(unicodeIndex))
         {
             var readings = _provider.GetUnihanReadings((int)unicodeIndex);
             if (readings is not null && readings.Count > 0)
diff --git a/CharacterMap/CharacterMap/Services/SQLite3Extensions.cs b/CharacterMap/CharacterMap/Services/SQLite3Extensions.cs
new file mode 100644
index 00000000..1581aaed
--- /dev/null
+++ b/CharacterMap/CharacterMap/Services/SQLite3Extensions.cs
@@ -0,0 +1,92 @@
+using SQLite;
+
+namespace CharacterMap.Services;
+
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+public class SQLReaderAttribute<T>(string Name, bool IsSingle = false) : Attribute where T : new() { }
+
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+public class SQLReaderMappingAttribute<T>(string Property, Type readType = null, int columnIndex = -1) : Attribute { }
+
+public static class SQLite3Extensions
+{
+    public static List<GlyphDescription> GetGlyphData(this SQLiteConnection c, string table, string sql, string query)
+    {
+        var cmd = c.CreateCommand(sql, query);
+        return table == "UnicodeGlyphData"
+            ? cmd.ReadAsUnicodeGlyphDatas()
+            : cmd.ReadAsGlyphDescriptions();
+    }
+
+    public static List<UnihanReading> GetUnihanReadings(this SQLiteConnection c, int idx)
+    {
+        return c.CreateCommand("SELECT * FROM UnihanReading WHERE Ix = ?", idx)
+                .ReadAsUnihanReadings();
+    }
+
+    public static List<UnihanReading> GetUnihanReadingsByDescription(this SQLiteConnection c, string sql, string query)
+    {
+        return c.CreateCommand(sql, query)
+                .ReadAsUnihanReadings();
+    }
+
+    public static AdobeGlyphListMapping GetGlyphListMapping(this SQLiteConnection c, string name)
+    {
+        return c.CreateCommand("SELECT * FROM AdobeGlyphListMapping WHERE S = ? LIMIT 1", name)
+                .ReadAsAdobeGlyphListMapping();
+    }
+
+    public static string GetUnicodeDescription(this SQLiteConnection c, int index, string table = "UnicodeGlyphData")
+    {
+        var cmd = c.CreateCommand($"SELECT Description FROM \"{table}\" WHERE Ix = ?", index);
+        var stmt = cmd.Prepare();
+
+        try
+        {
+            if (SQLite3.Step(stmt) == SQLite3.Result.Row)
+                return SQLite3.ColumnString(stmt, 0);
+        }
+        finally
+        {
+            stmt.Dispose();
+        }
+
+        return null;
+    }
+
+
+    
+    
+    //------------------------------------------------------
+    //
+    // Source Generator Shims
+    // - Used to source gen the "ReadAs{XXXX}" methods
+    // - Shims will be removed by compiler
+    //
+    //------------------------------------------------------
+
+    [SQLReader<GlyphDescription>("UnicodeGlyphData")]
+    [SQLReaderMapping<int>(nameof(GlyphDescription.UnicodeIndex))]
+    [SQLReaderMapping<string>(nameof(GlyphDescription.UnicodeHex))]
+    [SQLReaderMapping<string>(nameof(GlyphDescription.Description), typeof(string), 3)]
+    private class Shim1 : Object { }
+
+    [SQLReader<GlyphDescription>(nameof(GlyphDescription))]
+    [SQLReaderMapping<int>(nameof(GlyphDescription.UnicodeIndex))]
+    [SQLReaderMapping<string>(nameof(GlyphDescription.UnicodeHex))]
+    [SQLReaderMapping<string>(nameof(GlyphDescription.Description))]
+    private class Shim2 : Object { }
+
+    [SQLReader<UnihanReading>(nameof(UnihanReading))]
+    [SQLReaderMapping<int>(nameof(UnihanReading.Index))]
+    [SQLReaderMapping<UnihanFieldType>(nameof(UnihanReading.Type), typeof(int))]
+    [SQLReaderMapping<string>(nameof(UnihanReading.Description))]
+    private class Shim3 : Object { }
+
+    [SQLReader<AdobeGlyphListMapping>(nameof(AdobeGlyphListMapping), true)]
+    [SQLReaderMapping<int>(nameof(AdobeGlyphListMapping.UnicodeIndex))]
+    [SQLReaderMapping<int>(nameof(AdobeGlyphListMapping.UnicodeIndex2))]
+    [SQLReaderMapping<int>(nameof(AdobeGlyphListMapping.UnicodeIndex3))]
+    [SQLReaderMapping<int>(nameof(AdobeGlyphListMapping.UnicodeIndex4))]
+    private class Shim4 : Object { }
+}
diff --git a/CharacterMap/CharacterMap/Styles/ItemTemplates.xaml b/CharacterMap/CharacterMap/Styles/ItemTemplates.xaml
index a68e76bd..79113dfe 100644
--- a/CharacterMap/CharacterMap/Styles/ItemTemplates.xaml
+++ b/CharacterMap/CharacterMap/Styles/ItemTemplates.xaml
@@ -10,11 +10,7 @@
     mc:Ignorable="d">
 
     <DataTemplate x:Key="SearchResultTemplate" x:DataType="services:IGlyphData">
-        <Grid
-            Name="TemplateContent"
-            HorizontalAlignment="Stretch"
-            Background="Transparent"
-            ToolTipService.ToolTip="{x:Bind Description}">
+        <Grid Name="TemplateContent" HorizontalAlignment="Stretch">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="30" />
                 <ColumnDefinition Width="*" />
@@ -24,8 +20,12 @@
                 Margin="4,0,0,0"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
-                FontFamily="{Binding ElementName=SearchBox, Path=Tag}"
+                DataContext="{Binding ElementName=SearchBox}"
+                FontFamily="{Binding Path=(core:Properties.FontFamily)}"
                 FontSize="16"
+                FontStretch="{Binding Path=(core:Properties.FontStretch)}"
+                FontStyle="{Binding Path=(core:Properties.FontStyle)}"
+                FontWeight="{Binding Path=(core:Properties.FontWeight)}"
                 IsColorFontEnabled="True"
                 Text="{x:Bind core:Converters.ToHex(UnicodeIndex)}" />
             <TextBlock
diff --git a/CharacterMap/CharacterMap/Styles/TextBox.xaml b/CharacterMap/CharacterMap/Styles/TextBox.xaml
index c276c3e0..e7bbbba2 100644
--- a/CharacterMap/CharacterMap/Styles/TextBox.xaml
+++ b/CharacterMap/CharacterMap/Styles/TextBox.xaml
@@ -589,78 +589,6 @@
                 <ControlTemplate TargetType="TextBox">
                     <Grid x:Name="Root">
 
-                        <Grid.Resources>
-                            <Style x:Name="DeleteButtonStyle" TargetType="Button">
-                                <Setter Property="Template">
-                                    <Setter.Value>
-                                        <ControlTemplate TargetType="Button">
-                                            <Grid
-                                                x:Name="ButtonLayoutGrid"
-                                                Background="{ThemeResource TextControlButtonBackground}"
-                                                BorderBrush="{ThemeResource TextControlButtonBorderBrush}"
-                                                BorderThickness="{TemplateBinding BorderThickness}"
-                                                CornerRadius="{TemplateBinding CornerRadius}">
-
-                                                <VisualStateManager.VisualStateGroups>
-                                                    <VisualStateGroup x:Name="CommonStates">
-                                                        <VisualState x:Name="Normal" />
-
-                                                        <VisualState x:Name="PointerOver">
-                                                            <Storyboard>
-                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonLayoutGrid" Storyboard.TargetProperty="Background">
-                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlButtonBackgroundPointerOver}" />
-                                                                </ObjectAnimationUsingKeyFrames>
-                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonLayoutGrid" Storyboard.TargetProperty="BorderBrush">
-                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlButtonBorderBrushPointerOver}" />
-                                                                </ObjectAnimationUsingKeyFrames>
-                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement" Storyboard.TargetProperty="Foreground">
-                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlButtonForegroundPointerOver}" />
-                                                                </ObjectAnimationUsingKeyFrames>
-                                                            </Storyboard>
-                                                        </VisualState>
-
-                                                        <VisualState x:Name="Pressed">
-                                                            <Storyboard>
-                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonLayoutGrid" Storyboard.TargetProperty="Background">
-                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlButtonBackgroundPressed}" />
-                                                                </ObjectAnimationUsingKeyFrames>
-                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonLayoutGrid" Storyboard.TargetProperty="BorderBrush">
-                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlButtonBorderBrushPressed}" />
-                                                                </ObjectAnimationUsingKeyFrames>
-                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="GlyphElement" Storyboard.TargetProperty="Foreground">
-                                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlButtonForegroundPressed}" />
-                                                                </ObjectAnimationUsingKeyFrames>
-                                                            </Storyboard>
-                                                        </VisualState>
-
-                                                        <VisualState x:Name="Disabled">
-                                                            <Storyboard>
-                                                                <DoubleAnimation
-                                                                    Storyboard.TargetName="ButtonLayoutGrid"
-                                                                    Storyboard.TargetProperty="Opacity"
-                                                                    To="0"
-                                                                    Duration="0" />
-                                                            </Storyboard>
-                                                        </VisualState>
-                                                    </VisualStateGroup>
-                                                </VisualStateManager.VisualStateGroups>
-                                                <TextBlock
-                                                    x:Name="GlyphElement"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
-                                                    AutomationProperties.AccessibilityView="Raw"
-                                                    FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                    FontSize="{ThemeResource AutoSuggestBoxIconFontSize}"
-                                                    FontStyle="Normal"
-                                                    Foreground="{ThemeResource TextControlButtonForeground}"
-                                                    Text="&#xE10A;" />
-                                            </Grid>
-                                        </ControlTemplate>
-                                    </Setter.Value>
-                                </Setter>
-                            </Style>
-                        </Grid.Resources>
-
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Disabled">
@@ -695,6 +623,8 @@
                             Padding="{TemplateBinding Padding}"
                             AutomationProperties.AccessibilityView="Raw"
                             CornerRadius="{TemplateBinding CornerRadius}"
+                            FontStretch="{TemplateBinding FontStretch}"
+                            FontStyle="{TemplateBinding FontStyle}"
                             HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                             HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
                             IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
diff --git a/CharacterMap/CharacterMap/Themes/FluentThemeStyles.xaml b/CharacterMap/CharacterMap/Themes/FluentThemeStyles.xaml
index 03d310c9..f2a45508 100644
--- a/CharacterMap/CharacterMap/Themes/FluentThemeStyles.xaml
+++ b/CharacterMap/CharacterMap/Themes/FluentThemeStyles.xaml
@@ -2181,6 +2181,7 @@
                                         x:Name="SuggestionsList"
                                         MaxHeight="{TemplateBinding MaxSuggestionListHeight}"
                                         Margin="{ThemeResource AutoSuggestListPadding}"
+                                        core:Properties.ToolTipMemberPath="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(core:Properties.ToolTipMemberPath)}"
                                         DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
                                         Footer="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(core:Properties.Footer)}"
                                         IsItemClickEnabled="True"
diff --git a/CharacterMap/CharacterMap/Views/FontMapView.xaml b/CharacterMap/CharacterMap/Views/FontMapView.xaml
index 253abcac..b640f42d 100644
--- a/CharacterMap/CharacterMap/Views/FontMapView.xaml
+++ b/CharacterMap/CharacterMap/Views/FontMapView.xaml
@@ -576,6 +576,11 @@
                     Width="290"
                     Margin="6 0 6 0"
                     VerticalAlignment="Center"
+                    core:Properties.FontFamily="{x:Bind ViewModel.FontFamily, Mode=OneWay}"
+                    core:Properties.FontStretch="{x:Bind ViewModel.SelectedVariant.FontFace.Stretch, Mode=OneWay}"
+                    core:Properties.FontStyle="{x:Bind ViewModel.SelectedVariant.FontFace.Style, Mode=OneWay}"
+                    core:Properties.FontWeight="{x:Bind ViewModel.SelectedVariant.FontFace.Weight, Mode=OneWay}"
+                    core:Properties.ToolTipMemberPath="Description"
                     GotFocus="SearchBox_GotFocus"
                     ItemTemplate="{StaticResource SearchResultTemplate}"
                     ItemsSource="{Binding Source={StaticResource SearchResultsSource}}"

From 35c30cf76751460567b6aab3a905c92be2700ae0 Mon Sep 17 00:00:00 2001
From: Johnny Westlake <jmdwestlake@yahoo.co.uk>
Date: Sat, 18 May 2024 23:50:02 +0100
Subject: [PATCH 08/15] Smart collections UI work

---
 .../Readers/DependencyPropertyReader.cs       |   3 +
 .../Controls/CreateCollectionDialog.xaml      |   7 +-
 .../Controls/CreateCollectionDialog.xaml.cs   |  16 +-
 CharacterMap/CharacterMap/Core/AppSettings.cs |   2 +-
 .../CharacterMap/Core/InstalledFont.cs        |   2 +-
 .../Helpers/CompositionFactory.cs             |   4 +-
 .../CharacterMap/Helpers/FlyoutHelper.cs      |   9 +-
 .../Themes/ClassicThemeStyles.xaml            | 161 +++++++++++++++++-
 .../Themes/DefaultThemeStyles.xaml            | 161 +++++++++++++++++-
 .../Themes/FluentThemeStyles.xaml             |   1 +
 .../CharacterMap/Themes/ZuneThemeStyles.xaml  | 158 +++++++++++++++++
 .../ViewModels/SettingsViewModel.cs           |   1 +
 .../Views/CollectionManagementView.xaml.cs    |   1 +
 13 files changed, 509 insertions(+), 17 deletions(-)

diff --git a/CharacterMap/CharacterMap.Generators/Readers/DependencyPropertyReader.cs b/CharacterMap/CharacterMap.Generators/Readers/DependencyPropertyReader.cs
index caf5f54d..ef2625c9 100644
--- a/CharacterMap/CharacterMap.Generators/Readers/DependencyPropertyReader.cs
+++ b/CharacterMap/CharacterMap.Generators/Readers/DependencyPropertyReader.cs
@@ -147,6 +147,9 @@ public override void Write(GeneratorExecutionContext context)
             string target = group.First().ParentClass;
             List<string> usings = group.First().Usings;
 
+            if (usings.Contains("using Windows.UI.Xaml;") is false)
+                usings.Add("using Windows.UI.Xaml;");
+
             StringBuilder sb = new();
 
             foreach (DPData dp in group)
diff --git a/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml b/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml
index 03c5c600..96d8a8d8 100644
--- a/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml
+++ b/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml
@@ -23,15 +23,16 @@
 
         <CheckBox
             x:Name="SmartCollectionCheckbox"
-            x:Load="{x:Bind core:Converters.False(IsEditMode)}"
-            Content="Is Smart Collection"
+            x:Load="{x:Bind AllowSmartCollection}"
+            Margin="0 12 0 0"
+            Content="Create Smart Collection"
             IsChecked="{x:Bind TemplateSettings.IsSmartCollection, Mode=TwoWay}"
             Style="{StaticResource DefaultThemeCheckBoxStyle}" />
 
         <StackPanel
             x:Name="SmartFilters"
             x:Load="{x:Bind TemplateSettings.IsSmartCollection, Mode=OneWay}"
-            Margin="0 24 0 0"
+            Margin="0 12 0 0"
             Spacing="12">
             <TextBox Text="{Binding FilterFilePath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                 <TextBox.Header>
diff --git a/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml.cs b/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml.cs
index 77da15c5..b02f8409 100644
--- a/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml.cs
+++ b/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml.cs
@@ -1,4 +1,5 @@
-using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
 
 namespace CharacterMap.Controls;
 
@@ -63,12 +64,15 @@ void Add(string id, string field)
     }
 }
 
+//[DependencyProperty<bool>("AllowSmartCollection")]
 public sealed partial class CreateCollectionDialog : ContentDialog
 {
     public CreateCollectionDialogTemplateSettings TemplateSettings { get; }
 
     public bool IsEditMode { get; }
 
+    public bool AllowSmartCollection { get; private set; }
+
     public object Result { get; private set; }
 
 
@@ -77,7 +81,7 @@ public sealed partial class CreateCollectionDialog : ContentDialog
     public CreateCollectionDialog(IFontCollection collection = null)
     {
         _collection = collection;
-        TemplateSettings = new CreateCollectionDialogTemplateSettings();
+        TemplateSettings = new ();
         this.InitializeComponent();
 
         if (_collection != null)
@@ -89,6 +93,14 @@ public CreateCollectionDialog(IFontCollection collection = null)
         }
     }
 
+    public CreateCollectionDialog SetDataContext(object o)
+    {
+        this.DataContext = o;
+        if (o is null)
+            AllowSmartCollection = IsEditMode is false;
+        return this;
+    }
+
 
     private async void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
     {
diff --git a/CharacterMap/CharacterMap/Core/AppSettings.cs b/CharacterMap/CharacterMap/Core/AppSettings.cs
index dee5ae7e..85cec14f 100644
--- a/CharacterMap/CharacterMap/Core/AppSettings.cs
+++ b/CharacterMap/CharacterMap/Core/AppSettings.cs
@@ -101,7 +101,7 @@ public int ApplicationDesignTheme
 
     public int MaxSearchResult
     {
-        get => Get(51, "MSR");
+        get => Get(101, "MSR");
         set => Set(value, "MSR");
     }
 
diff --git a/CharacterMap/CharacterMap/Core/InstalledFont.cs b/CharacterMap/CharacterMap/Core/InstalledFont.cs
index f589f2c5..1b7341e2 100644
--- a/CharacterMap/CharacterMap/Core/InstalledFont.cs
+++ b/CharacterMap/CharacterMap/Core/InstalledFont.cs
@@ -59,7 +59,7 @@ public InstalledFont Clone()
 
     public static InstalledFont CreateDefault(DWriteFontFace face)
     {
-        var font = new InstalledFont("");
+        InstalledFont font = new ("Segoe UI");
         font._variants.Add(FontVariant.CreateDefault(face));
         return font;
     }
diff --git a/CharacterMap/CharacterMap/Helpers/CompositionFactory.cs b/CharacterMap/CharacterMap/Helpers/CompositionFactory.cs
index 9f9702cd..e4f62078 100644
--- a/CharacterMap/CharacterMap/Helpers/CompositionFactory.cs
+++ b/CharacterMap/CharacterMap/Helpers/CompositionFactory.cs
@@ -109,7 +109,7 @@ public static ImplicitAnimationCollection GetRepositionCollection(Compositor c)
             var g = c.CreateAnimationGroup();
             g.Add(c.CreateVector3KeyFrameAnimation()
                         .SetTarget(nameof(Visual.Offset))
-                        .AddKeyFrame(1f, "this.FinalValue")
+                        .AddKeyFrame(1f, FINAL_VALUE)
                         .SetDuration(CompositionFactory.DefaultOffsetDuration));
 
             var s = c.CreateImplicitAnimationCollection();
@@ -123,7 +123,7 @@ public static ICompositionAnimationBase CreateScaleAnimation(Compositor c)
         return c.GetCached("ScaleAni", () =>
         {
             return c.CreateVector3KeyFrameAnimation()
-                .AddKeyFrame(1f, "this.FinalValue")
+                .AddKeyFrame(1f, FINAL_VALUE)
                 .SetDuration(CompositionFactory.DefaultOffsetDuration)
                 .SetTarget(nameof(Visual.Scale));
         });
diff --git a/CharacterMap/CharacterMap/Helpers/FlyoutHelper.cs b/CharacterMap/CharacterMap/Helpers/FlyoutHelper.cs
index d2cd0f00..2f6eb7a9 100644
--- a/CharacterMap/CharacterMap/Helpers/FlyoutHelper.cs
+++ b/CharacterMap/CharacterMap/Helpers/FlyoutHelper.cs
@@ -391,12 +391,9 @@ static async void AddToSymbolFonts_Click(object sender, RoutedEventArgs e)
 
         static void CreateCollection_Click(object sender, RoutedEventArgs e)
         {
-            CreateCollectionDialog d = new ()
-            {
-                DataContext = (sender as FrameworkElement)?.DataContext
-            };
-
-            _ = d.ShowAsync();
+            _ = new CreateCollectionDialog()
+                   .SetDataContext(((FrameworkElement)sender).DataContext)
+                   .ShowAsync();
         }
 
         #endregion
diff --git a/CharacterMap/CharacterMap/Themes/ClassicThemeStyles.xaml b/CharacterMap/CharacterMap/Themes/ClassicThemeStyles.xaml
index 1d30f2c2..a97c1032 100644
--- a/CharacterMap/CharacterMap/Themes/ClassicThemeStyles.xaml
+++ b/CharacterMap/CharacterMap/Themes/ClassicThemeStyles.xaml
@@ -407,7 +407,165 @@
         <Setter Property="CornerRadius" Value="0" />
     </Style>
 
-    <Style x:Key="ThemeMenuFlyoutItemStyle" TargetType="MenuFlyoutItem" />
+    <Style x:Key="ThemeMenuFlyoutItemStyle" TargetType="MenuFlyoutItem">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="MenuFlyoutItem">
+                    <Grid
+                        x:Name="LayoutRoot"
+                        Padding="{TemplateBinding Padding}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal">
+
+                                    <Storyboard>
+                                        <PointerUpThemeAnimation Storyboard.TargetName="LayoutRoot" />
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="PointerOver">
+                                    <VisualState.Setters>
+                                        <Setter Target="LayoutRoot.(RevealBrush.State)" Value="PointerOver" />
+                                        <Setter Target="LayoutRoot.Background" Value="{ThemeResource MenuFlyoutItemRevealBackgroundPointerOver}" />
+                                        <Setter Target="LayoutRoot.BorderBrush" Value="{ThemeResource MenuFlyoutItemRevealBorderBrushPointerOver}" />
+                                        <Setter Target="IconContent.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundPointerOver}" />
+                                        <Setter Target="TextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundPointerOver}" />
+                                        <Setter Target="KeyboardAcceleratorTextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPointerOver}" />
+                                    </VisualState.Setters>
+
+                                    <Storyboard>
+                                        <PointerUpThemeAnimation Storyboard.TargetName="LayoutRoot" />
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="Pressed">
+                                    <VisualState.Setters>
+                                        <Setter Target="LayoutRoot.(RevealBrush.State)" Value="Pressed" />
+                                        <Setter Target="LayoutRoot.Background" Value="{ThemeResource MenuFlyoutItemRevealBackgroundPressed}" />
+                                        <Setter Target="LayoutRoot.BorderBrush" Value="{ThemeResource MenuFlyoutItemRevealBorderBrushPressed}" />
+                                        <Setter Target="IconContent.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundPressed}" />
+                                        <Setter Target="TextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundPressed}" />
+                                        <Setter Target="KeyboardAcceleratorTextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPressed}" />
+                                    </VisualState.Setters>
+
+                                    <Storyboard>
+                                        <PointerDownThemeAnimation Storyboard.TargetName="LayoutRoot" />
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="Disabled">
+                                    <VisualState.Setters>
+                                        <Setter Target="LayoutRoot.Background" Value="{ThemeResource MenuFlyoutItemRevealBackgroundDisabled}" />
+                                        <Setter Target="LayoutRoot.BorderBrush" Value="{ThemeResource MenuFlyoutItemRevealBorderBrushDisabled}" />
+                                        <Setter Target="IconContent.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundDisabled}" />
+                                        <Setter Target="TextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundDisabled}" />
+                                        <Setter Target="KeyboardAcceleratorTextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForegroundDisabled}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="CheckPlaceholderStates">
+                                <VisualState x:Name="NoPlaceholder" />
+                                <VisualState x:Name="CheckPlaceholder">
+                                    <VisualState.Setters>
+                                        <Setter Target="TextBlock.Margin" Value="{ThemeResource MenuFlyoutItemPlaceholderThemeThickness}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="IconPlaceholder">
+                                    <VisualState.Setters>
+                                        <Setter Target="TextBlock.Margin" Value="{ThemeResource LanguageSwitcherMenuFlyoutItemPlaceholderThemeThickness}" />
+                                        <Setter Target="IconRoot.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="CheckAndIconPlaceholder">
+                                    <VisualState.Setters>
+                                        <Setter Target="TextBlock.Margin" Value="{ThemeResource MenuFlyoutItemDoublePlaceholderThemeThickness}" />
+                                        <Setter Target="IconRoot.Margin" Value="{ThemeResource MenuFlyoutItemPlaceholderThemeThickness}" />
+                                        <Setter Target="IconRoot.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="PaddingSizeStates">
+                                <VisualState x:Name="DefaultPadding" />
+                                <VisualState x:Name="NarrowPadding">
+
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Padding">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource MenuFlyoutItemThemePaddingNarrow}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="KeyboardAcceleratorTextVisibility">
+                                <VisualState x:Name="KeyboardAcceleratorTextCollapsed" />
+                                <VisualState x:Name="KeyboardAcceleratorTextVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="KeyboardAcceleratorTextBlock.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+
+                        </VisualStateManager.VisualStateGroups>
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Viewbox
+                            x:Name="IconRoot"
+                            Width="32"
+                            Height="32"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Visibility="Collapsed">
+                            <ContentPresenter x:Name="IconContent" Content="{TemplateBinding Icon}" />
+                        </Viewbox>
+                        <TextBlock
+                            x:Name="TextBlock"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Foreground="{TemplateBinding Foreground}"
+                            Text="{TemplateBinding Text}"
+                            TextTrimming="Clip" />
+                        <TextBlock
+                            x:Name="KeyboardAcceleratorTextBlock"
+                            Grid.Column="1"
+                            MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KeyboardAcceleratorTextMinWidth}"
+                            Margin="24,0,0,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            AutomationProperties.AccessibilityView="Raw"
+                            Foreground="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                            Style="{ThemeResource CaptionTextBlockStyle}"
+                            Text="{TemplateBinding KeyboardAcceleratorTextOverride}"
+                            Visibility="Collapsed" />
+
+                        <TextBlock
+                            Grid.Column="1"
+                            Margin="24,0,0,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            FontFamily="{StaticResource SymbolThemeFontFamily}"
+                            Foreground="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                            HorizontalTextAlignment="Right"
+                            Opacity="0.7"
+                            Style="{ThemeResource CaptionTextBlockStyle}"
+                            Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(core:Properties.IconString)}" />
+
+                    </Grid>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
     <Style x:Key="DefaultThemeCheckBoxStyle" BasedOn="{StaticResource DefaultCheckBoxStyle}" TargetType="CheckBox">
         <Setter Property="VerticalContentAlignment" Value="Center" />
@@ -3174,6 +3332,7 @@
                                     x:Name="SuggestionsList"
                                     MaxHeight="{ThemeResource AutoSuggestListMaxHeight}"
                                     Margin="{ThemeResource AutoSuggestListPadding}"
+                                    core:Properties.ToolTipMemberPath="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(core:Properties.ToolTipMemberPath)}"
                                     DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
                                     Footer="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(core:Properties.Footer)}"
                                     IsItemClickEnabled="True"
diff --git a/CharacterMap/CharacterMap/Themes/DefaultThemeStyles.xaml b/CharacterMap/CharacterMap/Themes/DefaultThemeStyles.xaml
index 35a57ebb..abe06d67 100644
--- a/CharacterMap/CharacterMap/Themes/DefaultThemeStyles.xaml
+++ b/CharacterMap/CharacterMap/Themes/DefaultThemeStyles.xaml
@@ -70,7 +70,165 @@
         <Setter Property="CornerRadius" Value="8" />
     </Style>
 
-    <Style x:Key="ThemeMenuFlyoutItemStyle" TargetType="MenuFlyoutItem" />
+    <Style x:Key="ThemeMenuFlyoutItemStyle" TargetType="MenuFlyoutItem">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="MenuFlyoutItem">
+                    <Grid
+                        x:Name="LayoutRoot"
+                        Padding="{TemplateBinding Padding}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal">
+
+                                    <Storyboard>
+                                        <PointerUpThemeAnimation Storyboard.TargetName="LayoutRoot" />
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="PointerOver">
+                                    <VisualState.Setters>
+                                        <Setter Target="LayoutRoot.(RevealBrush.State)" Value="PointerOver" />
+                                        <Setter Target="LayoutRoot.Background" Value="{ThemeResource MenuFlyoutItemRevealBackgroundPointerOver}" />
+                                        <Setter Target="LayoutRoot.BorderBrush" Value="{ThemeResource MenuFlyoutItemRevealBorderBrushPointerOver}" />
+                                        <Setter Target="IconContent.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundPointerOver}" />
+                                        <Setter Target="TextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundPointerOver}" />
+                                        <Setter Target="KeyboardAcceleratorTextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPointerOver}" />
+                                    </VisualState.Setters>
+
+                                    <Storyboard>
+                                        <PointerUpThemeAnimation Storyboard.TargetName="LayoutRoot" />
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="Pressed">
+                                    <VisualState.Setters>
+                                        <Setter Target="LayoutRoot.(RevealBrush.State)" Value="Pressed" />
+                                        <Setter Target="LayoutRoot.Background" Value="{ThemeResource MenuFlyoutItemRevealBackgroundPressed}" />
+                                        <Setter Target="LayoutRoot.BorderBrush" Value="{ThemeResource MenuFlyoutItemRevealBorderBrushPressed}" />
+                                        <Setter Target="IconContent.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundPressed}" />
+                                        <Setter Target="TextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundPressed}" />
+                                        <Setter Target="KeyboardAcceleratorTextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPressed}" />
+                                    </VisualState.Setters>
+
+                                    <Storyboard>
+                                        <PointerDownThemeAnimation Storyboard.TargetName="LayoutRoot" />
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="Disabled">
+                                    <VisualState.Setters>
+                                        <Setter Target="LayoutRoot.Background" Value="{ThemeResource MenuFlyoutItemRevealBackgroundDisabled}" />
+                                        <Setter Target="LayoutRoot.BorderBrush" Value="{ThemeResource MenuFlyoutItemRevealBorderBrushDisabled}" />
+                                        <Setter Target="IconContent.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundDisabled}" />
+                                        <Setter Target="TextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundDisabled}" />
+                                        <Setter Target="KeyboardAcceleratorTextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForegroundDisabled}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="CheckPlaceholderStates">
+                                <VisualState x:Name="NoPlaceholder" />
+                                <VisualState x:Name="CheckPlaceholder">
+                                    <VisualState.Setters>
+                                        <Setter Target="TextBlock.Margin" Value="{ThemeResource MenuFlyoutItemPlaceholderThemeThickness}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="IconPlaceholder">
+                                    <VisualState.Setters>
+                                        <Setter Target="TextBlock.Margin" Value="{ThemeResource LanguageSwitcherMenuFlyoutItemPlaceholderThemeThickness}" />
+                                        <Setter Target="IconRoot.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="CheckAndIconPlaceholder">
+                                    <VisualState.Setters>
+                                        <Setter Target="TextBlock.Margin" Value="{ThemeResource MenuFlyoutItemDoublePlaceholderThemeThickness}" />
+                                        <Setter Target="IconRoot.Margin" Value="{ThemeResource MenuFlyoutItemPlaceholderThemeThickness}" />
+                                        <Setter Target="IconRoot.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="PaddingSizeStates">
+                                <VisualState x:Name="DefaultPadding" />
+                                <VisualState x:Name="NarrowPadding">
+
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Padding">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource MenuFlyoutItemThemePaddingNarrow}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="KeyboardAcceleratorTextVisibility">
+                                <VisualState x:Name="KeyboardAcceleratorTextCollapsed" />
+                                <VisualState x:Name="KeyboardAcceleratorTextVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="KeyboardAcceleratorTextBlock.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+
+                        </VisualStateManager.VisualStateGroups>
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Viewbox
+                            x:Name="IconRoot"
+                            Width="32"
+                            Height="32"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Visibility="Collapsed">
+                            <ContentPresenter x:Name="IconContent" Content="{TemplateBinding Icon}" />
+                        </Viewbox>
+                        <TextBlock
+                            x:Name="TextBlock"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Foreground="{TemplateBinding Foreground}"
+                            Text="{TemplateBinding Text}"
+                            TextTrimming="Clip" />
+                        <TextBlock
+                            x:Name="KeyboardAcceleratorTextBlock"
+                            Grid.Column="1"
+                            MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KeyboardAcceleratorTextMinWidth}"
+                            Margin="24,0,0,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            AutomationProperties.AccessibilityView="Raw"
+                            Foreground="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                            Style="{ThemeResource CaptionTextBlockStyle}"
+                            Text="{TemplateBinding KeyboardAcceleratorTextOverride}"
+                            Visibility="Collapsed" />
+
+                        <TextBlock
+                            Grid.Column="1"
+                            Margin="24,0,0,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            FontFamily="{StaticResource SymbolThemeFontFamily}"
+                            Foreground="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                            HorizontalTextAlignment="Right"
+                            Opacity="0.7"
+                            Style="{ThemeResource CaptionTextBlockStyle}"
+                            Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(core:Properties.IconString)}" />
+
+                    </Grid>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
 
 
@@ -2541,6 +2699,7 @@
                                     x:Name="SuggestionsList"
                                     MaxHeight="{ThemeResource AutoSuggestListMaxHeight}"
                                     Margin="{ThemeResource AutoSuggestListPadding}"
+                                    core:Properties.ToolTipMemberPath="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(core:Properties.ToolTipMemberPath)}"
                                     DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
                                     Footer="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(core:Properties.Footer)}"
                                     IsItemClickEnabled="True"
diff --git a/CharacterMap/CharacterMap/Themes/FluentThemeStyles.xaml b/CharacterMap/CharacterMap/Themes/FluentThemeStyles.xaml
index f2a45508..6530d8b8 100644
--- a/CharacterMap/CharacterMap/Themes/FluentThemeStyles.xaml
+++ b/CharacterMap/CharacterMap/Themes/FluentThemeStyles.xaml
@@ -958,6 +958,7 @@
                                 TextTrimming="{ThemeResource MenuFlyoutItemTextTrimming}" />
                             <TextBlock
                                 x:Name="KeyboardAcceleratorTextBlock"
+                                x:Load="False"
                                 Grid.Column="1"
                                 MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KeyboardAcceleratorTextMinWidth}"
                                 Margin="24,4,0,0"
diff --git a/CharacterMap/CharacterMap/Themes/ZuneThemeStyles.xaml b/CharacterMap/CharacterMap/Themes/ZuneThemeStyles.xaml
index 72dc3a80..74874c6d 100644
--- a/CharacterMap/CharacterMap/Themes/ZuneThemeStyles.xaml
+++ b/CharacterMap/CharacterMap/Themes/ZuneThemeStyles.xaml
@@ -3312,6 +3312,7 @@
                                     x:Name="SuggestionsList"
                                     MaxHeight="{ThemeResource AutoSuggestListMaxHeight}"
                                     Margin="{ThemeResource AutoSuggestListPadding}"
+                                    core:Properties.ToolTipMemberPath="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(core:Properties.ToolTipMemberPath)}"
                                     DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
                                     FontWeight="SemiBold"
                                     Footer="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(core:Properties.Footer)}"
@@ -3338,6 +3339,163 @@
     <Style x:Key="DefaultThemeMenuFlyoutItemStyle" TargetType="MenuFlyoutItem">
         <Setter Property="FontSize" Value="{StaticResource FontListFlyoutFontSize}" />
         <Setter Property="MinHeight" Value="30" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="MenuFlyoutItem">
+                    <Grid
+                        x:Name="LayoutRoot"
+                        Padding="{TemplateBinding Padding}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal">
+
+                                    <Storyboard>
+                                        <PointerUpThemeAnimation Storyboard.TargetName="LayoutRoot" />
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="PointerOver">
+                                    <VisualState.Setters>
+                                        <Setter Target="LayoutRoot.(RevealBrush.State)" Value="PointerOver" />
+                                        <Setter Target="LayoutRoot.Background" Value="{ThemeResource MenuFlyoutItemRevealBackgroundPointerOver}" />
+                                        <Setter Target="LayoutRoot.BorderBrush" Value="{ThemeResource MenuFlyoutItemRevealBorderBrushPointerOver}" />
+                                        <Setter Target="IconContent.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundPointerOver}" />
+                                        <Setter Target="TextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundPointerOver}" />
+                                        <Setter Target="KeyboardAcceleratorTextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPointerOver}" />
+                                    </VisualState.Setters>
+
+                                    <Storyboard>
+                                        <PointerUpThemeAnimation Storyboard.TargetName="LayoutRoot" />
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="Pressed">
+                                    <VisualState.Setters>
+                                        <Setter Target="LayoutRoot.(RevealBrush.State)" Value="Pressed" />
+                                        <Setter Target="LayoutRoot.Background" Value="{ThemeResource MenuFlyoutItemRevealBackgroundPressed}" />
+                                        <Setter Target="LayoutRoot.BorderBrush" Value="{ThemeResource MenuFlyoutItemRevealBorderBrushPressed}" />
+                                        <Setter Target="IconContent.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundPressed}" />
+                                        <Setter Target="TextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundPressed}" />
+                                        <Setter Target="KeyboardAcceleratorTextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPressed}" />
+                                    </VisualState.Setters>
+
+                                    <Storyboard>
+                                        <PointerDownThemeAnimation Storyboard.TargetName="LayoutRoot" />
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="Disabled">
+                                    <VisualState.Setters>
+                                        <Setter Target="LayoutRoot.Background" Value="{ThemeResource MenuFlyoutItemRevealBackgroundDisabled}" />
+                                        <Setter Target="LayoutRoot.BorderBrush" Value="{ThemeResource MenuFlyoutItemRevealBorderBrushDisabled}" />
+                                        <Setter Target="IconContent.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundDisabled}" />
+                                        <Setter Target="TextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundDisabled}" />
+                                        <Setter Target="KeyboardAcceleratorTextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForegroundDisabled}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="CheckPlaceholderStates">
+                                <VisualState x:Name="NoPlaceholder" />
+                                <VisualState x:Name="CheckPlaceholder">
+                                    <VisualState.Setters>
+                                        <Setter Target="TextBlock.Margin" Value="{ThemeResource MenuFlyoutItemPlaceholderThemeThickness}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="IconPlaceholder">
+                                    <VisualState.Setters>
+                                        <Setter Target="TextBlock.Margin" Value="{ThemeResource LanguageSwitcherMenuFlyoutItemPlaceholderThemeThickness}" />
+                                        <Setter Target="IconRoot.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="CheckAndIconPlaceholder">
+                                    <VisualState.Setters>
+                                        <Setter Target="TextBlock.Margin" Value="{ThemeResource MenuFlyoutItemDoublePlaceholderThemeThickness}" />
+                                        <Setter Target="IconRoot.Margin" Value="{ThemeResource MenuFlyoutItemPlaceholderThemeThickness}" />
+                                        <Setter Target="IconRoot.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="PaddingSizeStates">
+                                <VisualState x:Name="DefaultPadding" />
+                                <VisualState x:Name="NarrowPadding">
+
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Padding">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource MenuFlyoutItemThemePaddingNarrow}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="KeyboardAcceleratorTextVisibility">
+                                <VisualState x:Name="KeyboardAcceleratorTextCollapsed" />
+                                <VisualState x:Name="KeyboardAcceleratorTextVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="KeyboardAcceleratorTextBlock.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+
+                        </VisualStateManager.VisualStateGroups>
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Viewbox
+                            x:Name="IconRoot"
+                            Width="32"
+                            Height="32"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Visibility="Collapsed">
+                            <ContentPresenter x:Name="IconContent" Content="{TemplateBinding Icon}" />
+                        </Viewbox>
+                        <TextBlock
+                            x:Name="TextBlock"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Foreground="{TemplateBinding Foreground}"
+                            Text="{TemplateBinding Text}"
+                            TextTrimming="Clip" />
+                        <TextBlock
+                            x:Name="KeyboardAcceleratorTextBlock"
+                            Grid.Column="1"
+                            MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KeyboardAcceleratorTextMinWidth}"
+                            Margin="24,0,0,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            AutomationProperties.AccessibilityView="Raw"
+                            Foreground="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                            Style="{ThemeResource CaptionTextBlockStyle}"
+                            Text="{TemplateBinding KeyboardAcceleratorTextOverride}"
+                            Visibility="Collapsed" />
+
+                        <TextBlock
+                            Grid.Column="1"
+                            Margin="24,0,0,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            FontFamily="{StaticResource SymbolThemeFontFamily}"
+                            Foreground="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                            HorizontalTextAlignment="Right"
+                            Opacity="0.7"
+                            Style="{ThemeResource CaptionTextBlockStyle}"
+                            Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(core:Properties.IconString)}" />
+
+                    </Grid>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
     </Style>
 
     <Style TargetType="MenuFlyoutSubItem">
diff --git a/CharacterMap/CharacterMap/ViewModels/SettingsViewModel.cs b/CharacterMap/CharacterMap/ViewModels/SettingsViewModel.cs
index 40f8c059..6c3636c6 100644
--- a/CharacterMap/CharacterMap/ViewModels/SettingsViewModel.cs
+++ b/CharacterMap/CharacterMap/ViewModels/SettingsViewModel.cs
@@ -64,6 +64,7 @@ public SettingsViewModel()
 
     public void UpdatePreviews(InstalledFont font, CharacterRenderingOptions options)
     {
+        font ??= FontFinder.DefaultFont;
         GlyphNameModel.SetOptions(font, options);
         GlyphNameModel.Template = Settings.FileNameTemplate;
 
diff --git a/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml.cs b/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml.cs
index b9f74a65..ee1028bc 100644
--- a/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml.cs
+++ b/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml.cs
@@ -38,6 +38,7 @@ void CollectionSelector_SelectionChanged(object sender, SelectionChangedEventArg
     async void NewCollection_Click(object sender, RoutedEventArgs e)
     {
         CreateCollectionDialog d = new();
+        d.SetDataContext(null); // Do not remove
         await d.ShowAsync();
 
         if (d.Result is AddToCollectionResult result && result.Success)

From c76785e18673ee727b1e6f27979c758e183d3336 Mon Sep 17 00:00:00 2001
From: Johnny Westlake <jmdwestlake@yahoo.co.uk>
Date: Sun, 19 May 2024 12:06:54 +0100
Subject: [PATCH 09/15] Address #324

---
 .../CharacterMap/Views/CollectionManagementView.xaml.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml.cs b/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml.cs
index ee1028bc..f5a04811 100644
--- a/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml.cs
+++ b/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml.cs
@@ -83,7 +83,7 @@ async void DigDeleteCollection_PrimaryButtonClick(ContentDialog sender, ContentD
         CollectionSelector.SelectedIndex = -1;
         //SelectCollection(null);
         ViewModel.RefreshCollections();
-        ViewModel.Messenger.Send(new AppNotificationMessage(true, $"\"{name}\" collection deleted"));
+        ViewModel.Messenger.Send(new AppNotificationMessage(true, Localization.Get("NotificationCollectionDeleted", name)));
     }
 
     string GetCountLabel(int fontCount, int selectedCount)

From a27318e24fafa273d2fe3e82d3e9489a4b4a9fd4 Mon Sep 17 00:00:00 2001
From: Johnny Westlake <jmdwestlake@yahoo.co.uk>
Date: Sun, 19 May 2024 16:40:10 +0100
Subject: [PATCH 10/15] Localization for search filters & smart collections

---
 .../CharacterMap/Controls/AutoGrid.cs         |  49 +++--
 .../Controls/CreateCollectionDialog.xaml      |  49 +++--
 CharacterMap/CharacterMap/Core/FontFinder.cs  |   9 +-
 CharacterMap/CharacterMap/Core/Properties.cs  | 175 ++++++++++++++++++
 .../CharacterMap/Strings/en-US/Resources.resw |  31 ++++
 .../CharacterMap/Views/FontMapView.xaml       |   1 -
 .../CharacterMap/Views/MainPage.xaml.cs       |   2 +-
 7 files changed, 286 insertions(+), 30 deletions(-)

diff --git a/CharacterMap/CharacterMap/Controls/AutoGrid.cs b/CharacterMap/CharacterMap/Controls/AutoGrid.cs
index e157c2f8..4c411418 100644
--- a/CharacterMap/CharacterMap/Controls/AutoGrid.cs
+++ b/CharacterMap/CharacterMap/Controls/AutoGrid.cs
@@ -3,23 +3,48 @@
 
 namespace CharacterMap.Controls;
 
-public class AutoGrid : Grid
+[DependencyProperty<string>("Definitions")]
+[DependencyProperty<Orientation>("Orientation", Orientation.Horizontal, nameof(InvalidateArrange))]
+public partial class AutoGrid : Grid
 {
+    partial void OnDefinitionsChanged(string o, string n) => Properties.SetGridDefinitions(this, n);
+
     protected override Size ArrangeOverride(Size finalSize)
     {
-        var rows = this.Children.OfType<FrameworkElement>().Count(c => Grid.GetColumn(c) == 0);
-        while (this.RowDefinitions.Count > rows)
-            this.RowDefinitions.RemoveAt(0);
-        while (this.RowDefinitions.Count < rows)
-            this.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
-
-        int row = -1;
-        foreach (var child in this.Children.OfType<FrameworkElement>())
+        if (Orientation is Orientation.Vertical)
+        {
+            var rows = this.Children.OfType<FrameworkElement>().Count(c => Grid.GetColumn(c) == 0);
+            while (this.RowDefinitions.Count > rows)
+                this.RowDefinitions.RemoveAt(0);
+            while (this.RowDefinitions.Count < rows)
+                this.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+
+            int row = -1;
+            foreach (var child in this.Children.OfType<FrameworkElement>())
+            {
+                if (Grid.GetColumn(child) == 0)
+                    row++;
+
+                if (child.ReadLocalValue(Grid.RowProperty) == DependencyProperty.UnsetValue)
+                    Grid.SetRow(child, row);
+            }
+        }
+        else
         {
-            if (Grid.GetColumn(child) == 0)
-                row++;
+            var columns = this.Children.OfType<FrameworkElement>().Count(c => Grid.GetRow(c) == 0);
+            while (this.ColumnDefinitions.Count > columns)
+                this.ColumnDefinitions.RemoveAt(0);
+            while (this.ColumnDefinitions.Count < columns)
+                this.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+
+            int col = -1;
+            foreach (var child in this.Children.OfType<FrameworkElement>())
+            {
+                if (Grid.GetRow(child) == 0)
+                    col++;
 
-            Grid.SetRow(child, row);
+                Grid.SetColumn(child, col);
+            }
         }
 
         return base.ArrangeOverride(finalSize);
diff --git a/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml b/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml
index 96d8a8d8..2cb053b8 100644
--- a/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml
+++ b/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml
@@ -2,6 +2,7 @@
     x:Class="CharacterMap.Controls.CreateCollectionDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:CharacterMap.Controls"
     xmlns:core="using:CharacterMap.Core"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -21,13 +22,39 @@
             x:Uid="CreateCollectionEntryBox"
             Text="{Binding CollectionTitle, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-        <CheckBox
-            x:Name="SmartCollectionCheckbox"
+        <controls:AutoGrid
+            x:Name="SmartCollectionHeaderContainer"
             x:Load="{x:Bind AllowSmartCollection}"
             Margin="0 12 0 0"
-            Content="Create Smart Collection"
-            IsChecked="{x:Bind TemplateSettings.IsSmartCollection, Mode=TwoWay}"
-            Style="{StaticResource DefaultThemeCheckBoxStyle}" />
+            Definitions="c* cAuto"
+            Orientation="Horizontal">
+            <CheckBox
+                x:Name="SmartCollectionCheckbox"
+                x:Uid="CreateSmartCollectionCheck"
+                HorizontalAlignment="Stretch"
+                IsChecked="{x:Bind TemplateSettings.IsSmartCollection, Mode=TwoWay}"
+                Style="{StaticResource DefaultThemeCheckBoxStyle}"
+                d:Content="Create as Smart Collection" />
+            <controls:UXButton
+                x:Uid="CreateSmartCollectionHint"
+                MinWidth="0"
+                MinHeight="0"
+                Padding="4"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                core:Properties.Cursor="Hand"
+                core:Properties.Hyperlink="https://github.com/character-map-uwp/Character-Map-UWP/wiki/Smart-Collections"
+                CornerRadius="10"
+                FontSize="12">
+                <TextBlock
+                    FontFamily="{StaticResource SymbolThemeFontFamily}"
+                    Foreground="{ThemeResource AccentFillColorDefaultBrush}"
+                    Text="&#xE897;" />
+            </controls:UXButton>
+
+        </controls:AutoGrid>
+
+
 
         <StackPanel
             x:Name="SmartFilters"
@@ -40,7 +67,7 @@
                         Margin="0 -2"
                         Orientation="Horizontal"
                         Spacing="4">
-                        <TextBlock VerticalAlignment="Center" Text="File Path Filter" />
+                        <TextBlock x:Uid="SmartCollectionFilePathFilter" VerticalAlignment="Center" />
                         <Border
                             Padding="4 2"
                             VerticalAlignment="Center"
@@ -50,7 +77,7 @@
                                 FontFamily="Consolas"
                                 FontSize="12"
                                 Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                Text="filepath:" />
+                                Text="{core:Localizer Key=FilePathFilter}" />
                         </Border>
                     </StackPanel>
                 </TextBox.Header>
@@ -61,7 +88,7 @@
                         Margin="0 -2"
                         Orientation="Horizontal"
                         Spacing="4">
-                        <TextBlock VerticalAlignment="Center" Text="Foundry Filter" />
+                        <TextBlock x:Uid="SmartCollectionFoundryFilter" VerticalAlignment="Center" />
                         <Border
                             Padding="4 2"
                             VerticalAlignment="Center"
@@ -71,7 +98,7 @@
                                 FontFamily="Consolas"
                                 FontSize="12"
                                 Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                Text="foundry:" />
+                                Text="{core:Localizer Key=FoundryFilter}" />
                         </Border>
                     </StackPanel>
                 </TextBox.Header>
@@ -82,7 +109,7 @@
                         Margin="0 -2"
                         Orientation="Horizontal"
                         Spacing="4">
-                        <TextBlock VerticalAlignment="Center" Text="Designer Filter" />
+                        <TextBlock x:Uid="SmartCollectionDesignerFilter" VerticalAlignment="Center" />
                         <Border
                             Padding="4 2"
                             VerticalAlignment="Center"
@@ -92,7 +119,7 @@
                                 FontFamily="Consolas"
                                 FontSize="12"
                                 Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                Text="designer:" />
+                                Text="{core:Localizer Key=DesignerFilter}" />
                         </Border>
                     </StackPanel>
                 </TextBox.Header>
diff --git a/CharacterMap/CharacterMap/Core/FontFinder.cs b/CharacterMap/CharacterMap/Core/FontFinder.cs
index a6be4675..d4617264 100644
--- a/CharacterMap/CharacterMap/Core/FontFinder.cs
+++ b/CharacterMap/CharacterMap/Core/FontFinder.cs
@@ -266,7 +266,6 @@ internal static string GetAppPath(string path)
         }
         var temp = Path.GetDirectoryName(path).EndsWith(TEMP);
         return $"ms-appdata:///local/{(temp ? $"{TEMP}/" : string.Empty)}{Path.GetFileName(path)}";
-
     }
 
     internal static Task<FontImportResult> ImportFontsAsync(IReadOnlyList<IStorageItem> items)
@@ -669,7 +668,7 @@ static bool Is(string q, string i, out string o)
         if (!string.IsNullOrWhiteSpace(query))
         {
             string q;
-            if (Is(query, "char:", out q))
+            if (Is(query, Localization.Get("CharFilter"), out q))
             {
                 foreach (var ch in q)
                 {
@@ -679,18 +678,18 @@ static bool Is(string q, string i, out string o)
                 }
                 filterTitle = $"{filter.FilterTitle} \"{q}\"";
             }
-            else if (Is(query, "filepath:", out q))
+            else if (Is(query, Localization.Get("FilePathFilter"), out q))
             {
                 fontList = BasicFontFilter.ForFilePath(q).Query(fontList, fontCollections);
                 filterTitle = $"{filter.FilterTitle} \"{q}\"";
 
             }
-            else if (Is(query, "foundry:", out q))
+            else if (Is(query, Localization.Get("FoundryFilter"), out q))
             {
                 fontList = BasicFontFilter.ForFontInfo(q, Microsoft.Graphics.Canvas.Text.CanvasFontInformation.Manufacturer).Query(fontList, fontCollections);
                 filterTitle = $"{filter.FilterTitle} \"{q}\"";
             }
-            else if (Is(query, "designer:", out q))
+            else if (Is(query, Localization.Get("DesignerFilter"), out q))
             {
                 fontList = BasicFontFilter.ForFontInfo(q, Microsoft.Graphics.Canvas.Text.CanvasFontInformation.Designer).Query(fontList, fontCollections);
                 filterTitle = $"{filter.FilterTitle} \"{q}\"";
diff --git a/CharacterMap/CharacterMap/Core/Properties.cs b/CharacterMap/CharacterMap/Core/Properties.cs
index 8b932a3c..f3496cad 100644
--- a/CharacterMap/CharacterMap/Core/Properties.cs
+++ b/CharacterMap/CharacterMap/Core/Properties.cs
@@ -4,6 +4,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Windows.Foundation.Collections;
+using Windows.System;
 using Windows.UI.Composition;
 using Windows.UI.Core;
 using Windows.UI.Text;
@@ -66,6 +67,9 @@ namespace CharacterMap.Core;
 [AttachedProperty<FontWeight>("FontWeight", "FontWeights.Normal")] // Sets the FontWeight on a RichEditBox
 [AttachedProperty<FontFamily>("FontFamily")] // Sets the FontFamily on a RichEditBox
 [AttachedProperty<string>("ToolTipMemberPath")] // PropertyPath on an ItemContainer's Content to use as the ItemContainer's ToolTip
+[AttachedProperty<string>("GridDefinitions", "string.Empty")]
+[AttachedProperty<string>("Hyperlink")]
+[AttachedProperty<CoreCursorType>("Cursor", CoreCursorType.Arrow)]
 public partial class Properties : DependencyObject
 {
     #region FILTER 
@@ -1026,6 +1030,8 @@ static partial void OnFontWeightChanged(DependencyObject d, DependencyPropertyCh
 
     static FontFamily __BLANK { get; } = new FontFamily("ms-appx:///Assets/AdobeBlank.otf");
 
+    public static Dictionary<CoreCursorType, CoreCursor> Cursors => _cursors;
+
     static void UpdateFormat(RichEditBox r)
     {
         // This is *NOT* good for performance, but RichEditBox has a lot of problems
@@ -1102,4 +1108,173 @@ static void ContainerContentChanging(ListViewBase sender, ContainerContentChangi
     }
 
     #endregion
+
+    #region GridDefinitions
+
+    static partial void OnGridDefinitionsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is FrameworkElement f && e.NewValue is string s)
+        {
+            char c = s.Contains(",") ? ',' : ' ';
+            string[] parts = s.Split(c, StringSplitOptions.RemoveEmptyEntries);
+
+            Grid g = f as Grid;
+            g?.RowDefinitions?.Clear();
+            g?.ColumnDefinitions?.Clear();
+
+            foreach (var part in parts)
+            {
+                if (g is not null)
+                {
+                    // Create Grid Column or Row definitions
+
+                    if (part.StartsWith("cs"))
+                    {
+                        g.ColumnSpacing = Convert.ToDouble(part.Remove(0, 2));
+                    }
+                    else if (part.StartsWith("rs"))
+                    {
+                        g.RowSpacing = Convert.ToDouble(part.Remove(0, 2));
+                    }
+                    else if (part.StartsWith('c'))
+                    {
+                        var p = part.Remove(0, 1);
+                        ColumnDefinition cd = new();
+                        if (p == "*")
+                            cd.Width = new(1, GridUnitType.Star);
+                        else if (p.EndsWith("*"))
+                            cd.Width = new(Convert.ToDouble(p.Remove(p.Length - 1)), GridUnitType.Star);
+                        else if (p == "Auto")
+                            cd.Width = GridLength.Auto;
+                        else
+                            cd.Width = new(Convert.ToDouble(p));
+
+                        g.ColumnDefinitions.Add(cd);
+                    }
+                    else if (part.StartsWith('r'))
+                    {
+                        var p = part.Remove(0, 1);
+                        RowDefinition cd = new();
+                        if (p == "*")
+                            cd.Height = new(1, GridUnitType.Star);
+                        else if (p.EndsWith("*"))
+                            cd.Height = new(Convert.ToDouble(p.Remove(p.Length - 1)), GridUnitType.Star);
+                        else if (p == "Auto")
+                            cd.Height = GridLength.Auto;
+                        else
+                            cd.Height = new(Convert.ToDouble(p));
+
+                        g.RowDefinitions.Add(cd);
+                    }
+                }
+                else
+                {
+                    // Set Column or Row attached properties
+                    if (part.StartsWith('c'))
+                    {
+                        string p = part.Remove(0, 1);
+                        Grid.SetColumn(f, Convert.ToInt32(p));
+                    }
+                    else if (part.StartsWith('r'))
+                    {
+                        string p = part.Remove(0, 1);
+                        Grid.SetRow(f, Convert.ToInt32(p));
+                    }
+                    if (part.StartsWith("cs"))
+                    {
+                        string p = part.Remove(0, 2);
+                        Grid.SetColumnSpan(f, Convert.ToInt32(p));
+                    }
+                    else if (part.StartsWith("rs"))
+                    {
+                        string p = part.Remove(0, 2);
+                        Grid.SetRowSpan(f, Convert.ToInt32(p));
+                    }
+                }
+            }
+
+            f.InvalidateArrange();
+        }
+    }
+
+    #endregion
+
+    #region Hyperlink
+
+    static partial void OnHyperlinkChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is ButtonBase b)
+        {
+            b.Click -= B_Click;
+            b.Click += B_Click;
+
+            static void B_Click(object sender, RoutedEventArgs e)
+            {
+                var link = GetHyperlink((DependencyObject)sender);
+                if (!string.IsNullOrWhiteSpace(link) 
+                    && Uri.TryCreate(link, UriKind.RelativeOrAbsolute, out Uri uri))
+                    _ = Launcher.LaunchUriAsync(uri);
+            }
+        }
+    }
+
+
+    #endregion
+
+    #region Cursor
+
+    private static readonly object _cursorLock = new ();
+    private static readonly CoreCursor _defaultCursor = new (CoreCursorType.Arrow, 1);
+    private static readonly Dictionary<CoreCursorType, CoreCursor> _cursors =
+        new () { { CoreCursorType.Arrow, _defaultCursor } };
+
+    static partial void OnCursorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not FrameworkElement element)
+            return;
+
+        var value = (CoreCursorType)e.NewValue;
+
+        // lock ensures CoreCursor creation and event handlers attachment/detachment is atomic
+        lock (_cursorLock)
+        {
+            if (!Cursors.ContainsKey(value))
+                Cursors[value] = new CoreCursor(value, 1);
+
+            // make sure event handlers are not attached twice to element
+            element.PointerEntered -= Element_PointerEntered;
+            element.PointerEntered += Element_PointerEntered;
+            element.PointerExited -= Element_PointerExited;
+            element.PointerExited += Element_PointerExited;
+            element.Unloaded -= ElementOnUnloaded;
+            element.Unloaded += ElementOnUnloaded;
+        }
+
+        static void Element_PointerEntered(object sender, PointerRoutedEventArgs e)
+        {
+            CoreCursorType cursor = GetCursor((FrameworkElement)sender);
+            Window.Current.CoreWindow.PointerCursor = Cursors[cursor];
+        }
+
+        static void Element_PointerExited(object sender, PointerRoutedEventArgs e)
+        {
+            // when exiting change the cursor to the target Mouse.Cursor value of the new element
+            CoreCursor cursor;
+            if (e.OriginalSource is FrameworkElement newElement)
+                cursor = Cursors[GetCursor(newElement)];
+            else
+                cursor = _defaultCursor;
+
+            Window.Current.CoreWindow.PointerCursor = cursor;
+        }
+
+        static void ElementOnUnloaded(object sender, RoutedEventArgs routedEventArgs)
+        {
+            // when the element is programatically unloaded, reset the cursor back to default
+            // this is necessary when click triggers immediate change in layout and PointerExited is not called
+            Window.Current.CoreWindow.PointerCursor = _defaultCursor;
+        }
+    }
+
+    #endregion
 }
diff --git a/CharacterMap/CharacterMap/Strings/en-US/Resources.resw b/CharacterMap/CharacterMap/Strings/en-US/Resources.resw
index e1c4de37..785ce1c6 100644
--- a/CharacterMap/CharacterMap/Strings/en-US/Resources.resw
+++ b/CharacterMap/CharacterMap/Strings/en-US/Resources.resw
@@ -1718,4 +1718,35 @@ Otherwise, "All Fonts" is selected by default on every launch.</value>
     <value>Restore</value>
     <comment>Opposite of Fullscreen</comment>
   </data>
+  <data name="CharFilter" xml:space="preserve">
+    <value>char:</value>
+    <comment>Command used for character searches. Should be short.</comment>
+  </data>
+  <data name="CreateSmartCollectionCheck.Content" xml:space="preserve">
+    <value>Create as Smart Collection</value>
+  </data>
+  <data name="CreateSmartCollectionHint.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>View online documentation for Smart Collections</value>
+  </data>
+  <data name="DesignerFilter" xml:space="preserve">
+    <value>designer:</value>
+    <comment>Command used for designer searches. Should be short.</comment>
+  </data>
+  <data name="FilePathFilter" xml:space="preserve">
+    <value>filepath:</value>
+    <comment>Command used for file path searches. Should be short.</comment>
+  </data>
+  <data name="FoundryFilter" xml:space="preserve">
+    <value>foundry:</value>
+    <comment>Command used for foundry searches. Should be short.</comment>
+  </data>
+  <data name="SmartCollectionDesignerFilter.Text" xml:space="preserve">
+    <value>Designer Filter</value>
+  </data>
+  <data name="SmartCollectionFilePathFilter.Text" xml:space="preserve">
+    <value>File Path Filter</value>
+  </data>
+  <data name="SmartCollectionFoundryFilter.Text" xml:space="preserve">
+    <value>Foundry Filter</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/CharacterMap/CharacterMap/Views/FontMapView.xaml b/CharacterMap/CharacterMap/Views/FontMapView.xaml
index b640f42d..e6b78ba2 100644
--- a/CharacterMap/CharacterMap/Views/FontMapView.xaml
+++ b/CharacterMap/CharacterMap/Views/FontMapView.xaml
@@ -590,7 +590,6 @@
                     RenderTransformOrigin="0.5,0.5"
                     Style="{ThemeResource DefaultThemeAutoSuggestBoxStyle}"
                     SuggestionChosen="SearchBox_SuggestionChosen"
-                    Tag="{x:Bind ViewModel.FontFamily, Mode=OneWay}"
                     Text="{Binding SearchQuery, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                     TextChanged="SearchBox_TextChanged"
                     TextMemberPath="Description"
diff --git a/CharacterMap/CharacterMap/Views/MainPage.xaml.cs b/CharacterMap/CharacterMap/Views/MainPage.xaml.cs
index 066ca8f5..98732e3a 100644
--- a/CharacterMap/CharacterMap/Views/MainPage.xaml.cs
+++ b/CharacterMap/CharacterMap/Views/MainPage.xaml.cs
@@ -703,7 +703,7 @@ void OpenFolder()
 
     public void CharacterSearch(string s)
     {
-        ViewModel.FontSearch = $"char: {s}";
+        ViewModel.FontSearch = $"{Localization.Get("CharFilter")} {s}";
         FontListSearchBox.Focus(FocusState.Keyboard);
     }
 

From c63411c220b3462668e07946a7b6a6cca44d82b6 Mon Sep 17 00:00:00 2001
From: Johnny Westlake <jmdwestlake@yahoo.co.uk>
Date: Wed, 22 May 2024 23:04:04 +0100
Subject: [PATCH 11/15] Small bug fixes

---
 CharacterMap/CharacterMap/App.xaml            |  2 +
 .../CharacterMap/Controls/AutoGrid.cs         |  5 ++-
 .../CharacterMap/Controls/DirectTextBlock.cs  | 42 ++-----------------
 CharacterMap/CharacterMap/Core/Properties.cs  |  4 +-
 4 files changed, 10 insertions(+), 43 deletions(-)

diff --git a/CharacterMap/CharacterMap/App.xaml b/CharacterMap/CharacterMap/App.xaml
index 60c3f980..aa4f4e92 100644
--- a/CharacterMap/CharacterMap/App.xaml
+++ b/CharacterMap/CharacterMap/App.xaml
@@ -33,6 +33,8 @@
                     <converters:CasingConverter x:Key="CasingConverter" />
                     <converters:VisibilityConverter x:Key="VisConverter" />
 
+                    <FontFamily x:Key="BLANK">"ms-appx:///Assets/AdobeBlank.otf"</FontFamily>
+
                     <Style TargetType="FontIcon">
                         <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
                     </Style>
diff --git a/CharacterMap/CharacterMap/Controls/AutoGrid.cs b/CharacterMap/CharacterMap/Controls/AutoGrid.cs
index 4c411418..f9a10b79 100644
--- a/CharacterMap/CharacterMap/Controls/AutoGrid.cs
+++ b/CharacterMap/CharacterMap/Controls/AutoGrid.cs
@@ -4,7 +4,7 @@
 namespace CharacterMap.Controls;
 
 [DependencyProperty<string>("Definitions")]
-[DependencyProperty<Orientation>("Orientation", Orientation.Horizontal, nameof(InvalidateArrange))]
+[DependencyProperty<Orientation>("Orientation", Orientation.Vertical, nameof(InvalidateArrange))]
 public partial class AutoGrid : Grid
 {
     partial void OnDefinitionsChanged(string o, string n) => Properties.SetGridDefinitions(this, n);
@@ -43,7 +43,8 @@ protected override Size ArrangeOverride(Size finalSize)
                 if (Grid.GetRow(child) == 0)
                     col++;
 
-                Grid.SetColumn(child, col);
+                if (child.ReadLocalValue(Grid.ColumnProperty) == DependencyProperty.UnsetValue)
+                    Grid.SetColumn(child, col);
             }
         }
 
diff --git a/CharacterMap/CharacterMap/Controls/DirectTextBlock.cs b/CharacterMap/CharacterMap/Controls/DirectTextBlock.cs
index 5f7a51af..b4fe46a5 100644
--- a/CharacterMap/CharacterMap/Controls/DirectTextBlock.cs
+++ b/CharacterMap/CharacterMap/Controls/DirectTextBlock.cs
@@ -7,45 +7,11 @@
 
 namespace CharacterMap.Controls;
 
-public sealed class DirectTextBlock : Control
+[DependencyProperty<string>("Text", null, nameof(Update))]
+[DependencyProperty<CanvasFontFace>("FontFace", null, nameof(Update))]
+[DependencyProperty<TypographyFeatureInfo>("Typography", null, nameof(Update))]
+public sealed partial class DirectTextBlock : Control
 {
-    public CanvasFontFace FontFace
-    {
-        get { return (CanvasFontFace)GetValue(FontFaceProperty); }
-        set { SetValue(FontFaceProperty, value); }
-    }
-
-    public static readonly DependencyProperty FontFaceProperty =
-        DependencyProperty.Register(nameof(FontFace), typeof(CanvasFontFace), typeof(DirectTextBlock), new PropertyMetadata(null, (d, e) =>
-        {
-            ((DirectTextBlock)d).Update();
-        }));
-
-
-    public TypographyFeatureInfo Typography
-    {
-        get { return (TypographyFeatureInfo)GetValue(TypographyProperty); }
-        set { SetValue(TypographyProperty, value); }
-    }
-
-    public static readonly DependencyProperty TypographyProperty =
-        DependencyProperty.Register(nameof(Typography), typeof(TypographyFeatureInfo), typeof(DirectTextBlock), new PropertyMetadata(null, (d, e) =>
-        {
-            ((DirectTextBlock)d).Update();
-        }));
-
-    public string Text
-    {
-        get { return (string)GetValue(TextProperty); }
-        set { SetValue(TextProperty, value); }
-    }
-
-    public static readonly DependencyProperty TextProperty =
-        DependencyProperty.Register(nameof(Text), typeof(string), typeof(DirectTextBlock), new PropertyMetadata(null, (d, e) =>
-        {
-            ((DirectTextBlock)d).Update();
-        }));
-
     private CanvasControl m_canvas = null;
     private CanvasTextLayout m_layout = null;
     bool m_isStale = true;
diff --git a/CharacterMap/CharacterMap/Core/Properties.cs b/CharacterMap/CharacterMap/Core/Properties.cs
index f3496cad..9fd53c5e 100644
--- a/CharacterMap/CharacterMap/Core/Properties.cs
+++ b/CharacterMap/CharacterMap/Core/Properties.cs
@@ -1028,8 +1028,6 @@ static partial void OnFontWeightChanged(DependencyObject d, DependencyPropertyCh
             UpdateFormat(r);
     }
 
-    static FontFamily __BLANK { get; } = new FontFamily("ms-appx:///Assets/AdobeBlank.otf");
-
     public static Dictionary<CoreCursorType, CoreCursor> Cursors => _cursors;
 
     static void UpdateFormat(RichEditBox r)
@@ -1042,7 +1040,7 @@ static void UpdateFormat(RichEditBox r)
 
         r.TextDocument.BatchDisplayUpdates();
 
-        r.FontFamily = __BLANK;
+        r.FontFamily = ResourceHelper.Get<FontFamily>("BLANK");
 
         ITextCharacterFormat format = r.TextDocument.GetDefaultCharacterFormat();
         format.FontStyle = GetFontStyle(r);

From 228fcb87ce98152d2844f3e1b8165db9de49bfc9 Mon Sep 17 00:00:00 2001
From: Johnny Westlake <jmdwestlake@yahoo.co.uk>
Date: Thu, 23 May 2024 22:46:00 +0100
Subject: [PATCH 12/15] Allow editing Symbol font collection

---
 .../Controls/CreateCollectionDialog.xaml.cs   |  4 +-
 .../Controls/OpenFolderDialog.xaml.cs         |  1 -
 .../CharacterMap/Core/ExportManager.Font.cs   |  7 ++--
 .../Services/UserFontCollection.cs            | 11 +++++-
 .../CharacterMap/Strings/en-US/Resources.resw | 12 ++++++
 .../CollectionManagementViewModel.cs          | 39 +++++++++++++------
 .../CharacterMap/ViewModels/MainViewModel.cs  |  3 +-
 .../Views/CollectionManagementView.xaml       | 10 ++---
 .../Views/CollectionManagementView.xaml.cs    |  2 +-
 CharacterMap/CharacterMap/Views/MainPage.xaml |  2 +-
 10 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml.cs b/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml.cs
index b02f8409..eeed7d4d 100644
--- a/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml.cs
+++ b/CharacterMap/CharacterMap/Controls/CreateCollectionDialog.xaml.cs
@@ -87,8 +87,8 @@ public CreateCollectionDialog(IFontCollection collection = null)
         if (_collection != null)
         {
             IsEditMode = true;
-            this.Title = Localization.Get("DigRenameCollection/Title");
-            this.PrimaryButtonText = Localization.Get("DigRenameCollection/PrimaryButtonText");
+            this.Title = Localization.Get("DigEditCollection/Title");
+            this.PrimaryButtonText = Localization.Get("DigEditCollection/PrimaryButtonText");
             TemplateSettings.Populate(_collection);
         }
     }
diff --git a/CharacterMap/CharacterMap/Controls/OpenFolderDialog.xaml.cs b/CharacterMap/CharacterMap/Controls/OpenFolderDialog.xaml.cs
index 6d0077de..0001efbe 100644
--- a/CharacterMap/CharacterMap/Controls/OpenFolderDialog.xaml.cs
+++ b/CharacterMap/CharacterMap/Controls/OpenFolderDialog.xaml.cs
@@ -60,7 +60,6 @@ public void Cancel()
     }
 }
 
-
 public sealed partial class OpenFolderDialog : ContentDialog
 {
     public OpenFolderDialogTemplateSettings TemplateSettings { get; }
diff --git a/CharacterMap/CharacterMap/Core/ExportManager.Font.cs b/CharacterMap/CharacterMap/Core/ExportManager.Font.cs
index 2546a6ae..1b702296 100644
--- a/CharacterMap/CharacterMap/Core/ExportManager.Font.cs
+++ b/CharacterMap/CharacterMap/Core/ExportManager.Font.cs
@@ -39,11 +39,10 @@ static List<IGrouping<string, FontVariant>> GetGrouped(IList<FontVariant> fonts)
     }
 
     internal static Task ExportCollectionAsZipAsync(
-        IList<InstalledFont> fontList,
         IFontCollection selectedCollection,
         Action<string> callback = null)
     {
-        var fonts = fontList.SelectMany(f => f.Variants).ToList();
+        var fonts = selectedCollection.GetFontFamilies().SelectMany(f => f.Variants).ToList();
         return ExportFontsAsZipAsync(fonts, selectedCollection.Name, callback);
     }
 
@@ -86,10 +85,10 @@ await Task.Run(async () =>
     }
 
     internal static Task ExportCollectionToFolderAsync(
-        IList<InstalledFont> fontList,
+        IFontCollection selectedCollection,
         Action<string> callback = null)
     {
-        var fonts = fontList.SelectMany(f => f.Variants).ToList();
+        var fonts = selectedCollection.GetFontFamilies().SelectMany(f => f.Variants).ToList();
         return ExportFontsToFolderAsync(fonts, callback);
     }
 
diff --git a/CharacterMap/CharacterMap/Services/UserFontCollection.cs b/CharacterMap/CharacterMap/Services/UserFontCollection.cs
index ab0de2cb..284274a6 100644
--- a/CharacterMap/CharacterMap/Services/UserFontCollection.cs
+++ b/CharacterMap/CharacterMap/Services/UserFontCollection.cs
@@ -1,4 +1,6 @@
-namespace CharacterMap.Models;
+using System.Collections.ObjectModel;
+
+namespace CharacterMap.Models;
 
 public interface IFontCollection
 {
@@ -11,6 +13,8 @@ public interface IFontCollection
     bool ContainsFamily(string fontName);
 
     string Icon { get; }
+
+    IReadOnlyList<InstalledFont> GetFontFamilies();
 }
 
 public class SQLiteFontCollection
@@ -61,6 +65,9 @@ public class UserFontCollection : IFontCollection
     public bool ContainsFamily(string fontName) => Fonts.Contains(fontName);
 
     public string Icon => null;
+
+    public IReadOnlyList<InstalledFont> GetFontFamilies() =>
+        FontFinder.Fonts.Where(f => Fonts.Contains(f.Name)).ToList();
 }
 
 [DebuggerDisplay("({Id}) Name: {Name}, {Filters.Count} Filters")]
@@ -87,6 +94,8 @@ public IReadOnlyList<InstalledFont> UpdateFonts()
         return Fonts;
     }
 
+    public IReadOnlyList<InstalledFont> GetFontFamilies() => UpdateFonts();
+
     public string GetFlatArgs() => string.Join("\r\n", Filters);
 
     public bool ContainsFamily(string fontName)
diff --git a/CharacterMap/CharacterMap/Strings/en-US/Resources.resw b/CharacterMap/CharacterMap/Strings/en-US/Resources.resw
index 785ce1c6..512434ac 100644
--- a/CharacterMap/CharacterMap/Strings/en-US/Resources.resw
+++ b/CharacterMap/CharacterMap/Strings/en-US/Resources.resw
@@ -1749,4 +1749,16 @@ Otherwise, "All Fonts" is selected by default on every launch.</value>
   <data name="SmartCollectionFoundryFilter.Text" xml:space="preserve">
     <value>Foundry Filter</value>
   </data>
+  <data name="DigEditCollection.PrimaryButtonText" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="DigEditCollection.Title" xml:space="preserve">
+    <value>Edit Collection</value>
+  </data>
+  <data name="EditCollectionButton.Label" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="EditCollectionButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Edit Collection</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/CharacterMap/CharacterMap/ViewModels/CollectionManagementViewModel.cs b/CharacterMap/CharacterMap/ViewModels/CollectionManagementViewModel.cs
index a66cbffd..65471eac 100644
--- a/CharacterMap/CharacterMap/ViewModels/CollectionManagementViewModel.cs
+++ b/CharacterMap/CharacterMap/ViewModels/CollectionManagementViewModel.cs
@@ -11,24 +11,37 @@ public partial class CollectionManagementViewModel : ViewModelBase
     [ObservableProperty] bool _isSaving = false;
     [ObservableProperty] bool _isExporting = false;
 
+
     [ObservableProperty] string _query = null;
-    [ObservableProperty] List<UserFontCollection> _collections;
+    [ObservableProperty] List<IFontCollection> _collections;
     [ObservableProperty] ObservableCollection<InstalledFont> _fontList;
     [ObservableProperty] ObservableCollection<InstalledFont> _collectionFonts;
 
+    public bool IsSmartCollection => _selectedCollection is SmartFontCollection;
+    public bool IsUserCollection => _selectedCollection is UserFontCollection;
+
+    public bool IsSelectedEditable => SelectedCollection is not null && SelectedCollection != CollectionService.SymbolCollection;
+
     public ObservableCollection<InstalledFont> SelectedFonts = new();
 
     public ObservableCollection<InstalledFont> SelectedCollectionFonts = new();
     public UserCollectionsService CollectionService { get; private set; } = null;
 
-    private UserFontCollection _selectedCollection;
-    public UserFontCollection SelectedCollection
+    private IFontCollection _selectedCollection;
+    public IFontCollection SelectedCollection
     {
         get => _selectedCollection;
         set
         {
             if (Set(ref _selectedCollection, value) && value != null)
-                RefreshFontLists();
+            {
+                OnPropertyChanged(nameof(IsSelectedEditable));
+                OnPropertyChanged(nameof(IsSmartCollection));
+                OnPropertyChanged(nameof(IsUserCollection));
+
+                if (IsSmartCollection is false)
+                    RefreshFontLists();
+            }
         }
     }
 
@@ -63,13 +76,15 @@ public void RefreshCollections()
         // the same collection every time we need to 
         // make sure we call .ToList() or UI bindings will
         // not work correctly.
-        Collections = CollectionService.Items.ToList();
+        var collections = CollectionService.All.ToList();
+        collections.Add(CollectionService.SymbolCollection);
+        Collections = collections.OrderBy(c => c.Name).ToList();
         OnPropertyChanged(nameof(Collections));
     }
 
     public void RefreshFontLists()
     {
-        if (SelectedCollection is null)
+        if (SelectedCollection is not UserFontCollection collection)
         {
             // clear all the things
             CollectionFonts = new();
@@ -80,7 +95,7 @@ public void RefreshFontLists()
         Query = null;
 
         // 1. Get list of fonts in and not in the collection
-        var collectionFonts = FontFinder.Fonts.Where(f => SelectedCollection.Fonts.Contains(f.Name)).ToList();
+        var collectionFonts = collection.GetFontFamilies();
         var systemFonts = FontFinder.Fonts.Except(collectionFonts).ToList();
 
         // 2. Create binding lists
@@ -136,14 +151,17 @@ public void StartSave()
 
     async Task SaveAsync()
     {
-        if (SelectedCollection is null || IsSaving)
+        if (SelectedCollection is  null || IsSaving)
             return;
 
         IsSaving = true;
 
         try
         {
-            SelectedCollection.Fonts = new HashSet<string>(CollectionFonts.Select(c => c.Name));
+            if (SelectedCollection is UserFontCollection user)
+            {
+                user.Fonts = [..CollectionFonts.Select(c => c.Name)];
+            }
             await CollectionService.SaveCollectionAsync(SelectedCollection);
         }
         finally
@@ -159,7 +177,6 @@ internal async void ExportAsZip()
         try
         {
             await ExportManager.ExportCollectionAsZipAsync(
-                CollectionFonts,
                 SelectedCollection,
                 p => OnSyncContext(() => CollectionExportProgress = p));
         }
@@ -176,7 +193,7 @@ internal async void ExportAsFolder()
         try
         {
             await ExportManager.ExportCollectionToFolderAsync(
-                CollectionFonts,
+                SelectedCollection,
                 p => OnSyncContext(() => CollectionExportProgress = p));
         }
         finally
diff --git a/CharacterMap/CharacterMap/ViewModels/MainViewModel.cs b/CharacterMap/CharacterMap/ViewModels/MainViewModel.cs
index 2ad5d730..b56f23c1 100644
--- a/CharacterMap/CharacterMap/ViewModels/MainViewModel.cs
+++ b/CharacterMap/CharacterMap/ViewModels/MainViewModel.cs
@@ -646,7 +646,6 @@ internal async void ExportAsZip()
         try
         {
             await ExportManager.ExportCollectionAsZipAsync(
-                FontList,
                 SelectedCollection,
                 p => OnSyncContext(() => CollectionExportProgress = p));
         }
@@ -663,7 +662,7 @@ internal async void ExportAsFolder()
         try
         {
             await ExportManager.ExportCollectionToFolderAsync(
-                FontList,
+                SelectedCollection,
                 p => OnSyncContext(() => CollectionExportProgress = p));
         }
         finally
diff --git a/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml b/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml
index 1a437cbd..14549abf 100644
--- a/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml
+++ b/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml
@@ -42,7 +42,7 @@
                         DisplayMemberPath="Name"
                         ItemsSource="{x:Bind ViewModel.Collections, Mode=OneWay}"
                         SelectedItem="{x:Bind ViewModel.SelectedCollection, Mode=TwoWay}"
-                        SelectionChanged="CollectionSelector_SelectionChanged"
+                        SelectionChanged="{x:Bind ViewModel.RefreshFontLists}"
                         d:PlaceholderText="Select exisiting" />
                     <TextBlock
                         x:Uid="OrLabel"
@@ -63,12 +63,12 @@
                     Visibility="{x:Bind core:Converters.IsNotNullToVis(ViewModel.SelectedCollection), Mode=OneWay, FallbackValue=Collapsed}"
                     d:Visibility="Visible">
                     <controls:UXButton
-                        x:Uid="RenameCollectionButton"
+                        x:Uid="EditCollectionButton"
                         Height="Auto"
                         VerticalAlignment="Stretch"
                         Click="RenameFontCollection_Click"
                         Foreground="{ThemeResource AppBarItemForegroundThemeBrush}"
-                        IsEnabled="{x:Bind core:Converters.IsNotNull(ViewModel.SelectedCollection), Mode=OneWay}"
+                        IsEnabled="{x:Bind ViewModel.IsSelectedEditable, Mode=OneWay}"
                         Style="{StaticResource MapInfoButtonStyle}"
                         ToolTipService.Placement="Bottom"
                         d:Label="Rename">
@@ -80,7 +80,7 @@
                         VerticalAlignment="Stretch"
                         Click="DeleteCollection_Click"
                         Foreground="{ThemeResource AppBarItemForegroundThemeBrush}"
-                        IsEnabled="{x:Bind core:Converters.IsNotNull(ViewModel.SelectedCollection), Mode=OneWay}"
+                        IsEnabled="{x:Bind ViewModel.IsSelectedEditable, Mode=OneWay}"
                         Style="{StaticResource MapInfoButtonStyle}"
                         ToolTipService.Placement="Bottom"
                         d:Label="Delete">
@@ -154,7 +154,7 @@
         <Grid
             Grid.Row="2"
             ColumnSpacing="12"
-            Visibility="{x:Bind core:Converters.IsNotNullToVis(ViewModel.SelectedCollection), Mode=OneWay, FallbackValue=Collapsed}"
+            Visibility="{x:Bind ViewModel.IsUserCollection, Mode=OneWay, FallbackValue=Collapsed}"
             d:Visibility="Visible">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
diff --git a/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml.cs b/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml.cs
index f5a04811..68e00c1f 100644
--- a/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml.cs
+++ b/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml.cs
@@ -48,7 +48,7 @@ async void NewCollection_Click(object sender, RoutedEventArgs e)
         }
     }
 
-    void SelectCollection(UserFontCollection collection)
+    void SelectCollection(IFontCollection collection)
     {
         ViewModel.Activate();
         ViewModel.SelectedCollection = collection;
diff --git a/CharacterMap/CharacterMap/Views/MainPage.xaml b/CharacterMap/CharacterMap/Views/MainPage.xaml
index b0717910..d27bb683 100644
--- a/CharacterMap/CharacterMap/Views/MainPage.xaml
+++ b/CharacterMap/CharacterMap/Views/MainPage.xaml
@@ -623,7 +623,7 @@
                                 </Panel.Resources>
                                 <controls:UXButton
                                     x:Name="RenameButton"
-                                    x:Uid="RenameCollectionButton"
+                                    x:Uid="EditCollectionButton"
                                     Click="RenameFontCollection_Click"
                                     d:Label="Rename">
                                     <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE13E;" />

From 075e29f80c5f0e94c66a0c3dd5794fb1b160e1cc Mon Sep 17 00:00:00 2001
From: Johnny Westlake <jmdwestlake@yahoo.co.uk>
Date: Fri, 24 May 2024 06:31:38 +0100
Subject: [PATCH 13/15] Smart collection edit hint

---
 .../Services/UserFontCollection.cs            |  3 +-
 .../CharacterMap/Strings/en-US/Resources.resw |  3 ++
 .../ViewModels/SettingsViewModel.cs           | 12 ++++----
 .../Views/CollectionManagementView.xaml       | 28 +++++++++++++++++--
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/CharacterMap/CharacterMap/Services/UserFontCollection.cs b/CharacterMap/CharacterMap/Services/UserFontCollection.cs
index 284274a6..fb68d220 100644
--- a/CharacterMap/CharacterMap/Services/UserFontCollection.cs
+++ b/CharacterMap/CharacterMap/Services/UserFontCollection.cs
@@ -51,7 +51,6 @@ public SmartFontCollection AsSmartFontCollection()
     }
 }
 
-
 [DebuggerDisplay("({Id}) Name: {Name}, {Fonts.Count} Fonts")]
 public class UserFontCollection : IFontCollection
 {
@@ -73,7 +72,7 @@ public IReadOnlyList<InstalledFont> GetFontFamilies() =>
 [DebuggerDisplay("({Id}) Name: {Name}, {Filters.Count} Filters")]
 public class SmartFontCollection : IFontCollection
 {
-    static string ICON { get; } = new string('\uE945', 1);
+    static string ICON { get; } = new ('\uE945', 1);
 
     public long Id { get; set; }
     public string Name { get; set; }
diff --git a/CharacterMap/CharacterMap/Strings/en-US/Resources.resw b/CharacterMap/CharacterMap/Strings/en-US/Resources.resw
index 512434ac..fe989c9e 100644
--- a/CharacterMap/CharacterMap/Strings/en-US/Resources.resw
+++ b/CharacterMap/CharacterMap/Strings/en-US/Resources.resw
@@ -1761,4 +1761,7 @@ Otherwise, "All Fonts" is selected by default on every launch.</value>
   <data name="EditCollectionButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Edit Collection</value>
   </data>
+  <data name="SmartCollectionEditHint.Text" xml:space="preserve">
+    <value>To modify smart collections use the edit button above.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/CharacterMap/CharacterMap/ViewModels/SettingsViewModel.cs b/CharacterMap/CharacterMap/ViewModels/SettingsViewModel.cs
index 6c3636c6..0c9c1000 100644
--- a/CharacterMap/CharacterMap/ViewModels/SettingsViewModel.cs
+++ b/CharacterMap/CharacterMap/ViewModels/SettingsViewModel.cs
@@ -12,14 +12,14 @@ public partial class SettingsViewModel : ViewModelBase
 
     protected override bool TrackAnimation => true;
 
-    public List<GlyphAnnotation> Annotations { get; } = 
+    public IReadOnlyList<GlyphAnnotation> Annotations { get; } = 
     [
         GlyphAnnotation.None,
         GlyphAnnotation.UnicodeHex,
         GlyphAnnotation.UnicodeIndex
     ];
 
-    public List<String> Themes { get; } =
+    public IReadOnlyList<String> Themes { get; } =
         [
             "Windows 10",
             "Windows 11",
@@ -124,13 +124,15 @@ public void ResetFontPreview()
     private List<ChangelogItem> CreateChangelog()
     {
         // Could read this from a text file, but that's a waste of performance.
-        // Naught wrong with this :P
-
         // Not including bug fixes in here, just key features. The main idea
         // is to expose features people may not be aware exist inside the
         // application rather than bug-fixes or visual changes.
         return [
-            new("Latest Update (April 2024)", // April 2024
+             new("Latest Update (June 2024)", // June 2024
+                "- Added ability to create automatically updating Smart Collections in Settings->Collections\n" +
+                "- Added support for managing fonts in Symbol font collection in Settings->Collections\n" +
+                "- The Unicode character search box now supports searching Unihan descriptions"),
+            new("2024.2.0.0 (April 2024)", // April 2024
                 "- Support searching font families in Settings->Collections\n" +
                 "- Added option to restore last selected font filter / collection on app launch in Settings->Advanced\n" +
                 "- Added option to define how exported glyph files are named by default in Settings->Export"),
diff --git a/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml b/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml
index 14549abf..7eb2c181 100644
--- a/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml
+++ b/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml
@@ -39,11 +39,28 @@
                         x:Name="CollectionSelector"
                         x:Uid="CollectionSelector"
                         Width="200"
-                        DisplayMemberPath="Name"
                         ItemsSource="{x:Bind ViewModel.Collections, Mode=OneWay}"
                         SelectedItem="{x:Bind ViewModel.SelectedCollection, Mode=TwoWay}"
                         SelectionChanged="{x:Bind ViewModel.RefreshFontLists}"
-                        d:PlaceholderText="Select exisiting" />
+                        d:PlaceholderText="Select exisiting">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                                <controls:AutoGrid Definitions="c* cAuto" Orientation="Horizontal">
+                                    <TextBlock Text="{Binding Name}" />
+                                    <TextBlock
+                                        Margin="24,0,0,0"
+                                        HorizontalAlignment="Right"
+                                        VerticalAlignment="Center"
+                                        FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                        Foreground="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                                        HorizontalTextAlignment="Right"
+                                        Opacity="0.7"
+                                        Style="{ThemeResource CaptionTextBlockStyle}"
+                                        Text="{Binding Icon}" />
+                                </controls:AutoGrid>
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </controls:UXComboBox>
                     <TextBlock
                         x:Uid="OrLabel"
                         VerticalAlignment="Center"
@@ -274,6 +291,13 @@
             </controls:SettingsPresenter>
         </Grid>
 
+        <TextBlock
+            x:Name="SmartCollectionEditHint"
+            x:Load="{x:Bind ViewModel.IsSmartCollection, Mode=OneWay, FallbackValue=False, TargetNullValue=False}"
+            x:Uid="SmartCollectionEditHint"
+            Grid.Row="2"
+            Style="{StaticResource DescriptionStyle}"
+            Text="" />
 
     </Grid>
 </UserControl>

From bce943c5e1e2550126f29d3eb06b99b24493033f Mon Sep 17 00:00:00 2001
From: Johnny Westlake <jmdwestlake@yahoo.co.uk>
Date: Fri, 24 May 2024 06:34:00 +0100
Subject: [PATCH 14/15] Add button to Wiki

---
 CharacterMap/CharacterMap/Strings/en-US/Resources.resw      | 3 +++
 CharacterMap/CharacterMap/ViewModels/SettingsViewModel.cs   | 4 +++-
 .../CharacterMap/Views/CollectionManagementView.xaml        | 2 +-
 CharacterMap/CharacterMap/Views/SettingsView.xaml           | 6 ++++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CharacterMap/CharacterMap/Strings/en-US/Resources.resw b/CharacterMap/CharacterMap/Strings/en-US/Resources.resw
index fe989c9e..957e7f96 100644
--- a/CharacterMap/CharacterMap/Strings/en-US/Resources.resw
+++ b/CharacterMap/CharacterMap/Strings/en-US/Resources.resw
@@ -1761,6 +1761,9 @@ Otherwise, "All Fonts" is selected by default on every launch.</value>
   <data name="EditCollectionButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Edit Collection</value>
   </data>
+  <data name="BtnHelpAndTips.Content" xml:space="preserve">
+    <value>Help &amp; Tips</value>
+  </data>
   <data name="SmartCollectionEditHint.Text" xml:space="preserve">
     <value>To modify smart collections use the edit button above.</value>
   </data>
diff --git a/CharacterMap/CharacterMap/ViewModels/SettingsViewModel.cs b/CharacterMap/CharacterMap/ViewModels/SettingsViewModel.cs
index 0c9c1000..d174f318 100644
--- a/CharacterMap/CharacterMap/ViewModels/SettingsViewModel.cs
+++ b/CharacterMap/CharacterMap/ViewModels/SettingsViewModel.cs
@@ -131,7 +131,9 @@ private List<ChangelogItem> CreateChangelog()
              new("Latest Update (June 2024)", // June 2024
                 "- Added ability to create automatically updating Smart Collections in Settings->Collections\n" +
                 "- Added support for managing fonts in Symbol font collection in Settings->Collections\n" +
-                "- The Unicode character search box now supports searching Unihan descriptions"),
+                "- Added additional search filters to \"Find a font family\" search box - \"filepath:\", \"foundry\", \"designer:\"\n" +
+                "- The Unicode character search box now supports searching Unihan descriptions\n" +
+                "- Added a link for Helps and Tips at our Wiki in Settings->About"),
             new("2024.2.0.0 (April 2024)", // April 2024
                 "- Support searching font families in Settings->Collections\n" +
                 "- Added option to restore last selected font filter / collection on app launch in Settings->Advanced\n" +
diff --git a/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml b/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml
index 7eb2c181..45a5960b 100644
--- a/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml
+++ b/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml
@@ -48,7 +48,7 @@
                                 <controls:AutoGrid Definitions="c* cAuto" Orientation="Horizontal">
                                     <TextBlock Text="{Binding Name}" />
                                     <TextBlock
-                                        Margin="24,0,0,0"
+                                        Margin="12,0,0,0"
                                         HorizontalAlignment="Right"
                                         VerticalAlignment="Center"
                                         FontFamily="{StaticResource SymbolThemeFontFamily}"
diff --git a/CharacterMap/CharacterMap/Views/SettingsView.xaml b/CharacterMap/CharacterMap/Views/SettingsView.xaml
index 19b11b9d..a4306537 100644
--- a/CharacterMap/CharacterMap/Views/SettingsView.xaml
+++ b/CharacterMap/CharacterMap/Views/SettingsView.xaml
@@ -1022,6 +1022,12 @@
                                             <controls:UXHyperlinkButton x:Uid="BtnContributors" NavigateUri="https://github.com/character-map-uwp/Character-Map-UWP/graphs/contributors" />
                                         </StackPanel>
 
+                                        <controls:UXButton
+                                            x:Uid="BtnHelpAndTips"
+                                            Width="200"
+                                            HorizontalAlignment="Left"
+                                            core:Properties.Hyperlink="https://github.com/character-map-uwp/Character-Map-UWP/wiki" />
+
                                         <controls:UXButton
                                             x:Name="BtnReview"
                                             x:Uid="BtnRateAndReview"

From 069cbcb4bcf3ca8dee718cb2b0f396d68b970432 Mon Sep 17 00:00:00 2001
From: Johnny Westlake <jmdwestlake@yahoo.co.uk>
Date: Fri, 24 May 2024 07:31:31 +0100
Subject: [PATCH 15/15] Fix flyout icons

---
 CharacterMap/CharacterMap/Themes/ClassicThemeStyles.xaml | 4 ++--
 CharacterMap/CharacterMap/Themes/DefaultThemeStyles.xaml | 4 ++--
 CharacterMap/CharacterMap/Themes/ZuneThemeStyles.xaml    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CharacterMap/CharacterMap/Themes/ClassicThemeStyles.xaml b/CharacterMap/CharacterMap/Themes/ClassicThemeStyles.xaml
index a97c1032..99c61e6d 100644
--- a/CharacterMap/CharacterMap/Themes/ClassicThemeStyles.xaml
+++ b/CharacterMap/CharacterMap/Themes/ClassicThemeStyles.xaml
@@ -521,8 +521,8 @@
                         </Grid.ColumnDefinitions>
                         <Viewbox
                             x:Name="IconRoot"
-                            Width="32"
-                            Height="32"
+                            Width="16"
+                            Height="16"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             Visibility="Collapsed">
diff --git a/CharacterMap/CharacterMap/Themes/DefaultThemeStyles.xaml b/CharacterMap/CharacterMap/Themes/DefaultThemeStyles.xaml
index abe06d67..d9198d19 100644
--- a/CharacterMap/CharacterMap/Themes/DefaultThemeStyles.xaml
+++ b/CharacterMap/CharacterMap/Themes/DefaultThemeStyles.xaml
@@ -184,8 +184,8 @@
                         </Grid.ColumnDefinitions>
                         <Viewbox
                             x:Name="IconRoot"
-                            Width="32"
-                            Height="32"
+                            Width="16"
+                            Height="16"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             Visibility="Collapsed">
diff --git a/CharacterMap/CharacterMap/Themes/ZuneThemeStyles.xaml b/CharacterMap/CharacterMap/Themes/ZuneThemeStyles.xaml
index 74874c6d..6df8e9c7 100644
--- a/CharacterMap/CharacterMap/Themes/ZuneThemeStyles.xaml
+++ b/CharacterMap/CharacterMap/Themes/ZuneThemeStyles.xaml
@@ -3452,8 +3452,8 @@
                         </Grid.ColumnDefinitions>
                         <Viewbox
                             x:Name="IconRoot"
-                            Width="32"
-                            Height="32"
+                            Width="16"
+                            Height="16"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             Visibility="Collapsed">