From 05b404d504ea01072b95477867f9ee32cc43c588 Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Tue, 9 Jan 2024 20:32:07 +0000
Subject: [PATCH] Rip out Microsoft's configuration and replace because it
 simply doesn't support polymorphism.... we are getting advanced boys!!!

---
 .../DesktopFlyout/DesktopFlyoutHost.cs        |   5 +-
 .../DesktopFlyout/DesktopFlyoutPresenter.cs   |   2 +-
 .../DesktopFlyout/DesktopFlyoutPresenter.xaml |  28 +--
 Hyperbar.Windows.Interop/VirtualKeyboard.cs   |   3 +-
 .../IPrimaryCommandConfiguration.cs           |   9 +-
 .../KeyAcceleratorCommandConfiguration.cs     |  10 +-
 .../PrimaryWidgetConfiguration.cs             |   4 +-
 .../PrimaryWidgetProvider.cs                  |   2 +-
 .../ProcessCommandConfiguration.cs            |   7 +
 .../WidgetComponentMapping.cs                 |  17 +-
 Hyperbar.Windows/App.xaml.cs                  |   5 +-
 .../IServiceCollectionExtensions.cs           |   2 +-
 .../Mediators/KeyAcceleratorHandler.cs        |  20 +-
 Hyperbar.Windows/Views/WidgetButtonView.xaml  |   7 +-
 Hyperbar.Windows/Views/WidgetView.xaml.cs     |  11 +-
 ...torCommand.cs => KeyAcceleratorRequest.cs} |   2 +-
 Hyperbar/Commands/ProcessRequest.cs           |   3 +
 Hyperbar/Configuration/ConfigurationWriter.cs |  57 +++++-
 .../IServiceCollectionExtensions.cs           | 188 ++++++++++--------
 19 files changed, 247 insertions(+), 135 deletions(-)
 create mode 100644 Hyperbar.Windows.Primary/ProcessCommandConfiguration.cs
 rename Hyperbar/Commands/{KeyAcceleratorCommand.cs => KeyAcceleratorRequest.cs} (59%)
 create mode 100644 Hyperbar/Commands/ProcessRequest.cs

diff --git a/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutHost.cs b/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutHost.cs
index cab0abd..aa180e6 100644
--- a/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutHost.cs
+++ b/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutHost.cs
@@ -3,6 +3,7 @@ using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Hyperbar.Windows.UI;
 using Hyperbar.Windows.Interop;
+using Windows.Foundation;
 
 namespace Hyperbar.Windows.Controls;
 
@@ -37,8 +38,8 @@ internal class DesktopFlyoutHost : Window
         {
             return;
         }
-
-        //  presenter.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+        
+        presenter.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
 
         double height = presenter.DesiredSize.Height;
         double width = presenter.DesiredSize.Width;
diff --git a/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPresenter.cs b/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPresenter.cs
index 4dd59b0..cdfb884 100644
--- a/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPresenter.cs
+++ b/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPresenter.cs
@@ -12,7 +12,7 @@ public class DesktopFlyoutPresenter :
             typeof(DesktopFlyoutPresenterTemplateSettings), typeof(DesktopFlyoutPresenter),
             new PropertyMetadata(null));
 
