Cache duplication fix (#292)

* Cache duplication fix
Performance improvement
Closes #290

* Increment version

.editorconfig

@@ -6,8 +6,8 @@ csharp_indent_labels = one_less_than_current
 csharp_using_directive_placement = outside_namespace:error
 csharp_prefer_simple_using_statement = true:error
 csharp_prefer_braces = true:silent
-csharp_style_namespace_declarations = block_scoped:silent
-csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_namespace_declarations = file_scoped:error
+csharp_style_prefer_method_group_conversion = true:suggestion
 csharp_style_expression_bodied_methods = false:silent
 csharp_style_expression_bodied_constructors = false:silent
 csharp_style_expression_bodied_operators = false:silent
@@ -46,6 +46,9 @@ csharp_style_prefer_extended_property_pattern = true:suggestion
 csharp_style_var_for_built_in_types = false:silent
 csharp_style_var_when_type_is_apparent = false:silent
 csharp_style_var_elsewhere = false:silent
+csharp_style_prefer_top_level_statements = true:suggestion
+csharp_style_prefer_utf8_string_literals = true:suggestion
+csharp_style_prefer_readonly_struct = true:suggestion
 
 [*.{cs,vb}]
 #### Naming styles ####

.github/workflows/cd.yaml

@@ -53,12 +53,12 @@ jobs:
         echo "${{ env.Changelog }}"
 
     - name: Install .NET Core
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.x'
+        dotnet-version: '7.x'
 
     - name: Setup MSBuild.exe
-      uses: microsoft/setup-msbuild@v1.0.1
+      uses: microsoft/setup-msbuild@v1.3.1
 
     - name: Setup project secrets
       run: |
@@ -95,7 +95,7 @@ jobs:
       shell: pwsh
 
     - name: Publish release
-      uses: Xotl/cool-github-releases@v1.1.7
+      uses: Xotl/cool-github-releases@v1.1.8
       with:
         mode: update
         tag_name: v${{ env.Version }}

.github/workflows/ci.yaml

@@ -36,12 +36,12 @@ jobs:
         fetch-depth: 0
 
     - name: Install .NET Core
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.x'
+        dotnet-version: '7.x'
 
     - name: Setup MSBuild.exe
-      uses: microsoft/setup-msbuild@v1.0.1
+      uses: microsoft/setup-msbuild@v1.3.1
 
     - name: Execute Unit Tests
       run: dotnet test $env:Test_Project_Path

.github/workflows/codeql-analysis.yml

@@ -57,7 +57,7 @@ jobs:
     # If this step fails, then you should remove it and run the build manually (see below)
 
     - name: Install .NET Core
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.x'
 

Daybreak.Installer/Daybreak.Installer.csproj

@@ -5,6 +5,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <Platforms>AnyCPU;x86;x64</Platforms>
   </PropertyGroup>
 
 </Project>

Daybreak.Installer/Program.cs

@@ -14,6 +14,12 @@ if (File.Exists(tempFile) is false)
     return;
 }
 
+while (Process.GetProcesses().Where(p => p.ProcessName == "Daybreak").FirstOrDefault()?.HasExited is false)
+{
+    Console.WriteLine($"Detected Daybreak process is still running. Waiting 5s and retrying");
+    await Task.Delay(5000);
+}
+
 Console.WriteLine("Unpacking files...");
 try
 {
@@ -23,12 +29,32 @@ catch
 {
 
 }
-Console.WriteLine("Deleting package");
-File.Delete(tempFile);
 
 Console.WriteLine("Deleting browser caches");
-Directory.Delete("BrowserData", true);
-Directory.Delete("Daybreak.exe.WebView2", true);
+try
+{
+    Directory.Delete("BrowserData", true);
+}
+catch(Exception)
+{
+}
+try
+{
+    Directory.Delete("Daybreak.exe.WebView2", true);
+}
+catch(Exception)
+{
+}
+
+Console.WriteLine("Deleting package");
+try
+{
+    File.Delete(tempFile);
+}
+catch (Exception e)
+{
+    Console.WriteLine($"Failed to delete {tempFile}.\n{e}");
+}
 
 Console.WriteLine("Launching application");
 var process = new Process
@@ -43,4 +69,4 @@ if (process.Start() is false)
 {
     Console.WriteLine("Failed to launch application");
     Console.ReadKey();
-}
+}

Daybreak.Tests/Daybreak.Tests.csproj

@@ -3,15 +3,19 @@
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
     <IsPackable>false</IsPackable>
+    <Platforms>AnyCPU;x86;x64</Platforms>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0-preview-20220726-02" />
-    <PackageReference Include="Moq" Version="4.18.2" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2" />
+    <PackageReference Include="FluentAssertions" Version="6.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.1" />
+    <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.0.4" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.0.4" />
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
 

Daybreak.Tests/Models/InscriptionTests.cs

@@ -0,0 +1,15 @@
+using Daybreak.Models.Guildwars;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Collections.Generic;
+using System.Extensions;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+namespace Daybreak.Tests.Models;
+
+[TestClass]
+public sealed class InscriptionTests : ItemTestsBase<Inscription>
+{
+    protected override IEnumerable<Inscription> AllItems { get; } = Inscription.Inscriptions;
+}

Daybreak.Tests/Models/ItemBaseTests.cs

@@ -0,0 +1,74 @@
+using Daybreak.Models.Guildwars;
+using FluentAssertions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Collections.Generic;
+using System.Text;
+using System;
+using System.Linq;
+
+namespace Daybreak.Tests.Models;
+
+[TestClass]
+public sealed class ItemBaseTests
+{
+    [TestMethod]
+    public void TryParse_UnknownId_Fails()
+    {
+        var found = ItemBase.TryParse(int.MaxValue, modifiers: default, out var item);
+        found.Should().BeFalse();
+        item.Should().BeNull();
+    }
+
+    [TestMethod]
+    public void Parse_UnknownId_ThrowsInvalidOperationException()
+    {
+        var action = () => ItemBase.Parse(int.MaxValue, modifiers: default);
+        action.Should().Throw<InvalidOperationException>();
+    }
+
+    [TestMethod]
+    public void TryParse_KnownId_Succeeds()
+    {
+        var found = ItemBase.TryParse(Inscription.WeaponInscription.Id, Inscription.WeaponInscription.Modifiers, out var inscription);
+        found.Should().BeTrue();
+        inscription.Should().Be(Inscription.WeaponInscription);
+    }
+
+    [TestMethod]
+    public void Parse_KnownId_ReturnsExpected()
+    {
+        var inscription = ItemBase.Parse(Inscription.WeaponInscription.Id, Inscription.WeaponInscription.Modifiers);
+        inscription.Should().Be(Inscription.WeaponInscription);
+    }
+
+    [TestMethod]
+    public void ItemList_Should_ContainOnlyUniqueItems()
+    {
+        var itemMap = new Dictionary<ItemBase, int>();
+
+        foreach (var item in ItemBase.AllItems)
+        {
+            if (!itemMap.TryGetValue(item, out _))
+            {
+                itemMap[item] = 0;
+            }
+
+            itemMap[item] += 1;
+        }
+
+        var errorMessage = new StringBuilder("Duplicated item entries: ");
+        foreach (var tuple in itemMap)
+        {
+            if (tuple.Value > 1)
+            {
+                errorMessage.Append(tuple.Key.Name);
+                errorMessage.Append(", ");
+            }
+        }
+
+        if (itemMap.Any(kvp => kvp.Value > 1))
+        {
+            Assert.Fail(errorMessage.ToString());
+        }
+    }
+}

Daybreak.Tests/Models/ItemTestsBase.cs

@@ -0,0 +1,78 @@
+using Daybreak.Models.Guildwars;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Collections.Generic;
+using System.Extensions;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+namespace Daybreak.Tests.Models;
+
+public abstract class ItemTestsBase<T>
+    where T : ItemBase
+{
+    protected abstract IEnumerable<T> AllItems { get; }
+
+    [TestMethod]
+    public void InscriptionList_Should_ContainOnlyUniqueItems()
+    {
+        var itemMap = new Dictionary<T, int>();
+
+        foreach (var item in this.AllItems)
+        {
+            if (!itemMap.TryGetValue(item, out _))
+            {
+                itemMap[item] = 0;
+            }
+
+            itemMap[item] += 1;
+        }
+
+        var errorMessage = new StringBuilder($"Duplicated {typeof(T).Name} entries: ");
+        foreach (var tuple in itemMap)
+        {
+            if (tuple.Value > 1)
+            {
+                errorMessage.Append(tuple.Key.Name);
+                errorMessage.Append(", ");
+            }
+        }
+
+        if (itemMap.Any(kvp => kvp.Value > 1))
+        {
+            Assert.Fail(errorMessage.ToString());
+        }
+    }
+
+    [TestMethod]
+    public void InscriptionList_Should_ContainAllNpcs()
+    {
+        var itemMap = new Dictionary<T, bool>();
+        var definedItemFields = typeof(T).GetFields(BindingFlags.Static | BindingFlags.Public).Where(f => f.FieldType == typeof(T));
+        foreach (var field in definedItemFields)
+        {
+            var item = field.GetValue(default).Cast<T>();
+            itemMap[item] = false;
+        }
+
+        foreach (var item in this.AllItems)
+        {
+            itemMap[item] = true;
+        }
+
+        var errorMessage = new StringBuilder($"{typeof(T).Name} entries not in list: ");
+        foreach (var tuple in itemMap)
+        {
+            if (tuple.Value is false)
+            {
+                errorMessage.Append(tuple.Key.Name);
+                errorMessage.Append(", ");
+            }
+        }
+
+        if (itemMap.Any(kvp => kvp.Value is false))
+        {
+            Assert.Fail(errorMessage.ToString());
+        }
+    }
+}

Daybreak.Tests/Models/MaterialTests.cs

@@ -0,0 +1,11 @@
+using Daybreak.Models.Guildwars;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Collections.Generic;
+
+namespace Daybreak.Tests.Models;
+
+[TestClass]
+public sealed class MaterialTests : ItemTestsBase<Material>
+{
+    protected override IEnumerable<Material> AllItems { get; } = Material.All;
+}

Daybreak.Tests/Models/NpcTests.cs

@@ -0,0 +1,108 @@
+using Daybreak.Models.Guildwars;
+using FluentAssertions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Collections.Generic;
+using System.Extensions;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+namespace Daybreak.Tests.Models;
+
+[TestClass]
+public sealed class NpcTests
+{
+    [TestMethod]
+    public void TryParse_UnknownId_Fails()
+    {
+        var found = Npc.TryParse(int.MaxValue, out var npc);
+        found.Should().BeFalse();
+        npc.Should().BeNull();
+    }
+
+    [TestMethod]
+    public void Parse_UnknownId_ThrowsInvalidOperationException()
+    {
+        var action = () => Npc.Parse(int.MaxValue);
+        action.Should().Throw<InvalidOperationException>();
+    }
+
+    [TestMethod]
+    public void TryParse_KnownId_Succeeds()
+    {
+        var found = Npc.TryParse(Npc.Kormir.Ids.FirstOrDefault(), out var npc);
+        found.Should().BeTrue();
+        npc.Should().Be(Npc.Kormir);
+    }
+
+    [TestMethod]
+    public void Parse_KnownId_ReturnsExpected()
+    {
+        var npc = Npc.Parse(Npc.Kormir.Ids.FirstOrDefault());
+        npc.Should().Be(Npc.Kormir);
+    }
+
+    [TestMethod]
+    public void NpcList_Should_ContainOnlyUniqueItems()
+    {
+        var npcMap = new Dictionary<string, int>();
+
+        foreach(var npc in Npc.Npcs)
+        {
+            if (!npcMap.TryGetValue(npc.Name.ToLower(), out _))
+            {
+                npcMap[npc.Name.ToLower()] = 0;
+            }
+
+            npcMap[npc.Name.ToLower()] += 1;
+        }
+
+        var errorMessage = new StringBuilder("Duplicated npc entries: ");
+        foreach(var tuple in npcMap)
+        {
+            if (tuple.Value > 1)
+            {
+                errorMessage.Append(tuple.Key);
+                errorMessage.Append(", ");
+            }
+        }
+
+        if (npcMap.Any(kvp => kvp.Value > 1))
+        {
+            Assert.Fail(errorMessage.ToString());
+        }
+    }
+
+    [TestMethod]
+    public void NpcList_Should_ContainAllNpcs()
+    {
+        var npcMap = new Dictionary<Npc, bool>();
+        var definedNpcsFields = typeof(Npc).GetFields(BindingFlags.Static | BindingFlags.Public).Where(f => f.FieldType == typeof(Npc));
+        foreach(var field in definedNpcsFields)
+        {
+            var npc = field.GetValue(default).Cast<Npc>();
+            npcMap[npc] = false;
+        }
+
+        foreach(var npc in Npc.Npcs)
+        {
+            npcMap[npc] = true;
+        }
+
+        var errorMessage = new StringBuilder("Npcs not in list: ");
+        foreach(var tuple in npcMap)
+        {
+            if (tuple.Value is false)
+            {
+                errorMessage.Append(tuple.Key.Name);
+                errorMessage.Append(", ");
+            }
+        }
+
+        if (npcMap.Any(kvp => kvp.Value is false))
+        {
+            Assert.Fail(errorMessage.ToString());
+        }
+    }
+}

Daybreak.Tests/Models/QuestTests.cs

@@ -0,0 +1,108 @@
+using Daybreak.Models.Guildwars;
+using FluentAssertions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using System;
+using System.Linq;
+using System.Extensions;
+
+namespace Daybreak.Tests.Models;
+
+[TestClass]
+public sealed class QuestTests
+{
+    [TestMethod]
+    public void TryParse_UnknownId_Fails()
+    {
+        var found = Quest.TryParse(int.MaxValue, out var quest);
+        found.Should().BeFalse();
+        quest.Should().BeNull();
+    }
+
+    [TestMethod]
+    public void Parse_UnknownId_ThrowsInvalidOperationException()
+    {
+        var action = () => Quest.Parse(int.MaxValue);
+        action.Should().Throw<InvalidOperationException>();
+    }
+
+    [TestMethod]
+    public void TryParse_KnownId_Succeeds()
+    {
+        var found = Quest.TryParse(Quest.RaisuPalaceZaishenQuest.Id, out var quest);
+        found.Should().BeTrue();
+        quest.Should().Be(Quest.RaisuPalaceZaishenQuest);
+    }
+
+    [TestMethod]
+    public void Parse_KnownId_ReturnsExpected()
+    {
+        var quest = Quest.Parse(Quest.RaisuPalaceZaishenQuest.Id);
+        quest.Should().Be(Quest.RaisuPalaceZaishenQuest);
+    }
+
+    [TestMethod]
+    public void QuestList_Should_ContainOnlyUniqueItems()
+    {
+        var questMap = new Dictionary<int, int>();
+
+        foreach (var quest in Quest.Quests)
+        {
+            if (!questMap.TryGetValue(quest.Id, out _))
+            {
+                questMap[quest.Id] = 0;
+            }
+
+            questMap[quest.Id] += 1;
+        }
+
+        var errorMessage = new StringBuilder("Duplicated quest entries: ");
+        foreach (var tuple in questMap)
+        {
+            if (tuple.Value > 1)
+            {
+                errorMessage.Append(tuple.Key);
+                errorMessage.Append(", ");
+            }
+        }
+
+        if (questMap.Any(kvp => kvp.Value > 1))
+        {
+            Assert.Fail(errorMessage.ToString());
+        }
+    }
+
+    [TestMethod]
+    public void QuestList_Should_ContainAllNpcs()
+    {
+        var questMap = new Dictionary<Quest, bool>();
+        var definedNpcsFields = typeof(Quest).GetFields(BindingFlags.Static | BindingFlags.Public).Where(f => f.FieldType == typeof(Quest));
+        foreach (var field in definedNpcsFields)
+        {
+            var quest = field.GetValue(default).Cast<Quest>();
+            questMap[quest] = false;
+        }
+
+        foreach (var quest in Quest.Quests)
+        {
+            questMap[quest] = true;
+        }
+
+        var errorMessage = new StringBuilder("Quests not in list: ");
+        foreach (var tuple in questMap)
+        {
+            if (tuple.Value is false)
+            {
+                errorMessage.Append(tuple.Key.Name);
+                errorMessage.Append(", ");
+            }
+        }
+
+        if (questMap.Any(kvp => kvp.Value is false))
+        {
+            Assert.Fail(errorMessage.ToString());
+        }
+    }
+}

Daybreak.Tests/Models/RuneTests.cs

@@ -0,0 +1,11 @@
+using Daybreak.Models.Guildwars;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Collections.Generic;
+
+namespace Daybreak.Tests.Models;
+
+[TestClass]
+public sealed class RuneTests : ItemTestsBase<Rune>
+{
+    protected override IEnumerable<Rune> AllItems { get; } = Rune.Runes;
+}

Daybreak.Tests/Models/VersionTests.cs

@@ -5,132 +5,182 @@ using System;
 using System.Linq;
 using Version = Daybreak.Models.Versioning.Version;
 
-namespace Daybreak.Tests.Models
+namespace Daybreak.Tests.Models;
+
+[TestClass]
+public class VersionTests
 {
-    [TestClass]
-    public class VersionTests
+    [DataRow("v0.1.0.0.1", "v0.1.0.0.1")]
+    [DataRow("v0.1.0.0.1.0.0.0.0", "v0.1.0.0.1")]
+    [DataRow("v0.1.0", "v0.1")]
+    [DataRow("0.1.0", "0.1")]
+    [DataRow("v0.1.0.0.0", "v0.1")]
+    [DataRow("0.1.0.0.0", "0.1")]
+    [DataRow("v0", "v0")]
+    [DataRow("0", "0")]
+    [DataRow("v0.1", "v0.1")]
+    [DataRow("0.1-release", "0.1-release")]
+    [DataRow("v0.1-release", "v0.1-release")]
+    [TestMethod]
+    public void VersionToString(string version, string expectedString)
     {
-        [DataRow("v0.1.0.0.1", "v0.1.0.0.1")]
-        [DataRow("v0.1.0.0.1.0.0.0.0", "v0.1.0.0.1")]
-        [DataRow("v0.1.0", "v0.1")]
-        [DataRow("0.1.0", "0.1")]
-        [DataRow("v0.1.0.0.0", "v0.1")]
-        [DataRow("0.1.0.0.0", "0.1")]
-        [DataRow("v0", "v0")]
-        [DataRow("0", "0")]
-        [DataRow("v0.1", "v0.1")]
-        [DataRow("0.1-release", "0.1-release")]
-        [DataRow("v0.1-release", "v0.1-release")]
-        [TestMethod]
-        public void VersionToString(string version, string expectedString)
-        {
-            var parsedVersion = Version.Parse(version);
-            parsedVersion.ToString().Should().Be(expectedString);
-        }
+        var parsedVersion = Version.Parse(version);
+        parsedVersion.ToString().Should().Be(expectedString);
+    }
 
-        [DataRow("v0", false)]
-        [DataRow("0", false)]
-        [DataRow("v0.1", false)]
-        [DataRow("0.1-release", true)]
-        [DataRow("v0.1-release", true)]
-        [TestMethod]
-        public void VersionHasStringSuffix(string version, bool hasSuffix)
+    [DataRow("v0", false)]
+    [DataRow("0", false)]
+    [DataRow("v0.1", false)]
+    [DataRow("0.1-release", true)]
+    [DataRow("v0.1-release", true)]
+    [TestMethod]
+    public void VersionHasStringSuffix(string version, bool hasSuffix)
+    {
+        var parsedVersion = Version.Parse(version);
+        if (hasSuffix)
         {
-            var parsedVersion = Version.Parse(version);
-            if (hasSuffix)
-            {
-                parsedVersion.VersionTokens.Last().Should().BeOfType<VersionStringToken>();
-            }
-            else
-            {
-                parsedVersion.VersionTokens.Last().Should().BeOfType<VersionNumberToken>();
-            }
+            parsedVersion.VersionTokens.Last().Should().BeOfType<VersionStringToken>();
         }
-
-        [DataRow("v0", true)]
-        [DataRow("0", false)]
-        [DataRow("v0.1", true)]
-        [DataRow("0.1", false)]
-        [TestMethod]
-        public void VersionTokensHasPrefix(string version, bool hasPrefix)
+        else
         {
-            var parsedVersion = Version.Parse(version);
-            parsedVersion.HasPrefix.Should().Be(hasPrefix);
-        }
-
-        [DataRow(null, false)]
-        [DataRow("", false)]
-        [DataRow("asd", false)]
-        [DataRow("ads.pls.er", false)]
-        [DataRow("0.0.1", true)]
-        [DataRow("1", true)]
-        [DataRow("0.1.asd", false)]
-        [DataRow("0.", false)]
-        [DataRow(".1", false)]
-        [DataRow("0.1-", false)]
-        [DataRow("0.1-release", true)]
-        [DataRow("0..1", false)]
-        [TestMethod]
-        public void TryParseVersionTest(string version, bool result)
-        {
-            var success = Version.TryParse(version, out var parsedVersion);
-            success.Should().Be(result);
-            if (success is true)
-            {
-                parsedVersion.Should().NotBeNull();
-            }
-        }
-
-        [DataRow(null, false)]
-        [DataRow("", false)]
-        [DataRow("asd", false)]
-        [DataRow("ads.pls.er", false)]
-        [DataRow("0.0.1", true)]
-        [DataRow("1", true)]
-        [DataRow("0.1.asd", false)]
-        [DataRow("0.", false)]
-        [DataRow(".1", false)]
-        [DataRow("0.1-", false)]
-        [DataRow("0.1-release", true)]
-        [DataRow("0..1", false)]
-        [TestMethod]
-        public void ParseVersionTest(string version, bool shouldNotThrow)
-        {
-            var action = new Action(() => Version.Parse(version));
-            if (shouldNotThrow is false)
-            {
-                action.Should().Throw<InvalidOperationException>();
-            }
-            else
-            {
-                action.Should().NotThrow<InvalidOperationException>();
-            }
-        }
-
-        [DataRow(null, false)]
-        [DataRow("", false)]
-        [DataRow("asd", false)]
-        [DataRow("ads.pls.er", false)]
-        [DataRow("0.0.1", true)]
-        [DataRow("1", true)]
-        [DataRow("0.1.asd", false)]
-        [DataRow("0.", false)]
-        [DataRow(".1", false)]
-        [DataRow("0.1-", false)]
-        [DataRow("0.1-release", true)]
-        [DataRow("0..1", false)]
-        [TestMethod]
-        public void VersionConstructorTest(string version, bool shouldNotThrow)
-        {
-            var action = new Action(() => new Version(version));
-            if (shouldNotThrow is false)
-            {
-                action.Should().Throw<ArgumentException>();
-            }
-            else
-            {
-                action.Should().NotThrow<ArgumentException>();
-            }
+            parsedVersion.VersionTokens.Last().Should().BeOfType<VersionNumberToken>();
         }
     }
+
+    [DataRow("v0", true)]
+    [DataRow("0", false)]
+    [DataRow("v0.1", true)]
+    [DataRow("0.1", false)]
+    [TestMethod]
+    public void VersionTokensHasPrefix(string version, bool hasPrefix)
+    {
+        var parsedVersion = Version.Parse(version);
+        parsedVersion.HasPrefix.Should().Be(hasPrefix);
+    }
+
+    [DataRow(null, false)]
+    [DataRow("", false)]
+    [DataRow("asd", false)]
+    [DataRow("ads.pls.er", false)]
+    [DataRow("0.0.1", true)]
+    [DataRow("1", true)]
+    [DataRow("0.1.asd", false)]
+    [DataRow("0.", false)]
+    [DataRow(".1", false)]
+    [DataRow("0.1-", false)]
+    [DataRow("0.1-release", true)]
+    [DataRow("0..1", false)]
+    [TestMethod]
+    public void TryParseVersionTest(string version, bool result)
+    {
+        var success = Version.TryParse(version, out var parsedVersion);
+        success.Should().Be(result);
+        if (success is true)
+        {
+            parsedVersion.Should().NotBeNull();
+        }
+    }
+
+    [DataRow(null, false)]
+    [DataRow("", false)]
+    [DataRow("asd", false)]
+    [DataRow("ads.pls.er", false)]
+    [DataRow("0.0.1", true)]
+    [DataRow("1", true)]
+    [DataRow("0.1.asd", false)]
+    [DataRow("0.", false)]
+    [DataRow(".1", false)]
+    [DataRow("0.1-", false)]
+    [DataRow("0.1-release", true)]
+    [DataRow("0..1", false)]
+    [TestMethod]
+    public void ParseVersionTest(string version, bool shouldNotThrow)
+    {
+        var action = new Action(() => Version.Parse(version));
+        if (shouldNotThrow is false)
+        {
+            action.Should().Throw<InvalidOperationException>();
+        }
+        else
+        {
+            action.Should().NotThrow<InvalidOperationException>();
+        }
+    }
+
+    [DataRow(null, false)]
+    [DataRow("", false)]
+    [DataRow("asd", false)]
+    [DataRow("ads.pls.er", false)]
+    [DataRow("0.0.1", true)]
+    [DataRow("1", true)]
+    [DataRow("0.1.asd", false)]
+    [DataRow("0.", false)]
+    [DataRow(".1", false)]
+    [DataRow("0.1-", false)]
+    [DataRow("0.1-release", true)]
+    [DataRow("0..1", false)]
+    [TestMethod]
+    public void VersionConstructorTest(string version, bool shouldNotThrow)
+    {
+        var action = new Action(() => new Version(version));
+        if (shouldNotThrow is false)
+        {
+            action.Should().Throw<ArgumentException>();
+        }
+        else
+        {
+            action.Should().NotThrow<ArgumentException>();
+        }
+    }
+
+    [DataRow("v0.1.0.0.1", "v0.1.0.0.1", true)]
+    [DataRow("v0.1.0.0.1.0.0.0.0", "v0.1.0.0.1", true)]
+    [DataRow("v0.1.0", "v0.1", true)]
+    [DataRow("0.1.0", "0.1", true)]
+    [DataRow("v0.1.0.0.0", "v0.1", true)]
+    [DataRow("0.1.0.0.0", "0.1", true)]
+    [DataRow("v0", "v0", true)]
+    [DataRow("0", "0", true)]
+    [DataRow("v0.1", "v0.1", true)]
+    [DataRow("0.1-release", "0.1-release", true)]
+    [DataRow("v0.1-release", "v0.1-release", true)]
+    [DataRow("v0.1.0.0", "v0.1.0.0.1", false)]
+    [DataRow("v0.1.0.0.1", "v0.1.0.0", false)]
+    [DataRow("v0.9.8.9", "v0.9.8.10", false)]
+    [DataRow("0.1-release", "0.2-release", false)]
+    [DataRow("v1.1-release", "v0.1-release", false)]
+    [TestMethod]
+    public void Equals(string version, string version2, bool result)
+    {
+        var parsedVersion1 = Version.Parse(version);
+        var parsedVersion2 = Version.Parse(version2);
+
+        parsedVersion1.Equals(parsedVersion2).Should().Be(result);
+    }
+
+    [DataRow("v0.1.0.0.1", "v0.1.0.0.1", 0)]
+    [DataRow("v0.1.0.0.1.0.0.0.0", "v0.1.0.0.1", 0)]
+    [DataRow("v0.1.0", "v0.1", 0)]
+    [DataRow("0.1.0", "0.1", 0)]
+    [DataRow("v0.1.0.0.0", "v0.1", 0)]
+    [DataRow("0.1.0.0.0", "0.1", 0)]
+    [DataRow("v0", "v0", 0)]
+    [DataRow("0", "0", 0)]
+    [DataRow("v0.1", "v0.1", 0)]
+    [DataRow("0.1-release", "0.1-release", 0)]
+    [DataRow("v0.1-release", "v0.1-release", 0)]
+    [DataRow("v0.1.0.0", "v0.1.0.0.1", -1)]
+    [DataRow("v0.1.0.0.1", "v0.1.0.0", 1)]
+    [DataRow("v0.9.8.9", "v0.9.8.10", -1)]
+    [DataRow("v0.9.8.10", "v0.9.8.9", 1)]
+    [DataRow("0.1-release", "0.2-release", -1)]
+    [DataRow("v1.1-release", "v0.1-release", 1)]
+    [TestMethod]
+    public void CompareTo(string version, string version2, int comparisonResult)
+    {
+        var parsedVersion1 = Version.Parse(version);
+        var parsedVersion2 = Version.Parse(version2);
+
+        parsedVersion1.CompareTo(parsedVersion2).Should().Be(comparisonResult);
+    }
 }

Daybreak.Tests/Services/ApplicationConfigurationOptionsManagerTests.cs

@@ -1,63 +0,0 @@
-using Daybreak.Configuration;
-using Daybreak.Services.Configuration;
-using Daybreak.Services.Options;
-using FluentAssertions;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Moq;
-using System;
-
-namespace Daybreak.Tests.Services
-{
-    [TestClass]
-    public class ApplicationConfigurationOptionsManagerTests
-    {
-        private ApplicationConfigurationOptionsManager applicationConfigurationOptionsManager;
-
-        [TestInitialize]
-        public void TestInitialize()
-        {
-            var configurationManagerMock = new Mock<IConfigurationManager>();
-            configurationManagerMock
-                .Setup(u => u.GetConfiguration())
-                .Returns(new ApplicationConfiguration());
-
-            this.applicationConfigurationOptionsManager = new ApplicationConfigurationOptionsManager(configurationManagerMock.Object);
-        }
-
-        [TestMethod]
-        public void GetApplicationConfiguration_ReturnsObject()
-        {
-            var config = this.applicationConfigurationOptionsManager.GetOptions<ApplicationConfiguration>();
-
-            config.Should().NotBeNull();
-        }
-
-        [TestMethod]
-        public void GetOtherOptions_ThrowsInvalidOperationException()
-        {
-            var action = new Action(() =>
-            {
-                this.applicationConfigurationOptionsManager.GetOptions<object>();
-            });
-
-            action.Should().Throw<InvalidOperationException>();
-        }
-
-        [TestMethod]
-        public void UpdateOptions_OnApplicationConfiguration_Succeeds()
-        {
-            this.applicationConfigurationOptionsManager.UpdateOptions(new ApplicationConfiguration());
-        }
-
-        [TestMethod]
-        public void UpdateOptions_OnOthers_ThrowsInvalidOperationException()
-        {
-            var action = new Action(() =>
-            {
-                this.applicationConfigurationOptionsManager.UpdateOptions(new object());
-            });
-
-            action.Should().Throw<InvalidOperationException>();
-        }
-    }
-}

Daybreak.Tests/Services/BuildTemplateManagerTests.cs

@@ -1,4 +1,5 @@
 using Daybreak.Models.Builds;
+using Daybreak.Models.Guildwars;
 using Daybreak.Services.BuildTemplates;
 using FluentAssertions;
 using Microsoft.Extensions.Logging;
@@ -6,91 +7,90 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System.Collections.Generic;
 
-namespace Daybreak.Tests.Services
+namespace Daybreak.Tests.Services;
+
+[TestClass]
+public class BuildTemplateManagerTests
 {
-    [TestClass]
-    public class BuildTemplateManagerTests
+    private const string EncodedTemplate = "OwBk0texXNu0Dj/z+TDzBj+TN4AE";
+    private IBuildTemplateManager buildTemplateManager;
+
+    [TestInitialize]
+    public void Initialize()
     {
-        private const string EncodedTemplate = "OwBk0texXNu0Dj/z+TDzBj+TN4AE";
-        private IBuildTemplateManager buildTemplateManager;
+        this.buildTemplateManager = new BuildTemplateManager(new Mock<ILogger<BuildTemplateManager>>().Object);
+    }
 
-        [TestInitialize]
-        public void Initialize()
-        {
-            this.buildTemplateManager = new BuildTemplateManager(new Mock<ILogger<BuildTemplateManager>>().Object);
-        }
+    [TestMethod]
+    public void TestDecode()
+    {
+        var build = this.buildTemplateManager.DecodeTemplate(EncodedTemplate);
+        build.Primary.Should().Be(Profession.Assassin);
+        build.Secondary.Should().Be(Profession.None);
+        build.Attributes.Count.Should().Be(4);
+        build.Attributes[1].Attribute.Should().Be(Attribute.DaggerMastery);
+        build.Attributes[1].Points.Should().Be(11);
+        build.Attributes[2].Attribute.Should().Be(Attribute.DeadlyArts);
+        build.Attributes[2].Points.Should().Be(1);
+        build.Attributes[3].Attribute.Should().Be(Attribute.ShadowArts);
+        build.Attributes[3].Points.Should().Be(5);
+        build.Attributes[0].Attribute.Should().Be(Attribute.CriticalStrikes);
+        build.Attributes[0].Points.Should().Be(11);
+        build.Skills.Count.Should().Be(8);
+        build.Skills[0].Should().Be(Skill.UnsuspectingStrike);
+        build.Skills[1].Should().Be(Skill.WildStrike);
+        build.Skills[2].Should().Be(Skill.CriticalStrike);
+        build.Skills[3].Should().Be(Skill.MoebiusStrike);
+        build.Skills[4].Should().Be(Skill.DeathBlossom);
+        build.Skills[5].Should().Be(Skill.CriticalEye);
+        build.Skills[6].Should().Be(Skill.CriticalAgility);
+        build.Skills[7].Should().Be(Skill.CriticalDefenses);
+    }
 
-        [TestMethod]
-        public void TestDecode()
+    [TestMethod]
+    public void TestEncode()
+    {
+        var build = new Build()
         {
-            var build = this.buildTemplateManager.DecodeTemplate(EncodedTemplate);
-            build.Primary.Should().Be(Profession.Assassin);
-            build.Secondary.Should().Be(Profession.None);
-            build.Attributes.Count.Should().Be(4);
-            build.Attributes[0].Attribute.Should().Be(Attribute.DaggerMastery);
-            build.Attributes[0].Points.Should().Be(11);
-            build.Attributes[1].Attribute.Should().Be(Attribute.DeadlyArts);
-            build.Attributes[1].Points.Should().Be(1);
-            build.Attributes[2].Attribute.Should().Be(Attribute.ShadowArts);
-            build.Attributes[2].Points.Should().Be(5);
-            build.Attributes[3].Attribute.Should().Be(Attribute.CriticalStrikes);
-            build.Attributes[3].Points.Should().Be(11);
-            build.Skills.Count.Should().Be(8);
-            build.Skills[0].Should().Be(Skill.UnsuspectingStrike);
-            build.Skills[1].Should().Be(Skill.WildStrike);
-            build.Skills[2].Should().Be(Skill.CriticalStrike);
-            build.Skills[3].Should().Be(Skill.MoebiusStrike);
-            build.Skills[4].Should().Be(Skill.DeathBlossom);
-            build.Skills[5].Should().Be(Skill.CriticalEye);
-            build.Skills[6].Should().Be(Skill.CriticalAgility);
-            build.Skills[7].Should().Be(Skill.CriticalDefenses);
-        }
-
-        [TestMethod]
-        public void TestEncode()
-        {
-            var build = new Build()
+            Primary = Profession.Assassin,
+            Secondary = Profession.None,
+            Attributes = new List<AttributeEntry>
             {
-                Primary = Profession.Assassin,
-                Secondary = Profession.None,
-                Attributes = new List<AttributeEntry>
+                new AttributeEntry
                 {
-                    new AttributeEntry
-                    {
-                        Attribute = Attribute.DaggerMastery,
-                        Points = 11
-                    },
-                    new AttributeEntry
-                    {
-                        Attribute = Attribute.DeadlyArts,
-                        Points = 1
-                    },
-                    new AttributeEntry
-                    {
-                        Attribute = Attribute.ShadowArts,
-                        Points = 5
-                    },
-                    new AttributeEntry
-                    {
-                        Attribute = Attribute.CriticalStrikes,
-                        Points = 11
-                    }
+                    Attribute = Attribute.DaggerMastery,
+                    Points = 11
                 },
-                Skills = new List<Skill>
+                new AttributeEntry
                 {
-                    Skill.UnsuspectingStrike,
-                    Skill.WildStrike,
-                    Skill.CriticalStrike,
-                    Skill.MoebiusStrike,
-                    Skill.DeathBlossom,
-                    Skill.CriticalEye,
-                    Skill.CriticalAgility,
-                    Skill.CriticalDefenses
+                    Attribute = Attribute.DeadlyArts,
+                    Points = 1
+                },
+                new AttributeEntry
+                {
+                    Attribute = Attribute.ShadowArts,
+                    Points = 5
+                },
+                new AttributeEntry
+                {
+                    Attribute = Attribute.CriticalStrikes,
+                    Points = 11
                 }
-            };
+            },
+            Skills = new List<Skill>
+            {
+                Skill.UnsuspectingStrike,
+                Skill.WildStrike,
+                Skill.CriticalStrike,
+                Skill.MoebiusStrike,
+                Skill.DeathBlossom,
+                Skill.CriticalEye,
+                Skill.CriticalAgility,
+                Skill.CriticalDefenses
+            }
+        };
 
-            var encoded = this.buildTemplateManager.EncodeTemplate(build);
-            encoded.Should().Be(EncodedTemplate);
-        }
+        var encoded = this.buildTemplateManager.EncodeTemplate(build);
+        encoded.Should().Be(EncodedTemplate);
     }
 }

Daybreak.Tests/Services/JsonLoggerProviderTests.cs

@@ -7,68 +7,67 @@ using System.IO;
 using System.Linq;
 using System.Logging;
 
-namespace Daybreak.Tests.Services
+namespace Daybreak.Tests.Services;
+
+[TestClass]
+public class JsonLoggerProviderTests
 {
-    [TestClass]
-    public class JsonLoggerProviderTests
+    private ILogsManager logsManager;
+    private ILoggerProvider loggerProvider;
+    private ILiteDatabase liteDatabase;
+
+    [TestInitialize]
+    public void InitializeProvider()
     {
-        private ILogsManager logsManager;
-        private ILoggerProvider loggerProvider;
-        private ILiteDatabase liteDatabase;
+        File.Delete("Daybreak.db");
+        this.liteDatabase = new LiteDatabase("Daybreak.db");
+        this.logsManager = new JsonLogsManager(this.liteDatabase.GetCollection<Daybreak.Models.Log>());
+        this.loggerProvider = new CVLoggerProvider(this.logsManager);
+    }
 
-        [TestInitialize]
-        public void InitializeProvider()
-        {
-            File.Delete("Daybreak.db");
-            this.liteDatabase = new LiteDatabase("Daybreak.db");
-            this.logsManager = new JsonLogsManager(this.liteDatabase);
-            this.loggerProvider = new CVLoggerProvider(this.logsManager);
-        }
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        this.liteDatabase.Dispose();
+    }
 
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            this.liteDatabase.Dispose();
-        }
+    [TestMethod]
+    public void CreateLoggerReturnsLogger()
+    {
+        var logger = this.loggerProvider.CreateLogger("SomeCategory");
+        logger.Should().NotBeNull();
+    }
+    [TestMethod]
+    public void LoggerLogsAndReaderReadsFiltered()
+    {
+        var logger = this.loggerProvider.CreateLogger("SomeCategory");
+        logger.LogTrace("Logging some trace");
+        logger.LogInformation("Logging some stuff");
+        logger.LogError("Logging some error");
 
-        [TestMethod]
-        public void CreateLoggerReturnsLogger()
-        {
-            var logger = this.loggerProvider.CreateLogger("SomeCategory");
-            logger.Should().NotBeNull();
-        }
-        [TestMethod]
-        public void LoggerLogsAndReaderReadsFiltered()
-        {
-            var logger = this.loggerProvider.CreateLogger("SomeCategory");
-            logger.LogTrace("Logging some trace");
-            logger.LogInformation("Logging some stuff");
-            logger.LogError("Logging some error");
+        this.logsManager.GetLogs(l => l.LogLevel < LogLevel.Information).Should().HaveCount(1);
+        var log = this.logsManager.GetLogs(l => l.LogLevel < LogLevel.Information).First();
+        log.LogLevel.Should().Be(LogLevel.Error);
+    }
+    [TestMethod]
+    public void LoggerLogsAndReaderReads()
+    {
+        var logger = this.loggerProvider.CreateLogger("SomeCategory");
+        logger.LogInformation("Logging some stuff");
+        logger.LogError("Logging some error");
 
-            this.logsManager.GetLogs(l => l.LogLevel < LogLevel.Information).Should().HaveCount(1);
-            var log = this.logsManager.GetLogs(l => l.LogLevel < LogLevel.Information).First();
-            log.LogLevel.Should().Be(LogLevel.Error);
-        }
-        [TestMethod]
-        public void LoggerLogsAndReaderReads()
-        {
-            var logger = this.loggerProvider.CreateLogger("SomeCategory");
-            logger.LogInformation("Logging some stuff");
-            logger.LogError("Logging some error");
+        this.logsManager.GetLogs().Should().HaveCount(2);
+    }
+    [TestMethod]
+    public void DeletingLogsShouldDeleteLogs()
+    {
+        var logger = this.loggerProvider.CreateLogger("SomeCategory");
+        logger.LogInformation("Logging some stuff");
+        logger.LogError("Logging some error");
 
-            this.logsManager.GetLogs().Should().HaveCount(2);
-        }
-        [TestMethod]
-        public void DeletingLogsShouldDeleteLogs()
-        {
-            var logger = this.loggerProvider.CreateLogger("SomeCategory");
-            logger.LogInformation("Logging some stuff");
-            logger.LogError("Logging some error");
+        this.logsManager.GetLogs().Should().HaveCount(2);
 
-            this.logsManager.GetLogs().Should().HaveCount(2);
-
-            this.logsManager.DeleteLogs();
-            this.logsManager.GetLogs().Should().HaveCount(0);
-        }
+        this.logsManager.DeleteLogs();
+        this.logsManager.GetLogs().Should().HaveCount(0);
     }
 }

Daybreak.sln

@@ -35,34 +35,48 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|x64.Build.0 = Debug|Any CPU
+		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|x64.ActiveCfg = Debug|x64
+		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|x64.Build.0 = Debug|x64
+		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|x86.ActiveCfg = Debug|x86
+		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|x86.Build.0 = Debug|x86
 		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|x64.ActiveCfg = Release|Any CPU
-		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|x64.Build.0 = Release|Any CPU
+		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|x64.ActiveCfg = Release|x64
+		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|x64.Build.0 = Release|x64
+		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|x86.ActiveCfg = Release|x86
+		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|x86.Build.0 = Release|x86
 		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Debug|x64.Build.0 = Debug|Any CPU
+		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Debug|x64.ActiveCfg = Debug|x64
+		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Debug|x64.Build.0 = Debug|x64
+		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Debug|x86.ActiveCfg = Debug|x86
+		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Debug|x86.Build.0 = Debug|x86
 		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Release|x64.ActiveCfg = Release|Any CPU
-		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Release|x64.Build.0 = Release|Any CPU
+		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Release|x64.ActiveCfg = Release|x64
+		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Release|x64.Build.0 = Release|x64
+		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Release|x86.ActiveCfg = Release|x86
+		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Release|x86.Build.0 = Release|x86
 		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Debug|x64.Build.0 = Debug|Any CPU
+		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Debug|x64.ActiveCfg = Debug|x64
+		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Debug|x64.Build.0 = Debug|x64
+		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Debug|x86.ActiveCfg = Debug|x86
+		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Debug|x86.Build.0 = Debug|x86
 		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|x64.ActiveCfg = Release|Any CPU
-		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|x64.Build.0 = Release|Any CPU
+		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|x64.ActiveCfg = Release|x64
+		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|x64.Build.0 = Release|x64
+		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|x86.ActiveCfg = Release|x86
+		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Daybreak/Attributes/OptionCustomValidatorAttribute.cs

@@ -0,0 +1,16 @@
+using Daybreak.Validators;
+using System;
+
+namespace Daybreak.Attributes;
+
+[AttributeUsage(AttributeTargets.Property)]
+public sealed class OptionCustomValidatorAttribute<T> : Attribute
+    where T : IValidator, new()
+{
+    public IValidator Validator { get; }
+
+    public OptionCustomValidatorAttribute()
+    {
+        this.Validator = Activator.CreateInstance<T>();
+    }
+}

Daybreak/Attributes/OptionIgnoreAttribute.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace Daybreak.Attributes;
+
+[AttributeUsage(AttributeTargets.Property)]
+public sealed class OptionIgnoreAttribute : Attribute
+{
+}

Daybreak/Attributes/OptionNameAttribute.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace Daybreak.Attributes;
+
+[AttributeUsage(AttributeTargets.Property)]
+public sealed class OptionNameAttribute : Attribute
+{
+    public string Name { get; init; } = string.Empty;
+    public string Description { get; init; } = string.Empty;
+}

Daybreak/Attributes/OptionRangeAttribute.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace Daybreak.Attributes;
+
+[AttributeUsage(AttributeTargets.Property)]
+public sealed class OptionRangeAttribute<T> : Attribute
+    where T : IComparable<T>
+{
+    public T MinValue { get; init; } = default!;
+    public T MaxValue { get; init; } = default!;
+}

Daybreak/Attributes/OptionSetterView.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Windows.Controls;
+
+namespace Daybreak.Attributes;
+
+/// <summary>
+/// Mark a custom view that is supposed to set the value of the option.
+/// In the option view, a button will be displayed that will redirect to the custom view.
+/// The custom view must be registered in the <see cref="Services.Navigation.IViewManager"/>
+/// </summary>
+/// <typeparam name="T">Type of view. Has to be registered in the <see cref="Services.Navigation.IViewManager"./></typeparam>
+[AttributeUsage(AttributeTargets.Property)]
+public sealed class OptionSetterView<T> : Attribute
+    where T : UserControl
+{
+    public string Action { get; set; } = "Set";
+}

Daybreak/Attributes/OptionsIgnoreAttribute.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace Daybreak.Attributes;
+
+[AttributeUsage(AttributeTargets.Class)]
+public sealed class OptionsIgnoreAttribute : Attribute
+{
+}

Daybreak/Attributes/OptionsNameAttribute.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace Daybreak.Attributes;
+
+[AttributeUsage(AttributeTargets.Class)]
+public sealed class OptionsNameAttribute : Attribute
+{
+    public string? Name { get; init; }
+}

Daybreak/Behaviors/ScaleFontWithSize.cs