-    internal new DesktopFlyout Parent;
+    internal new DesktopFlyout? Parent;
 
     public DesktopFlyoutPresenter()
     {
diff --git a/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPresenter.xaml b/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPresenter.xaml
index 40676c4..e6cc739 100644
--- a/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPresenter.xaml
+++ b/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPresenter.xaml
@@ -5,21 +5,22 @@
     xmlns:controls="using:Hyperbar.Windows.Controls">
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Default">
-            <StaticResource x:Key="CommandBarFlyoutBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
-            <StaticResource x:Key="CommandBarFlyoutForeground" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="CommandBarFlyoutBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
+            <StaticResource x:Key="DesktopFlyoutPresenterBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
+            <StaticResource x:Key="DesktopFlyoutPresenterForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="DesktopFlyoutPresenterBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
         </ResourceDictionary>
         <ResourceDictionary x:Key="Light">
-            <StaticResource x:Key="CommandBarFlyoutBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
-            <StaticResource x:Key="CommandBarFlyoutForeground" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="CommandBarFlyoutBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
+            <StaticResource x:Key="DesktopFlyoutPresenterBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
+            <StaticResource x:Key="DesktopFlyoutPresenterForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="DesktopFlyoutPresenterBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
+    <Thickness x:Key="DesktopFlyoutPresenterBorderThemeThickness">1</Thickness>
     <Style TargetType="controls:DesktopFlyoutPresenter">
-        <Setter Property="Background" Value="{ThemeResource CommandBarFlyoutBackground}" />
-        <Setter Property="Foreground" Value="{ThemeResource CommandBarFlyoutForeground}" />
-        <Setter Property="BorderBrush" Value="{ThemeResource CommandBarFlyoutBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{ThemeResource CommandBarFlyoutBorderThemeThickness}" />
+        <Setter Property="Background" Value="{ThemeResource DesktopFlyoutPresenterBackground}" />
+        <Setter Property="Foreground" Value="{ThemeResource DesktopFlyoutPresenterForeground}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource DesktopFlyoutPresenterBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource DesktopFlyoutPresenterBorderThemeThickness}" />
         <Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />
         <Setter Property="Template">
             <Setter.Value>
@@ -29,9 +30,9 @@
                             x:Name="BackgroundElement"
                             Height="48"
                             MinWidth="40"
-                            Margin="24"
+                            Margin="16"
                             Background="{TemplateBinding Background}"
-                            BackgroundSizing="InnerBorderEdge"
+                            BackgroundSizing="OuterBorderEdge"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             CornerRadius="{TemplateBinding CornerRadius}"
@@ -42,7 +43,8 @@
                                 </TransitionCollection>
                             </Border.Transitions>
                             <ContentControl
-                                Margin="{TemplateBinding Padding}"
+                                Height="40"
+                                Margin="4"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                 Content="{TemplateBinding Content}"
diff --git a/Hyperbar.Windows.Interop/VirtualKeyboard.cs b/Hyperbar.Windows.Interop/VirtualKeyboard.cs
index fabd9ab..20e2f96 100644
--- a/Hyperbar.Windows.Interop/VirtualKeyboard.cs
+++ b/Hyperbar.Windows.Interop/VirtualKeyboard.cs
@@ -24,8 +24,7 @@ public class VirtualKeyboard :
         91      // LeftWindows
        ];
 