@@ -6,74 +6,73 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace Daybreak.Behaviors
+namespace Daybreak.Behaviors;
+
+public class ScaleFontWithSize : Behavior<TextBlock>
 {
-    public class ScaleFontWithSize : Behavior<TextBlock>
+    public static readonly DependencyProperty MaxFontSizeProperty = DependencyProperty.Register("MaxFontSize", typeof(double), typeof(ScaleFontWithSize), new PropertyMetadata(12d));
+
+    public double MaxFontSize
     {
-        public static readonly DependencyProperty MaxFontSizeProperty = DependencyProperty.Register("MaxFontSize", typeof(double), typeof(ScaleFontWithSize), new PropertyMetadata(12d));
-
-        public double MaxFontSize
+        get
         {
-            get
-            {
-                return (double)this.GetValue(MaxFontSizeProperty);
-            }
-            set
-            {
-                this.SetValue(MaxFontSizeProperty, value);
-            }
+            return (double)this.GetValue(MaxFontSizeProperty);
         }
-
-        protected override void OnAttached()
+        set
         {
-            base.OnAttached();
-            this.AssociatedObject.SizeChanged += (_, __) => this.CalculateFontSize();
-            DependencyPropertyDescriptor.FromProperty(
-                TextBlock.TextProperty, typeof(TextBlock)).AddValueChanged(this.AssociatedObject, (_, __) => this.CalculateFontSize());
-            DependencyPropertyDescriptor.FromProperty(
-                TextBlock.FontSizeProperty, typeof(TextBlock)).AddValueChanged(this.AssociatedObject, (_, __) => this.CalculateFontSize());
-        }
-
-        private void CalculateFontSize()
-        {
-            var textMeasurement = this.MeasureText(this.AssociatedObject.FontSize);
-            var maximumTextMeasurement = this.MeasureText(this.MaxFontSize);
-            var desiredWidthFontSize = this.MaxFontSize;
-            var desiredHeightFontSize = this.MaxFontSize;
-
-            if (Math.Round(textMeasurement.Height) != Math.Round(this.AssociatedObject.ActualHeight))
-            {
-
-                var scale = this.AssociatedObject.ActualHeight / maximumTextMeasurement.Height;
-                desiredHeightFontSize = (this.MaxFontSize * scale) - 1;
-                desiredHeightFontSize = desiredHeightFontSize <= this.MaxFontSize ? desiredHeightFontSize : this.MaxFontSize;
-            }
-
-            if (Math.Round(textMeasurement.Width) != Math.Round(this.AssociatedObject.ActualWidth))
-            {
-                var scale = this.AssociatedObject.ActualWidth / maximumTextMeasurement.Width;
-                desiredWidthFontSize = (this.MaxFontSize * scale) - 1;
-                desiredWidthFontSize = desiredWidthFontSize <= this.MaxFontSize ? desiredWidthFontSize : this.MaxFontSize;
-
-            }
-
-            var desiredFontSize = Math.Min(desiredHeightFontSize, desiredWidthFontSize);
-
-            if ((int)desiredFontSize != (int)this.AssociatedObject.FontSize && desiredFontSize > 0)
-            {
-                this.AssociatedObject.FontSize = desiredFontSize;
-                return;
-            }
-        }
-
-        private Size MeasureText(double fontSize)
-        {
-            var formattedText = new FormattedText(this.AssociatedObject.Text, CultureInfo.CurrentUICulture,
-                FlowDirection.LeftToRight,
-                new Typeface(this.AssociatedObject.FontFamily, this.AssociatedObject.FontStyle, this.AssociatedObject.FontWeight, this.AssociatedObject.FontStretch),
-                fontSize, Brushes.Black, VisualTreeHelper.GetDpi(this.AssociatedObject).PixelsPerDip);
-
-            return new Size(formattedText.Width, formattedText.Height);
+            this.SetValue(MaxFontSizeProperty, value);
         }
     }
+
+    protected override void OnAttached()
+    {
+        base.OnAttached();
+        this.AssociatedObject.SizeChanged += (_, __) => this.CalculateFontSize();
+        DependencyPropertyDescriptor.FromProperty(
+            TextBlock.TextProperty, typeof(TextBlock)).AddValueChanged(this.AssociatedObject, (_, __) => this.CalculateFontSize());
+        DependencyPropertyDescriptor.FromProperty(
+            TextBlock.FontSizeProperty, typeof(TextBlock)).AddValueChanged(this.AssociatedObject, (_, __) => this.CalculateFontSize());
+    }
+
+    private void CalculateFontSize()
+    {
+        var textMeasurement = this.MeasureText(this.AssociatedObject.FontSize);
+        var maximumTextMeasurement = this.MeasureText(this.MaxFontSize);
+        var desiredWidthFontSize = this.MaxFontSize;
+        var desiredHeightFontSize = this.MaxFontSize;
+
+        if (Math.Round(textMeasurement.Height) != Math.Round(this.AssociatedObject.ActualHeight))
+        {
+
+            var scale = this.AssociatedObject.ActualHeight / maximumTextMeasurement.Height;
+            desiredHeightFontSize = (this.MaxFontSize * scale) - 1;
+            desiredHeightFontSize = desiredHeightFontSize <= this.MaxFontSize ? desiredHeightFontSize : this.MaxFontSize;
+        }
+
+        if (Math.Round(textMeasurement.Width) != Math.Round(this.AssociatedObject.ActualWidth))
+        {
+            var scale = this.AssociatedObject.ActualWidth / maximumTextMeasurement.Width;
+            desiredWidthFontSize = (this.MaxFontSize * scale) - 1;
+            desiredWidthFontSize = desiredWidthFontSize <= this.MaxFontSize ? desiredWidthFontSize : this.MaxFontSize;
+
+        }
+
+        var desiredFontSize = Math.Min(desiredHeightFontSize, desiredWidthFontSize);
+
+        if ((int)desiredFontSize != (int)this.AssociatedObject.FontSize && desiredFontSize > 0)
+        {
+            this.AssociatedObject.FontSize = desiredFontSize;
+            return;
+        }
+    }
+
+    private Size MeasureText(double fontSize)
+    {
+        var formattedText = new FormattedText(this.AssociatedObject.Text, CultureInfo.CurrentUICulture,
+            FlowDirection.LeftToRight,
+            new Typeface(this.AssociatedObject.FontFamily, this.AssociatedObject.FontStyle, this.AssociatedObject.FontWeight, this.AssociatedObject.FontStretch),
+            fontSize, Brushes.Black, VisualTreeHelper.GetDpi(this.AssociatedObject).PixelsPerDip);
+
+        return new Size(formattedText.Width, formattedText.Height);
+    }
 }

Daybreak/Behaviors/ScrollIntoView.cs

@@ -3,53 +3,52 @@ using System;
 using System.Extensions;
 using System.Windows.Controls;
 
-namespace Daybreak.Behaviors
-{
-    public class ScrollIntoView : Behavior<ListView>
-    {
-        /// <summary>
-        ///  When Beahvior is attached
-        /// </summary>
-        protected override void OnAttached()
-        {
-            base.OnAttached();
-            this.AssociatedObject.SelectionChanged += this.AssociatedObject_SelectionChanged;
-        }
+namespace Daybreak.Behaviors;
 
-        /// <summary>
-        /// On Selection Changed
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void AssociatedObject_SelectionChanged(object sender,
-                                               SelectionChangedEventArgs e)
+public class ScrollIntoView : Behavior<ListView>
+{
+    /// <summary>
+    ///  When Beahvior is attached
+    /// </summary>
+    protected override void OnAttached()
+    {
+        base.OnAttached();
+        this.AssociatedObject.SelectionChanged += this.AssociatedObject_SelectionChanged;
+    }
+
+    /// <summary>
+    /// On Selection Changed
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    void AssociatedObject_SelectionChanged(object sender,
+                                           SelectionChangedEventArgs e)
+    {
+        if (sender is ListView)
         {
-            if (sender is ListView)
+            var listView = sender.As<ListView>();
+            if (listView.SelectedItem != null)
             {
-                var listView = sender.As<ListView>();
-                if (listView.SelectedItem != null)
-                {
-                    listView.Dispatcher.BeginInvoke(
-                        (Action)(() =>
-                        {
-                            listView.UpdateLayout();
-                            if (listView.SelectedItem !=
-                            null)
-                                listView.ScrollIntoView(
-                                listView.SelectedItem);
-                        }));
-                }
+                listView.Dispatcher.BeginInvoke(
+                    (Action)(() =>
+                    {
+                        listView.UpdateLayout();
+                        if (listView.SelectedItem !=
+                        null)
+                            listView.ScrollIntoView(
+                            listView.SelectedItem);
+                    }));
             }
         }
-        /// <summary>
-        /// When behavior is detached
-        /// </summary>
-        protected override void OnDetaching()
-        {
-            base.OnDetaching();
-            this.AssociatedObject.SelectionChanged -=
-                this.AssociatedObject_SelectionChanged;
+    }
+    /// <summary>
+    /// When behavior is detached
+    /// </summary>
+    protected override void OnDetaching()
+    {
+        base.OnDetaching();
+        this.AssociatedObject.SelectionChanged -=
+            this.AssociatedObject_SelectionChanged;
 
-        }
     }
 }

Daybreak/Configuration/ApplicationConfiguration.cs

@@ -1,43 +0,0 @@
-using Daybreak.Models;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-
-namespace Daybreak.Configuration
-{
-    public sealed class ApplicationConfiguration
-    {
-        [JsonProperty("SetGuildwarsWindowSizeOnLaunch")]
-        public bool SetGuildwarsWindowSizeOnLaunch { get; set; }
-        [JsonProperty("DesiredGuildwarsScreen")]
-        public int DesiredGuildwarsScreen { get; set; }
-        [JsonProperty("BrowsersEnabled")]
-        public bool BrowsersEnabled { get; set; } = true;
-        [JsonProperty("ToolboxPath")]
-        public string ToolboxPath { get; set; }
-        [JsonProperty("TexmodPath")]
-        public string TexmodPath { get; set; }
-        [JsonProperty("ToolboxAutoLaunch")]
-        public bool ToolboxAutoLaunch { get; set; }
-        [JsonProperty("LeftBrowserDefault")]
-        public string LeftBrowserDefault { get; set; } = "https://gwpvx.fandom.com/wiki/PvX_wiki";
-        [JsonProperty("RightBrowserDefault")]
-        public string RightBrowserDefault { get; set; } = "https://wiki.guildwars.com/wiki/Quick_access_links";
-        [JsonProperty("GuildwarsPaths")]
-        public List<GuildwarsPath> GuildwarsPaths { get; set; } = new();
-        [JsonProperty("ProtectedLoginCredentials")]
-        public List<ProtectedLoginCredentials> ProtectedLoginCredentials { get; set; } = new();
-        [JsonProperty("AddressBarReadonly")]
-        public bool AddressBarReadonly { get; set; } = true;
-        [JsonProperty("ExperimentalFeatures")]
-        public ExperimentalFeatures ExperimentalFeatures { get; set; } = new();
-        [JsonProperty("ShortcutLocation")]
-        public string ShortcutLocation { get; set; } = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
-        [JsonProperty("PlaceShortcut")]
-        public bool PlaceShortcut { get; set; }
-        [JsonProperty("AutoCheckUpdate")]
-        public bool AutoCheckUpdate { get; set; } = true;
-        [JsonProperty("ProtectedGraphAccessToken")]
-        public string ProtectedGraphAccessToken { get; set; }
-    }
-}

Daybreak/Configuration/ExperimentalFeatures.cs

@@ -1,24 +0,0 @@
-using Daybreak.Models;
-using Newtonsoft.Json;
-using System.Collections.Generic;
-
-namespace Daybreak.Configuration
-{
-    public sealed class ExperimentalFeatures
-    {
-        [JsonProperty("MultiLaunchSupport")]
-        public bool MultiLaunchSupport { get; set; }
-        [JsonProperty("ToolboxAutoLaunchDelay")]
-        public int ToolboxAutoLaunchDelay { get; set; } = 5000;
-        [JsonProperty("DynamicBuildLoading")]
-        public bool DynamicBuildLoading { get; set; } = true;
-        [JsonProperty("LaunchGuildwarsAsCurrentUser")]
-        public bool LaunchGuildwarsAsCurrentUser { get; set; } = true;
-        [JsonProperty("CanInterceptKeys")]
-        public bool CanInterceptKeys { get; set; }
-        [JsonProperty("DownloadIcons")]
-        public bool DownloadIcons { get; set; }
-        [JsonProperty("Macros")]
-        public List<KeyMacro> Macros { get; set; } = new();
-    }
-}

Daybreak/Configuration/FocusView/ExperienceDisplay.cs

@@ -0,0 +1,9 @@
+namespace Daybreak.Configuration.FocusView;
+
+public enum ExperienceDisplay
+{
+    TotalCurretAndTotalMax,
+    CurrentLevelCurrentAndCurrentLevelMax,
+    RemainingUntilNextLevel,
+    Percentage
+}

Daybreak/Configuration/FocusView/PointsDisplay.cs

@@ -0,0 +1,8 @@
+namespace Daybreak.Configuration.FocusView;
+
+public enum PointsDisplay
+{
+    CurrentAndMax,
+    Remaining,
+    Percentage
+}

Daybreak/Configuration/Options/AscalonTradeChatOptions.cs

@@ -0,0 +1,12 @@
+using Daybreak.Attributes;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsName(Name = "Ascalon Trade Chat")]
+[OptionsIgnore]
+public sealed class AscalonTradeChatOptions : ITradeChatOptions
+{
+    public string HttpsUri { get; set; } = "https://ascalon.gwtoolbox.com/";
+
+    public string WssUri { get; set; } = "wss://ascalon.gwtoolbox.com/";
+}

Daybreak/Configuration/Options/BrowserOptions.cs

@@ -0,0 +1,20 @@
+using Daybreak.Attributes;
+using Newtonsoft.Json;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsName(Name = "Browser")]
+public sealed class BrowserOptions
+{
+    [JsonProperty(nameof(Enabled))]
+    [OptionName(Name = "Enabled", Description = "If true, the browser component will be displayed")]
+    public bool Enabled { get; set; } = true;
+
+    [JsonProperty(nameof(AddressBarReadonly))]
+    [OptionName(Name = "Read-only Address Bar", Description = "If true, the browser component will force the address bar to be read-only")]
+    public bool AddressBarReadonly { get; set; } = true;
+
+    [JsonProperty(nameof(DynamicBuildLoading))]
+    [OptionName(Name = "Dynamic Build Loading", Description = "If true, the browser will dynamically parse build templates and prompt the user to load them")]
+    public bool DynamicBuildLoading { get; set; } = true;
+}

Daybreak/Configuration/Options/BuildSynchronizationOptions.cs

@@ -0,0 +1,14 @@
+using Daybreak.Attributes;
+using Newtonsoft.Json;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsName(Name = "Build Synchronization")]
+[OptionsIgnore]
+public sealed class BuildSynchronizationOptions
+{
+    [JsonProperty(nameof(ProtectedGraphAccessToken))]
+    public string? ProtectedGraphAccessToken { get; set; }
+    [JsonProperty(nameof(ProtectedGraphRefreshToken))]
+    public string? ProtectedGraphRefreshToken { get; set; }
+}

Daybreak/Configuration/Options/DSOALOptions.cs

@@ -0,0 +1,15 @@
+using Daybreak.Attributes;
+using Newtonsoft.Json;
+
+namespace Daybreak.Configuration.Options;
+[OptionsName(Name = "DSOAL")]
+public sealed class DSOALOptions
+{
+    [JsonProperty(nameof(Path))]
+    [OptionName(Name = "Path", Description = "The path to the DSOAL installation")]
+    public string? Path { get; set; }
+
+    [JsonProperty(nameof(Enabled))]
+    [OptionName(Name = "Enabled", Description = "If true, the launcher will also launch DSOAL when launching GuildWars")]
+    public bool Enabled { get; set; }
+}

Daybreak/Configuration/Options/FocusViewOptions.cs

@@ -0,0 +1,55 @@
+using Daybreak.Attributes;
+using Daybreak.Configuration.FocusView;
+using Newtonsoft.Json;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsName(Name = "Focus View")]
+public sealed class FocusViewOptions
+{
+    [JsonProperty(nameof(Enabled))]
+    [OptionName(Name = "Enabled", Description = "If true, the focus view is enabled, showing live information from the game")]
+    public bool Enabled { get; set; }
+
+    [OptionName(Name = "Inventory Component Enabled", Description = "If true, the focus view will show a component with the inventory contents")]
+    public bool InventoryComponentVisible { get; set; }
+
+    [OptionName(Name = "Minimap Component Enabled", Description = "If true, the focus view will show a minimap component")]
+    public bool MinimapComponentVisible { get; set; }
+
+    [JsonProperty(nameof(ExperienceDisplay))]
+    [OptionName(Name = "Experience Display Mode", Description = "Sets how should the experience display show the information")]
+    public ExperienceDisplay ExperienceDisplay { get; set; }
+
+    [JsonProperty(nameof(KurzickPointsDisplay))]
+    [OptionName(Name = "Kurzick Points Display Mode", Description = "Sets how should the kurzick points display show the information")]
+    public PointsDisplay KurzickPointsDisplay { get; set; }
+
+    [JsonProperty(nameof(LuxonPointsDisplay))]
+    [OptionName(Name = "Luxon Points Display Mode", Description = "Sets how should the luxon points display show the information")]
+    public PointsDisplay LuxonPointsDisplay { get; set; }
+
+    [JsonProperty(nameof(BalthazarPointsDisplay))]
+    [OptionName(Name = "Balthazar Points Display Mode", Description = "Sets how should the balthazar points display show the information")]
+    public PointsDisplay BalthazarPointsDisplay { get; set; }
+
+    [JsonProperty(nameof(ImperialPointsDisplay))]
+    [OptionName(Name = "Imperial Points Display Mode", Description = "Sets how should the imperial points display show the information")]
+    public PointsDisplay ImperialPointsDisplay { get; set; }
+
+    [JsonProperty(nameof(VanquishingDisplay))]
+    [OptionName(Name = "Vanquishing Display Mode", Description = "Sets how should the vanquishing display show the information")]
+    public PointsDisplay VanquishingDisplay { get; set; }
+
+    [JsonProperty(nameof(HealthDisplay))]
+    [OptionName(Name = "Health Display Mode", Description = "Sets how should the health display show the information")]
+    public PointsDisplay HealthDisplay { get; set; }
+
+    [JsonProperty(nameof(EnergyDisplay))]
+    [OptionName(Name = "Energy Display Mode", Description = "Sets how should the energy display show the information")]
+    public PointsDisplay EnergyDisplay { get; set; }
+
+    [JsonProperty(nameof(BrowserUrl))]
+    [OptionIgnore]
+    public string? BrowserUrl { get; set; } = "https://wiki.guildwars.com/wiki/Main_Page";
+}

Daybreak/Configuration/Options/ILiteCollectionOptions.cs

@@ -0,0 +1,10 @@
+namespace Daybreak.Configuration.Options;
+
+public interface ILiteCollectionOptions<T> : ILiteCollectionOptions
+{
+}
+
+public interface ILiteCollectionOptions
+{
+    string CollectionName { get; }
+}

Daybreak/Configuration/Options/ITradeChatOptions.cs

@@ -0,0 +1,8 @@
+namespace Daybreak.Configuration.Options;
+
+public interface ITradeChatOptions
+{
+    string HttpsUri { get; set; }
+
+    string WssUri { get; set; }
+}

Daybreak/Configuration/Options/KamadanTradeChatOptions.cs

@@ -0,0 +1,12 @@
+using Daybreak.Attributes;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsName(Name = "Kamadan Trade Chat")]
+[OptionsIgnore]
+public sealed class KamadanTradeChatOptions : ITradeChatOptions
+{
+    public string HttpsUri { get; set; } = "https://kamadan.gwtoolbox.com/";
+
+    public string WssUri { get; set; } = "wss://kamadan.gwtoolbox.com/";
+}

Daybreak/Configuration/Options/LauncherOptions.cs

@@ -0,0 +1,53 @@
+using Daybreak.Attributes;
+using Daybreak.Models;
+using Daybreak.Views;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsName(Name = "Launcher")]
+public sealed class LauncherOptions
+{
+    [JsonProperty(nameof(SetGuildwarsWindowSizeOnLaunch))]
+    [OptionName(Name = "Set GuildWars Window Size On Launch", Description = "Sets the GuildWars window size and position on launch")]
+    public bool SetGuildwarsWindowSizeOnLaunch { get; set; }
+
+    [JsonProperty(nameof(DesiredGuildwarsScreen))]
+    [OptionName(Name = "Desired GuildWars Screen", Description = "Sets the screen on which the GuildWars window will be placed")]
+    [OptionSetterView<ScreenChoiceView>(Action = "Screen Selector")]
+    public int DesiredGuildwarsScreen { get; set; }
+
+    [JsonProperty(nameof(LaunchGuildwarsAsCurrentUser))]
+    [OptionName(Name = "Launch GuildWars As Current User", Description = "If true, will attempt to launch GuildWars as the current user. Otherwise will attempt to launch as system user")]
+    public bool LaunchGuildwarsAsCurrentUser { get; set; } = true;
+
+    [JsonProperty(nameof(GuildwarsPaths))]
+    [OptionIgnore]
+    public List<GuildwarsPath> GuildwarsPaths { get; set; } = new();
+
+    [JsonProperty(nameof(ProtectedLoginCredentials))]
+    [OptionIgnore]
+    public List<ProtectedLoginCredentials> ProtectedLoginCredentials { get; set; } = new();
+
+    [JsonProperty(nameof(ShortcutLocation))]
+    [OptionName(Name = "Shortcut Location", Description = "Location where the shortcut will be placed")]
+    public string? ShortcutLocation { get; set; } = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
+
+    [JsonProperty(nameof(PlaceShortcut))]
+    [OptionName(Name = "Shortcut Placed", Description = "If true, the shortcut will be placed. If false, the shortcut will be deleted")]
+    public bool PlaceShortcut { get; set; }
+
+    [JsonProperty(nameof(AutoCheckUpdate))]
+    [OptionName(Name = "Auto-Check For Updates", Description = "Automatically check for updates")]
+    public bool AutoCheckUpdate { get; set; } = true;
+
+    [JsonProperty(nameof(MultiLaunchSupport))]
+    [OptionName(Name = "Multi-Launch Support", Description = "If true, the launcher will support multiple executables being launched at the same time")]
+    public bool MultiLaunchSupport { get; set; }
+
+    [JsonProperty(nameof(DownloadIcons))]
+    [OptionName(Name = "Download Icons", Description = "If true, the launcher will download icons that are not found in the local cache")]
+    public bool DownloadIcons { get; set; } = true;
+}

Daybreak/Configuration/Options/LoggingOptions.cs

@@ -0,0 +1,10 @@
+using Daybreak.Attributes;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsName(Name = "Logging Options")]
+[OptionsIgnore]
+public sealed class LoggingOptions : ILiteCollectionOptions<Models.Log>
+{
+    public string CollectionName => "logs";
+}

Daybreak/Configuration/Options/MemoryReaderOptions.cs

@@ -0,0 +1,13 @@
+using Daybreak.Attributes;
+using Newtonsoft.Json;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsName(Name = "Memory Reader")]
+public sealed class MemoryReaderOptions
+{
+    [JsonProperty(nameof(MemoryReaderFrequency))]
+    [OptionRange<double>(MinValue = 0, MaxValue = 1000)]
+    [OptionName(Name = "Memory Reader Frequency", Description = "Measured in ms. Sets how often should the launcher polls information from the game. Actual frequency is capped by the memory reading speed")]
+    public double MemoryReaderFrequency { get; set; } = 0;
+}

Daybreak/Configuration/Options/NotificationStorageOptions.cs

@@ -0,0 +1,10 @@
+using Daybreak.Attributes;
+using Daybreak.Services.Notifications.Models;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsIgnore]
+internal sealed class NotificationStorageOptions : ILiteCollectionOptions<NotificationDTO>
+{
+    public string CollectionName => "notifications";
+}

Daybreak/Configuration/Options/PathfindingOptions.cs

@@ -0,0 +1,16 @@
+using Daybreak.Attributes;
+using Newtonsoft.Json;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsName(Name = "Pathfinding")]
+public sealed class PathfindingOptions
+{
+    [JsonProperty(nameof(EnablePathfinding))]
+    [OptionName(Name = "Enable Pathfinding", Description = "If true, the pathfinder will attempt to produce paths from the player position to objectives")]
+    public bool EnablePathfinding { get; set; } = true;
+
+    [JsonProperty(nameof(ImprovedPathfinding))]
+    [OptionName(Name = "Distance-Based Pathfinding", Description = "If true, the pathfinder will attempt use an improved algorithm to find paths. Slower but generally more precise")]
+    public bool ImprovedPathfinding { get; set; } = true;
+}

Daybreak/Configuration/Options/PriceHistoryOptions.cs

@@ -0,0 +1,19 @@
+using Daybreak.Attributes;
+using Daybreak.Services.TradeChat.Models;
+using System;
+using System.Collections.Generic;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsName(Name = "Price History")]
+[OptionsIgnore]
+public sealed class PriceHistoryOptions : ILiteCollectionOptions<TraderQuoteDTO>
+{
+    public string HttpsUri { get; set; } = "https://kamadan.gwtoolbox.com/";
+
+    public string CollectionName => "price_history";
+
+    public TimeSpan UpdateInterval { get; set; } = TimeSpan.FromHours(1);
+
+    public Dictionary<string, DateTime> ItemHistoryMetadata { get; set; } = new();
+}

Daybreak/Configuration/Options/ScreenManagerOptions.cs

@@ -0,0 +1,15 @@
+using Daybreak.Attributes;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsName(Name = "Screen Manager")]
+[OptionsIgnore]
+public sealed class ScreenManagerOptions
+{
+    public double X { get; set; }
+    public double Y { get; set; }
+    public double Width { get; set; }
+    public double Height { get; set; }
+    public double DpiX { get; set; }
+    public double DpiY { get; set; }
+}

Daybreak/Configuration/Options/SoundOptions.cs

@@ -0,0 +1,10 @@
+using Daybreak.Attributes;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsName(Name = "Sounds")]
+public sealed class SoundOptions
+{
+    [OptionName(Name = "Sounds Enabled", Description = "If enabled, the client will play sounds.")]
+    public bool Enabled { get; set; }
+}

Daybreak/Configuration/Options/ThemeOptions.cs

@@ -0,0 +1,14 @@
+using Daybreak.Attributes;
+using Daybreak.Models;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsName(Name = "Theme")]
+public sealed class ThemeOptions
+{
+    [OptionName(Name = "Dark Mode", Description = "If true, the client will switch to dark mode")]
+    public bool DarkMode { get; set; } = true;
+
+    [OptionName(Name = "Color Scheme", Description = "The client will apply the selected color scheme")]
+    public ColorScheme Theme { get; set; } = ColorScheme.Steel;
+}

Daybreak/Configuration/Options/ToolboxOptions.cs

@@ -0,0 +1,16 @@
+using Daybreak.Attributes;
+using Newtonsoft.Json;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsName(Name = "GWToolbox")]
+public sealed class ToolboxOptions
+{
+    [JsonProperty(nameof(Path))]
+    [OptionName(Name = "Path", Description = "The path to the GWToolbox executable")]
+    public string? Path { get; set; }
+
+    [JsonProperty(nameof(Enabled))]
+    [OptionName(Name = "Enabled", Description = "If true, the launcher will also launch GWToolbox when launching GuildWars")]
+    public bool Enabled { get; set; }
+}

Daybreak/Configuration/Options/TradeAlertingOptions.cs

@@ -0,0 +1,14 @@
+using Daybreak.Attributes;
+using Daybreak.Models.Trade;
+using System;
+using System.Collections.Generic;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsIgnore]
+public sealed class TradeAlertingOptions
+{
+    public TimeSpan MaxLookbackPeriod { get; set; } = TimeSpan.FromDays(31);
+    public DateTime LastCheckTime { get; set; } = DateTime.MinValue;
+    public List<TradeAlert> Alerts { get; set; } = new();
+}

Daybreak/Configuration/Options/TraderMessagesOptions.cs

@@ -0,0 +1,10 @@
+using Daybreak.Attributes;
+using Daybreak.Services.TradeChat.Models;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsIgnore]
+public sealed class TraderMessagesOptions : ILiteCollectionOptions<TraderMessageDTO>
+{
+    public string CollectionName => "trader_messages";
+}

Daybreak/Configuration/Options/TraderQuotesOptions.cs

@@ -0,0 +1,18 @@
+using Daybreak.Attributes;
+using System;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsName(Name = "Trader Quotes")]
+public sealed class TraderQuotesOptions
+{
+    [OptionIgnore]
+    public string HttpsUri { get; set; } = "https://kamadan.gwtoolbox.com/";
+
+    [OptionIgnore]
+    public DateTime LastCheckTime { get; set;} = DateTime.MinValue;
+    [OptionName(Name = "Cache Update Interval", Description = "The amount of minutes in between cache updates")]
+
+    [OptionRange<double>(MinValue = 30d, MaxValue = 1440d)]
+    public double CacheUpdateInterval { get; set; } = 60;
+}

Daybreak/Configuration/Options/UModOptions.cs

@@ -0,0 +1,20 @@
+using Daybreak.Attributes;
+using Newtonsoft.Json;
+
+namespace Daybreak.Configuration.Options;
+
+[OptionsName(Name = "uMod")]
+public sealed class UModOptions
+{
+    [JsonProperty(nameof(Path))]
+    [OptionName(Name = "Path", Description = "The path to the uMod executable")]
+    public string? Path { get; set; }
+
+    [JsonProperty(nameof(Enabled))]
+    [OptionName(Name = "Enabled", Description = "If true, the launcher will also launch uMod when launching GuildWars")]
+    public bool Enabled { get; set; }
+
+    [JsonProperty(nameof(AutoEnableMods))]
+    [OptionName(Name = "Auto-Enable Mods", Description = "If true, mods downloaded through the launcher will be auto-placed in the managed mod list")]
+    public bool AutoEnableMods { get; set; }
+}

Daybreak/Configuration/ProjectConfiguration.cs

@@ -1,7 +1,6 @@
 using Daybreak.Services.ApplicationLauncher;
 using Daybreak.Services.Bloogum;
 using Daybreak.Services.BuildTemplates;
-using Daybreak.Services.Configuration;
 using Daybreak.Services.Credentials;
 using Daybreak.Services.IconRetrieve;
 using Daybreak.Services.Logging;
@@ -11,7 +10,6 @@ using Daybreak.Services.Screens;
 using Daybreak.Services.Screenshots;
 using Daybreak.Services.Shortcuts;
 using Daybreak.Services.Updater;
-using Daybreak.Services.ViewManagement;
 using Daybreak.Views;
 using Microsoft.Extensions.Http.Logging;
 using Microsoft.Extensions.Logging;
@@ -25,92 +23,374 @@ using Microsoft.CorrelationVector;
 using System.Logging;
 using Daybreak.Services.Updater.PostUpdate;
 using System.Core.Extensions;
-using Daybreak.Services.Updater.PostUpdate.Actions;
 using Daybreak.Services.Graph;
+using Microsoft.Extensions.DependencyInjection;
+using Daybreak.Services.Navigation;
+using Daybreak.Services.Onboarding;
+using Daybreak.Services.Menu;
+using Daybreak.Services.Scanner;
+using Daybreak.Services.Experience;
+using Daybreak.Services.Metrics;
+using Daybreak.Services.Monitoring;
+using System.Net.Http.Headers;
+using Daybreak.Services.Downloads;
+using Daybreak.Services.ExceptionHandling;
+using Daybreak.Services.Pathfinding;
+using Daybreak.Services.Startup;
+using Daybreak.Services.Startup.Actions;
+using Daybreak.Services.Drawing;
+using Daybreak.Services.Drawing.Modules.Entities;
+using Daybreak.Services.Drawing.Modules.MapIcons;
+using Daybreak.Services.Drawing.Modules;
+using Daybreak.Services.Guildwars;
+using Daybreak.Configuration.Options;
+using System.Configuration;
+using Daybreak.Services.UMod;
+using Daybreak.Services.Toolbox;
+using Daybreak.Views.Onboarding.UMod;
+using Daybreak.Views.Onboarding.Toolbox;
+using Daybreak.Services.Themes;
+using Daybreak.Services.TradeChat;
+using Daybreak.Views.Trade;
+using System.Net.WebSockets;
+using Daybreak.Utils;
+using Daybreak.Services.Notifications;
+using Microsoft.Extensions.Options;
+using Daybreak.Services.TradeChat.Models;
+using Daybreak.Services.Charts;
+using Daybreak.Services.Images;
+using Daybreak.Services.Drawing.Modules.Bosses;
+using Daybreak.Services.InternetChecker;
+using System;
+using Daybreak.Services.Sounds;
+using Daybreak.Services.Notifications.Models;
+using Daybreak.Models.Notifications.Handling;
+using Daybreak.Services.TradeChat.Notifications;
+using Daybreak.Views.Copy;
+using Daybreak.Services.DSOAL;
+using Daybreak.Services.Mods;
+using Daybreak.Views.Onboarding.DSOAL;
 
-namespace Daybreak.Configuration
+namespace Daybreak.Configuration;
+
+public static class ProjectConfiguration
 {
-    public static class ProjectConfiguration
+    private const string DaybreakUserAgent = "Daybreak";
+
+    public static void RegisterResolvers(IServiceManager serviceManager)
     {
-        public static void RegisterResolvers(IServiceManager serviceManager)
+        serviceManager.ThrowIfNull();
+
+        serviceManager.RegisterOptionsManager<OptionsManager>();
+        serviceManager.RegisterResolver(new LoggerResolver());
+        serviceManager.RegisterResolver(new ClientWebSocketResolver());
+        serviceManager
+            .RegisterHttpClient<ApplicationUpdater>()
+                .WithMessageHandler(SetupLoggingAndMetrics<ApplicationUpdater>)
+                .WithDefaultRequestHeadersSetup(SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<BloogumClient>()
+                .WithMessageHandler(SetupLoggingAndMetrics<BloogumClient>)
+                .WithDefaultRequestHeadersSetup(SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<GraphClient>()
+                .WithMessageHandler(SetupLoggingAndMetrics<GraphClient>)
+                .WithDefaultRequestHeadersSetup(SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<DownloadService>()
+                .WithMessageHandler(SetupLoggingAndMetrics<DownloadService>)
+                .WithDefaultRequestHeadersSetup(SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<TradeChatService<KamadanTradeChatOptions>>()
+                .WithMessageHandler(SetupLoggingAndMetrics<TradeChatService<KamadanTradeChatOptions>>)
+                .WithDefaultRequestHeadersSetup(SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<TradeChatService<AscalonTradeChatOptions>>()
+                .WithMessageHandler(SetupLoggingAndMetrics<TradeChatService<AscalonTradeChatOptions>>)
+                .WithDefaultRequestHeadersSetup(SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<IconCache>()
+                .WithMessageHandler(SetupLoggingAndMetrics<IconCache>)
+                .WithDefaultRequestHeadersSetup(SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<TraderQuoteService>()
+                .WithMessageHandler(SetupLoggingAndMetrics<TraderQuoteService>)
+                .WithDefaultRequestHeadersSetup(SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<PriceHistoryService>()
+                .WithMessageHandler(SetupLoggingAndMetrics<PriceHistoryService>)
+                .WithDefaultRequestHeadersSetup(SetupDaybreakUserAgent)
+                .Build()
+            .RegisterHttpClient<InternetCheckingService>()
+                .WithMessageHandler(SetupLoggingAndMetrics<InternetCheckingService>)
+                .WithDefaultRequestHeadersSetup(SetupDaybreakUserAgent)
+                .Build();
+    }
+
+    public static void RegisterServices(IServiceCollection services)
+    {
+        services.ThrowIfNull();
+
+        services.AddSingleton<ILogsManager, JsonLogsManager>();
+        services.AddSingleton<IDebugLogsWriter, Services.Logging.DebugLogsWriter>();
+        services.AddSingleton<IEventViewerLogsWriter, EventViewerLogsWriter>();
+        services.AddSingleton<ILoggerFactory, LoggerFactory>(sp =>
         {
-            serviceManager.ThrowIfNull();
+            var factory = new LoggerFactory();
+            factory.AddProvider(new CVLoggerProvider(sp.GetService<ILogsWriter>()));
+            return factory;
+        });
+        services.AddSingleton<ILogsWriter, CompositeLogsWriter>(sp => new CompositeLogsWriter(
+            sp.GetService<ILogsManager>()!,
+            sp.GetService<IDebugLogsWriter>()!,
+            sp.GetService<IEventViewerLogsWriter>()!));
 
-            serviceManager.RegisterHttpFactory((serviceProvider, categoryType) =>
-            {
-                var loggerType = typeof(ILogger<>).MakeGenericType(categoryType);
-                var logger = serviceProvider.GetService(loggerType).As<ILogger>();
-                var handler = new LoggingHttpMessageHandler(logger) { InnerHandler = new HttpClientHandler() };
-                return handler;
-            });
-            serviceManager.RegisterOptionsManager<ApplicationConfigurationOptionsManager>();
-        }
+        services.AddScoped((sp) => new ScopeMetadata(new CorrelationVector()));
+        services.AddSingleton<ViewManager>();
+        services.AddSingleton<ProcessorUsageMonitor>();
+        services.AddSingleton<MemoryUsageMonitor>();
+        services.AddSingleton<IViewManager, ViewManager>(sp => sp.GetRequiredService<ViewManager>());
+        services.AddSingleton<IViewProducer, ViewManager>(sp => sp.GetRequiredService<ViewManager>());
+        services.AddSingleton<PostUpdateActionManager>();
+        services.AddSingleton<IPostUpdateActionManager>(sp => sp.GetRequiredService<PostUpdateActionManager>());
+        services.AddSingleton<IPostUpdateActionProducer>(sp => sp.GetRequiredService<PostUpdateActionManager>());
+        services.AddSingleton<IPostUpdateActionProvider>(sp => sp.GetRequiredService<PostUpdateActionManager>());
+        services.AddSingleton<IMenuService, MenuService>();
+        services.AddSingleton<IMenuServiceInitializer, MenuService>(sp => sp.GetRequiredService<IMenuService>().As<MenuService>()!);
+        services.AddSingleton<ILiteDatabase, LiteDatabase>(sp => new LiteDatabase("Daybreak.db"));
+        services.AddSingleton<IMutexHandler, MutexHandler>();
+        services.AddSingleton<IShortcutManager, ShortcutManager>();
+        services.AddSingleton<IMetricsService, MetricsService>();
+        services.AddSingleton<IStartupActionProducer, StartupActionManager>();
+        services.AddSingleton<IOptionsProducer, OptionsManager>(sp => sp.GetRequiredService<IOptionsManager>().As<OptionsManager>()!);
+        services.AddSingleton<IOptionsUpdateHook, OptionsManager>(sp => sp.GetRequiredService<IOptionsManager>().As<OptionsManager>()!);
+        services.AddSingleton<IOptionsProvider, OptionsManager>(sp => sp.GetRequiredService<IOptionsManager>().As<OptionsManager>()!);
+        services.AddSingleton<IThemeManager, ThemeManager>();
+        services.AddSingleton<INotificationService, NotificationService>();
+        services.AddSingleton<INotificationProducer, NotificationService>(sp => sp.GetRequiredService<INotificationService>().As<NotificationService>()!);
+        services.AddSingleton<INotificationHandlerProducer, NotificationService>(sp => sp.GetRequiredService<INotificationService>().As<NotificationService>()!);
+        services.AddSingleton<ILiveChartInitializer, LiveChartInitializer>();
+        services.AddSingleton<IImageCache, ImageCache>();
+        services.AddSingleton<ISoundService, SoundService>();
+        services.AddSingleton<IInternetCheckingService, InternetCheckingService>();
+        services.AddSingleton<IConnectivityStatus, ConnectivityStatus>();
+        services.AddSingleton<INotificationStorage, NotificationStorage>();
+        services.AddSingleton<ITradeAlertingService, TradeAlertingService>();
+        services.AddSingleton<IModsManager, ModsManager>();
+        services.AddSingleton<IGuildwarsMemoryCache, GuildwarsMemoryCache>();
+        services.AddScoped<ICredentialManager, CredentialManager>();
+        services.AddScoped<IApplicationLauncher, ApplicationLauncher>();
+        services.AddScoped<IScreenshotProvider, ScreenshotProvider>();
+        services.AddScoped<IBloogumClient, BloogumClient>();
+        services.AddScoped<IApplicationUpdater, ApplicationUpdater>();
+        services.AddScoped<IBuildTemplateManager, BuildTemplateManager>();
+        services.AddScoped<IIconCache, IconCache>();
+        services.AddScoped<IPrivilegeManager, PrivilegeManager>();
+        services.AddScoped<IScreenManager, ScreenManager>();
+        services.AddScoped<IGraphClient, GraphClient>();
+        services.AddScoped<IOnboardingService, OnboardingService>();
+        services.AddScoped<IGuildwarsMemoryReader, GuildwarsMemoryReader>();
+        services.AddScoped<IMemoryScanner, MemoryScanner>();
+        services.AddScoped<IExperienceCalculator, ExperienceCalculator>();
+        services.AddScoped<IAttributePointCalculator, AttributePointCalculator>();
+        services.AddScoped<IDownloadService, DownloadService>();
+        services.AddScoped<IGuildwarsInstaller, GuildwarsInstaller>();
+        services.AddScoped<IGuildwarsEntityDebouncer, GuildwarsEntityDebouncer>();
+        services.AddScoped<IExceptionHandler, ExceptionHandler>();
+        services.AddScoped<IPathfinder, StupidPathfinder>();
+        services.AddScoped<IDrawingService, DrawingService>();
+        services.AddScoped<IDrawingModuleProducer, DrawingService>(sp => sp.GetRequiredService<IDrawingService>().As<DrawingService>()!);
+        services.AddScoped<ITradeChatService<KamadanTradeChatOptions>, TradeChatService<KamadanTradeChatOptions>>();
+        services.AddScoped<ITradeChatService<AscalonTradeChatOptions>, TradeChatService<AscalonTradeChatOptions>>();
+        services.AddScoped<ITraderQuoteService, TraderQuoteService>();
+        services.AddScoped<IPriceHistoryDatabase, PriceHistoryDatabase>();
+        services.AddScoped<IPriceHistoryService, PriceHistoryService>();
+        services.AddScoped<IWordHighlightingService, WordHighlightingService>();
+        services.AddScoped<ITradeHistoryDatabase, TradeHistoryDatabase>();
+        services.AddScoped<IGuildwarsCopyService, GuildwarsCopyService>();
+        services.AddScoped<IItemHashService, ItemHashService>();
+    }
 
-        public static void RegisterServices(IServiceProducer serviceProducer)
+    public static void RegisterViews(IViewProducer viewProducer)
+    {
+        viewProducer.ThrowIfNull();
+
+        viewProducer.RegisterPermanentView<Views.FocusView>();
+        viewProducer.RegisterView<LauncherView>();
+        viewProducer.RegisterView<AskUpdateView>();
+        viewProducer.RegisterView<UpdateView>();
+        viewProducer.RegisterView<AccountsView>();
+        viewProducer.RegisterView<ExecutablesView>();
+        viewProducer.RegisterView<BuildTemplateView>();
+        viewProducer.RegisterView<BuildsListView>();
+        viewProducer.RegisterView<RequestElevationView>();
+        viewProducer.RegisterView<ScreenChoiceView>();
+        viewProducer.RegisterView<VersionManagementView>();
+        viewProducer.RegisterView<LogsView>();
+        viewProducer.RegisterView<GraphAuthorizationView>();
+        viewProducer.RegisterView<BuildsSynchronizationView>();
+        viewProducer.RegisterView<LauncherOnboardingView>();
+        viewProducer.RegisterView<MetricsView>();
+        viewProducer.RegisterView<GuildwarsDownloadView>();
+        viewProducer.RegisterView<UModInstallingView>();
+        viewProducer.RegisterView<UModInstallationChoiceView>();
+        viewProducer.RegisterView<UModOnboardingEntryView>();
+        viewProducer.RegisterView<UModSwitchView>();
+        viewProducer.RegisterView<UModBrowserView>();
+        viewProducer.RegisterView<ToolboxInstallationView>();
+        viewProducer.RegisterView<ToolboxInstallationChoiceView>();
+        viewProducer.RegisterView<ToolboxOnboardingEntryView>();
+        viewProducer.RegisterView<ToolboxSwitchView>();
+        viewProducer.RegisterView<ToolboxHomepageView>();
+        viewProducer.RegisterView<OptionSectionView>();
+        viewProducer.RegisterView<KamadanTradeChatView>();
+        viewProducer.RegisterView<AscalonTradeChatView>();
+        viewProducer.RegisterView<PriceQuotesView>();
+        viewProducer.RegisterView<PriceHistoryView>();
+        viewProducer.RegisterView<NotificationsView>();
+        viewProducer.RegisterView<TradeAlertsView>();
+        viewProducer.RegisterView<TradeAlertSetupView>();
+        viewProducer.RegisterView<TradeNotificationView>();
+        viewProducer.RegisterView<GuildwarsCopySelectionView>();
+        viewProducer.RegisterView<GuildwarsCopyView>();
+        viewProducer.RegisterView<DSOALInstallingView>();
+        viewProducer.RegisterView<DSOALOnboardingEntryView>();
+        viewProducer.RegisterView<DSOALSwitchView>();
+        viewProducer.RegisterView<DSOALHomepageView>();
+        viewProducer.RegisterView<DSOALBrowserView>();
+    }
+
+    public static void RegisterStartupActions(IStartupActionProducer startupActionProducer)
+    {
+        startupActionProducer.ThrowIfNull();
+
+        startupActionProducer.RegisterAction<RenameInstallerAction>();
+    }
+
+    public static void RegisterPostUpdateActions(IPostUpdateActionProducer postUpdateActionProducer)
+    {
+        postUpdateActionProducer.ThrowIfNull();
+    }
+
+    public static void RegisterDrawingModules(IDrawingModuleProducer drawingModuleProducer)
+    {
+        drawingModuleProducer.ThrowIfNull();
+
+        drawingModuleProducer.RegisterDrawingModule<DeadEntityDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<NeutralEntityDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<AlliedCreatureEntityDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<AllyEntityDrawingModule>();
+
+        drawingModuleProducer.RegisterDrawingModule<NeutralBossEntityDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<WarriorBossEntityDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<RangerBossEntityDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<MesmerBossEntityDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<NecromancerBossEntityDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<MonkBossEntityDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<ElementalistBossEntityDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<AssassinBossEntityDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<RitualistBossEntityDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<DervishBossEntityDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<ParagonBossEntityDrawingModule>();
+
+        drawingModuleProducer.RegisterDrawingModule<EnemyEntityDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<NpcEntityDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<UnknownEntityDrawingModule>();
+
+        drawingModuleProducer.RegisterDrawingModule<ResurrectionShrineDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<CollectorDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<GateDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<StairsDownDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<StairsUpDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<CircledStarDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<AreaMapDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<DungeonBossDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<DungeonKeyDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<FlagDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<PersonDrawingModule>();
+
+        drawingModuleProducer.RegisterDrawingModule<PathfindingDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<PlayerPositionHistoryDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<QuestObjectiveDrawingModule>();
+
+        drawingModuleProducer.RegisterDrawingModule<MainPlayerDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<PartyMemberDrawingModule>();
+        drawingModuleProducer.RegisterDrawingModule<WorldPlayerDrawingModule>();
+
+        drawingModuleProducer.RegisterDrawingModule<EngagementAreaDrawingModule>();
+    }
+
+    public static void RegisterOptions(IOptionsProducer optionsProducer)
+    {
+        optionsProducer.ThrowIfNull();
+
+        optionsProducer.RegisterOptions<SoundOptions>();
+        optionsProducer.RegisterOptions<ThemeOptions>();
+        optionsProducer.RegisterOptions<BrowserOptions>();
+        optionsProducer.RegisterOptions<BuildSynchronizationOptions>();
+        optionsProducer.RegisterOptions<FocusViewOptions>();
+        optionsProducer.RegisterOptions<MemoryReaderOptions>();
+        optionsProducer.RegisterOptions<LauncherOptions>();
+        optionsProducer.RegisterOptions<ToolboxOptions>();
+        optionsProducer.RegisterOptions<UModOptions>();
+        optionsProducer.RegisterOptions<DSOALOptions>();
+        optionsProducer.RegisterOptions<ScreenManagerOptions>();
+        optionsProducer.RegisterOptions<KamadanTradeChatOptions>();
+        optionsProducer.RegisterOptions<AscalonTradeChatOptions>();
+        optionsProducer.RegisterOptions<LoggingOptions>();
+        optionsProducer.RegisterOptions<PriceHistoryOptions>();
+        optionsProducer.RegisterOptions<TraderQuotesOptions>();
+        optionsProducer.RegisterOptions<PathfindingOptions>();
+        optionsProducer.RegisterOptions<NotificationStorageOptions>();
+        optionsProducer.RegisterOptions<TradeAlertingOptions>();
+        optionsProducer.RegisterOptions<TraderMessagesOptions>();
+    }
+
+    public static void RegisterLiteCollections(IServiceCollection services)
+    {
+        RegisterLiteCollection<Models.Log, LoggingOptions>(services);
+        RegisterLiteCollection<TraderQuoteDTO, PriceHistoryOptions>(services);
+        RegisterLiteCollection<NotificationDTO, NotificationStorageOptions>(services);
+        RegisterLiteCollection<TraderMessageDTO, TraderMessagesOptions>(services);
+    }
+
+    public static void RegisterNotificationHandlers(INotificationHandlerProducer notificationHandlerProducer)
+    {
+        notificationHandlerProducer.RegisterNotificationHandler<NoActionHandler>();
+        notificationHandlerProducer.RegisterNotificationHandler<MessageBoxHandler>();
+        notificationHandlerProducer.RegisterNotificationHandler<TradeMessageNotificationHandler>();
+    }
+
+    public static void RegisterMods(IModsManager modsManager)
+    {
+        modsManager.RegisterMod<IToolboxService, ToolboxService>();
+        modsManager.RegisterMod<IUModService, UModService>();
+        modsManager.RegisterMod<IDSOALService, DSOALService>();
+    }
+
+    private static void RegisterLiteCollection<TCollectionType, TOptionsType>(IServiceCollection services)
+        where TOptionsType : class, ILiteCollectionOptions<TCollectionType>
+    {
+        services.AddSingleton(sp =>
         {
-            serviceProducer.ThrowIfNull();
+            var options = sp.GetRequiredService<IOptions<TOptionsType>>();
+            var liteDatabase = sp.GetRequiredService<ILiteDatabase>();
+            return liteDatabase.GetCollection<TCollectionType>(options.Value.CollectionName, BsonAutoId.Int64);
+        });
+    }
 
-            serviceProducer.RegisterSingleton<ILogsManager, JsonLogsManager>();
-            serviceProducer.RegisterSingleton<IDebugLogsWriter, Services.Logging.DebugLogsWriter>();
-            serviceProducer.RegisterSingleton<ILoggerFactory, LoggerFactory>(sp =>
-            {
-                var factory = new LoggerFactory();
-                factory.AddProvider(new CVLoggerProvider(sp.GetService<ILogsWriter>()));
-                return factory;
-            });
-            serviceProducer.RegisterSingleton<ILogsWriter, CompositeLogsWriter>(sp => new CompositeLogsWriter(
-                sp.GetService<ILogsManager>(),
-                sp.GetService<IDebugLogsWriter>()));
+    private static void SetupDaybreakUserAgent(HttpRequestHeaders httpRequestHeaders)
+    {
+        httpRequestHeaders.ThrowIfNull().TryAddWithoutValidation("User-Agent", DaybreakUserAgent);
+    }
 
-            serviceProducer.RegisterScoped((sp) => new ScopeMetadata(new CorrelationVector()));
-            serviceProducer.RegisterSingleton<ViewManager>(registerAllInterfaces: true);
-            serviceProducer.RegisterSingleton<PostUpdateActionManager>(registerAllInterfaces: true);
-            serviceProducer.RegisterSingleton<IConfigurationManager, ConfigurationManager>();
-            serviceProducer.RegisterSingleton<ILiteDatabase, LiteDatabase>(sp => new LiteDatabase("Daybreak.db"));
-            serviceProducer.RegisterSingleton<IMutexHandler, MutexHandler>();
-            serviceProducer.RegisterSingleton<IShortcutManager, ShortcutManager>();
-            serviceProducer.RegisterSingleton<IIconBrowser, IconBrowser>();
-            serviceProducer.RegisterSingleton<IIconDownloader, IconDownloader>();
-            serviceProducer.RegisterScoped<ICredentialManager, CredentialManager>();
-            serviceProducer.RegisterScoped<IApplicationLauncher, ApplicationLauncher>();
-            serviceProducer.RegisterScoped<IScreenshotProvider, ScreenshotProvider>();
-            serviceProducer.RegisterScoped<IBloogumClient, BloogumClient>();
-            serviceProducer.RegisterScoped<IApplicationUpdater, ApplicationUpdater>();
-            serviceProducer.RegisterScoped<IBuildTemplateManager, BuildTemplateManager>();
-            serviceProducer.RegisterScoped<IIconCache, IconCache>();
-            serviceProducer.RegisterScoped<IPrivilegeManager, PrivilegeManager>();
-            serviceProducer.RegisterScoped<IScreenManager, ScreenManager>();
-            serviceProducer.RegisterScoped<IGraphClient, GraphClient>();
-        }
+    private static HttpMessageHandler SetupLoggingAndMetrics<T>(System.IServiceProvider serviceProvider)
+    {
+        var logger = serviceProvider.GetRequiredService<ILogger<T>>();
+        var metricsService = serviceProvider.GetRequiredService<IMetricsService>();
 
-        public static void RegisterViews(IViewProducer viewProducer)
-        {
-            viewProducer.ThrowIfNull();
-
-            viewProducer.RegisterView<MainView>();
-            viewProducer.RegisterView<SettingsView>();
-            viewProducer.RegisterView<AskUpdateView>();
-            viewProducer.RegisterView<UpdateView>();
-            viewProducer.RegisterView<SettingsCategoryView>();
-            viewProducer.RegisterView<AccountsView>();
-            viewProducer.RegisterView<ExperimentalSettingsView>();
-            viewProducer.RegisterView<ExecutablesView>();
-            viewProducer.RegisterView<BuildTemplateView>();
-            viewProducer.RegisterView<BuildsListView>();
-            viewProducer.RegisterView<RequestElevationView>();
-            viewProducer.RegisterView<ScreenChoiceView>();
-            viewProducer.RegisterView<VersionManagementView>();
-            viewProducer.RegisterView<LogsView>();
-            viewProducer.RegisterView<IconDownloadView>();
-            viewProducer.RegisterView<GraphAuthorizationView>();
-            viewProducer.RegisterView<BuildsSynchronizationView>();
-        }
-
-        public static void RegisterPostUpdateActions(IPostUpdateActionProducer postUpdateActionProducer)
-        {
-            postUpdateActionProducer.ThrowIfNull();
-
-            postUpdateActionProducer.AddPostUpdateAction<RenameInstallerAction>();
-        }
+        return new MetricsHttpMessageHandler<T>(
+            metricsService,
+            new LoggingHttpMessageHandler(logger!) { InnerHandler = new HttpClientHandler() });
     }
 }

Daybreak/Configuration/SecretKeys.cs

@@ -5,7 +5,7 @@ public class SecretKeys
     public static readonly SecretKeys AadApplicationId = new() { Key = "AadApplicationId" };
     public static readonly SecretKeys AadTenantId = new() { Key = "AadTenantId" };
 
-    public string Key { get; private set; }
+    public string Key { get; private set; } = string.Empty;
     private SecretKeys()
     {
     }

Daybreak/Configuration/SecretManager.cs

@@ -7,7 +7,7 @@ namespace Daybreak.Configuration;
 
 public static class SecretManager
 {
-    private static JObject SecretsHolder;
+    private static JObject? SecretsHolder;
 
     public static string GetSecret(SecretKeys secretKey)
     {
@@ -16,7 +16,7 @@ public static class SecretManager
             LoadSecrets();
         }
 
-        return SecretsHolder.Value<string>(secretKey.Key);
+        return SecretsHolder!.Value<string>(secretKey.Key)!;
     }
 
     public static T GetSecret<T>(SecretKeys secretKey)
@@ -26,7 +26,7 @@ public static class SecretManager
             LoadSecrets();
         }
 
-        return SecretsHolder.Value<T>(secretKey.Key);
+        return SecretsHolder!.Value<T>(secretKey.Key)!;
     }
 
     private static void LoadSecrets()

Daybreak/Controls/BagItemContextMenu.xaml

@@ -0,0 +1,45 @@
+<UserControl x:Class="Daybreak.Controls.BagItemContextMenu"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls"
+             xmlns:guildwars="clr-namespace:Daybreak.Models.Guildwars"
+             Background="{StaticResource Daybreak.Brushes.Background}"
+             d:DataContext="{d:DesignInstance Type=guildwars:BagItem, IsDesignTimeCreatable=True}"
+             BorderBrush="{StaticResource MahApps.Brushes.ThemeForeground}"
+             BorderThickness="1"
+             x:Name="_this"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <StackPanel Margin="5, 0, 5, 0">
+        <TextBlock 
+            Text="{Binding Item.Name, Mode=OneWay}" 
+            FontSize="16"
+            Foreground="{StaticResource MahApps.Brushes.ThemeForeground}" />
+        <WrapPanel>
+            <TextBlock 
+                Text="Wiki: " 
+                FontSize="16"
+                Foreground="{StaticResource MahApps.Brushes.ThemeForeground}" />
+            <TextBlock 
+                Text="{Binding Item.WikiUrl, Mode=OneWay}" 
+                FontSize="16"
+                Foreground="{StaticResource MahApps.Brushes.Accent}"
+                Cursor="Hand"
+                MouseLeftButtonDown="WikiTextBlock_MouseLeftButtonDown"/>
+        </WrapPanel>
+        <WrapPanel>
+            <TextBlock 
+                Text="Price history: " 
+                FontSize="16"
+                Foreground="{StaticResource MahApps.Brushes.ThemeForeground}" />
+            <TextBlock 
+                Text="Check" 
+                FontSize="16"
+                Foreground="{StaticResource MahApps.Brushes.Accent}"
+                Cursor="Hand"
+                MouseLeftButtonDown="PriceHistoryTextBlock_MouseLeftButtonDown"/>
+        </WrapPanel>
+    </StackPanel>
+</UserControl>

Daybreak/Controls/BagItemContextMenu.xaml.cs

@@ -0,0 +1,41 @@
+using Daybreak.Models.Guildwars;
+using System;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Daybreak.Controls;
+/// <summary>
+/// Interaction logic for BagItemContextMenu.xaml
+/// </summary>
+public partial class BagItemContextMenu : UserControl
+{
+    public event EventHandler<ItemBase>? PriceHistoryClicked;
+    public event EventHandler<ItemBase>? WikiClicked;
+
+    public BagItemContextMenu()
+    {
+        this.InitializeComponent();
+    }
+
+    private void WikiTextBlock_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (this.DataContext is not BagItem bagItem ||
+            bagItem.Item is not ItemBase itemBase)
+        {
+            return;
+        }
+
+        this.WikiClicked?.Invoke(this, itemBase);
+    }
+
+    private void PriceHistoryTextBlock_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (this.DataContext is not BagItem bagItem ||
+            bagItem.Item is not ItemBase itemBase)
+        {
+            return;
+        }
+
+        this.PriceHistoryClicked?.Invoke(this, itemBase);
+    }
+}

Daybreak/Controls/Buttons/AddButton.xaml

@@ -1,22 +1,27 @@
-<UserControl x:Class="Daybreak.Controls.AddButton"
+<UserControl x:Class="Daybreak.Controls.Buttons.AddButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Daybreak.Controls"
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
              mc:Ignorable="d"
              x:Name="_this"
+             Cursor="Hand"
              d:DesignHeight="450" d:DesignWidth="800">
-    <Viewbox>
-        <Grid>
-            <Ellipse x:Name="BackgroundEllipse" Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Visibility="Visible" Opacity="0.1" />
-            <Path Data="m13,26a13,13 0 1 1 13,-13a13,13 0 0 1 -13,13zm0,-24a11,11 0 1 0 11,11a11,11 0 0 0 -11,-11z"
-                  Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></Path>
-            <Path Data="m13,20a1,1 0 0 1 -1,-1l0,-12a1,1 0 0 1 2,0l0,12a1,1 0 0 1 -1,1z"
-                  Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></Path>
-            <Path Data="m19,14l-12,0a1,1 0 0 1 0,-2l12,0a1,1 0 0 1 0,2z"
-                  Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></Path>
-            <Ellipse Fill="Transparent" MouseEnter="Ellipse_MouseEnter" MouseLeave="Ellipse_MouseLeave" MouseLeftButtonDown="Ellipse_MouseLeftButtonDown"></Ellipse>
-        </Grid>
-    </Viewbox>
+    <Grid>
+        <local:CircularButton Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"
+                               Highlight="{StaticResource MahApps.Brushes.Accent}"
+                               Clicked="HighlightButton_Clicked">
+            <local:CircularButton.Content>
+                <Viewbox Stretch="Fill" Width="60" Height="60">
+                    <Grid Width="25" Height="25">
+                        <Path Data="m13,20a1,1 0 0 1 -1,-1l0,-12a1,1 0 0 1 2,0l0,12a1,1 0 0 1 -1,1z"
+                            Fill="{StaticResource MahApps.Brushes.ThemeForeground}"></Path>
+                        <Path Data="m19,14l-12,0a1,1 0 0 1 0,-2l12,0a1,1 0 0 1 0,2z"
+                            Fill="{StaticResource MahApps.Brushes.ThemeForeground}"></Path>
+                    </Grid>
+                </Viewbox>
+            </local:CircularButton.Content>
+        </local:CircularButton>
+    </Grid>
 </UserControl>

Daybreak/Controls/Buttons/AddButton.xaml.cs

@@ -1,37 +1,22 @@
 using System;
 using System.Windows.Controls;
-using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls.Buttons;
+
+/// <summary>
+/// Interaction logic for AddButton.xaml
+/// </summary>
+public partial class AddButton : UserControl
 {
-    /// <summary>
-    /// Interaction logic for AddButton.xaml
-    /// </summary>
-    public partial class AddButton : UserControl
+    public event EventHandler? Clicked;
+
+    public AddButton()
     {
-        public event EventHandler Clicked;
+        this.InitializeComponent();
+    }
 
-        public AddButton()
-        {
-            this.InitializeComponent();
-        }
-
-        private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Opacity = 0.6;
-        }
-
-        private void Ellipse_MouseLeave(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Opacity = 0;
-        }
-
-        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                Clicked?.Invoke(this, e);
-            }
-        }
+    private void HighlightButton_Clicked(object sender, EventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
     }
 }