-    public void Send(int key,
-        params int[] modifierKeys)
+    public void Send(int key, params int[] modifierKeys)
     {
         foreach (int modiferKey in modifierKeys)
         {
diff --git a/Hyperbar.Windows.Primary/IPrimaryCommandConfiguration.cs b/Hyperbar.Windows.Primary/IPrimaryCommandConfiguration.cs
index 859486a..c2da743 100644
--- a/Hyperbar.Windows.Primary/IPrimaryCommandConfiguration.cs
+++ b/Hyperbar.Windows.Primary/IPrimaryCommandConfiguration.cs
@@ -1,5 +1,10 @@
-namespace Hyperbar.Windows.Primary;
+using System.Text.Json.Serialization;
 
-public interface IPrimaryCommandConfiguration
+namespace Hyperbar.Windows.Primary;
+
+[JsonDerivedType(typeof(KeyAcceleratorCommandConfiguration), typeDiscriminator: "KeyAcceleratorCommand")]
+[JsonDerivedType(typeof(ProcessCommandConfiguration), typeDiscriminator: "ProcessCommand")]
+public class PrimaryCommandConfiguration
 {
+    public string? Icon { get; set; }
 }
\ No newline at end of file
diff --git a/Hyperbar.Windows.Primary/KeyAcceleratorCommandConfiguration.cs b/Hyperbar.Windows.Primary/KeyAcceleratorCommandConfiguration.cs
index 0241bbf..9a5bc7c 100644
--- a/Hyperbar.Windows.Primary/KeyAcceleratorCommandConfiguration.cs
+++ b/Hyperbar.Windows.Primary/KeyAcceleratorCommandConfiguration.cs
@@ -1,11 +1,9 @@
 namespace Hyperbar.Windows.Primary;
 
 public class KeyAcceleratorCommandConfiguration :
-    IPrimaryCommandConfiguration
+    PrimaryCommandConfiguration
 {
-    public string? Icon { get; set; }
+    public int Key { get; set; }
 
-    public string? Key { get; set; }
-
-    public string[]? Modifiers { get; set; }
-}
\ No newline at end of file
+    public int[]? Modifiers { get; set; }
+}
diff --git a/Hyperbar.Windows.Primary/PrimaryWidgetConfiguration.cs b/Hyperbar.Windows.Primary/PrimaryWidgetConfiguration.cs
index 1017ca5..a0a5bc1 100644
--- a/Hyperbar.Windows.Primary/PrimaryWidgetConfiguration.cs
+++ b/Hyperbar.Windows.Primary/PrimaryWidgetConfiguration.cs
@@ -1,10 +1,10 @@
 namespace Hyperbar.Windows.Primary;
 
 public class PrimaryWidgetConfiguration :
-    List<KeyAcceleratorCommandConfiguration>
+    List<PrimaryCommandConfiguration>
 {
     public static PrimaryWidgetConfiguration Defaults => new()
     {
-        new KeyAcceleratorCommandConfiguration { Icon = "\uE720", Key = "Test", Modifiers = ["Test", "Test"] }
+        new KeyAcceleratorCommandConfiguration { Icon = "\uE720", Key = 91, Modifiers = [] }
     };
 }
\ No newline at end of file
diff --git a/Hyperbar.Windows.Primary/PrimaryWidgetProvider.cs b/Hyperbar.Windows.Primary/PrimaryWidgetProvider.cs
index c554074..9e5a342 100644
--- a/Hyperbar.Windows.Primary/PrimaryWidgetProvider.cs
+++ b/Hyperbar.Windows.Primary/PrimaryWidgetProvider.cs
@@ -7,7 +7,7 @@ public class PrimaryWidgetProvider :
     IWidgetProvider
 {
     public void Create(HostBuilderContext comtext, IServiceCollection services) => 
-            services.AddConfiguration< PrimaryWidgetConfiguration>(comtext.Configuration.GetSection(nameof(PrimaryWidgetConfiguration)))
+            services.AddConfiguration<PrimaryWidgetConfiguration>()
             .AddHandler<WidgetComponentMapping>()
             .AddHandler<PrimaryWidgetConfigurationChangedHandler>()
             .AddWidgetTemplate<PrimaryWidgetViewModel>();
diff --git a/Hyperbar.Windows.Primary/ProcessCommandConfiguration.cs b/Hyperbar.Windows.Primary/ProcessCommandConfiguration.cs
new file mode 100644
index 0000000..2a64c15
--- /dev/null
+++ b/Hyperbar.Windows.Primary/ProcessCommandConfiguration.cs
@@ -0,0 +1,7 @@
+namespace Hyperbar.Windows.Primary;
+
+public class ProcessCommandConfiguration :
+    PrimaryCommandConfiguration
+{
+    public string? Path { get; set; }
+}
\ No newline at end of file
diff --git a/Hyperbar.Windows.Primary/WidgetComponentMapping.cs b/Hyperbar.Windows.Primary/WidgetComponentMapping.cs
index 68f53ad..5b2cf80 100644
--- a/Hyperbar.Windows.Primary/WidgetComponentMapping.cs
+++ b/Hyperbar.Windows.Primary/WidgetComponentMapping.cs
@@ -1,5 +1,4 @@
-
-namespace Hyperbar.Windows.Primary;
+namespace Hyperbar.Windows.Primary;
 
 public class WidgetComponentMapping(PrimaryWidgetConfiguration configuration,
     IServiceFactory service,
@@ -8,12 +7,18 @@ public class WidgetComponentMapping(PrimaryWidgetConfiguration configuration,
 {
     public IEnumerable<IWidgetComponentViewModel> Handle()
     {
-        foreach (IPrimaryCommandConfiguration item in configuration)
+        foreach (var item in configuration)
         {
-            if (item is KeyAcceleratorCommandConfiguration keyAcceleratorCommand)
+            if (item is KeyAcceleratorCommandConfiguration keyAcceleratorCommandConfiguration)
             {
-                yield return service.Create<WidgetButtonViewModel>(keyAcceleratorCommand.Icon, new Action(async () =>
-                   await mediator.SendAsync(new KeyAcceleratorCommand(VirtualKey.LeftWindows))));
+                 yield return service.Create<WidgetButtonViewModel>(keyAcceleratorCommandConfiguration.Icon, new Action(async () =>
+                   await mediator.SendAsync(new KeyAcceleratorRequest((VirtualKey)keyAcceleratorCommandConfiguration.Key, 
+                    keyAcceleratorCommandConfiguration.Modifiers?.Select(modifier => (VirtualKey)modifier).ToArray()))));
+            }
+
+            if (item is ProcessCommandConfiguration processCommandConfiguration)
+            {
+
             }
         }
     }
diff --git a/Hyperbar.Windows/App.xaml.cs b/Hyperbar.Windows/App.xaml.cs
index 6af1fab..c973367 100644
--- a/Hyperbar.Windows/App.xaml.cs
+++ b/Hyperbar.Windows/App.xaml.cs
@@ -4,8 +4,10 @@ using Hyperbar.Windows.Primary;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
+using System.Text.Json;
 
 namespace Hyperbar.Windows;
 
@@ -18,8 +20,7 @@ public partial class App :
     {
         base.OnLaunched(args);
 
-        var context = new DispatcherQueueSynchronizationContext(
-                    DispatcherQueue.GetForCurrentThread());
+        DispatcherQueueSynchronizationContext context = new(DispatcherQueue.GetForCurrentThread());
         SynchronizationContext.SetSynchronizationContext(context);
 
         IHost? host = Host.CreateDefaultBuilder()
diff --git a/Hyperbar.Windows/Lifecycles/IServiceCollectionExtensions.cs b/Hyperbar.Windows/Lifecycles/IServiceCollectionExtensions.cs
index c6e8960..af0438a 100644
--- a/Hyperbar.Windows/Lifecycles/IServiceCollectionExtensions.cs
+++ b/Hyperbar.Windows/Lifecycles/IServiceCollectionExtensions.cs
@@ -36,7 +36,7 @@ namespace Hyperbar.Windows
 
                     isolatedServices.AddSingleton<IMediator, Mediator>();
                     isolatedServices.AddHandler<KeyAcceleratorHandler>();
-
+                    isolatedServices.AddHandler<ProcesssAcceleratorHandler>();
                     isolatedServices.AddTransient<IWidgetView, WidgetView>();
                     isolatedServices.AddContentTemplate<WidgetButtonViewModel, WidgetButtonView>();
 
diff --git a/Hyperbar.Windows/Mediators/KeyAcceleratorHandler.cs b/Hyperbar.Windows/Mediators/KeyAcceleratorHandler.cs
index f37088a..84e6b0a 100644
--- a/Hyperbar.Windows/Mediators/KeyAcceleratorHandler.cs
+++ b/Hyperbar.Windows/Mediators/KeyAcceleratorHandler.cs
@@ -1,14 +1,26 @@
 using Hyperbar.Windows.Interop;
+using System.Diagnostics;
 
 namespace Hyperbar.Windows;
 
 public class KeyAcceleratorHandler(IVirtualKeyboard virtualKeyboard) :
-    IRequestHandler<KeyAcceleratorCommand>
+    IRequestHandler<KeyAcceleratorRequest>
 {
-    public ValueTask<Unit> Handle(KeyAcceleratorCommand command,
+    public ValueTask<Unit> Handle(KeyAcceleratorRequest request,
         CancellationToken cancellationToken)
-    {       
-        virtualKeyboard.Send((int)command.Key);
+    {
+        virtualKeyboard.Send((int)request.Key, request.Modifiers?.Select(modifier => (int)modifier).ToArray() ?? []);
+        return default;
+    }
+}
+
+public class ProcesssAcceleratorHandler :
+    IRequestHandler<ProcessRequest>
+{
+    public ValueTask<Unit> Handle(ProcessRequest request,
+        CancellationToken cancellationToken)
+    {
+        Process.Start(request.Process);
         return default;
     }
 }
diff --git a/Hyperbar.Windows/Views/WidgetButtonView.xaml b/Hyperbar.Windows/Views/WidgetButtonView.xaml
index 3f631f6..e8e04ba 100644
--- a/Hyperbar.Windows/Views/WidgetButtonView.xaml
+++ b/Hyperbar.Windows/Views/WidgetButtonView.xaml
@@ -10,13 +10,14 @@
         <SolidColorBrush x:Key="ButtonBorderBrushPressed" Color="Transparent" />
         <SolidColorBrush x:Key="ButtonBorderBrushDisabled" Color="Transparent" />
         <Thickness x:Key="ButtonPadding">0</Thickness>
-        <x:Double x:Key="ButtonWidth">32</x:Double>
-        <x:Double x:Key="ButtonHeight">32</x:Double>
+        <x:Double x:Key="ButtonWidth">40</x:Double>
+        <x:Double x:Key="ButtonHeight">40</x:Double>
     </UserControl.Resources>
     <Button
         Width="{StaticResource ButtonWidth}"
         Height="{StaticResource ButtonHeight}"
-        Padding="0"
+        Padding="{StaticResource ButtonPadding}"
+        FontSize="16"
         Command="{Binding Click}"
         Content="{Binding Icon}"
         FontFamily="{StaticResource SymbolThemeFontFamily}" />
diff --git a/Hyperbar.Windows/Views/WidgetView.xaml.cs b/Hyperbar.Windows/Views/WidgetView.xaml.cs
index d77a38f..45f9a72 100644
--- a/Hyperbar.Windows/Views/WidgetView.xaml.cs
+++ b/Hyperbar.Windows/Views/WidgetView.xaml.cs
@@ -1,4 +1,5 @@
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
 
 namespace Hyperbar.Windows;
 
@@ -6,5 +7,13 @@ public sealed partial class WidgetView :
     UserControl,
     IWidgetView
 {
-    public WidgetView() => InitializeComponent();
+    public WidgetView()
+    {
+        InitializeComponent();
+    }
+
+    protected override void OnKeyDown(KeyRoutedEventArgs e)
+    {
+        base.OnKeyDown(e);
+    }
 }
\ No newline at end of file
diff --git a/Hyperbar/Commands/KeyAcceleratorCommand.cs b/Hyperbar/Commands/KeyAcceleratorRequest.cs
similarity index 59%
rename from Hyperbar/Commands/KeyAcceleratorCommand.cs
rename to Hyperbar/Commands/KeyAcceleratorRequest.cs
index ceb4d97..fcbd357 100644
--- a/Hyperbar/Commands/KeyAcceleratorCommand.cs
+++ b/Hyperbar/Commands/KeyAcceleratorRequest.cs
@@ -1,5 +1,5 @@
 namespace Hyperbar;
 
-public record KeyAcceleratorCommand(VirtualKey Key,
+public record KeyAcceleratorRequest(VirtualKey Key,
     VirtualKey[]? Modifiers = null) :
     IRequest;
diff --git a/Hyperbar/Commands/ProcessRequest.cs b/Hyperbar/Commands/ProcessRequest.cs
new file mode 100644
index 0000000..b0b4bf5
--- /dev/null
+++ b/Hyperbar/Commands/ProcessRequest.cs
@@ -0,0 +1,3 @@
+namespace Hyperbar;
+
+public record ProcessRequest(string Process) : IRequest;
\ No newline at end of file
diff --git a/Hyperbar/Configuration/ConfigurationWriter.cs b/Hyperbar/Configuration/ConfigurationWriter.cs
index 39d8ffe..c6c88a8 100644
--- a/Hyperbar/Configuration/ConfigurationWriter.cs
+++ b/Hyperbar/Configuration/ConfigurationWriter.cs
@@ -4,7 +4,62 @@ using System.Text.Json.Serialization;
 
 namespace Hyperbar;
 
-public class ConfigurationWriter<TConfiguration>(string path,
+public interface IConfigurationReader<TConfiguration>
+    where TConfiguration :
+    class, new()
+{
+    TConfiguration Read();
+}
+
+public class ConfigurationReader<TConfiguration>(string path,
+    string section,
+    JsonSerializerOptions? serializerOptions = null) :
+    IConfigurationReader<TConfiguration>
+    where TConfiguration :
+    class, new()
+{
+    private static readonly Func<JsonSerializerOptions> defaultSerializerOptions = new(() =>
+    {
+        return new JsonSerializerOptions
+        {
+            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+            Converters = 
+            { 
+                new JsonStringEnumConverter() 
+            }
+        };
+    });
+
+    public TConfiguration Read()
+    {
+        if ((TryGet(out TConfiguration? value) ? value : new TConfiguration()) is TConfiguration configuration)
+        {
+            return configuration;
+        }
+
+        return new TConfiguration();
+    }
+
+    private bool TryGet(out TConfiguration? value)
+    {
+        if (File.Exists(path))
+        {
+            byte[] jsonContent = File.ReadAllBytes(path);
+
+            using JsonDocument jsonDocument = JsonDocument.Parse(jsonContent);
+            if (jsonDocument.RootElement.TryGetProperty(section, out JsonElement sectionValue))
+            {
+                value = JsonSerializer.Deserialize<TConfiguration>(sectionValue.ToString(), serializerOptions ?? defaultSerializerOptions());
+                return true;
+            }
+        }
+
+        value = default;
+        return false;
+    }
+}
+
+ public class ConfigurationWriter<TConfiguration>(string path,
     string section,
     JsonSerializerOptions? serializerOptions = null) :
     IConfigurationWriter<TConfiguration>
diff --git a/Hyperbar/Extensions/IServiceCollectionExtensions.cs b/Hyperbar/Extensions/IServiceCollectionExtensions.cs
index ca93bf6..619c3f9 100644
--- a/Hyperbar/Extensions/IServiceCollectionExtensions.cs
+++ b/Hyperbar/Extensions/IServiceCollectionExtensions.cs
@@ -3,15 +3,113 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Options;
 using System.Text.Json;
 
 namespace Hyperbar;
 
 public static class IServiceCollectionExtensions
 {
-    public static IServiceCollection AddHandler<THandler>(this IServiceCollection services, 
-        ServiceLifetime lifetime = ServiceLifetime.Transient) 
+    public static IServiceCollection AddConfiguration<TConfiguration>(this IServiceCollection services)
+        where TConfiguration :
+        class, new()
+    {
+        return services.AddConfiguration<TConfiguration>(typeof(TConfiguration).Name, "Settings.json", null);
+    }
+
+    public static IServiceCollection AddConfiguration<TConfiguration>(this IServiceCollection services,
+        IConfiguration configuration,
+        TConfiguration? defaults = null)
+        where TConfiguration :
+        class, new()
+    {
+        return services.AddConfiguration(typeof(TConfiguration).Name, "Settings.json", defaults);
+    }
+
+    public static IServiceCollection AddConfiguration<TConfiguration>(this IServiceCollection services,
+        string section,
+        string path = "Settings.json",
+        TConfiguration? defaults = null,
+        Action<JsonSerializerOptions>? serializerDelegate = null)
+        where TConfiguration :
+        class, new()
+    {
+        services.AddTransient(provider => provider.GetRequiredService<IConfigurationReader<TConfiguration>>().Read());
+
+        services.AddSingleton<IConfigurationReader<TConfiguration>>(provider =>
+        {
+            string? jsonFilePath = null;
+            if (provider.GetService<IHostEnvironment>() is IHostEnvironment hostEnvironment)
+            {
+                IFileProvider fileProvider = hostEnvironment.ContentRootFileProvider;
+                IFileInfo fileInfo = fileProvider.GetFileInfo(path);
+
+                jsonFilePath = fileInfo.PhysicalPath;
+            }
+
+            jsonFilePath ??= Path.Combine(AppDomain.CurrentDomain.BaseDirectory, path);
+
+            JsonSerializerOptions? defaultSerializer = null;
+            if (serializerDelegate is not null)
+            {
+                defaultSerializer = new JsonSerializerOptions();
+                serializerDelegate.Invoke(defaultSerializer);
+            }
+
+            return new ConfigurationReader<TConfiguration>(jsonFilePath, section, defaultSerializer);
+        });
+
+        services.AddSingleton<IConfigurationWriter<TConfiguration>>(provider =>
+        {
+            string? jsonFilePath = null;
+            if (provider.GetService<IHostEnvironment>() is IHostEnvironment hostEnvironment)
+            {
+                IFileProvider fileProvider = hostEnvironment.ContentRootFileProvider;
+                IFileInfo fileInfo = fileProvider.GetFileInfo(path);
+
+                jsonFilePath = fileInfo.PhysicalPath;
+            }
+
+            jsonFilePath ??= Path.Combine(AppDomain.CurrentDomain.BaseDirectory, path);
+
+            JsonSerializerOptions? defaultSerializer = null;
+            if (serializerDelegate is not null)
+            {
+                defaultSerializer = new JsonSerializerOptions();
+                serializerDelegate.Invoke(defaultSerializer);
+            }
+
+            return new ConfigurationWriter<TConfiguration>(jsonFilePath, section, defaultSerializer);
+        });
+
+        services.AddTransient(provider => new DefaultConfiguration<TConfiguration>(defaults));
+        services.AddTransient<IInitializer, ConfigurationInitializer<TConfiguration>>();
+
+        services.AddTransient<IWritableConfiguration<TConfiguration>, WritableConfiguration<TConfiguration>>();
+
+        return services;
+    }
+
+    public static IServiceCollection AddContentTemplate<TContent, TTemplate>(this IServiceCollection services,
+        object? key = null)
+    {
+        Type contentType = typeof(TContent);
+        Type templateType = typeof(TTemplate);
+
+        key ??= contentType.Name;
+
+        services.AddTransient(contentType);
+        services.TryAddTransient(templateType);
+
+        services.AddKeyedTransient(contentType, key);
+        services.AddKeyedTransient(templateType, key);
+
+        services.AddTransient<IContentTemplateDescriptor>(provider => new ContentTemplateDescriptor { ContentType = contentType, TemplateType = templateType, Key = key });
+
+        return services;
+    }
+
+    public static IServiceCollection AddHandler<THandler>(this IServiceCollection services,
+                        ServiceLifetime lifetime = ServiceLifetime.Transient) 
         where THandler :
         IHandler
     {
@@ -62,71 +160,6 @@ public static class IServiceCollectionExtensions
 
         return services;
     }
-
-    public static IServiceCollection AddConfiguration<TConfiguration>(this IServiceCollection services,
-        IConfiguration configuration)
-        where TConfiguration :
-        class, new()
-    {
-        return services.AddConfiguration<TConfiguration>(configuration, typeof(TConfiguration).Name, "Settings.json", null);
-    }
-
-    public static IServiceCollection AddConfiguration<TConfiguration>(this IServiceCollection services,
-        IConfiguration configuration,
-        TConfiguration? defaults = null)
-        where TConfiguration :
-        class, new()
-    {
-        return services.AddConfiguration(configuration, typeof(TConfiguration).Name, "Settings.json", defaults);
-    }
-
-    public static IServiceCollection AddConfiguration<TConfiguration>(this IServiceCollection services,
-        IConfiguration configuration,
-        string section,
-        string path = "Settings.json",
-        TConfiguration? defaults = null,
-        Action<JsonSerializerOptions>? serializerDelegate = null)
-        where TConfiguration :
-        class, new()
-    {
-        services.Configure<TConfiguration>(configuration);
-        services.AddSingleton<IConfigureOptions<TConfiguration>>(new ConfigureNamedOptions<TConfiguration>("", args => { }));
-        services.AddTransient(provider => provider.GetService<IOptionsMonitor<TConfiguration>>()!.CurrentValue);
-
-        services.AddSingleton<IConfigurationWriter<TConfiguration>>(provider =>
-        {
-            string? jsonFilePath = null;
-            if (provider.GetService<IHostEnvironment>() is IHostEnvironment hostEnvironment)
-            {
-                IFileProvider fileProvider = hostEnvironment.ContentRootFileProvider;
-                IFileInfo fileInfo = fileProvider.GetFileInfo(path);
-
-                jsonFilePath = fileInfo.PhysicalPath;
-            }
-
-            jsonFilePath ??= Path.Combine(AppDomain.CurrentDomain.BaseDirectory, path);
-
-            JsonSerializerOptions? defaultSerializer = null;
-            if (serializerDelegate is not null)
-            {
-                defaultSerializer = new JsonSerializerOptions();
-                serializerDelegate.Invoke(defaultSerializer);
-            }
-
-            return new ConfigurationWriter<TConfiguration>(jsonFilePath, section, defaultSerializer);
-        });
-
-        if (defaults is not null)
-        {
-        }
-
-        services.AddTransient(provider => new DefaultConfiguration<TConfiguration>(defaults));
-        services.AddTransient<IInitializer, ConfigurationInitializer<TConfiguration>>();
-
-        services.AddTransient<IWritableConfiguration<TConfiguration>, WritableConfiguration<TConfiguration>>();
-        return services;
-    }
-
     public static IServiceCollection AddWidgetTemplate<TWidgetContent>(this IServiceCollection services)
         where TWidgetContent :
         IWidgetViewModel
@@ -166,23 +199,4 @@ public static class IServiceCollectionExtensions
 
         return services;
     }
-
-    public static IServiceCollection AddContentTemplate<TContent, TTemplate>(this IServiceCollection services,
-        object? key = null)
-    {
-        Type contentType = typeof(TContent);
-        Type templateType = typeof(TTemplate);
-
-        key ??= contentType.Name;
-
-        services.AddTransient(contentType);
-        services.TryAddTransient(templateType);
-
-        services.AddKeyedTransient(contentType, key);
-        services.AddKeyedTransient(templateType, key);
-
-        services.AddTransient<IContentTemplateDescriptor>(provider => new ContentTemplateDescriptor { ContentType = contentType, TemplateType = templateType, Key = key });
-
-        return services;
-    }
 }
\ No newline at end of file