Daybreak/Controls/Buttons/BackButton.xaml

@@ -1,20 +1,25 @@
-<UserControl x:Class="Daybreak.Controls.BackButton"
+<UserControl x:Class="Daybreak.Controls.Buttons.BackButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Daybreak.Controls"
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
              mc:Ignorable="d"
              x:Name="_this"
+             Cursor="Hand"
              d:DesignHeight="450" d:DesignWidth="800">
-    <Viewbox>
-        <Grid>
-            <Ellipse x:Name="BackgroundEllipse" Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Visibility="Visible" Opacity="0.1" />
-            <Path Fill="{Binding Foreground, ElementName=_this, Mode=OneWay}"
-                Data="m30,15a15,15 0 1 1 -15,-15a15,15 0 0 1 15,15zm-28,0a13,13 0 1 0 13,-13a13,13 0 0 0 -13,13z"></Path>
-            <Path Fill="{Binding Foreground, ElementName=_this, Mode=OneWay}"
-                Data="m18.87,9.41l-5.58,5.59l5.58,5.59a1,1 0 0 1 0,1.41l0,0a1,1 0 0 1 -1.41,0l-6.36,-6.36a0.91,0.91 0 0 1 0,-1.28l6.36,-6.36a1,1 0 0 1 1.41,0l0,0a1,1 0 0 1 0,1.41z"></Path>
-            <Ellipse Fill="Transparent" MouseEnter="Ellipse_MouseEnter" MouseLeave="Ellipse_MouseLeave" MouseLeftButtonDown="Ellipse_MouseLeftButtonDown"></Ellipse>
-        </Grid>
-    </Viewbox>
+    <Grid>
+        <local:CircularButton Foreground="{DynamicResource MahApps.Brushes.ThemeForeground}"
+                               Highlight="{DynamicResource MahApps.Brushes.Accent}"
+                               Clicked="HighlightButton_Clicked">
+            <local:CircularButton.Content>
+                <Viewbox Stretch="Fill" Width="60" Height="60">
+                    <Grid Width="30" Height="30" Margin="-2, 0, 0 ,0">
+                        <Path Fill="{DynamicResource MahApps.Brushes.ThemeForeground}" VerticalAlignment="Top" HorizontalAlignment="Left"
+                            Data="m18.87,9.41l-5.58,5.59l5.58,5.59a1,1 0 0 1 0,1.41l0,0a1,1 0 0 1 -1.41,0l-6.36,-6.36a0.91,0.91 0 0 1 0,-1.28l6.36,-6.36a1,1 0 0 1 1.41,0l0,0a1,1 0 0 1 0,1.41z"></Path>
+                    </Grid>
+                </Viewbox>
+            </local:CircularButton.Content>
+        </local:CircularButton>
+    </Grid>
 </UserControl>

Daybreak/Controls/Buttons/BackButton.xaml.cs

@@ -1,37 +1,22 @@
 using System;
 using System.Windows.Controls;
-using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls.Buttons;
+
+/// <summary>
+/// Interaction logic for BackButton.xaml
+/// </summary>
+public partial class BackButton : UserControl
 {
-    /// <summary>
-    /// Interaction logic for BackButton.xaml
-    /// </summary>
-    public partial class BackButton : UserControl
+    public event EventHandler? Clicked;
+
+    public BackButton()
     {
-        public event EventHandler Clicked;
+        this.InitializeComponent();
+    }
 
-        public BackButton()
-        {
-            this.InitializeComponent();
-        }
-
-        private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Opacity = 0.6;
-        }
-
-        private void Ellipse_MouseLeave(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Opacity = 0;
-        }
-
-        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                Clicked?.Invoke(this, e);
-            }
-        }
+    private void HighlightButton_Clicked(object sender, EventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
     }
 }

Daybreak/Controls/Buttons/BinButton.xaml

@@ -1,30 +1,35 @@
-<UserControl x:Class="Daybreak.Controls.BinButton"
+<UserControl x:Class="Daybreak.Controls.Buttons.BinButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Daybreak.Controls"
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
              mc:Ignorable="d"
              x:Name="_this"
+             Cursor="Hand"
              d:DesignHeight="450" d:DesignWidth="800">
-    <Viewbox>
-        <Grid>
-            <Ellipse x:Name="BackgroundEllipse" Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Width="80" Height="80" Opacity="0.6"
-                     Visibility="Hidden"></Ellipse>
-            <Path Data="m40,7l-2,0l0,-5l-18,0l0,5l-2,0l0,-6a1,1 0 0 1 1,-1l20,0a1,1 0 0 1 1,1l0,6z" 
-                  Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Margin="11"></Path>
-            <Path Data="m58,14l-2,0l0,-3l-54,0l0,3l-2,0l0,-4a1,1 0 0 1 1,-1l56,0a1,1 0 0 1 1,1l0,4z" 
-                  Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Margin="11"></Path>
-            <Path Data="m51,64l-44,0a1,1 0 0 1 -1,-1l0,-48l2,0l0,47l42,0l0,-47l2,0l0,48a1,1 0 0 1 -1,1z" 
-                  Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Margin="11"></Path>
-            <Rectangle Margin="38, 32, 0, 0" Width="2" Height="32" Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                       VerticalAlignment="Top" HorizontalAlignment="Left"></Rectangle>
-            <Rectangle Margin="26, 35, 0, 0" Width="2" Height="32" Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                       VerticalAlignment="Top" HorizontalAlignment="Left"></Rectangle>
-            <Rectangle Margin="50, 35, 0, 0" Width="2" Height="32" Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                       VerticalAlignment="Top" HorizontalAlignment="Left"></Rectangle>
-            <Ellipse Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" StrokeThickness="3" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Fill="Transparent"
-                       MouseLeftButtonDown="Ellipse_MouseLeftButtonDown" MouseEnter="Ellipse_MouseEnter" MouseLeave="Ellipse_MouseLeave"></Ellipse>
-        </Grid>
-    </Viewbox>
+    <Grid>
+        <local:CircularButton Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"
+                               Highlight="{StaticResource MahApps.Brushes.Accent}"
+                               Clicked="HighlightButton_Clicked">
+            <local:CircularButton.Content>
+                <Viewbox Width="60" Height="60">
+                    <Grid Margin="10">
+                        <Path Data="m40,7l-2,0l0,-5l-18,0l0,5l-2,0l0,-6a1,1 0 0 1 1,-1l20,0a1,1 0 0 1 1,1l0,6z" 
+                            Fill="{StaticResource MahApps.Brushes.ThemeForeground}" Margin="11"></Path>
+                        <Path Data="m58,14l-2,0l0,-3l-54,0l0,3l-2,0l0,-4a1,1 0 0 1 1,-1l56,0a1,1 0 0 1 1,1l0,4z" 
+                            Fill="{StaticResource MahApps.Brushes.ThemeForeground}" Margin="11"></Path>
+                        <Path Data="m51,64l-44,0a1,1 0 0 1 -1,-1l0,-48l2,0l0,47l42,0l0,-47l2,0l0,48a1,1 0 0 1 -1,1z" 
+                            Fill="{StaticResource MahApps.Brushes.ThemeForeground}" Margin="11"></Path>
+                        <Rectangle Margin="38, 32, 0, 0" Width="2" Height="32" Stroke="{StaticResource MahApps.Brushes.ThemeForeground}"
+                            VerticalAlignment="Top" HorizontalAlignment="Left"></Rectangle>
+                        <Rectangle Margin="26, 35, 0, 0" Width="2" Height="32" Stroke="{StaticResource MahApps.Brushes.ThemeForeground}"
+                            VerticalAlignment="Top" HorizontalAlignment="Left"></Rectangle>
+                        <Rectangle Margin="50, 35, 0, 0" Width="2" Height="32" Stroke="{StaticResource MahApps.Brushes.ThemeForeground}"
+                            VerticalAlignment="Top" HorizontalAlignment="Left"></Rectangle>
+                    </Grid>
+                </Viewbox>
+            </local:CircularButton.Content>
+        </local:CircularButton>
+    </Grid>
 </UserControl>

Daybreak/Controls/Buttons/BinButton.xaml.cs

@@ -1,36 +1,22 @@
 using System;
 using System.Windows.Controls;
-using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls.Buttons;
+
+/// <summary>
+/// Interaction logic for BinButton.xaml
+/// </summary>
+public partial class BinButton : UserControl
 {
-    /// <summary>
-    /// Interaction logic for BinButton.xaml
-    /// </summary>
-    public partial class BinButton : UserControl
+    public event EventHandler? Clicked;
+
+    public BinButton()
     {
-        public event EventHandler Clicked;
-        public BinButton()
-        {
-            this.InitializeComponent();
-        }
+        this.InitializeComponent();
+    }
 
-        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                this.Clicked?.Invoke(this, e);
-            }
-        }
-
-        private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Visibility = System.Windows.Visibility.Visible;
-        }
-
-        private void Ellipse_MouseLeave(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Visibility = System.Windows.Visibility.Hidden;
-        }
+    private void HighlightButton_Clicked(object sender, EventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
     }
 }

Daybreak/Controls/Buttons/CancelButton.xaml

@@ -1,19 +1,25 @@
-<UserControl x:Class="Daybreak.Controls.CancelButton"
+<UserControl x:Class="Daybreak.Controls.Buttons.CancelButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Daybreak.Controls"
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
              mc:Ignorable="d"
              x:Name="_this"
+             Cursor="Hand"
              d:DesignHeight="450" d:DesignWidth="800">
-    <Viewbox>
-        <Grid>
-            <Ellipse x:Name="BackgroundEllipse" Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Visibility="Visible" Opacity="0.1" />
-            <Ellipse StrokeThickness="2"  Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Width="30" Height="30"></Ellipse>
-            <Line X1="7" X2="23" Y1="7" Y2="23" StrokeThickness="2" Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></Line>
-            <Line X1="23" X2="7" Y1="7" Y2="23" StrokeThickness="2" Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></Line>
-            <Ellipse Fill="Transparent" MouseEnter="Ellipse_MouseEnter" MouseLeave="Ellipse_MouseLeave" MouseLeftButtonDown="Ellipse_MouseLeftButtonDown"></Ellipse>
-        </Grid>
-    </Viewbox>
+    <Grid>
+        <local:CircularButton Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"
+                               Highlight="{StaticResource MahApps.Brushes.Accent}"
+                               Clicked="HighlightButton_Clicked">
+            <local:CircularButton.Content>
+                <Viewbox Width="60" Height="60">
+                    <Grid Width="30" Height="30">
+                        <Line X1="7" X2="23" Y1="7" Y2="23" StrokeThickness="2" Stroke="{StaticResource MahApps.Brushes.ThemeForeground}"></Line>
+                        <Line X1="23" X2="7" Y1="7" Y2="23" StrokeThickness="2" Stroke="{StaticResource MahApps.Brushes.ThemeForeground}"></Line>
+                    </Grid>
+                </Viewbox>
+            </local:CircularButton.Content>
+        </local:CircularButton>
+    </Grid>
 </UserControl>

Daybreak/Controls/Buttons/CancelButton.xaml.cs

@@ -1,37 +1,22 @@
 using System;
 using System.Windows.Controls;
-using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls.Buttons;
+
+/// <summary>
+/// Interaction logic for BackButton.xaml
+/// </summary>
+public partial class CancelButton : UserControl
 {
-    /// <summary>
-    /// Interaction logic for BackButton.xaml
-    /// </summary>
-    public partial class CancelButton : UserControl
+    public event EventHandler? Clicked;
+
+    public CancelButton()
     {
-        public event EventHandler Clicked;
+        this.InitializeComponent();
+    }
 
-        public CancelButton()
-        {
-            this.InitializeComponent();
-        }
-
-        private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Opacity = 0.6;
-        }
-
-        private void Ellipse_MouseLeave(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Opacity = 0;
-        }
-
-        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                Clicked?.Invoke(this, e);
-            }
-        }
+    private void HighlightButton_Clicked(object sender, EventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
     }
 }

Daybreak/Controls/Buttons/CircularButton.xaml

@@ -0,0 +1,24 @@
+<UserControl x:Class="Daybreak.Controls.Buttons.CircularButton"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
+             x:Name="_this"
+             Cursor="Hand"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"></BooleanToVisibilityConverter>
+    </UserControl.Resources>
+    <Viewbox>
+        <Grid>
+            <Ellipse Fill="{Binding ElementName=_this, Path=Highlight, Mode=OneWay}"
+                     Visibility="{Binding ElementName=_this, Path=IsHighlighted, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" Opacity="0.6" />
+            <Ellipse Stroke="{DynamicResource MahApps.Brushes.ThemeForeground}" StrokeThickness="3"
+                     VerticalAlignment="Stretch" HorizontalAlignment="Stretch"></Ellipse>
+            <ContentPresenter Content="{Binding ElementName=_this, Path=Content, Mode=OneWay}"></ContentPresenter>
+            <Ellipse Fill="Transparent" MouseEnter="Ellipse_MouseEnter" MouseLeave="Ellipse_MouseLeave" MouseLeftButtonDown="Ellipse_MouseLeftButtonDown"></Ellipse>
+        </Grid>
+    </Viewbox>
+</UserControl>

Daybreak/Controls/Buttons/CircularButton.xaml.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Extensions;
+using System.Windows.Media;
+
+namespace Daybreak.Controls.Buttons;
+/// <summary>
+/// Interaction logic for HighlightButton.xaml
+/// </summary>
+public partial class CircularButton : UserControl
+{
+    public event EventHandler Clicked;
+
+    [GenerateDependencyProperty]
+    private Brush highlight = default!;
+
+    [GenerateDependencyProperty]
+    private bool isHighlighted;
+
+    [GenerateDependencyProperty]
+    private FrameworkElement content = default!;
+
+    public CircularButton()
+    {
+        this.InitializeComponent();
+    }
+
+    private void Ellipse_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
+    {
+        this.IsHighlighted = true;
+    }
+
+    private void Ellipse_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
+    {
+        this.IsHighlighted = false;
+    }
+
+    private void Ellipse_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
+    }
+}

Daybreak/Controls/Buttons/CopyButton.xaml

@@ -0,0 +1,26 @@
+<UserControl x:Class="Daybreak.Controls.Buttons.CopyButton"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
+             xmlns:controls="clr-namespace:Daybreak.Controls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <local:CircularButton Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"
+                               Highlight="{StaticResource MahApps.Brushes.Accent}"
+                               Clicked="HighlightButton_Clicked">
+            <local:CircularButton.Content>
+                <Viewbox Stretch="Fill" Width="60" Height="60">
+                    <Grid Width="80" Height="80">
+                        <Path Data="m28,0l-24,0c-2.21,0 -4,1.79 -4,4l0,28l4,0l0,-28l24,0l0,-4zm6,8l-22,0c-2.21,0 -4,1.79 -4,4l0,28c0,2.21 1.79,4 4,4l22,0c2.21,0 4,-1.79 4,-4l0,-28c0,-2.21 -1.79,-4 -4,-4zm0,32l-22,0l0,-28l22,0l0,28z"
+                              Fill="{StaticResource MahApps.Brushes.ThemeForeground}" 
+                              VerticalAlignment="Center"
+                              HorizontalAlignment="Center"/>
+                    </Grid>
+                </Viewbox>
+            </local:CircularButton.Content>
+        </local:CircularButton>
+    </Grid>
+</UserControl>

Daybreak/Controls/Buttons/CopyButton.xaml.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Windows.Controls;
+
+namespace Daybreak.Controls.Buttons;
+/// <summary>
+/// Interaction logic for CopyButton.xaml
+/// </summary>
+public partial class CopyButton : UserControl
+{
+    public event EventHandler? Clicked;
+
+    public CopyButton()
+    {
+        this.InitializeComponent();
+    }
+
+    private void HighlightButton_Clicked(object sender, EventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
+    }
+}

Daybreak/Controls/Buttons/FilePickerButton.xaml

@@ -0,0 +1,25 @@
+<UserControl x:Class="Daybreak.Controls.Buttons.FilePickerButton"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
+             xmlns:glyphs="clr-namespace:Daybreak.Controls.Glyphs"
+             mc:Ignorable="d"
+             x:Name="_this"
+             Cursor="Hand"
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <local:CircularButton Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"
+                               Highlight="{StaticResource MahApps.Brushes.Accent}"
+                               Clicked="HighlightButton_Clicked">
+            <local:CircularButton.Content>
+                <Viewbox Width="60" Height="60">
+                    <Grid>
+                        <glyphs:ThreeDotsGlyph Foreground="{StaticResource MahApps.Brushes.ThemeForeground}" Padding="0.5"></glyphs:ThreeDotsGlyph>
+                    </Grid>
+                </Viewbox>
+            </local:CircularButton.Content>
+        </local:CircularButton>
+    </Grid>
+</UserControl>

Daybreak/Controls/Buttons/FilePickerButton.xaml.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Windows.Controls;
+
+namespace Daybreak.Controls.Buttons;
+
+/// <summary>
+/// Interaction logic for FilePickerGlyph.xaml
+/// </summary>
+public partial class FilePickerButton : UserControl
+{
+    public event EventHandler? Clicked;
+
+    public FilePickerButton()
+    {
+        this.InitializeComponent();
+    }
+
+    private void HighlightButton_Clicked(object sender, EventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
+    }
+}

Daybreak/Controls/Buttons/FilePickerGlyph.xaml

@@ -1,24 +0,0 @@
-<UserControl x:Class="Daybreak.Controls.FilePickerGlyph"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Daybreak.Controls"
-             mc:Ignorable="d"
-             x:Name="_this"
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
-        <Ellipse x:Name="BackgroundEllipse" Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Visibility="Visible" Opacity="0.1" />
-        <Viewbox Stretch="Fill">
-            <Grid>
-                <Ellipse Height="4" Width="4" StrokeThickness="0.2" Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></Ellipse>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                    <Ellipse Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Height="1" Width="1"></Ellipse>
-                    <Ellipse Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Height="1" Width="1"></Ellipse>
-                    <Ellipse Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Height="1" Width="1"></Ellipse>
-                </StackPanel>
-            </Grid>
-        </Viewbox>
-        <Ellipse Fill="Transparent" MouseEnter="Ellipse_MouseEnter" MouseLeave="Ellipse_MouseLeave" MouseLeftButtonDown="Ellipse_MouseLeftButtonDown"></Ellipse>
-    </Grid>
-</UserControl>

Daybreak/Controls/Buttons/FilePickerGlyph.xaml.cs

@@ -1,37 +0,0 @@
-using System;
-using System.Windows.Controls;
-using System.Windows.Input;
-
-namespace Daybreak.Controls
-{
-    /// <summary>
-    /// Interaction logic for FilePickerGlyph.xaml
-    /// </summary>
-    public partial class FilePickerGlyph : UserControl
-    {
-        public event EventHandler Clicked;
-
-        public FilePickerGlyph()
-        {
-            this.InitializeComponent();
-        }
-
-        private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Opacity = 0.6;
-        }
-
-        private void Ellipse_MouseLeave(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Opacity = 0;
-        }
-
-        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                this.Clicked?.Invoke(this, e);
-            }
-        }
-    }
-}

Daybreak/Controls/Buttons/HelpButton.xaml

@@ -1,19 +1,25 @@
-<UserControl x:Class="Daybreak.Controls.HelpButton"
+<UserControl x:Class="Daybreak.Controls.Buttons.HelpButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Daybreak.Controls"
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
              mc:Ignorable="d"
              x:Name="_this"
+             Cursor="Hand"
              d:DesignHeight="450" d:DesignWidth="800">
-    <Viewbox>
-        <Grid>
-            <Ellipse x:Name="BackgroundEllipse" Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Visibility="Visible" Opacity="0.1" Width="30" Height="30" />
-            <Ellipse Width="30" Height="30" StrokeThickness="2" Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></Ellipse>
-            <Path Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" VerticalAlignment="Center" HorizontalAlignment="Center"
-                  Data="m4.99353,17.899l0,-1.47c0,-1.436 0.322,-2.188 1.075,-3.229l2.404,-3.3c1.254,-1.721 1.684,-2.546 1.684,-3.766c0,-2.044 -1.434,-3.335 -3.479,-3.335c-2.008,0 -3.299,1.219 -3.729,3.407c-0.036,0.215 -0.179,0.323 -0.395,0.287l-2.259,-0.395c-0.216,-0.036 -0.323,-0.179 -0.288,-0.395c0.539,-3.443 3.014,-5.703 6.744,-5.703c3.872,0 6.49,2.546 6.49,6.097c0,1.722 -0.608,2.977 -1.828,4.663l-2.403,3.3c-0.717,0.968 -0.933,1.47 -0.933,2.689l0,1.147c0,0.215 -0.143,0.358 -0.358,0.358l-2.367,0c-0.215,0.004 -0.358,-0.14 -0.358,-0.355zm-0.179,3.444c0,-0.215 0.143,-0.358 0.359,-0.358l2.726,0c0.215,0 0.358,0.144 0.358,0.358l0,3.084c0,0.216 -0.144,0.358 -0.358,0.358l-2.726,0c-0.217,0 -0.359,-0.143 -0.359,-0.358l0,-3.084z"></Path>
-            <Ellipse Fill="Transparent" MouseEnter="Ellipse_MouseEnter" MouseLeave="Ellipse_MouseLeave" MouseLeftButtonDown="Ellipse_MouseLeftButtonDown"></Ellipse>
-        </Grid>
-    </Viewbox>
+    <Grid>
+        <local:CircularButton Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"
+                               Highlight="{StaticResource MahApps.Brushes.Accent}"
+                               Clicked="HighlightButton_Clicked">
+            <local:CircularButton.Content>
+                <Viewbox Width="60" Height="60">
+                    <Grid Width="30" Height="35">
+                        <Path Fill="{StaticResource MahApps.Brushes.ThemeForeground}" VerticalAlignment="Center" HorizontalAlignment="Center"
+                            Data="m4.99353,17.899l0,-1.47c0,-1.436 0.322,-2.188 1.075,-3.229l2.404,-3.3c1.254,-1.721 1.684,-2.546 1.684,-3.766c0,-2.044 -1.434,-3.335 -3.479,-3.335c-2.008,0 -3.299,1.219 -3.729,3.407c-0.036,0.215 -0.179,0.323 -0.395,0.287l-2.259,-0.395c-0.216,-0.036 -0.323,-0.179 -0.288,-0.395c0.539,-3.443 3.014,-5.703 6.744,-5.703c3.872,0 6.49,2.546 6.49,6.097c0,1.722 -0.608,2.977 -1.828,4.663l-2.403,3.3c-0.717,0.968 -0.933,1.47 -0.933,2.689l0,1.147c0,0.215 -0.143,0.358 -0.358,0.358l-2.367,0c-0.215,0.004 -0.358,-0.14 -0.358,-0.355zm-0.179,3.444c0,-0.215 0.143,-0.358 0.359,-0.358l2.726,0c0.215,0 0.358,0.144 0.358,0.358l0,3.084c0,0.216 -0.144,0.358 -0.358,0.358l-2.726,0c-0.217,0 -0.359,-0.143 -0.359,-0.358l0,-3.084z"></Path>
+                    </Grid>
+                </Viewbox>
+            </local:CircularButton.Content>
+        </local:CircularButton>
+    </Grid>
 </UserControl>

Daybreak/Controls/Buttons/HelpButton.xaml.cs

@@ -1,37 +1,22 @@
 using System;
 using System.Windows.Controls;
-using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls.Buttons;
+
+/// <summary>
+/// Interaction logic for AddButton.xaml
+/// </summary>
+public partial class HelpButton : UserControl
 {
-    /// <summary>
-    /// Interaction logic for AddButton.xaml
-    /// </summary>
-    public partial class HelpButton : UserControl
+    public event EventHandler? Clicked;
+
+    public HelpButton()
     {
-        public event EventHandler Clicked;
+        this.InitializeComponent();
+    }
 
-        public HelpButton()
-        {
-            this.InitializeComponent();
-        }
-
-        private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Opacity = 0.6;
-        }
-
-        private void Ellipse_MouseLeave(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Opacity = 0;
-        }
-
-        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                this.Clicked?.Invoke(this, e);
-            }
-        }
+    private void HighlightButton_Clicked(object sender, EventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
     }
 }

Daybreak/Controls/Buttons/HighlightButton.xaml

@@ -0,0 +1,36 @@
+<UserControl x:Class="Daybreak.Controls.Buttons.HighlightButton"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
+             xmlns:converters="clr-namespace:Daybreak.Converters"
+             x:Name="_this"
+             Cursor="Hand"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <converters:MenuButtonHighlightConverter x:Key="HighlightConverter"></converters:MenuButtonHighlightConverter>
+    </UserControl.Resources>
+    <Grid>
+        <Rectangle
+            Fill="{Binding ElementName=_this, Path=HighlightColor, Mode=OneWay}"
+            Opacity="{Binding ElementName=_this, Path=Highlighted, Converter={StaticResource HighlightConverter}}">
+        </Rectangle>
+        <TextBlock Text="{Binding ElementName=_this, Path=Title, Mode=OneWay}" 
+                   FontSize="{Binding ElementName=_this, Path=FontSize, Mode=OneWay}"
+                   FontFamily="{Binding ElementName=_this, Path=FontFamily, Mode=OneWay}"
+                   Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                   VerticalAlignment="{Binding ElementName=_this, Path=VerticalContentAlignment, Mode=OneWay}"
+                   HorizontalAlignment="{Binding ElementName=_this, Path=HorizontalContentAlignment, Mode=OneWay}"
+                   TextWrapping="{Binding ElementName=_this, Path=TextWrapping, Mode=OneWay}"
+                   TextAlignment="{Binding ElementName=_this, Path=TextAlignment, Mode=OneWay}"
+                   Padding="{Binding ElementName=_this, Path=TextPadding, Mode=OneWay}"/>
+        <ContentPresenter 
+            Content="{Binding ElementName=_this, Path=ButtonContent, Mode=OneWay}"/>
+        <Rectangle Fill="Transparent"
+                   MouseEnter="Grid_MouseEnter" 
+                   MouseLeave="Grid_MouseLeave"
+                   MouseLeftButtonDown="Rectangle_MouseLeftButtonDown" />
+    </Grid>
+</UserControl>

Daybreak/Controls/Buttons/HighlightButton.xaml.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Extensions;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace Daybreak.Controls.Buttons;
+/// <summary>
+/// Interaction logic for HighlightButton.xaml
+/// </summary>
+public partial class HighlightButton : UserControl
+{
+    public event EventHandler? Clicked;
+
+    [GenerateDependencyProperty]
+    private bool highlighted;
+    [GenerateDependencyProperty]
+    private Brush highlightColor = default!;
+    [GenerateDependencyProperty(InitialValue = "")]
+    private string title = string.Empty;
+    [GenerateDependencyProperty(InitialValue = HorizontalAlignment.Left)]
+    private HorizontalAlignment horizontalContentAlignment = HorizontalAlignment.Left;
+    [GenerateDependencyProperty(InitialValue = VerticalAlignment.Top)]
+    private VerticalAlignment verticalContentAlignment = VerticalAlignment.Top;
+    [GenerateDependencyProperty(InitialValue = TextAlignment.Center)]
+    private TextAlignment textAlignment = TextAlignment.Center;
+    [GenerateDependencyProperty(InitialValue = TextWrapping.Wrap)]
+    private TextWrapping textWrapping = TextWrapping.Wrap;
+    [GenerateDependencyProperty]
+    private Thickness textPadding = new Thickness(0);
+    [GenerateDependencyProperty]
+    private UIElement buttonContent = default!;
+
+    public HighlightButton()
+    {
+        this.InitializeComponent();
+    }
+
+    private void Grid_MouseEnter(object sender, MouseEventArgs e)
+    {
+        this.Highlighted = true;
+    }
+
+    private void Grid_MouseLeave(object sender, MouseEventArgs e)
+    {
+        this.Highlighted = false;
+    }
+
+    private void Rectangle_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
+    }
+}

Daybreak/Controls/Buttons/HomeButton.xaml

@@ -1,25 +1,29 @@
-<UserControl x:Class="Daybreak.Controls.HomeButton"
+<UserControl x:Class="Daybreak.Controls.Buttons.HomeButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Daybreak.Controls"
-             mc:Ignorable="d" 
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
+             mc:Ignorable="d"
              x:Name="_this"
+             Cursor="Hand"
              d:DesignHeight="450" d:DesignWidth="800">
-    <Viewbox>
-        <Grid>
-            <Ellipse x:Name="BackgroundEllipse" Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Visibility="Visible" Opacity="0.1" />
-            <Ellipse Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" StrokeThickness="3" Width="60" Height="60"></Ellipse>
-            <Grid VerticalAlignment="Center" HorizontalAlignment="Center">
-                <Path Data="m42,45.384l-14,0l0,-13l-8,0l0,13l-14,0l0,-21c0,-0.552 0.447,-1 1,-1s1,0.448 1,1l0,19l10,0l0,-13l12,0l0,13l10,0l0,-18c0,-0.552 0.447,-1 1,-1s1,0.448 1,1l0,20z"
-                  Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></Path>
-                <Path Data="m47,24.384c-0.249,0 -0.497,-0.092 -0.691,-0.277l-22.309,-21.339l-22.309,21.339c-0.399,0.381 -1.032,0.368 -1.414,-0.031c-0.382,-0.399 -0.367,-1.032 0.031,-1.414l23.692,-22.662l23.691,22.661c0.398,0.382 0.413,1.015 0.031,1.414c-0.196,0.205 -0.458,0.309 -0.722,0.309z"
-                  Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></Path>
-                <Path Data="m39,12.384c-0.553,0 -1,-0.448 -1,-1l0,-6l-6,0c-0.553,0 -1,-0.448 -1,-1s0.447,-1 1,-1l8,0l0,8c0,0.552 -0.447,1 -1,1z"
-                  Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></Path>
-            </Grid>
-            <Ellipse Fill="Transparent" MouseEnter="Ellipse_MouseEnter" MouseLeave="Ellipse_MouseLeave" MouseLeftButtonDown="Ellipse_MouseLeftButtonDown"></Ellipse>
-        </Grid>
-    </Viewbox>
+    <Grid>
+        <local:CircularButton Foreground="{DynamicResource MahApps.Brushes.ThemeForeground}"
+                               Highlight="{DynamicResource MahApps.Brushes.Accent}"
+                               Clicked="HighlightButton_Clicked">
+            <local:CircularButton.Content>
+                <Viewbox Stretch="Fill">
+                    <Grid>
+                        <Path Data="m42,45.384l-14,0l0,-13l-8,0l0,13l-14,0l0,-21c0,-0.552 0.447,-1 1,-1s1,0.448 1,1l0,19l10,0l0,-13l12,0l0,13l10,0l0,-18c0,-0.552 0.447,-1 1,-1s1,0.448 1,1l0,20z"
+                            Fill="{DynamicResource MahApps.Brushes.ThemeForeground}"></Path>
+                        <Path Data="m47,24.384c-0.249,0 -0.497,-0.092 -0.691,-0.277l-22.309,-21.339l-22.309,21.339c-0.399,0.381 -1.032,0.368 -1.414,-0.031c-0.382,-0.399 -0.367,-1.032 0.031,-1.414l23.692,-22.662l23.691,22.661c0.398,0.382 0.413,1.015 0.031,1.414c-0.196,0.205 -0.458,0.309 -0.722,0.309z"
+                            Fill="{DynamicResource MahApps.Brushes.ThemeForeground}"></Path>
+                        <Path Data="m39,12.384c-0.553,0 -1,-0.448 -1,-1l0,-6l-6,0c-0.553,0 -1,-0.448 -1,-1s0.447,-1 1,-1l8,0l0,8c0,0.552 -0.447,1 -1,1z"
+                            Fill="{DynamicResource MahApps.Brushes.ThemeForeground}"></Path>
+                    </Grid>
+                </Viewbox>
+            </local:CircularButton.Content>
+        </local:CircularButton>
+    </Grid>
 </UserControl>

Daybreak/Controls/Buttons/HomeButton.xaml.cs

@@ -1,37 +1,22 @@
 using System;
 using System.Windows.Controls;
-using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls.Buttons;
+
+/// <summary>
+/// Interaction logic for HomeButton.xaml
+/// </summary>
+public partial class HomeButton : UserControl
 {
-    /// <summary>
-    /// Interaction logic for HomeButton.xaml
-    /// </summary>
-    public partial class HomeButton : UserControl
+    public event EventHandler? Clicked;
+
+    public HomeButton()
     {
-        public event EventHandler Clicked;
+        this.InitializeComponent();
+    }
 
-        public HomeButton()
-        {
-            this.InitializeComponent();
-        }
-
-        private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Opacity = 0.6;
-        }
-
-        private void Ellipse_MouseLeave(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Opacity = 0;
-        }
-
-        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                Clicked?.Invoke(this, e);
-            }
-        }
+    private void HighlightButton_Clicked(object sender, EventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
     }
 }

Daybreak/Controls/Buttons/MaximizeButton.xaml

@@ -1,39 +1,31 @@
-<UserControl x:Class="Daybreak.Controls.MaximizeButton"
+<UserControl x:Class="Daybreak.Controls.Buttons.MaximizeButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Daybreak.Controls"
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
              x:Name="_this"
+             Cursor="Hand"
              mc:Ignorable="d" 
              d:DesignHeight="50" d:DesignWidth="50">
     <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.3*" />
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="0.3*" />
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="0.3*" />
-            <RowDefinition Height="1*" />
-            <RowDefinition Height="0.3*" />
-        </Grid.RowDefinitions>
-        <Ellipse x:Name="BackgroundEllipse" Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                 Opacity="0.6" Visibility="Hidden" Grid.RowSpan="3" Grid.ColumnSpan="3"></Ellipse>
-        <Viewbox Grid.Row="1" Grid.Column="1">
-            <Grid>
-                <Path Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                      Data="m30,0l-24,0a5.9966,5.9966 0 0 0 -6,6l0,24a6,6 0 0 0 12,0l0,-18l18,0a6,6 0 0 0 0,-12z"></Path>
-                <Path Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                      Data="m90,0l-24,0a6,6 0 0 0 0,12l18,0l0,18a6,6 0 0 0 12,0l0,-24a5.9966,5.9966 0 0 0 -6,-6z"></Path>
-                <Path Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                      Data="m30,84l-18,0l0,-18a6,6 0 0 0 -12,0l0,24a5.9966,5.9966 0 0 0 6,6l24,0a6,6 0 0 0 0,-12z"></Path>
-                <Path Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                      Data="m90,60a5.9966,5.9966 0 0 0 -6,6l0,18l-18,0a6,6 0 0 0 0,12l24,0a5.9966,5.9966 0 0 0 6,-6l0,-24a5.9966,5.9966 0 0 0 -6,-6z"></Path>
-            </Grid>
-        </Viewbox>
-        <Ellipse Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" StrokeThickness="1" Fill="Transparent"
-                 MouseEnter="Ellipse_MouseEnter" MouseLeave="Ellipse_MouseLeave" MouseLeftButtonDown="Ellipse_MouseLeftButtonDown"
-                 Grid.RowSpan="3" Grid.ColumnSpan="3"></Ellipse>
+        <local:CircularButton Foreground="{DynamicResource MahApps.Brushes.ThemeForeground}"
+                               Highlight="{DynamicResource MahApps.Brushes.Accent}"
+                               Clicked="HighlightButton_Clicked">
+            <local:CircularButton.Content>
+                <Viewbox Stretch="Fill" Width="60" Height="60">
+                    <Grid Width="130" Height="130" Margin="35, 35, 0, 0">
+                        <Path Fill="{DynamicResource MahApps.Brushes.ThemeForeground}"
+                            Data="m30,0l-24,0a5.9966,5.9966 0 0 0 -6,6l0,24a6,6 0 0 0 12,0l0,-18l18,0a6,6 0 0 0 0,-12z"></Path>
+                        <Path Fill="{DynamicResource MahApps.Brushes.ThemeForeground}"
+                            Data="m90,0l-24,0a6,6 0 0 0 0,12l18,0l0,18a6,6 0 0 0 12,0l0,-24a5.9966,5.9966 0 0 0 -6,-6z"></Path>
+                        <Path Fill="{DynamicResource MahApps.Brushes.ThemeForeground}"
+                            Data="m30,84l-18,0l0,-18a6,6 0 0 0 -12,0l0,24a5.9966,5.9966 0 0 0 6,6l24,0a6,6 0 0 0 0,-12z"></Path>
+                        <Path Fill="{DynamicResource MahApps.Brushes.ThemeForeground}"
+                            Data="m90,60a5.9966,5.9966 0 0 0 -6,6l0,18l-18,0a6,6 0 0 0 0,12l24,0a5.9966,5.9966 0 0 0 6,-6l0,-24a5.9966,5.9966 0 0 0 -6,-6z"></Path>
+                    </Grid>
+                </Viewbox>
+            </local:CircularButton.Content>
+        </local:CircularButton>
     </Grid>
 </UserControl>

Daybreak/Controls/Buttons/MaximizeButton.xaml.cs

@@ -1,37 +1,22 @@
 using System;
 using System.Windows.Controls;
-using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls.Buttons;
+
+/// <summary>
+/// Interaction logic for SaveButton.xaml
+/// </summary>
+public partial class MaximizeButton : UserControl
 {
-    /// <summary>
-    /// Interaction logic for SaveButton.xaml
-    /// </summary>
-    public partial class MaximizeButton : UserControl
+    public event EventHandler? Clicked;
+
+    public MaximizeButton()
     {
-        public event EventHandler Clicked;
+        this.InitializeComponent();
+    }
 
-        public MaximizeButton()
-        {
-            this.InitializeComponent();
-        }
-
-        private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Visibility = System.Windows.Visibility.Visible;
-        }
-
-        private void Ellipse_MouseLeave(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Visibility = System.Windows.Visibility.Hidden;
-        }
-
-        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                Clicked?.Invoke(this, e);
-            }
-        }
+    private void HighlightButton_Clicked(object sender, EventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
     }
 }

Daybreak/Controls/Buttons/MenuButton.xaml

@@ -0,0 +1,44 @@
+<UserControl x:Class="Daybreak.Controls.Buttons.MenuButton"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:behaviors="clr-namespace:Daybreak.Behaviors"
+             xmlns:converters="clr-namespace:Daybreak.Converters"
+             x:Name="_this"
+             Cursor="Hand"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <converters:MenuButtonHighlightConverter x:Key="HighlightConverter"></converters:MenuButtonHighlightConverter>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="auto"></ColumnDefinition>
+            <ColumnDefinition Width="*"></ColumnDefinition>
+        </Grid.ColumnDefinitions>
+        <Rectangle
+            Fill="{Binding ElementName=_this, Path=HighlightColor, Mode=OneWay}"
+            Opacity="{Binding ElementName=_this, Path=Highlighted, Converter={StaticResource HighlightConverter}}"
+            Grid.ColumnSpan="2">
+        </Rectangle>
+        <ContentPresenter Margin="5"
+                          HorizontalAlignment="{Binding ElementName=_this, Path=HorizontalContentAlignment, Mode=OneWay}"
+                          VerticalAlignment="{Binding ElementName=_this, Path=VerticalContentAlignment, Mode=OneWay}"
+                          Content="{Binding ElementName=_this, Path=InnerContent, Mode=OneWay}" />
+        <TextBlock Grid.Column="1" 
+                   Text="{Binding ElementName=_this, Path=Title, Mode=OneWay}" 
+                   FontSize="{Binding ElementName=_this, Path=FontSize, Mode=OneWay}"
+                   FontFamily="{Binding ElementName=_this, Path=FontFamily, Mode=OneWay}"
+                   Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                   VerticalAlignment="Center" HorizontalAlignment="Stretch" TextWrapping="Wrap"
+                   TextAlignment="Left" />
+        <Rectangle Fill="Transparent"
+                   MouseEnter="Grid_MouseEnter" 
+                   MouseLeave="Grid_MouseLeave"
+                   MouseLeftButtonDown="Rectangle_MouseLeftButtonDown"
+                   Grid.ColumnSpan="2" />
+    </Grid>
+</UserControl>

Daybreak/Controls/Buttons/MenuButton.xaml.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Windows.Extensions;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Input;
+
+namespace Daybreak.Controls.Buttons;
+
+/// <summary>
+/// Interaction logic for MenuButton.xaml
+/// </summary>
+public partial class MenuButton : UserControl
+{
+    public event EventHandler? Clicked;
+
+    [GenerateDependencyProperty]
+    private bool highlighted;
+    [GenerateDependencyProperty]
+    private Brush highlightColor = default!;
+    [GenerateDependencyProperty]
+    private FrameworkElement innerContent = default!;
+    [GenerateDependencyProperty(InitialValue = "")]
+    private string title = string.Empty;
+    [GenerateDependencyProperty]
+    private HorizontalAlignment horizontalContentAlignment = HorizontalAlignment.Left;
+    [GenerateDependencyProperty]
+    private VerticalAlignment verticalContentAlignment = VerticalAlignment.Top;
+
+    public MenuButton()
+    {
+        this.InitializeComponent();
+    }
+
+    private void Grid_MouseEnter(object sender, MouseEventArgs e)
+    {
+        this.Highlighted = true;
+    }
+
+    private void Grid_MouseLeave(object sender, MouseEventArgs e)
+    {
+        this.Highlighted = false;
+    }
+
+    private void Rectangle_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
+    }
+}

Daybreak/Controls/Buttons/MinusButton.xaml

@@ -1,20 +1,25 @@
-<UserControl x:Class="Daybreak.Controls.MinusButton"
+<UserControl x:Class="Daybreak.Controls.Buttons.MinusButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Daybreak.Controls"
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
              mc:Ignorable="d"
              x:Name="_this"
+             Cursor="Hand"
              d:DesignHeight="450" d:DesignWidth="800">
-    <Viewbox>
-        <Grid>
-            <Ellipse x:Name="BackgroundEllipse" Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Visibility="Visible" Opacity="0.1" />
-            <Path Data="m13,26a13,13 0 1 1 13,-13a13,13 0 0 1 -13,13zm0,-24a11,11 0 1 0 11,11a11,11 0 0 0 -11,-11z"
-                  Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></Path>
-            <Path Data="m19,14l-12,0a1,1 0 0 1 0,-2l12,0a1,1 0 0 1 0,2z"
-                  Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></Path>
-            <Ellipse Fill="Transparent" MouseEnter="Ellipse_MouseEnter" MouseLeave="Ellipse_MouseLeave" MouseLeftButtonDown="Ellipse_MouseLeftButtonDown"></Ellipse>
-        </Grid>
-    </Viewbox>
+    <Grid>
+        <local:CircularButton Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"
+                               Highlight="{StaticResource MahApps.Brushes.Accent}"
+                               Clicked="HighlightButton_Clicked">
+            <local:CircularButton.Content>
+                <Viewbox Stretch="Fill" Width="60" Height="60">
+                    <Grid Width="25" Height="25">
+                        <Path Data="m19,14l-12,0a1,1 0 0 1 0,-2l12,0a1,1 0 0 1 0,2z"
+                            Fill="{StaticResource MahApps.Brushes.ThemeForeground}"></Path>
+                    </Grid>
+                </Viewbox>
+            </local:CircularButton.Content>
+        </local:CircularButton>
+    </Grid>
 </UserControl>

Daybreak/Controls/Buttons/MinusButton.xaml.cs

@@ -1,37 +1,22 @@
 using System;
 using System.Windows.Controls;
-using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls.Buttons;
+
+/// <summary>
+/// Interaction logic for AddButton.xaml
+/// </summary>
+public partial class MinusButton : UserControl
 {
-    /// <summary>
-    /// Interaction logic for AddButton.xaml
-    /// </summary>
-    public partial class MinusButton : UserControl
+    public event EventHandler? Clicked;
+
+    public MinusButton()
     {
-        public event EventHandler Clicked;
+        this.InitializeComponent();
+    }
 
-        public MinusButton()
-        {
-            this.InitializeComponent();
-        }
-
-        private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Opacity = 0.6;
-        }
-
-        private void Ellipse_MouseLeave(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Opacity = 0;
-        }
-
-        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                Clicked?.Invoke(this, e);
-            }
-        }
+    private void HighlightButton_Clicked(object sender, EventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
     }
 }

Daybreak/Controls/Buttons/OpaqueButton.xaml

@@ -1,32 +0,0 @@
-<UserControl x:Class="Daybreak.Controls.OpaqueButton"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Daybreak.Controls"
-             mc:Ignorable="d"
-             x:Name="_this"
-             d:DesignHeight="450" d:DesignWidth="800">
-    <UserControl.Resources>
-        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"></BooleanToVisibilityConverter>
-    </UserControl.Resources>
-    <Grid>
-        <Rectangle Fill="{Binding ElementName=_this, Path=TransparentBackground, Mode=OneWay}"
-                   Opacity="{Binding ElementName=_this, Path=BackgroundOpacity, Mode=OneWay}"></Rectangle>
-        <TextBlock Background="Transparent" Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                   Text="{Binding ElementName=_this, Path=Text, Mode=OneWay}"
-                   FontSize="{Binding ElementName=_this, Path=FontSize, Mode=OneWay}"
-                   FontFamily="{Binding ElementName=_this, Path=FontFamily, Mode=OneWay}"
-                   FontStretch="{Binding ElementName=_this, Path=FontStretch, Mode=OneWay}"
-                   FontWeight="{Binding ElementName=_this, Path=FontWeight, Mode=OneWay}"
-                   FontStyle="{Binding ElementName=_this, Path=FontStyle, Mode=OneWay}"
-                   VerticalAlignment="Center"
-                   HorizontalAlignment="Center"></TextBlock>
-        <Rectangle Fill="{Binding ElementName=_this, Path=Highlight, Mode=OneWay}"
-                   Opacity="{Binding ElementName=_this, Path=HighlightOpacity, Mode=OneWay}"
-                   Visibility="{Binding ElementName=_this, Path=HighlightVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}"></Rectangle>
-        <Rectangle MouseEnter="Rectangle_MouseEnter" MouseLeave="Rectangle_MouseLeave"
-                   MouseLeftButtonDown="Rectangle_MouseLeftButtonDown" Fill="Transparent"
-                   Cursor="Hand"></Rectangle>
-    </Grid>
-</UserControl>

Daybreak/Controls/Buttons/OpaqueButton.xaml.cs

@@ -1,91 +0,0 @@
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Extensions;
-using System.Windows.Input;
-using System.Windows.Media;
-
-namespace Daybreak.Controls
-{
-    /// <summary>
-    /// Interaction logic for OpaqueButton.xaml
-    /// </summary>
-    public partial class OpaqueButton : UserControl
-    {
-        public static readonly DependencyProperty TextProperty =
-            DependencyPropertyExtensions.Register<OpaqueButton, string>(nameof(Text));
-
-        public static readonly DependencyProperty TransparentBackgroundProperty =
-            DependencyPropertyExtensions.Register<OpaqueButton, Brush>(nameof(TransparentBackground));
-
-        public static readonly DependencyProperty HighlightProperty =
-            DependencyPropertyExtensions.Register<OpaqueButton, Brush>(nameof(Highlight));
-
-        public static readonly DependencyProperty BackgroundOpacityProperty =
-            DependencyPropertyExtensions.Register<OpaqueButton, double>(nameof(BackgroundOpacity));
-
-        public static readonly DependencyProperty HighlightOpacityProperty =
-            DependencyPropertyExtensions.Register<OpaqueButton, double>(nameof(HighlightOpacity));
-
-        public static readonly DependencyProperty HighlightVisibleProperty =
-            DependencyPropertyExtensions.Register<OpaqueButton, bool>(nameof(HighlightVisible));
-
-        public event EventHandler Clicked;
-
-        public string Text
-        {
-            get => this.GetTypedValue<string>(TextProperty);
-            set => this.SetTypedValue(TextProperty, value);
-        }
-
-        public Brush TransparentBackground
-        {
-            get => this.GetTypedValue<Brush>(TransparentBackgroundProperty);
-            set => this.SetTypedValue(TransparentBackgroundProperty, value);
-        }
-
-        public Brush Highlight
-        {
-            get => this.GetTypedValue<Brush>(HighlightProperty);
-            set => this.SetTypedValue(HighlightProperty, value);
-        }
-
-        public double BackgroundOpacity
-        {
-            get => this.GetTypedValue<double>(BackgroundOpacityProperty);
-            set => this.SetTypedValue(BackgroundOpacityProperty, value);
-        }
-
-        public double HighlightOpacity
-        {
-            get => this.GetTypedValue<double>(HighlightOpacityProperty);
-            set => this.SetTypedValue(HighlightOpacityProperty, value);
-        }
-
-        public bool HighlightVisible
-        {
-            get => this.GetTypedValue<bool>(HighlightVisibleProperty);
-            set => this.SetTypedValue(HighlightVisibleProperty, value);
-        }
-
-        public OpaqueButton()
-        {
-            this.InitializeComponent();
-        }
-
-        private void Rectangle_MouseEnter(object sender, MouseEventArgs e)
-        {
-            this.HighlightVisible = true;
-        }
-
-        private void Rectangle_MouseLeave(object sender, MouseEventArgs e)
-        {
-            this.HighlightVisible = false;
-        }
-
-        private void Rectangle_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            this.Clicked?.Invoke(this, e);
-        }
-    }
-}

Daybreak/Controls/Buttons/RefreshButton.xaml

@@ -0,0 +1,21 @@
+<UserControl x:Class="Daybreak.Controls.Buttons.RefreshButton"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
+             xmlns:glyphs="clr-namespace:Daybreak.Controls.Glyphs"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <local:CircularButton Foreground="{DynamicResource MahApps.Brushes.ThemeForeground}"
+                               Highlight="{DynamicResource MahApps.Brushes.Accent}"
+                               Clicked="HighlightButton_Clicked">
+            <local:CircularButton.Content>
+                <Viewbox Width="60" Height="60">
+                    <glyphs:RefreshGlyph Foreground="{DynamicResource MahApps.Brushes.ThemeForeground}" Margin="0, 60, 60, 120"></glyphs:RefreshGlyph>
+                </Viewbox>
+            </local:CircularButton.Content>
+        </local:CircularButton>
+    </Grid>
+</UserControl>

Daybreak/Controls/Buttons/RefreshButton.xaml.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Windows.Controls;
+
+namespace Daybreak.Controls.Buttons;
+/// <summary>
+/// Interaction logic for RefreshButton.xaml
+/// </summary>
+public partial class RefreshButton : UserControl
+{
+    public event EventHandler? Clicked;
+
+    public RefreshButton()
+    {
+        this.InitializeComponent();
+    }
+
+    private void HighlightButton_Clicked(object sender, EventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
+    }
+}

Daybreak/Controls/Buttons/SaveButton.xaml

@@ -1,28 +1,33 @@
-<UserControl x:Class="Daybreak.Controls.SaveButton"
+<UserControl x:Class="Daybreak.Controls.Buttons.SaveButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Daybreak.Controls"
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
              x:Name="_this"
+             Cursor="Hand"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
-    <Viewbox>
-        <Grid>
-            <Ellipse x:Name="BackgroundEllipse" Fill="{Binding ElementName=_this, Path=Foreground}"
-                     Opacity="0.6" Visibility="Hidden"></Ellipse>
-            <Path Data="m76.996,0l-3.385,0l-38.651,0l-29.759,0c-2.868,0 -5.201,2.333 -5.201,5.201l0,75.6c0,2.866 2.333,5.199 5.201,5.199l3.199,0l69.061,0l3.34,0c2.867,0 5.199,-2.333 5.199,-5.199l0,-71.796l-9.004,-9.005zm-5.385,2l0,15.802c0,1.764 -1.436,3.198 -3.199,3.198l-29.25,0c-1.766,0 -3.202,-1.435 -3.202,-3.198l0,-15.802l35.651,0zm-61.211,82l0,-45.251c0,-1.764 1.437,-3.199 3.201,-3.199l58.66,0c1.764,0 3.199,1.435 3.199,3.199l0,45.251l-65.06,0zm73.6,-3.199c0,1.764 -1.436,3.199 -3.199,3.199l-3.34,0l0,-45.251c0,-2.867 -2.332,-5.199 -5.199,-5.199l-58.66,0c-2.868,0 -5.201,2.333 -5.201,5.199l0,45.251l-3.199,0c-1.765,0 -3.202,-1.435 -3.202,-3.199l0,-75.6c0,-1.765 1.437,-3.201 3.201,-3.201l28.759,0l0,15.802c0,2.866 2.334,5.198 5.202,5.198l29.25,0c2.867,0 5.199,-2.332 5.199,-5.198l0,-15.802l2.557,0l7.832,7.833l0,70.968z"
-                    Stroke="{Binding ElementName=_this, Path=Foreground}" StrokeThickness="3" Margin="22"/>
-            <Rectangle Stroke="{Binding ElementName=_this, Path=Foreground}" Margin="84.352, 25.201, 0, 0" 
-                    VerticalAlignment="Top" HorizontalAlignment="Left" StrokeThickness="3" Width="4.209" Height="12.473" />
-            <Rectangle Stroke="{Binding ElementName=_this, Path=Foreground}" Margin="39.375, 67.25, 0, 0" 
-                    VerticalAlignment="Top" HorizontalAlignment="Left" StrokeThickness="3" Width="47.25" Height="3" />
-            <Rectangle Stroke="{Binding ElementName=_this, Path=Foreground}" Margin="39.375, 76.875, 0, 0" 
-                    VerticalAlignment="Top" HorizontalAlignment="Left" StrokeThickness="3" Width="47.25" Height="3" />
-            <Rectangle Stroke="{Binding ElementName=_this, Path=Foreground}" Margin="39.375, 85.625, 0, 0" 
-                    VerticalAlignment="Top" HorizontalAlignment="Left" StrokeThickness="3" Width="47.25" Height="3" />
-            <Ellipse Stroke="{Binding ElementName=_this, Path=Foreground}" Width="128" Height="128" StrokeThickness="8" Fill="Transparent"
-                     MouseEnter="Ellipse_MouseEnter" MouseLeave="Ellipse_MouseLeave" MouseLeftButtonDown="Ellipse_MouseLeftButtonDown"></Ellipse>
-        </Grid>
-    </Viewbox>
+    <Grid>
+        <local:CircularButton Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"
+                               Highlight="{StaticResource MahApps.Brushes.Accent}"
+                               Clicked="HighlightButton_Clicked">
+            <local:CircularButton.Content>
+                <Viewbox Stretch="Fill" Width="60" Height="60">
+                    <Grid Width="150" Height="150" Margin="20, 20, 0, 0">
+                        <Path Data="m76.996,0l-3.385,0l-38.651,0l-29.759,0c-2.868,0 -5.201,2.333 -5.201,5.201l0,75.6c0,2.866 2.333,5.199 5.201,5.199l3.199,0l69.061,0l3.34,0c2.867,0 5.199,-2.333 5.199,-5.199l0,-71.796l-9.004,-9.005zm-5.385,2l0,15.802c0,1.764 -1.436,3.198 -3.199,3.198l-29.25,0c-1.766,0 -3.202,-1.435 -3.202,-3.198l0,-15.802l35.651,0zm-61.211,82l0,-45.251c0,-1.764 1.437,-3.199 3.201,-3.199l58.66,0c1.764,0 3.199,1.435 3.199,3.199l0,45.251l-65.06,0zm73.6,-3.199c0,1.764 -1.436,3.199 -3.199,3.199l-3.34,0l0,-45.251c0,-2.867 -2.332,-5.199 -5.199,-5.199l-58.66,0c-2.868,0 -5.201,2.333 -5.201,5.199l0,45.251l-3.199,0c-1.765,0 -3.202,-1.435 -3.202,-3.199l0,-75.6c0,-1.765 1.437,-3.201 3.201,-3.201l28.759,0l0,15.802c0,2.866 2.334,5.198 5.202,5.198l29.25,0c2.867,0 5.199,-2.332 5.199,-5.198l0,-15.802l2.557,0l7.832,7.833l0,70.968z"
+                            Stroke="{StaticResource MahApps.Brushes.ThemeForeground}" StrokeThickness="3" Margin="22"/>
+                        <Rectangle Stroke="{StaticResource MahApps.Brushes.ThemeForeground}" Margin="84.352, 25.201, 0, 0" 
+                            VerticalAlignment="Top" HorizontalAlignment="Left" StrokeThickness="3" Width="4.209" Height="12.473" />
+                        <Rectangle Stroke="{StaticResource MahApps.Brushes.ThemeForeground}" Margin="39.375, 67.25, 0, 0" 
+                            VerticalAlignment="Top" HorizontalAlignment="Left" StrokeThickness="3" Width="47.25" Height="3" />
+                        <Rectangle Stroke="{StaticResource MahApps.Brushes.ThemeForeground}" Margin="39.375, 76.875, 0, 0" 
+                            VerticalAlignment="Top" HorizontalAlignment="Left" StrokeThickness="3" Width="47.25" Height="3" />
+                        <Rectangle Stroke="{StaticResource MahApps.Brushes.ThemeForeground}" Margin="39.375, 85.625, 0, 0" 
+                            VerticalAlignment="Top" HorizontalAlignment="Left" StrokeThickness="3" Width="47.25" Height="3" />
+                    </Grid>
+                </Viewbox>
+            </local:CircularButton.Content>
+        </local:CircularButton>
+    </Grid>
 </UserControl>

Daybreak/Controls/Buttons/SaveButton.xaml.cs

@@ -1,37 +1,22 @@
 using System;
 using System.Windows.Controls;
-using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls.Buttons;
+
+/// <summary>
+/// Interaction logic for SaveButton.xaml
+/// </summary>
+public partial class SaveButton : UserControl
 {
-    /// <summary>
-    /// Interaction logic for SaveButton.xaml
-    /// </summary>
-    public partial class SaveButton : UserControl
+    public event EventHandler? Clicked;
+
+    public SaveButton()
     {
-        public event EventHandler Clicked;
+        this.InitializeComponent();
+    }
 
-        public SaveButton()
-        {
-            this.InitializeComponent();
-        }
-
-        private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Visibility = System.Windows.Visibility.Visible;
-        }
-
-        private void Ellipse_MouseLeave(object sender, MouseEventArgs e)
-        {
-            this.BackgroundEllipse.Visibility = System.Windows.Visibility.Hidden;
-        }
-
-        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                Clicked?.Invoke(this, e);
-            }
-        }
+    private void HighlightButton_Clicked(object sender, EventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
     }
 }

Daybreak/Controls/Buttons/StarButton.xaml

@@ -0,0 +1,23 @@
+<UserControl x:Class="Daybreak.Controls.Buttons.StarButton"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
+             xmlns:glyphs="clr-namespace:Daybreak.Controls.Glyphs"
+             x:Name="_this"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <local:CircularButton Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"
+                               Highlight="{StaticResource MahApps.Brushes.Accent}"
+                               Clicked="HighlightButton_Clicked">
+            <local:CircularButton.Content>
+                <Viewbox Stretch="Fill" Width="60" Height="60">
+                    <glyphs:StarGlyph Foreground="{StaticResource MahApps.Brushes.ThemeForeground}" Margin="10"
+                                      IsEnabled="{Binding ElementName=_this, Path=IsEnabled, Mode=OneWay}"></glyphs:StarGlyph>
+                </Viewbox>
+            </local:CircularButton.Content>
+        </local:CircularButton>
+    </Grid>
+</UserControl>

Daybreak/Controls/Buttons/StarButton.xaml.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Windows.Controls;
+
+namespace Daybreak.Controls.Buttons;
+/// <summary>
+/// Interaction logic for StarButton.xaml
+/// </summary>
+public partial class StarButton : UserControl
+{
+    public event EventHandler? Clicked;
+
+    public StarButton()
+    {
+        this.InitializeComponent();
+    }
+
+    private void HighlightButton_Clicked(object sender, EventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
+    }
+}

Daybreak/Controls/Buttons/SynchronizeButton.xaml

@@ -1,36 +1,40 @@
-<UserControl x:Class="Daybreak.Controls.SynchronizeButton"
+<UserControl x:Class="Daybreak.Controls.Buttons.SynchronizeButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Daybreak.Controls"
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
              mc:Ignorable="d"
              x:Name="_this"
+             Cursor="Hand"
              d:DesignHeight="450" d:DesignWidth="800">
-    <Viewbox>
-        <Grid>
-            <Ellipse x:Name="BackgroundEllipse" Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Visibility="Visible" Opacity="0.1" Width="35" Height="35" />
-            <Ellipse Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" 
-                     StrokeThickness="3"/>
-            <Grid VerticalAlignment="Center"
-                  HorizontalAlignment="Center">
-                <Path Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                      StrokeThickness="1.5"
-                      Data="m19,15.6073c1.4937,-0.5852 3,-1.9184 3,-4.6073c0,-4 -3.3333,-5 -5,-5c0,-2 0,-6 -6,-6c-6,0 -6,4 -6,6c-1.66667,0 -5,1 -5,5c0,2.6889 1.50628,4.0221 3,4.6073" />
-                <Path StrokeThickness="1.5"
-                      Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                      Data="m6,17l1.76777,1.7678c1.56214,1.5621 4.09474,1.5621 5.65684,0l0.3536,-0.3536" />
-                <Path StrokeThickness="1.5"
-                      Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                      Data="m6.35355,19.4749l-0.35355,-2.4749l2.47482,0.3536l-2.12127,2.1213z" />
-                <Path StrokeThickness="1.5"
-                      Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                      Data="m14.77821,14.93927l-1.7678,-1.7677c-1.5621,-1.5621 -4.0948,-1.5621 -5.65685,0l-0.35356,0.3535" />
-                <Path StrokeThickness="1.5"
-                      Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                      Data="m14.1213,12l0.3536,2.4749l-2.4749,-0.3536l2.1213,-2.1213z" />
-            </Grid>
-            <Ellipse Fill="Transparent" MouseEnter="Ellipse_MouseEnter" MouseLeave="Ellipse_MouseLeave" MouseLeftButtonDown="Ellipse_MouseLeftButtonDown"></Ellipse>
-        </Grid>
-    </Viewbox>
+    <Grid>
+        <local:CircularButton Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"
+                               Highlight="{StaticResource MahApps.Brushes.Accent}"
+                               Clicked="HighlightButton_Clicked">
+            <local:CircularButton.Content>
+                <Viewbox Stretch="Fill" Width="60" Height="60">
+                    <Grid>
+                        <Grid Width="30" Height="30" Margin="7.5, 7.5, 0, 0">
+                            <Path Stroke="{StaticResource MahApps.Brushes.ThemeForeground}"
+                                StrokeThickness="2"
+                                Data="m19,15.6073c1.4937,-0.5852 3,-1.9184 3,-4.6073c0,-4 -3.3333,-5 -5,-5c0,-2 0,-6 -6,-6c-6,0 -6,4 -6,6c-1.66667,0 -5,1 -5,5c0,2.6889 1.50628,4.0221 3,4.6073" />
+                            <Path StrokeThickness="2"
+                                Stroke="{StaticResource MahApps.Brushes.ThemeForeground}"
+                                Data="m6,17l1.76777,1.7678c1.56214,1.5621 4.09474,1.5621 5.65684,0l0.3536,-0.3536" />
+                            <Path StrokeThickness="2"
+                                Stroke="{StaticResource MahApps.Brushes.ThemeForeground}"
+                                Data="m6.35355,19.4749l-0.35355,-2.4749l2.47482,0.3536l-2.12127,2.1213z" />
+                            <Path StrokeThickness="2"
+                                Stroke="{StaticResource MahApps.Brushes.ThemeForeground}"
+                                Data="m14.77821,14.93927l-1.7678,-1.7677c-1.5621,-1.5621 -4.0948,-1.5621 -5.65685,0l-0.35356,0.3535" />
+                            <Path StrokeThickness="2"
+                                Stroke="{StaticResource MahApps.Brushes.ThemeForeground}"
+                                Data="m14.1213,12l0.3536,2.4749l-2.4749,-0.3536l2.1213,-2.1213z" />
+                        </Grid>
+                    </Grid>
+                </Viewbox>
+            </local:CircularButton.Content>
+        </local:CircularButton>
+    </Grid>
 </UserControl>

Daybreak/Controls/Buttons/SynchronizeButton.xaml.cs

@@ -1,36 +1,22 @@
 using System;
 using System.Windows.Controls;
-using System.Windows.Input;
 
-namespace Daybreak.Controls;
+namespace Daybreak.Controls.Buttons;
 
 /// <summary>
 /// Interaction logic for SynchronizeButton.xaml
 /// </summary>
 public partial class SynchronizeButton : UserControl
 {
-    public event EventHandler Clicked;
+    public event EventHandler? Clicked;
 
     public SynchronizeButton()
     {
         this.InitializeComponent();
     }
 
-    private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
+    private void HighlightButton_Clicked(object sender, EventArgs e)
     {
-        this.BackgroundEllipse.Opacity = 0.6;
-    }
-
-    private void Ellipse_MouseLeave(object sender, MouseEventArgs e)
-    {
-        this.BackgroundEllipse.Opacity = 0;
-    }
-
-    private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-    {
-        if (e.ChangedButton == MouseButton.Left)
-        {
-            this.Clicked?.Invoke(this, e);
-        }
+        this.Clicked?.Invoke(this, e);
     }
 }

Daybreak/Controls/Buttons/TileButton.xaml

@@ -1,45 +0,0 @@
-<UserControl x:Class="Daybreak.Controls.TileButton"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Daybreak.Controls"
-             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-             xmlns:behaviors="clr-namespace:Daybreak.Behaviors"
-             xmlns:converters="clr-namespace:Daybreak.Converters"
-             x:Name="_this"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <UserControl.Resources>
-        <converters:TileButtonHighlightConverter x:Key="HighlightConverter"></converters:TileButtonHighlightConverter>
-    </UserControl.Resources>
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*"></RowDefinition>
-            <RowDefinition Height="auto"></RowDefinition>
-        </Grid.RowDefinitions>
-        <ContentPresenter Margin="5" 
-                          Content="{Binding ElementName=_this, Path=InnerContent}"></ContentPresenter>
-        <Border BorderBrush="{Binding ElementName=_this, Path=BorderBrush}" 
-                BorderThickness="{Binding ElementName=_this, Path=BorderThickness}"
-                Opacity="{Binding ElementName=_this, Path=Highlighted, Converter={StaticResource HighlightConverter}}"
-                Grid.RowSpan="2">
-        </Border>
-        <TextBlock Grid.Row="1" Text="{Binding ElementName=_this, Path=Title}" 
-                   FontSize="{Binding ElementName=_this, Path=FontSize}"
-                   FontFamily="{Binding ElementName=_this, Path=FontFamily}"
-                   Foreground="{Binding ElementName=_this, Path=Foreground}"
-                   VerticalAlignment="Center" HorizontalAlignment="Stretch" TextWrapping="Wrap"
-                   TextAlignment="Center">
-            <i:Interaction.Behaviors>
-                <behaviors:ScaleFontWithSize MaxFontSize="22"></behaviors:ScaleFontWithSize>
-            </i:Interaction.Behaviors>
-        </TextBlock>
-        <Rectangle Fill="Transparent"
-                   MouseEnter="Grid_MouseEnter" 
-                   MouseLeave="Grid_MouseLeave"
-                   MouseLeftButtonDown="Rectangle_MouseLeftButtonDown"
-                   Grid.RowSpan="2">
-        </Rectangle>
-    </Grid>
-</UserControl>

Daybreak/Controls/Buttons/TileButton.xaml.cs

@@ -1,68 +0,0 @@
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-
-namespace Daybreak.Controls
-{
-    /// <summary>
-    /// Interaction logic for TileButton.xaml
-    /// </summary>
-    public partial class TileButton : UserControl
-    {
-        public event EventHandler Clicked;
-
-        public static readonly DependencyProperty HighlightedProperty =
-            DependencyProperty.Register("Highlighted", typeof(bool), typeof(TileButton), null);
-        public static readonly DependencyProperty HighlightColorProperty =
-            DependencyProperty.Register("HighlightColor", typeof(Brush), typeof(TileButton), null);
-        public static readonly DependencyProperty InnerContentProperty =
-            DependencyProperty.Register("InnerContent", typeof(FrameworkElement), typeof(TileButton), null);
-        public static readonly DependencyProperty TitleProperty =
-            DependencyProperty.Register("Title", typeof(string), typeof(TileButton), null);
-
-        public TileButton()
-        {
-            this.InitializeComponent();
-        }
-
-        public bool Highlighted
-        {
-            get => (bool)this.GetValue(HighlightedProperty);
-            set => this.SetValue(HighlightedProperty, value);
-        }
-
-        public string Title
-        {
-            get => this.GetValue(TitleProperty) as string;
-            set => this.SetValue(TitleProperty, value);
-        }
-
-        public FrameworkElement InnerContent
-        {
-            get => this.GetValue(InnerContentProperty) as FrameworkElement;
-            set => this.SetValue(InnerContentProperty, value);
-        }
-
-        public Brush HighlightColor
-        {
-            get => this.GetValue(HighlightColorProperty) as Brush;
-            set => this.SetValue(HighlightColorProperty, value);
-        }
-
-        private void Grid_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
-        {
-            this.Highlighted = true;
-        }
-
-        private void Grid_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
-        {
-            this.Highlighted = false;
-        }
-
-        private void Rectangle_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
-        {
-            Clicked?.Invoke(this, e);
-        }
-    }
-}

Daybreak/Controls/ChromiumBrowserWrapper.xaml

@@ -6,21 +6,27 @@
              xmlns:wv2="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
              xmlns:local="clr-namespace:Daybreak.Controls"
              xmlns:converters="clr-namespace:Daybreak.Converters"
+             xmlns:buttons="clr-namespace:Daybreak.Controls.Buttons"
              mc:Ignorable="d"
+             Loaded="UserControl_Loaded"
              Unloaded="UserControl_Unloaded"
              x:Name="_this"
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
-        <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" TriggerValue="True"></converters:BooleanToVisibilityConverter>
-        <converters:BooleanToVisibilityConverter x:Key="ReverseBooleanToVisibilityConverter" TriggerValue="False"></converters:BooleanToVisibilityConverter>
+        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"></BooleanToVisibilityConverter>
+        <converters:BooleanToVisibilityConverter x:Key="ReverseBooleanToVisibilityConverter" TriggerValue="True"></converters:BooleanToVisibilityConverter>
     </UserControl.Resources>
     <UserControl.ContextMenu>
         <ContextMenu>
             <ContextMenu.Template>
                 <ControlTemplate>
                     <StackPanel Margin="10">
-                        <local:OpaqueButton Text="Load build template" Foreground="White" Background="#F0202020" BackgroundOpacity="0.4"
-                                            Clicked="LoadBuildTemplateButton_Click" FontSize="16" Height="40" Width="200"></local:OpaqueButton>
+                        <buttons:MenuButton Title="Load build template" Foreground="{DynamicResource MahApps.Brushes.ThemeForeground}"
+                                            Background="{DynamicResource MahApps.Brushes.ThemeBackground}"
+                                            HighlightColor="{DynamicResource MahApps.Brushes.Accent}"
+                                            Clicked="LoadBuildTemplateButton_Click" FontSize="16" Height="40" Width="200"
+                                            BorderBrush="{StaticResource MahApps.Brushes.ThemeForeground}"
+                                            BorderThickness="1"></buttons:MenuButton>
                     </StackPanel>
                 </ControlTemplate>
             </ContextMenu.Template>
@@ -31,33 +37,33 @@
             <RowDefinition Height="*"></RowDefinition>
             <RowDefinition Height="auto"></RowDefinition>
         </Grid.RowDefinitions>
-        <wv2:WebView2 x:Name="WebBrowser" Source="{Binding ElementName=_this, Path=Address, Mode=TwoWay}"
-                      IsEnabled="{Binding ElementName=_this, Path=BrowserSupported, Mode=OneWay}"></wv2:WebView2>
-        <Grid Grid.Row="1" Background="#80808080" IsEnabled="{Binding ElementName=_this, Path=BrowserSupported, Mode=OneWay}"
-              Visibility="{Binding ElementName=_this, Path=ControlsEnabled, Mode=OneWay, Converter={StaticResource ReverseBooleanToVisibilityConverter}}">
+        <wv2:WebView2 x:Name="WebBrowser"
+                      Margin="{Binding ElementName=_this, Path=BorderThickness, Mode=OneWay}"
+                      IsEnabled="{Binding ElementName=_this, Path=BrowserSupported, Mode=OneWay}"
+                      Visibility="{Binding ElementName=_this, Path=BrowserEnabled, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}"></wv2:WebView2>
+        <Grid Grid.Row="1" Background="{DynamicResource Daybreak.Brushes.Background}" IsEnabled="{Binding ElementName=_this, Path=BrowserSupported, Mode=OneWay}"
+              Visibility="{Binding ElementName=_this, Path=ControlsEnabled, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="auto"></ColumnDefinition>
                 <ColumnDefinition Width="*"></ColumnDefinition>
                 <ColumnDefinition Width="auto"></ColumnDefinition>
             </Grid.ColumnDefinitions>
             <WrapPanel>
-                <local:BackButton Height="30" Width="30" Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                <buttons:BackButton Height="30" Width="30"
                                   Clicked="BackButton_Clicked" Margin="5" Cursor="Hand"
-                                  IsEnabled="{Binding ElementName=WebBrowser, Path=CanGoBack, Mode=OneWay}"></local:BackButton>
-                <local:BackButton Height="30" Width="30" Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                                  IsEnabled="{Binding ElementName=WebBrowser, Path=CanGoBack, Mode=OneWay}"></buttons:BackButton>
+                <buttons:BackButton Height="30" Width="30"
                                   Clicked="ForwardButton_Clicked" Margin="5" Cursor="Hand"
                                   IsEnabled="{Binding ElementName=WebBrowser, Path=CanGoForward, Mode=OneWay}">
-                    <local:BackButton.RenderTransform>
+                    <buttons:BackButton.RenderTransform>
                         <RotateTransform Angle="180" CenterX="15" CenterY="15"></RotateTransform>
-                    </local:BackButton.RenderTransform>
-                </local:BackButton>
+                    </buttons:BackButton.RenderTransform>
+                </buttons:BackButton>
                 <Grid Height="30" Width="30" Margin="5">
-                    <local:RefreshGlyph Height="30" Width="30" Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                                        Clicked="RefreshGlyph_Clicked" Cursor="Hand"
-                                        Visibility="{Binding ElementName=_this, Path=Navigating, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}"></local:RefreshGlyph>
-                    <local:CancelButton Height="30" Width="30" Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                                        Clicked="CancelGlyph_Clicked" Cursor="Hand"
-                                        Visibility="{Binding ElementName=_this, Path=Navigating, Mode=OneWay, Converter={StaticResource ReverseBooleanToVisibilityConverter}}"></local:CancelButton>
+                    <buttons:RefreshButton Height="30" Width="30" Clicked="RefreshGlyph_Clicked" Cursor="Hand"
+                                        Visibility="{Binding ElementName=_this, Path=Navigating, Mode=OneWay, Converter={StaticResource ReverseBooleanToVisibilityConverter}}"></buttons:RefreshButton>
+                    <buttons:RefreshButton Height="30" Width="30" Clicked="CancelGlyph_Clicked" Cursor="Hand"
+                                        Visibility="{Binding ElementName=_this, Path=Navigating, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}"></buttons:RefreshButton>
                 </Grid>
             </WrapPanel>
             <TextBox Text="{Binding ElementName=_this, Path=Address, Mode=OneWay}" FontSize="16" 
@@ -68,33 +74,40 @@
                      PreviewKeyDown="TextBox_PreviewKeyDown"
                      IsEnabled="{Binding ElementName=_this, Path=BrowserSupported, Mode=OneWay}"></TextBox>
             <StackPanel Grid.Column="2" Orientation="Horizontal">
-                <local:HomeButton Width="30" Height="30" Margin="5"
-                                  Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                                  IsEnabled="{Binding ElementName=_this, Path=BrowserSupported, Mode=OneWay}"
-                                  Clicked="HomeButton_Clicked"></local:HomeButton>
-                <local:StarGlyph Height="30" Width="30" Margin="5"
-                             Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                             IsEnabled="{Binding ElementName=_this, Path=BrowserSupported, Mode=OneWay}"
-                             Clicked="StarGlyph_Clicked" x:Name="FavoriteButton"></local:StarGlyph>
-                <local:MaximizeButton Height="30" Width="30" Margin="5"
-                             Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                             IsEnabled="{Binding ElementName=_this, Path=BrowserSupported, Mode=OneWay}"
-                             Clicked="MaximizeButton_Clicked"></local:MaximizeButton>
+                <buttons:HomeButton Width="30" Height="30" Margin="5"
+                                    Visibility="{Binding ElementName=_this, Path=HomeButtonVisible, Mode=OneWay, Converter={StaticResource ReverseBooleanToVisibilityConverter}}"
+                                    Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                                    IsEnabled="{Binding ElementName=_this, Path=BrowserSupported, Mode=OneWay}"
+                                    Clicked="HomeButton_Clicked"></buttons:HomeButton>
+                <buttons:StarButton Height="30" Width="30" Margin="5"
+                                    Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                                    Visibility="{Binding ElementName=_this, Path=HomeButtonVisible, Mode=OneWay, Converter={StaticResource ReverseBooleanToVisibilityConverter}}"
+                                    IsEnabled="{Binding ElementName=_this, Path=BrowserSupported, Mode=OneWay}"
+                                    Clicked="StarGlyph_Clicked" x:Name="FavoriteButton"></buttons:StarButton>
+                <buttons:MaximizeButton Height="30" Width="30" Margin="5"
+                                    Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                                    IsEnabled="{Binding ElementName=_this, Path=BrowserSupported, Mode=OneWay}"
+                                    Clicked="MaximizeButton_Clicked"></buttons:MaximizeButton>
             </StackPanel>
         </Grid>
-        <Grid Grid.RowSpan="2" Background="Gray"
-              Visibility="{Binding ElementName=_this, Path=BrowserSupported, Mode=OneWay,Converter={StaticResource BooleanToVisibilityConverter}}">
+        <Grid Grid.RowSpan="2" Background="{StaticResource Daybreak.Brushes.Background}"
+              Visibility="{Binding ElementName=_this, Path=BrowserSupported, Mode=OneWay,Converter={StaticResource ReverseBooleanToVisibilityConverter}}">
             <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                <TextBlock Foreground="White" Text="Browser not supported." FontSize="26" TextWrapping="Wrap"></TextBlock>
-                <TextBlock Foreground="White" Text="Download the Evergreen Bootstrapper from here:" FontSize="26" TextWrapping="Wrap" />
+                <TextBlock Foreground="{StaticResource MahApps.Brushes.ThemeForeground}" Text="Browser not supported." FontSize="26" TextWrapping="Wrap"></TextBlock>
+                <TextBlock Foreground="{StaticResource MahApps.Brushes.ThemeForeground}" Text="Download the Evergreen Bootstrapper from here:" FontSize="26" TextWrapping="Wrap" />
                 <TextBox Background="Transparent" BorderBrush="Transparent" BorderThickness="0"
                          Text="https://go.microsoft.com/fwlink/p/?LinkId=2124703"
-                         IsReadOnly="True" Margin="0, 0, 0, 30" FontSize="22" Foreground="Blue"
+                         IsReadOnly="True" Margin="0, 0, 0, 30" FontSize="22" Foreground="{StaticResource MahApps.Brushes.Accent}"
                          PreviewMouseLeftButtonDown="Hyperlink_PreviewMouseLeftButtonDown" Cursor="Hand"
                          TextWrapping="Wrap"></TextBox>
-                <TextBlock Foreground="White" Text="Restart after the installation." FontSize="26" TextWrapping="Wrap" />
+                <TextBlock Foreground="{StaticResource MahApps.Brushes.ThemeForeground}" Text="Restart after the installation." FontSize="26" TextWrapping="Wrap" />
+            </StackPanel>
+        </Grid>
+        <Grid Grid.RowSpan="2" Background="{StaticResource Daybreak.Brushes.Background}"
+              Visibility="{Binding ElementName=_this, Path=ShowBrowserDisabledMessage, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                <TextBlock Foreground="{StaticResource MahApps.Brushes.ThemeForeground}" Text="Browser is disabled." FontSize="26" TextWrapping="Wrap"></TextBlock>
             </StackPanel>
         </Grid>
-        
     </Grid>
 </UserControl>