Alexmacocian/gwca integration (#141)

Setup memory scanner
Setup Focus View
Scan for player information and show in the Focus View
Setup Quest parsing

.github/workflows/cd.yaml

@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        targetplatform: [x64]
+        targetplatform: [x86]
 
     runs-on: windows-latest
 
@@ -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

@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        targetplatform: [x64]
+        targetplatform: [x86]
 
     runs-on: windows-latest
 
@@ -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</Platforms>
   </PropertyGroup>
 
 </Project>

Daybreak.Tests/Daybreak.Tests.csproj

@@ -3,15 +3,16 @@
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
     <IsPackable>false</IsPackable>
+    <Platforms>AnyCPU;x86</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.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
 

Daybreak.Tests/Models/VersionTests.cs

@@ -5,132 +5,131 @@ 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);
+            parsedVersion.VersionTokens.Last().Should().BeOfType<VersionNumberToken>();
         }
+    }
 
-        [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)
+    [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)
         {
-            var success = Version.TryParse(version, out var parsedVersion);
-            success.Should().Be(result);
-            if (success is true)
-            {
-                parsedVersion.Should().NotBeNull();
-            }
+            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)
+    [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)
         {
-            var action = new Action(() => Version.Parse(version));
-            if (shouldNotThrow is false)
-            {
-                action.Should().Throw<InvalidOperationException>();
-            }
-            else
-            {
-                action.Should().NotThrow<InvalidOperationException>();
-            }
+            action.Should().Throw<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)
+        else
         {
-            var action = new Action(() => new Version(version));
-            if (shouldNotThrow is false)
-            {
-                action.Should().Throw<ArgumentException>();
-            }
-            else
-            {
-                action.Should().NotThrow<ArgumentException>();
-            }
+            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>();
         }
     }
 }

Daybreak.Tests/Services/ApplicationConfigurationOptionsManagerTests.cs

@@ -6,58 +6,57 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
 
-namespace Daybreak.Tests.Services
+namespace Daybreak.Tests.Services;
+
+[TestClass]
+public class ApplicationConfigurationOptionsManagerTests
 {
-    [TestClass]
-    public class ApplicationConfigurationOptionsManagerTests
+    private ApplicationConfigurationOptionsManager applicationConfigurationOptionsManager;
+
+    [TestInitialize]
+    public void TestInitialize()
     {
-        private ApplicationConfigurationOptionsManager applicationConfigurationOptionsManager;
+        var configurationManagerMock = new Mock<IConfigurationManager>();
+        configurationManagerMock
+            .Setup(u => u.GetConfiguration())
+            .Returns(new ApplicationConfiguration());
 
-        [TestInitialize]
-        public void TestInitialize()
+        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(() =>
         {
-            var configurationManagerMock = new Mock<IConfigurationManager>();
-            configurationManagerMock
-                .Setup(u => u.GetConfiguration())
-                .Returns(new ApplicationConfiguration());
+            this.applicationConfigurationOptionsManager.GetOptions<object>();
+        });
 
-            this.applicationConfigurationOptionsManager = new ApplicationConfigurationOptionsManager(configurationManagerMock.Object);
-        }
+        action.Should().Throw<InvalidOperationException>();
+    }
 
-        [TestMethod]
-        public void GetApplicationConfiguration_ReturnsObject()
+    [TestMethod]
+    public void UpdateOptions_OnApplicationConfiguration_Succeeds()
+    {
+        this.applicationConfigurationOptionsManager.UpdateOptions(new ApplicationConfiguration());
+    }
+
+    [TestMethod]
+    public void UpdateOptions_OnOthers_ThrowsInvalidOperationException()
+    {
+        var action = new Action(() =>
         {
-            var config = this.applicationConfigurationOptionsManager.GetOptions<ApplicationConfiguration>();
+            this.applicationConfigurationOptionsManager.UpdateOptions(new object());
+        });
 
-            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>();
-        }
+        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[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 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);
+        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

@@ -34,35 +34,35 @@ EndProject
 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|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|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|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|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|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|x86.ActiveCfg = Release|x86
+		{4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

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

@@ -3,41 +3,42 @@ using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 
-namespace Daybreak.Configuration
+namespace Daybreak.Configuration;
+
+public sealed class ApplicationConfiguration
 {
-    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; }
-    }
+    [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; }
+    [JsonProperty("ProtectedGraphRefreshToken")]
+    public string? ProtectedGraphRefreshToken { get; set; }
 }

Daybreak/Configuration/ExperimentalFeatures.cs

@@ -2,23 +2,24 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
 
-namespace Daybreak.Configuration
+namespace Daybreak.Configuration;
+
+public sealed class ExperimentalFeatures
 {
-    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();
-    }
+    [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("FocusViewEnabled")]
+    public bool FocusViewEnabled { get; set; }
+    [JsonProperty("Macros")]
+    public List<KeyMacro> Macros { get; set; } = new();
 }

Daybreak/Configuration/ProjectConfiguration.cs

@@ -11,7 +11,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;
@@ -28,6 +27,10 @@ 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;
 
 namespace Daybreak.Configuration;
 
@@ -44,21 +47,21 @@ public static class ProjectConfiguration
                 .WithMessageHandler(sp =>
                 {
                     var logger = sp.GetService<ILogger<ApplicationUpdater>>();
-                    return new LoggingHttpMessageHandler(logger) { InnerHandler = new HttpClientHandler() };
+                    return new LoggingHttpMessageHandler(logger!) { InnerHandler = new HttpClientHandler() };
                 })
                 .Build()
             .RegisterHttpClient<BloogumClient>()
                 .WithMessageHandler(sp =>
                 {
                     var logger = sp.GetService<ILogger<BloogumClient>>();
-                    return new LoggingHttpMessageHandler(logger) { InnerHandler = new HttpClientHandler() };
+                    return new LoggingHttpMessageHandler(logger!) { InnerHandler = new HttpClientHandler() };
                 })
                 .Build()
             .RegisterHttpClient<GraphClient>()
                 .WithMessageHandler(sp =>
                 {
                     var logger = sp.GetService<ILogger<GraphClient>>();
-                    return new LoggingHttpMessageHandler(logger) { InnerHandler = new HttpClientHandler() };
+                    return new LoggingHttpMessageHandler(logger!) { InnerHandler = new HttpClientHandler() };
                 })
                 .Build();
     }
@@ -69,6 +72,7 @@ public static class ProjectConfiguration
 
         services.AddSingleton<ILogsManager, JsonLogsManager>();
         services.AddSingleton<IDebugLogsWriter, Services.Logging.DebugLogsWriter>();
+        services.AddSingleton<IEventViewerLogsWriter, EventViewerLogsWriter>();
         services.AddSingleton<ILoggerFactory, LoggerFactory>(sp =>
         {
             var factory = new LoggerFactory();
@@ -76,8 +80,9 @@ public static class ProjectConfiguration
             return factory;
         });
         services.AddSingleton<ILogsWriter, CompositeLogsWriter>(sp => new CompositeLogsWriter(
-            sp.GetService<ILogsManager>(),
-            sp.GetService<IDebugLogsWriter>()));
+            sp.GetService<ILogsManager>()!,
+            sp.GetService<IDebugLogsWriter>()!,
+            sp.GetService<IEventViewerLogsWriter>()!));
 
         services.AddScoped((sp) => new ScopeMetadata(new CorrelationVector()));
         services.AddSingleton<ViewManager>();
@@ -87,6 +92,8 @@ public static class ProjectConfiguration
         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<IConfigurationManager, ConfigurationManager>();
         services.AddSingleton<ILiteDatabase, LiteDatabase>(sp => new LiteDatabase("Daybreak.db"));
         services.AddSingleton<IMutexHandler, MutexHandler>();
@@ -103,13 +110,16 @@ public static class ProjectConfiguration
         services.AddScoped<IPrivilegeManager, PrivilegeManager>();
         services.AddScoped<IScreenManager, ScreenManager>();
         services.AddScoped<IGraphClient, GraphClient>();
+        services.AddScoped<IOnboardingService, OnboardingService>();
+        services.AddScoped<IGuildwarsMemoryReader, GuildwarsMemoryReader>();
+        services.AddScoped<IMemoryScanner, MemoryScanner>();
     }
 
     public static void RegisterViews(IViewProducer viewProducer)
     {
         viewProducer.ThrowIfNull();
 
-        viewProducer.RegisterPermanentView<CompanionView>();
+        viewProducer.RegisterPermanentView<LauncherView>();
         viewProducer.RegisterView<SettingsView>();
         viewProducer.RegisterView<AskUpdateView>();
         viewProducer.RegisterView<UpdateView>();
@@ -125,6 +135,8 @@ public static class ProjectConfiguration
         viewProducer.RegisterView<IconDownloadView>();
         viewProducer.RegisterView<GraphAuthorizationView>();
         viewProducer.RegisterView<BuildsSynchronizationView>();
+        viewProducer.RegisterView<OnboardingView>();
+        viewProducer.RegisterView<FocusView>();
     }
 
     public static void RegisterPostUpdateActions(IPostUpdateActionProducer postUpdateActionProducer)

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/Buttons/AddButton.xaml.cs

@@ -2,36 +2,35 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <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_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_MouseLeave(object sender, MouseEventArgs e)
+    private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.ChangedButton == MouseButton.Left)
         {
-            this.BackgroundEllipse.Opacity = 0;
-        }
-
-        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                Clicked?.Invoke(this, e);
-            }
+            Clicked?.Invoke(this, e);
         }
     }
 }

Daybreak/Controls/Buttons/BackButton.xaml.cs

@@ -2,36 +2,35 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <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_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_MouseLeave(object sender, MouseEventArgs e)
+    private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.ChangedButton == MouseButton.Left)
         {
-            this.BackgroundEllipse.Opacity = 0;
-        }
-
-        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                Clicked?.Invoke(this, e);
-            }
+            Clicked?.Invoke(this, e);
         }
     }
 }

Daybreak/Controls/Buttons/BinButton.xaml.cs

@@ -2,35 +2,34 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <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)
+    private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.ChangedButton == MouseButton.Left)
         {
-            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;
+            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;
+    }
 }

Daybreak/Controls/Buttons/CancelButton.xaml.cs

@@ -2,36 +2,35 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <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_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_MouseLeave(object sender, MouseEventArgs e)
+    private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.ChangedButton == MouseButton.Left)
         {
-            this.BackgroundEllipse.Opacity = 0;
-        }
-
-        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                Clicked?.Invoke(this, e);
-            }
+            Clicked?.Invoke(this, e);
         }
     }
 }

Daybreak/Controls/Buttons/FilePickerGlyph.xaml.cs

@@ -2,36 +2,35 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for FilePickerGlyph.xaml
+/// </summary>
+public partial class FilePickerGlyph : UserControl
 {
-    /// <summary>
-    /// Interaction logic for FilePickerGlyph.xaml
-    /// </summary>
-    public partial class FilePickerGlyph : UserControl
+    public event EventHandler? Clicked;
+
+    public FilePickerGlyph()
     {
-        public event EventHandler Clicked;
+        this.InitializeComponent();
+    }
 
-        public FilePickerGlyph()
-        {
-            this.InitializeComponent();
-        }
+    private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
+    {
+        this.BackgroundEllipse.Opacity = 0.6;
+    }
 
-        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_MouseLeave(object sender, MouseEventArgs e)
+    private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.ChangedButton == MouseButton.Left)
         {
-            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/HelpButton.xaml.cs

@@ -2,36 +2,35 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <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_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_MouseLeave(object sender, MouseEventArgs e)
+    private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.ChangedButton == MouseButton.Left)
         {
-            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/HomeButton.xaml.cs

@@ -2,36 +2,35 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <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_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_MouseLeave(object sender, MouseEventArgs e)
+    private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.ChangedButton == MouseButton.Left)
         {
-            this.BackgroundEllipse.Opacity = 0;
-        }
-
-        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                Clicked?.Invoke(this, e);
-            }
+            Clicked?.Invoke(this, e);
         }
     }
 }

Daybreak/Controls/Buttons/MaximizeButton.xaml.cs

@@ -2,36 +2,35 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <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_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_MouseLeave(object sender, MouseEventArgs e)
+    private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.ChangedButton == MouseButton.Left)
         {
-            this.BackgroundEllipse.Visibility = System.Windows.Visibility.Hidden;
-        }
-
-        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                Clicked?.Invoke(this, e);
-            }
+            Clicked?.Invoke(this, e);
         }
     }
 }

Daybreak/Controls/Buttons/MenuButton.xaml.cs

@@ -11,16 +11,16 @@ namespace Daybreak.Controls.Buttons;
 /// </summary>
 public partial class MenuButton : UserControl
 {
-    public event EventHandler Clicked;
+    public event EventHandler? Clicked;
 
     [GenerateDependencyProperty]
     private bool highlighted;
     [GenerateDependencyProperty]
-    private Brush highlightColor;
+    private Brush highlightColor = default!;
     [GenerateDependencyProperty]
-    private FrameworkElement innerContent;
-    [GenerateDependencyProperty]
-    private string title;
+    private FrameworkElement innerContent = default!;
+    [GenerateDependencyProperty(InitialValue = "")]
+    private string title = string.Empty;
 
     public MenuButton()
     {

Daybreak/Controls/Buttons/MinusButton.xaml.cs

@@ -2,36 +2,35 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <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_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_MouseLeave(object sender, MouseEventArgs e)
+    private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.ChangedButton == MouseButton.Left)
         {
-            this.BackgroundEllipse.Opacity = 0;
-        }
-
-        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                Clicked?.Invoke(this, e);
-            }
+            Clicked?.Invoke(this, e);
         }
     }
 }

Daybreak/Controls/Buttons/OpaqueButton.xaml.cs

@@ -5,87 +5,45 @@ using System.Windows.Extensions;
 using System.Windows.Input;
 using System.Windows.Media;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for OpaqueButton.xaml
+/// </summary>
+public partial class OpaqueButton : UserControl
 {
-    /// <summary>
-    /// Interaction logic for OpaqueButton.xaml
-    /// </summary>
-    public partial class OpaqueButton : UserControl
+    public event EventHandler? Clicked;
+
+    [GenerateDependencyProperty(InitialValue = "")]
+    private string text = string.Empty;
+    [GenerateDependencyProperty]
+    private Brush transparentBackground = default!;
+    [GenerateDependencyProperty]
+    private Brush highlight = default!;
+    [GenerateDependencyProperty]
+    public double backgroundOpacity;
+    [GenerateDependencyProperty]
+    public double highlightOpacity;
+    [GenerateDependencyProperty]
+    public bool highlightVisible;
+
+    public OpaqueButton()
     {
-        public static readonly DependencyProperty TextProperty =
-            DependencyPropertyExtensions.Register<OpaqueButton, string>(nameof(Text));
+        this.InitializeComponent();
+    }
 
-        public static readonly DependencyProperty TransparentBackgroundProperty =
-            DependencyPropertyExtensions.Register<OpaqueButton, Brush>(nameof(TransparentBackground));
+    private void Rectangle_MouseEnter(object sender, MouseEventArgs e)
+    {
+        this.HighlightVisible = true;
+    }
 
-        public static readonly DependencyProperty HighlightProperty =
-            DependencyPropertyExtensions.Register<OpaqueButton, Brush>(nameof(Highlight));
+    private void Rectangle_MouseLeave(object sender, MouseEventArgs e)
+    {
+        this.HighlightVisible = false;
+    }
 
-        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);
-        }
+    private void Rectangle_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
     }
 }

Daybreak/Controls/Buttons/SaveButton.xaml.cs

@@ -2,36 +2,35 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <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_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_MouseLeave(object sender, MouseEventArgs e)
+    private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.ChangedButton == MouseButton.Left)
         {
-            this.BackgroundEllipse.Visibility = System.Windows.Visibility.Hidden;
-        }
-
-        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                Clicked?.Invoke(this, e);
-            }
+            Clicked?.Invoke(this, e);
         }
     }
 }

Daybreak/Controls/Buttons/SynchronizeButton.xaml.cs

@@ -9,7 +9,7 @@ namespace Daybreak.Controls;
 /// </summary>
 public partial class SynchronizeButton : UserControl
 {
-    public event EventHandler Clicked;
+    public event EventHandler? Clicked;
 
     public SynchronizeButton()
     {

Daybreak/Controls/Buttons/TileButton.xaml.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Extensions;
 using System.Windows.Media;
 
 namespace Daybreak.Controls;
@@ -10,46 +11,22 @@ namespace Daybreak.Controls;
 /// </summary>
 public partial class TileButton : UserControl
 {
-    public event EventHandler Clicked;
+    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);
+    [GenerateDependencyProperty]
+    public bool highlighted;
+    [GenerateDependencyProperty(InitialValue = "")]
+    public string title = string.Empty;
+    [GenerateDependencyProperty]
+    public FrameworkElement InnerContent = default!;
+    [GenerateDependencyProperty]
+    public Brush HighlightColor = default!;
 
     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;

Daybreak/Controls/ChromiumBrowserWrapper.xaml.cs

@@ -1,6 +1,6 @@
 using Daybreak.Configuration;
 using Daybreak.Models.Browser;
-using Daybreak.Models.Builds;
+using Daybreak.Models.Guildwars;
 using Daybreak.Services.BuildTemplates;
 using Daybreak.Utils;
 using Microsoft.Extensions.DependencyInjection;
@@ -15,332 +15,328 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Extensions;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for ChromiumBrowserWrapper.xaml
+/// </summary>
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Fields used by source generator for DependencyProperty")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
+public partial class ChromiumBrowserWrapper : UserControl
 {
-    /// <summary>
-    /// Interaction logic for ChromiumBrowserWrapper.xaml
-    /// </summary>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Fields used by source generator for DependencyProperty")]
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
-    public partial class ChromiumBrowserWrapper : UserControl
+    public static readonly DependencyProperty AddressProperty =
+        DependencyPropertyExtensions.Register<ChromiumBrowserWrapper, string>(nameof(Address));
+    
+    private const string BrowserDownloadLink = "https://developer.microsoft.com/en-us/microsoft-edge/webview2/";
+
+    private static CoreWebView2Environment? coreWebView2Environment;
+
+    public event EventHandler<string>? FavoriteUriChanged;
+    public event EventHandler? MaximizeClicked;
+    public event EventHandler<Build>? BuildDecoded;
+
+    private ILiveOptions<ApplicationConfiguration>? liveOptions;
+    private ILogger<ChromiumBrowserWrapper>? logger;
+    private IBuildTemplateManager? buildTemplateManager;
+    
+    [GenerateDependencyProperty(InitialValue = true)]
+    private bool canDownloadBuild;
+    [GenerateDependencyProperty(InitialValue = true)]
+    private bool canNavigate;
+    [GenerateDependencyProperty(InitialValue = true)]
+    private bool controlsEnabled;
+    [GenerateDependencyProperty(InitialValue = null)]
+    private bool? browserSupported;
+    [GenerateDependencyProperty]
+    private bool addressBarReadonly;
+    [GenerateDependencyProperty]
+    private bool browserEnabled;
+    [GenerateDependencyProperty]
+    private bool navigating;
+    [GenerateDependencyProperty]
+    private string favoriteAddress = string.Empty;
+    [GenerateDependencyProperty(InitialValue = false)]
+    private bool preventDispose;
+    public string Address
     {
-        public static readonly DependencyProperty AddressProperty =
-            DependencyPropertyExtensions.Register<ChromiumBrowserWrapper, string>(nameof(Address));
-        
-        private const string BrowserDownloadLink = "https://developer.microsoft.com/en-us/microsoft-edge/webview2/";
-
-        private static CoreWebView2Environment coreWebView2Environment;
-
-        public event EventHandler<string> FavoriteUriChanged;
-        public event EventHandler MaximizeClicked;
-        public event EventHandler<Build> BuildDecoded;
-
-        private ILiveOptions<ApplicationConfiguration> liveOptions;
-        private ILogger<ChromiumBrowserWrapper> logger;
-        private IBuildTemplateManager buildTemplateManager;
-        
-        [GenerateDependencyProperty(InitialValue = true)]
-        private bool canDownloadBuild;
-        [GenerateDependencyProperty(InitialValue = true)]
-        private bool canNavigate;
-        [GenerateDependencyProperty(InitialValue = true)]
-        private bool controlsEnabled;
-        [GenerateDependencyProperty(InitialValue = null)]
-        private bool? browserSupported;
-        [GenerateDependencyProperty]
-        private bool addressBarReadonly;
-        [GenerateDependencyProperty]
-        private bool browserEnabled;
-        [GenerateDependencyProperty]
-        private bool navigating;
-        [GenerateDependencyProperty]
-        private string favoriteAddress;
-        [GenerateDependencyProperty(InitialValue = false)]
-        private bool preventDispose;
-        public string Address
-        {
-            get => this.GetTypedValue<string>(AddressProperty);
-            set
-            {
-                if (this.BrowserSupported is true)
-                {
-                    this.SetValue(AddressProperty, value);
-                }
-            }
-        }
-
-        public ChromiumBrowserWrapper()
-        {
-            this.InitializeComponent();
-            this.WebBrowser.IsEnabled = false;
-        }
-
-        protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
-        {
-            base.OnPropertyChanged(e);
-            if (e.Property == AddressProperty || e.Property == FavoriteAddressProperty)
-            {
-                this.CheckFavoriteAddress();
-            }
-        }
-
-        public async Task InitializeDefaultBrowser()
-        {
-            var options = Launch.Launcher.Instance.ApplicationServiceProvider.GetRequiredService<ILiveOptions<ApplicationConfiguration>>();
-            var buildTemplateManager = Launch.Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IBuildTemplateManager>();
-            var logger = Launch.Launcher.Instance.ApplicationServiceProvider.GetRequiredService<ILogger<ChromiumBrowserWrapper>>();
-
-            await this.InitializeDefaultBrowser(options, buildTemplateManager, logger);
-        }
-
-        public async Task InitializeDefaultBrowser(
-            ILiveOptions<ApplicationConfiguration> liveOptions,
-            IBuildTemplateManager buildTemplateManager,
-            ILogger<ChromiumBrowserWrapper> logger)
-        {
-            this.liveOptions = liveOptions;
-            this.buildTemplateManager = buildTemplateManager;
-            this.logger = logger;
-            this.InitializeEnvironment();
-            await this.InitializeBrowser();
-        }
-
-        public async void ReinitializeBrowser()
-        {
-            await this.InitializeBrowser();
-        }
-
-        private void InitializeEnvironment()
-        {
-            if (this.liveOptions.Value.BrowsersEnabled is false)
-            {
-                this.BrowserSupported = false;
-                return;
-            }
-
-            try
-            {
-                if (coreWebView2Environment is null)
-                {
-                    coreWebView2Environment = System.Extensions.TaskExtensions.RunSync(() => CoreWebView2Environment.CreateAsync(null, "BrowserData", null));
-                }
-
-                this.BrowserSupported = true;
-            }
-            catch(Exception e)
-            {
-                this.logger.LogWarning($"Browser initialization failed. Details: {e}");
-                this.BrowserSupported = false;
-            }
-        }
-
-        private async Task InitializeBrowser()
+        get => this.GetTypedValue<string>(AddressProperty);
+        set
         {
             if (this.BrowserSupported is true)
             {
-                this.WebBrowser.IsEnabled = true;
-                this.BrowserEnabled = true;
-                await this.WebBrowser.EnsureCoreWebView2Async(coreWebView2Environment);
-                this.AddressBarReadonly = this.liveOptions.Value.AddressBarReadonly;
-                this.CanDownloadBuild = this.liveOptions.Value.ExperimentalFeatures.DynamicBuildLoading;
-                this.WebBrowser.CoreWebView2.NewWindowRequested += (browser, args) => args.Handled = true;
-                this.WebBrowser.NavigationStarting += (browser, args) =>
+                this.SetValue(AddressProperty, value);
+            }
+        }
+    }
+
+    public ChromiumBrowserWrapper()
+    {
+        this.InitializeComponent();
+        this.WebBrowser.IsEnabled = false;
+    }
+
+    protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
+    {
+        base.OnPropertyChanged(e);
+        if (e.Property == AddressProperty || e.Property == FavoriteAddressProperty)
+        {
+            this.CheckFavoriteAddress();
+        }
+    }
+
+    public async Task InitializeDefaultBrowser()
+    {
+        var options = Launch.Launcher.Instance.ApplicationServiceProvider.GetRequiredService<ILiveOptions<ApplicationConfiguration>>();
+        var buildTemplateManager = Launch.Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IBuildTemplateManager>();
+        var logger = Launch.Launcher.Instance.ApplicationServiceProvider.GetRequiredService<ILogger<ChromiumBrowserWrapper>>();
+
+        await this.InitializeDefaultBrowser(options, buildTemplateManager, logger);
+    }
+
+    public async Task InitializeDefaultBrowser(
+        ILiveOptions<ApplicationConfiguration> liveOptions,
+        IBuildTemplateManager buildTemplateManager,
+        ILogger<ChromiumBrowserWrapper> logger)
+    {
+        this.liveOptions = liveOptions;
+        this.buildTemplateManager = buildTemplateManager;
+        this.logger = logger;
+        this.InitializeEnvironment();
+        await this.InitializeBrowser();
+    }
+
+    public async void ReinitializeBrowser()
+    {
+        await this.InitializeBrowser();
+    }
+
+    private void InitializeEnvironment()
+    {
+        if (this.liveOptions!.Value.BrowsersEnabled is false)
+        {
+            this.BrowserSupported = false;
+            return;
+        }
+
+        try
+        {
+            coreWebView2Environment ??= System.Extensions.TaskExtensions.RunSync(() => CoreWebView2Environment.CreateAsync(null, "BrowserData", null));
+
+            this.BrowserSupported = true;
+        }
+        catch(Exception e)
+        {
+            this.logger!.LogWarning($"Browser initialization failed. Details: {e}");
+            this.BrowserSupported = false;
+        }
+    }
+
+    private async Task InitializeBrowser()
+    {
+        if (this.BrowserSupported is true)
+        {
+            this.WebBrowser.IsEnabled = true;
+            this.BrowserEnabled = true;
+            await this.WebBrowser.EnsureCoreWebView2Async(coreWebView2Environment);
+            this.AddressBarReadonly = this.liveOptions!.Value.AddressBarReadonly;
+            this.CanDownloadBuild = this.liveOptions.Value.ExperimentalFeatures.DynamicBuildLoading;
+            this.WebBrowser.CoreWebView2.NewWindowRequested += (browser, args) => args.Handled = true;
+            this.WebBrowser.NavigationStarting += (browser, args) =>
+            {
+                if (this.CanNavigate is false && args.Uri != this.Address)
                 {
-                    if (this.CanNavigate is false && args.Uri != this.Address)
-                    {
-                        args.Cancel = true;
-                    }
-                    else
-                    {
-                        this.Navigating = true;
-                    }
-                };
-                this.WebBrowser.NavigationCompleted += (browser, args) => this.Navigating = false;
-                this.WebBrowser.WebMessageReceived += this.CoreWebView2_WebMessageReceived;
-                this.WebBrowser.CoreWebView2.Settings.AreDevToolsEnabled = false;
-                this.WebBrowser.CoreWebView2.Settings.AreDefaultContextMenusEnabled = false;
-                if (this.CanDownloadBuild)
-                {
-                    await this.WebBrowser.CoreWebView2.AddScriptToExecuteOnDocumentCreatedAsync(Scripts.SendSelectionOnContextMenu);
+                    args.Cancel = true;
                 }
-            }
-        }
-
-        private async void RetryInitializeButton_Clicked(object sender, EventArgs e)
-        {
-            this.InitializeEnvironment();
-            try
-            {
-                await this.InitializeBrowser();
-            }
-            catch
-            {
-                this.BrowserSupported = false;
-            }
-        }
-
-        private void Hyperlink_PreviewMouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
-        {
-            if (Uri.TryCreate(BrowserDownloadLink, UriKind.Absolute, out var uri))
-            {
-                Process.Start("explorer.exe", uri.ToString());
-            }
-        }
-
-        private void TextBox_PreviewKeyDown(object sender, System.Windows.Input.KeyEventArgs e)
-        {
-            if (e.Key == System.Windows.Input.Key.Enter)
-            {
-                var newAddress = sender.As<TextBox>().Text;
-                newAddress = SanitizeAddress(newAddress);
-                if (newAddress is null)
+                else
                 {
-                    return;
+                    this.Navigating = true;
                 }
-
-                this.Address = newAddress;
-                this.WebBrowser.CoreWebView2.Navigate(this.Address);
-                e.Handled = true;
+            };
+            this.WebBrowser.NavigationCompleted += (browser, args) => this.Navigating = false;
+            this.WebBrowser.WebMessageReceived += this.CoreWebView2_WebMessageReceived!;
+            this.WebBrowser.CoreWebView2.Settings.AreDevToolsEnabled = false;
+            this.WebBrowser.CoreWebView2.Settings.AreDefaultContextMenusEnabled = false;
+            if (this.CanDownloadBuild)
+            {
+                await this.WebBrowser.CoreWebView2.AddScriptToExecuteOnDocumentCreatedAsync(Scripts.SendSelectionOnContextMenu);
             }
         }
+    }
 
-        private void CoreWebView2_WebMessageReceived(object sender, CoreWebView2WebMessageReceivedEventArgs args)
+    private async void RetryInitializeButton_Clicked(object sender, EventArgs e)
+    {
+        this.InitializeEnvironment();
+        try
         {
-            BrowserPayload payload = default;
-            try
-            {
-                payload = args.WebMessageAsJson.Deserialize<BrowserPayload>();
-            }
-            catch(Exception e)
-            {
-                this.logger.LogError(e, $"Exception encountered when deserializing {nameof(BrowserPayload)}");
-            }
-
-            if (payload?.Key == BrowserPayload.PayloadKeys.ContextMenu)
-            {
-                var contextMenuPayload = args.WebMessageAsJson.Deserialize<BrowserPayload<OnContextMenuPayload>>();
-                var maybeTemplate = contextMenuPayload.Value.Selection;
-                if (string.IsNullOrWhiteSpace(maybeTemplate))
-                {
-                    return;
-                }
-
-                if (this.buildTemplateManager is null)
-                {
-                    return;
-                }
-
-                if (this.buildTemplateManager.IsTemplate(maybeTemplate) is false)
-                {
-                    return;
-                }
-
-                Task.Run(() =>
-                {
-                    try
-                    {
-                        var build = this.buildTemplateManager.DecodeTemplate(maybeTemplate);
-                        this.Dispatcher.Invoke(() =>
-                        {
-                            this.ContextMenu.DataContext = build;
-                            this.ContextMenu.IsOpen = true;
-                        });
-                    }
-                    catch(Exception e)
-                    {
-                        this.logger.LogWarning($"Exception when decoding template {maybeTemplate}. Details {e}");
-                    }
-                });
-            }
+            await this.InitializeBrowser();
         }
-
-        private void LoadBuildTemplateButton_Click(object sender, EventArgs e)
+        catch
         {
-            var build = this.ContextMenu.DataContext.As<Build>();
-            this.ContextMenu.IsOpen = false;
-            this.BuildDecoded?.Invoke(this, build);
+            this.BrowserSupported = false;
         }
+    }
 
-        private void UserControl_Unloaded(object sender, RoutedEventArgs e)
+    private void Hyperlink_PreviewMouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+    {
+        if (Uri.TryCreate(BrowserDownloadLink, UriKind.Absolute, out var uri))
         {
-            if (this.PreventDispose)
+            Process.Start("explorer.exe", uri.ToString());
+        }
+    }
+
+    private void TextBox_PreviewKeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+    {
+        if (e.Key == System.Windows.Input.Key.Enter)
+        {
+            var newAddress = sender.As<TextBox>().Text;
+            newAddress = SanitizeAddress(newAddress);
+            if (newAddress.IsNullOrWhiteSpace())
             {
                 return;
             }
 
-            this.WebBrowser?.Dispose();
-        }
-
-        private void BackButton_Clicked(object sender, EventArgs e)
-        {
-            this.WebBrowser.GoBack();
-            this.Address = this.WebBrowser.Source.ToString();
-        }
-
-        private void ForwardButton_Clicked(object sender, EventArgs e)
-        {
-            this.WebBrowser.GoForward();
-            this.Address = this.WebBrowser.Source.ToString();
-        }
-
-        private void RefreshGlyph_Clicked(object sender, EventArgs e)
-        {
-            this.WebBrowser.Reload();
-            this.Address = this.WebBrowser.Source.ToString();
-        }
-
-        private void CancelGlyph_Clicked(object sender, EventArgs e)
-        {
-            this.WebBrowser.Stop();
-        }
-
-        private void StarGlyph_Clicked(object sender, EventArgs e)
-        {
-            this.FavoriteAddress = this.Address;
-            this.FavoriteUriChanged?.Invoke(this, this.FavoriteAddress);
-        }
-
-        private void HomeButton_Clicked(object sender, EventArgs e)
-        {
-            this.WebBrowser.CoreWebView2.Navigate(this.FavoriteAddress);
-        }
-
-        private void MaximizeButton_Clicked(object sender, EventArgs e)
-        {
-            this.MaximizeClicked?.Invoke(this, e);
-        }
-
-        private void CheckFavoriteAddress()
-        {
-            if (this.Address == this.FavoriteAddress)
-            {
-                this.FavoriteButton.IsEnabled = false;
-            }
-            else
-            {
-                this.FavoriteButton.IsEnabled = true;
-            }
-        }
-
-        private static string SanitizeAddress(string address)
-        {
-            if (string.IsNullOrWhiteSpace(address))
-            {
-                return null;
-            }
-
-            if (address.StartsWith("www") is false &&
-                address.StartsWith("http") is false)
-            {
-                address = "https://www." + address;
-            }
-            else if (address.StartsWith("www"))
-            {
-                address = "https://" + address;
-            }
-
-            Uri.TryCreate(address, UriKind.Absolute, out var uri);
-            return uri?.ToString();
+            this.Address = newAddress;
+            this.WebBrowser.CoreWebView2.Navigate(this.Address);
+            e.Handled = true;
         }
     }
+
+    private void CoreWebView2_WebMessageReceived(object sender, CoreWebView2WebMessageReceivedEventArgs args)
+    {
+        BrowserPayload payload = default!;
+        try
+        {
+            payload = args.WebMessageAsJson.Deserialize<BrowserPayload>();
+        }
+        catch(Exception e)
+        {
+            this.logger!.LogError(e, $"Exception encountered when deserializing {nameof(BrowserPayload)}");
+        }
+
+        if (payload?.Key == BrowserPayload.PayloadKeys.ContextMenu)
+        {
+            var contextMenuPayload = args.WebMessageAsJson.Deserialize<BrowserPayload<OnContextMenuPayload>>();
+            var maybeTemplate = contextMenuPayload.Value!.Selection;
+            if (string.IsNullOrWhiteSpace(maybeTemplate))
+            {
+                return;
+            }
+
+            if (this.buildTemplateManager is null)
+            {
+                return;
+            }
+
+            if (this.buildTemplateManager.IsTemplate(maybeTemplate) is false)
+            {
+                return;
+            }
+
+            Task.Run(() =>
+            {
+                try
+                {
+                    var build = this.buildTemplateManager.DecodeTemplate(maybeTemplate);
+                    this.Dispatcher.Invoke(() =>
+                    {
+                        this.ContextMenu.DataContext = build;
+                        this.ContextMenu.IsOpen = true;
+                    });
+                }
+                catch(Exception e)
+                {
+                    this.logger!.LogWarning($"Exception when decoding template {maybeTemplate}. Details {e}");
+                }
+            });
+        }
+    }
+
+    private void LoadBuildTemplateButton_Click(object sender, EventArgs e)
+    {
+        var build = this.ContextMenu.DataContext.As<Build>();
+        this.ContextMenu.IsOpen = false;
+        this.BuildDecoded?.Invoke(this, build);
+    }
+
+    private void UserControl_Unloaded(object sender, RoutedEventArgs e)
+    {
+        if (this.PreventDispose)
+        {
+            return;
+        }
+
+        this.WebBrowser?.Dispose();
+    }
+
+    private void BackButton_Clicked(object sender, EventArgs e)
+    {
+        this.WebBrowser.GoBack();
+        this.Address = this.WebBrowser.Source.ToString();
+    }
+
+    private void ForwardButton_Clicked(object sender, EventArgs e)
+    {
+        this.WebBrowser.GoForward();
+        this.Address = this.WebBrowser.Source.ToString();
+    }
+
+    private void RefreshGlyph_Clicked(object sender, EventArgs e)
+    {
+        this.WebBrowser.Reload();
+        this.Address = this.WebBrowser.Source.ToString();
+    }
+
+    private void CancelGlyph_Clicked(object sender, EventArgs e)
+    {
+        this.WebBrowser.Stop();
+    }
+
+    private void StarGlyph_Clicked(object sender, EventArgs e)
+    {
+        this.FavoriteAddress = this.Address;
+        this.FavoriteUriChanged?.Invoke(this, this.FavoriteAddress);
+    }
+
+    private void HomeButton_Clicked(object sender, EventArgs e)
+    {
+        this.WebBrowser.CoreWebView2.Navigate(this.FavoriteAddress);
+    }
+
+    private void MaximizeButton_Clicked(object sender, EventArgs e)
+    {
+        this.MaximizeClicked?.Invoke(this, e);
+    }
+
+    private void CheckFavoriteAddress()
+    {
+        if (this.Address == this.FavoriteAddress)
+        {
+            this.FavoriteButton.IsEnabled = false;
+        }
+        else
+        {
+            this.FavoriteButton.IsEnabled = true;
+        }
+    }
+
+    private static string SanitizeAddress(string address)
+    {
+        if (string.IsNullOrWhiteSpace(address))
+        {
+            return default!;
+        }
+
+        if (address.StartsWith("www") is false &&
+            address.StartsWith("http") is false)
+        {
+            address = "https://www." + address;
+        }
+        else if (address.StartsWith("www"))
+        {
+            address = "https://" + address;
+        }
+
+        Uri.TryCreate(address, UriKind.Absolute, out var uri);
+        return uri?.ToString() ?? string.Empty;
+    }
 }

Daybreak/Controls/CircularLoadingWidget.xaml.cs

@@ -1,31 +1,30 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace Daybreak.Controls
-{
-    /// <summary>
-    /// Interaction logic for CircularLoadingWidget.xaml
-    /// </summary>
-    public partial class CircularLoadingWidget : UserControl
-    {
-        public CircularLoadingWidget()
-        {
-            this.InitializeComponent();
-        }
+namespace Daybreak.Controls;
 
-        protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
+/// <summary>
+/// Interaction logic for CircularLoadingWidget.xaml
+/// </summary>
+public partial class CircularLoadingWidget : UserControl
+{
+    public CircularLoadingWidget()
+    {
+        this.InitializeComponent();
+    }
+
+    protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
+    {
+        base.OnPropertyChanged(e);
+        if (e.Property == IsEnabledProperty)
         {
-            base.OnPropertyChanged(e);
-            if (e.Property == IsEnabledProperty)
+            if (e.NewValue is true)
             {
-                if (e.NewValue is true)
-                {
-                    this.ProgressAnimation_BeginStoryboard.Storyboard.Pause();
-                }
-                else
-                {
-                    this.ProgressAnimation_BeginStoryboard.Storyboard.Resume();
-                }
+                this.ProgressAnimation_BeginStoryboard.Storyboard.Pause();
+            }
+            else
+            {
+                this.ProgressAnimation_BeginStoryboard.Storyboard.Resume();
             }
         }
     }

Daybreak/Controls/Glyphs/AvatarGlyph.xaml.cs

@@ -1,15 +1,14 @@
 using System.Windows.Controls;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for AvatarGlyph.xaml
+/// </summary>
+public partial class AvatarGlyph : UserControl
 {
-    /// <summary>
-    /// Interaction logic for AvatarGlyph.xaml
-    /// </summary>
-    public partial class AvatarGlyph : UserControl
+    public AvatarGlyph()
     {
-        public AvatarGlyph()
-        {
-            this.InitializeComponent();
-        }
+        this.InitializeComponent();
     }
 }

Daybreak/Controls/Glyphs/ExperimentGlyph.xaml.cs

@@ -13,16 +13,15 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for ExperimentGlyph.xaml
+/// </summary>
+public partial class ExperimentGlyph : UserControl
 {
-    /// <summary>
-    /// Interaction logic for ExperimentGlyph.xaml
-    /// </summary>
-    public partial class ExperimentGlyph : UserControl
+    public ExperimentGlyph()
     {
-        public ExperimentGlyph()
-        {
-            this.InitializeComponent();
-        }
+        this.InitializeComponent();
     }
 }

Daybreak/Controls/Glyphs/FileGlyph.xaml.cs

@@ -1,15 +1,14 @@
 using System.Windows.Controls;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for FileGlyph.xaml
+/// </summary>
+public partial class FileGlyph : UserControl
 {
-    /// <summary>
-    /// Interaction logic for FileGlyph.xaml
-    /// </summary>
-    public partial class FileGlyph : UserControl
+    public FileGlyph()
     {
-        public FileGlyph()
-        {
-            this.InitializeComponent();
-        }
+        this.InitializeComponent();
     }
 }

Daybreak/Controls/Glyphs/FireballGlyph.xaml

@@ -10,11 +10,14 @@
     <Viewbox>
         <Grid>
             <Line Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                  X1="15" X2="26" Y1="11" Y2="0"></Line>
+                  X1="15" X2="26" Y1="11" Y2="0"
+                  StrokeThickness="2"></Line>
             <Ellipse Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                Width="4" Height="4"
+                     Width="4" Height="4"
+                     StrokeThickness="2"
                      Margin="8,13,13,8"></Ellipse>
             <Path Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                  StrokeThickness="2"
                   Data="m15.025,0l-12.7,11.3c-3.1,3.1 -3.1,8.2 0,11.3s8.2,3.1 11.3,0l12.4,-11.6"></Path>
         </Grid>
     </Viewbox>

Daybreak/Controls/Glyphs/FireballGlyph.xaml.cs

@@ -13,16 +13,15 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for FireballGlyph.xaml
+/// </summary>
+public partial class FireballGlyph : UserControl
 {
-    /// <summary>
-    /// Interaction logic for FireballGlyph.xaml
-    /// </summary>
-    public partial class FireballGlyph : UserControl
+    public FireballGlyph()
     {
-        public FireballGlyph()
-        {
-            this.InitializeComponent();
-        }
+        this.InitializeComponent();
     }
 }

Daybreak/Controls/Glyphs/GoldenArrowGlyph.xaml.cs

@@ -13,16 +13,15 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for GoldenArrowGlyph.xaml
+/// </summary>
+public partial class GoldenArrowGlyph : UserControl
 {
-    /// <summary>
-    /// Interaction logic for GoldenArrowGlyph.xaml
-    /// </summary>
-    public partial class GoldenArrowGlyph : UserControl
+    public GoldenArrowGlyph()
     {
-        public GoldenArrowGlyph()
-        {
-            this.InitializeComponent();
-        }
+        this.InitializeComponent();
     }
 }

Daybreak/Controls/Glyphs/LogsGlyph.xaml.cs

@@ -1,15 +1,14 @@
 using System.Windows.Controls;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for LogsGlyph.xaml
+/// </summary>
+public partial class LogsGlyph : UserControl
 {
-    /// <summary>
-    /// Interaction logic for LogsGlyph.xaml
-    /// </summary>
-    public partial class LogsGlyph : UserControl
+    public LogsGlyph()
     {
-        public LogsGlyph()
-        {
-            this.InitializeComponent();
-        }
+        this.InitializeComponent();
     }
 }

Daybreak/Controls/Glyphs/RefreshGlyph.xaml.cs

@@ -2,36 +2,35 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for RefreshGlyph.xaml
+/// </summary>
+public partial class RefreshGlyph : UserControl
 {
-    /// <summary>
-    /// Interaction logic for RefreshGlyph.xaml
-    /// </summary>
-    public partial class RefreshGlyph : UserControl
+    public event EventHandler? Clicked;
+
+    public RefreshGlyph()
     {
-        public event EventHandler Clicked;
+        this.InitializeComponent();
+    }
 
-        public RefreshGlyph()
-        {
-            this.InitializeComponent();
-        }
+    private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
+    {
+        this.BackgroundEllipse.Opacity = 0.6;
+    }
 
-        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_MouseLeave(object sender, MouseEventArgs e)
+    private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.ChangedButton == MouseButton.Left)
         {
-            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/Glyphs/StarGlyph.xaml.cs

@@ -2,36 +2,35 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for BackButton.xaml
+/// </summary>
+public partial class StarGlyph : UserControl
 {
-    /// <summary>
-    /// Interaction logic for BackButton.xaml
-    /// </summary>
-    public partial class StarGlyph : UserControl
+    public event EventHandler? Clicked;
+
+    public StarGlyph()
     {
-        public event EventHandler Clicked;
+        this.InitializeComponent();
+    }
 
-        public StarGlyph()
-        {
-            this.InitializeComponent();
-        }
+    private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
+    {
+        this.BackgroundEllipse.Opacity = 0.6;
+    }
 
-        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_MouseLeave(object sender, MouseEventArgs e)
+    private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.ChangedButton == MouseButton.Left)
         {
-            this.BackgroundEllipse.Opacity = 0;
-        }
-
-        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                Clicked?.Invoke(this, e);
-            }
+            Clicked?.Invoke(this, e);
         }
     }
 }

Daybreak/Controls/Glyphs/StaticGlyph.xaml.cs

@@ -1,15 +1,14 @@
 using System.Windows.Controls;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for StaticGlyph.xaml
+/// </summary>
+public partial class StaticGlyph : UserControl
 {
-    /// <summary>
-    /// Interaction logic for StaticGlyph.xaml
-    /// </summary>
-    public partial class StaticGlyph : UserControl
+    public StaticGlyph()
     {
-        public StaticGlyph()
-        {
-            this.InitializeComponent();
-        }
+        this.InitializeComponent();
     }
 }

Daybreak/Controls/ImageViewer.xaml.cs

@@ -5,88 +5,87 @@ using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for ImageViewer.xaml
+/// </summary>
+public partial class ImageViewer : UserControl
 {
-    /// <summary>
-    /// Interaction logic for ImageViewer.xaml
-    /// </summary>
-    public partial class ImageViewer : UserControl
+    public ImageSource ImageSource
     {
-        public ImageSource ImageSource
+        get => this.CurrentVisible().Source;
+        set => this.ShowImage(value);
+    }
+
+    public ImageViewer()
+    {
+        this.InitializeComponent();
+        this.Image1.Visibility = Visibility.Visible;
+        this.Image1.Opacity = 1;
+        this.Image2.Visibility = Visibility.Hidden;
+        this.Image2.Opacity = 0;
+    }
+
+    public async void ShowImage(ImageSource imageSource)
+    {
+        var currentVisible = this.CurrentVisible();
+        var nextVisible = this.NextVisible();
+
+        if (nextVisible.Source is BitmapImage bitmapImage)
         {
-            get => this.CurrentVisible().Source;
-            set => this.ShowImage(value);
+            await bitmapImage.StreamSource.DisposeAsync().ConfigureAwait(true);
         }
 
-        public ImageViewer()
-        {
-            this.InitializeComponent();
-            this.Image1.Visibility = Visibility.Visible;
-            this.Image1.Opacity = 1;
-            this.Image2.Visibility = Visibility.Hidden;
-            this.Image2.Opacity = 0;
-        }
+        nextVisible.Source = imageSource;
+        Transition(currentVisible, nextVisible);
+    }
 
-        public async void ShowImage(ImageSource imageSource)
+    private Image CurrentVisible()
+    {
+        if (this.Image1.Visibility == Visibility.Visible)
         {
-            var currentVisible = this.CurrentVisible();
-            var nextVisible = this.NextVisible();
-
-            if (nextVisible.Source is BitmapImage bitmapImage)
-            {
-                await bitmapImage.StreamSource.DisposeAsync().ConfigureAwait(true);
-            }
-
-            nextVisible.Source = imageSource;
-            Transition(currentVisible, nextVisible);
+            return this.Image1;
         }
-
-        private Image CurrentVisible()
+        else
         {
-            if (this.Image1.Visibility == Visibility.Visible)
-            {
-                return this.Image1;
-            }
-            else
-            {
-                return this.Image2;
-            }
-        }
-        private Image NextVisible()
-        {
-            if (this.Image1.Visibility == Visibility.Visible)
-            {
-                return this.Image2;
-            }
-            else
-            {
-                return this.Image1;
-            }
-        }
-        private static void Transition(Image from, Image to)
-        {
-            to.Visibility = Visibility.Visible;
-            to.Opacity = 0;
-            from.Visibility = Visibility.Visible;
-            from.Opacity = 1;
-            var showAnimation = new DoubleAnimation()
-            {
-                From = 0,
-                To = 1,
-                Duration = TimeSpan.FromSeconds(1.5)
-            };
-            var hideAnimation = new DoubleAnimation
-            {
-                From = 1,
-                To = 0,
-                Duration = TimeSpan.FromSeconds(1.5)
-            };
-            hideAnimation.Completed += (s, e) =>
-            {
-                from.Visibility = Visibility.Hidden;
-                to.BeginAnimation(Image.OpacityProperty, showAnimation);
-            };
-            from.BeginAnimation(Image.OpacityProperty, hideAnimation);
+            return this.Image2;
         }
     }
+    private Image NextVisible()
+    {
+        if (this.Image1.Visibility == Visibility.Visible)
+        {
+            return this.Image2;
+        }
+        else
+        {
+            return this.Image1;
+        }
+    }
+    private static void Transition(Image from, Image to)
+    {
+        to.Visibility = Visibility.Visible;
+        to.Opacity = 0;
+        from.Visibility = Visibility.Visible;
+        from.Opacity = 1;
+        var showAnimation = new DoubleAnimation()
+        {
+            From = 0,
+            To = 1,
+            Duration = TimeSpan.FromSeconds(1.5)
+        };
+        var hideAnimation = new DoubleAnimation
+        {
+            From = 1,
+            To = 0,
+            Duration = TimeSpan.FromSeconds(1.5)
+        };
+        hideAnimation.Completed += (s, e) =>
+        {
+            from.Visibility = Visibility.Hidden;
+            to.BeginAnimation(Image.OpacityProperty, showAnimation);
+        };
+        from.BeginAnimation(Image.OpacityProperty, hideAnimation);
+    }
 }

Daybreak/Controls/MenuList.xaml

@@ -18,6 +18,16 @@
                                    Width="40"></local:GoldenArrowGlyph>
             </buttons:MenuButton.InnerContent>
         </buttons:MenuButton>
+        <buttons:MenuButton Title="Manage builds" 
+                            Foreground="White"
+                            HighlightColor="White"
+                            Height="30"
+                            Clicked="ManageBuildsButton_Clicked">
+            <buttons:MenuButton.InnerContent>
+                <local:FireballGlyph Foreground="White"
+                                       Width="40"></local:FireballGlyph>
+            </buttons:MenuButton.InnerContent>
+        </buttons:MenuButton>
         <buttons:MenuButton Title="Account settings" 
                             Foreground="White"
                             HighlightColor="White"
@@ -59,16 +69,6 @@
                                        Width="40"></local:ExperimentGlyph>
             </buttons:MenuButton.InnerContent>
         </buttons:MenuButton>
-        <buttons:MenuButton Title="Manage builds" 
-                            Foreground="White"
-                            HighlightColor="White"
-                            Height="30"
-                            Clicked="ManageBuildsButton_Clicked">
-            <buttons:MenuButton.InnerContent>
-                <local:FireballGlyph Foreground="White"
-                                       Width="40"></local:FireballGlyph>
-            </buttons:MenuButton.InnerContent>
-        </buttons:MenuButton>
         <buttons:MenuButton Title="Manage client version" 
                             Foreground="White"
                             HighlightColor="White"

Daybreak/Controls/MenuList.xaml.cs

@@ -1,78 +1,77 @@
 using Daybreak.Configuration;
 using Daybreak.Launch;
-using Daybreak.Services.ViewManagement;
+using Daybreak.Services.Navigation;
 using Daybreak.Views;
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Configuration;
 using System.Windows.Controls;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for MenuList.xaml
+/// </summary>
+public partial class MenuList : UserControl
 {
-    /// <summary>
-    /// Interaction logic for MenuList.xaml
-    /// </summary>
-    public partial class MenuList : UserControl
+    public MenuList()
     {
-        public MenuList()
-        {
-            this.InitializeComponent();
-        }
+        this.InitializeComponent();
+    }
 
-        private void GameCompanionButton_Clicked(object sender, EventArgs e)
-        {
-            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
-            viewManager.ShowView<CompanionView>();
-        }
+    private void GameCompanionButton_Clicked(object sender, EventArgs e)
+    {
+        var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+        viewManager.ShowView<LauncherView>();
+    }
 
-        private void AccountSettingsButton_Clicked(object sender, EventArgs e)
-        {
-            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
-            viewManager.ShowView<AccountsView>();
-        }
+    private void AccountSettingsButton_Clicked(object sender, EventArgs e)
+    {
+        var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+        viewManager.ShowView<AccountsView>();
+    }
 
-        private void GuildwarsSettingsButton_Clicked(object sender, EventArgs e)
-        {
-            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
-            viewManager.ShowView<ExecutablesView>();
-        }
+    private void GuildwarsSettingsButton_Clicked(object sender, EventArgs e)
+    {
+        var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+        viewManager.ShowView<ExecutablesView>();
+    }
 
-        private void LauncherSettingsButton_Clicked(object sender, EventArgs e)
-        {
-            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
-            viewManager.ShowView<SettingsView>();
-        }
+    private void LauncherSettingsButton_Clicked(object sender, EventArgs e)
+    {
+        var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+        viewManager.ShowView<SettingsView>();
+    }
 
-        private void ExperimentalSettingsButton_Clicked(object sender, EventArgs e)
-        {
-            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
-            viewManager.ShowView<ExperimentalSettingsView>();
-        }
+    private void ExperimentalSettingsButton_Clicked(object sender, EventArgs e)
+    {
+        var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+        viewManager.ShowView<ExperimentalSettingsView>();
+    }
 
-        private void ManageBuildsButton_Clicked(object sender, EventArgs e)
+    private void ManageBuildsButton_Clicked(object sender, EventArgs e)
+    {
+        var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+        var options = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<ILiveOptions<ApplicationConfiguration>>();
+        if (options.Value.ExperimentalFeatures.DownloadIcons)
         {
-            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
-            var options = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<ILiveOptions<ApplicationConfiguration>>();
-            if (options.Value.ExperimentalFeatures.DownloadIcons)
-            {
-                viewManager.ShowView<IconDownloadView>();
-            }
-            else
-            {
-                viewManager.ShowView<BuildsListView>();
-            }
+            viewManager.ShowView<IconDownloadView>();
         }
-
-        private void VersionManagementButton_Clicked(object sender, EventArgs e)
+        else
         {
-            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
-            viewManager.ShowView<VersionManagementView>();
-        }
-
-        private void LogsButton_Clicked(object sender, EventArgs e)
-        {
-            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
-            viewManager.ShowView<LogsView>();
+            viewManager.ShowView<BuildsListView>();
         }
     }
+
+    private void VersionManagementButton_Clicked(object sender, EventArgs e)
+    {
+        var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+        viewManager.ShowView<VersionManagementView>();
+    }
+
+    private void LogsButton_Clicked(object sender, EventArgs e)
+    {
+        var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+        viewManager.ShowView<LogsView>();
+    }
 }

Daybreak/Controls/SearchTextBox.xaml.cs

@@ -4,39 +4,38 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Extensions;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for SearchTextBox.xaml
+/// </summary>
+public partial class SearchTextBox : UserControl
 {
-    /// <summary>
-    /// Interaction logic for SearchTextBox.xaml
-    /// </summary>
-    public partial class SearchTextBox : UserControl
+    public event EventHandler<string>? TextChanged;
+
+    [GenerateDependencyProperty(InitialValue = true)]
+    private bool placeholderVisibility;
+    [GenerateDependencyProperty]
+    private string searchText = default!;
+
+    public SearchTextBox()
     {
-        public event EventHandler<string> TextChanged;
+        this.InitializeComponent();
+    }
 
-        [GenerateDependencyProperty(InitialValue = true)]
-        private bool placeholderVisibility;
-        [GenerateDependencyProperty]
-        private string searchText;
-
-        public SearchTextBox()
+    private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
+    {
+        var searchText = e.Source.As<TextBox>().Text;
+        if (searchText.IsNullOrWhiteSpace())
         {
-            this.InitializeComponent();
+            this.PlaceholderVisibility = true;
+        }
+        else
+        {
+            this.PlaceholderVisibility = false;
         }
 
-        private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            var searchText = e.Source.As<TextBox>().Text;
-            if (searchText.IsNullOrWhiteSpace())
-            {
-                this.PlaceholderVisibility = true;
-            }
-            else
-            {
-                this.PlaceholderVisibility = false;
-            }
-
-            this.SearchText = searchText;
-            this.TextChanged?.Invoke(this, searchText);
-        }
+        this.SearchText = searchText;
+        this.TextChanged?.Invoke(this, searchText);
     }
 }

Daybreak/Controls/Templates/AccountTemplate.xaml.cs

@@ -5,68 +5,67 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Extensions;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for AccountTemplate.xaml
+/// </summary>
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Fields used by source generator for DependencyProperty")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
+public partial class AccountTemplate : UserControl
 {
-    /// <summary>
-    /// Interaction logic for AccountTemplate.xaml
-    /// </summary>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Fields used by source generator for DependencyProperty")]
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
-    public partial class AccountTemplate : UserControl
+    public event EventHandler? RemoveClicked;
+    public event EventHandler? DefaultClicked;
+    
+    [GenerateDependencyProperty]
+    private string username = string.Empty;
+    [GenerateDependencyProperty]
+    private string password = string.Empty;
+    [GenerateDependencyProperty]
+    private string characterName = string.Empty;
+    [GenerateDependencyProperty]
+    private bool isDefault;
+
+    public AccountTemplate()
     {
-        public event EventHandler RemoveClicked;
-        public event EventHandler DefaultClicked;
-        
-        [GenerateDependencyProperty]
-        private string username;
-        [GenerateDependencyProperty]
-        private string password;
-        [GenerateDependencyProperty]
-        private string characterName;
-        [GenerateDependencyProperty]
-        private bool isDefault;
+        this.InitializeComponent();
+        this.DataContextChanged += this.AccountTemplate_DataContextChanged;
+    }
 
-        public AccountTemplate()
+    private void AccountTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
+    {
+        if (e.NewValue is LoginCredentials loginCredentials)
         {
-            this.InitializeComponent();
-            this.DataContextChanged += this.AccountTemplate_DataContextChanged;
-        }
-
-        private void AccountTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue is LoginCredentials loginCredentials)
-            {
-                this.PasswordBox.Password = loginCredentials.Password;
-                this.Username = loginCredentials.Username;
-                this.CharacterName = loginCredentials.CharacterName;
-                this.IsDefault = loginCredentials.Default;
-            }
-        }
-
-        private void BinButton_Clicked(object sender, EventArgs e)
-        {
-            this.RemoveClicked?.Invoke(this, e);
-        }
-
-        private void UsernameTextbox_TextChanged(object sender, EventArgs e)
-        {
-            this.DataContext.As<LoginCredentials>().Username = this.Username;
-        }
-
-        private void CharacterNameTextbox_TextChanged(object sender, EventArgs e)
-        {
-            this.DataContext.As<LoginCredentials>().CharacterName = this.CharacterName;
-        }
-
-        private void Passwordbox_PasswordChanged(object sender, EventArgs e)
-        {
-            this.Password = sender.As<PasswordBox>()?.Password;
-            this.DataContext.As<LoginCredentials>().Password = this.Password;
-        }
-
-        private void StarGlyph_Clicked(object sender, EventArgs e)
-        {
-            this.DefaultClicked?.Invoke(this, e);
+            this.PasswordBox.Password = loginCredentials.Password;
+            this.Username = loginCredentials.Username;
+            this.CharacterName = loginCredentials.CharacterName;
+            this.IsDefault = loginCredentials.Default;
         }
     }
+
+    private void BinButton_Clicked(object sender, EventArgs e)
+    {
+        this.RemoveClicked?.Invoke(this, e);
+    }
+
+    private void UsernameTextbox_TextChanged(object sender, EventArgs e)
+    {
+        this.DataContext.As<LoginCredentials>().Username = this.Username;
+    }
+
+    private void CharacterNameTextbox_TextChanged(object sender, EventArgs e)
+    {
+        this.DataContext.As<LoginCredentials>().CharacterName = this.CharacterName;
+    }
+
+    private void Passwordbox_PasswordChanged(object sender, EventArgs e)
+    {
+        this.Password = sender.As<PasswordBox>()?.Password;
+        this.DataContext.As<LoginCredentials>().Password = this.Password;
+    }
+
+    private void StarGlyph_Clicked(object sender, EventArgs e)
+    {
+        this.DefaultClicked?.Invoke(this, e);
+    }
 }

Daybreak/Controls/Templates/AttributeTemplate.xaml.cs

@@ -5,73 +5,72 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Extensions;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for AttributeTemplate.xaml
+/// </summary>
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Fields used by source generator for DependencyProperty")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
+public partial class AttributeTemplate : UserControl
 {
-    /// <summary>
-    /// Interaction logic for AttributeTemplate.xaml
-    /// </summary>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Fields used by source generator for DependencyProperty")]
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
-    public partial class AttributeTemplate : UserControl
+    public event EventHandler<AttributeEntry>? HelpClicked;
+    public event EventHandler<AttributeEntry>? AttributeChanged;
+    
+    [GenerateDependencyProperty(InitialValue = false)]
+    private bool canAdd;
+    [GenerateDependencyProperty(InitialValue = false)]
+    private bool canSubtract;
+
+    public AttributeTemplate()
     {
-        public event EventHandler<AttributeEntry> HelpClicked;
-        public event EventHandler<AttributeEntry> AttributeChanged;
-        
-        [GenerateDependencyProperty(InitialValue = false)]
-        private bool canAdd;
-        [GenerateDependencyProperty(InitialValue = false)]
-        private bool canSubtract;
+        this.InitializeComponent();
+        this.DataContextChanged += this.AttributeTemplate_DataContextChanged;
+    }
 
-        public AttributeTemplate()
+    private void AttributeTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
+    {
+        if (e.NewValue is AttributeEntry attributeEntry)
         {
-            this.InitializeComponent();
-            this.DataContextChanged += this.AttributeTemplate_DataContextChanged;
-        }
-
-        private void AttributeTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue is AttributeEntry attributeEntry)
+            if (attributeEntry.Points > 0)
             {
-                if (attributeEntry.Points > 0)
-                {
-                    this.CanSubtract = true;
-                }
-
-                if (attributeEntry.Points < 12)
-                {
-                    this.CanAdd = true;
-                }
-            }
-        }
-
-        private void MinusButton_Clicked(object sender, System.EventArgs e)
-        {
-            if (this.DataContext.As<AttributeEntry>().Points > 0)
-            {
-                this.DataContext.As<AttributeEntry>().Points--;
-                this.CanSubtract = this.DataContext.As<AttributeEntry>().Points > 0;
-                this.CanAdd = true;
-                this.AttributeChanged?.Invoke(this, this.DataContext.As<AttributeEntry>());
-            }
-        }
-
-        private void AddButton_Clicked(object sender, System.EventArgs e)
-        {
-            if (this.DataContext.As<AttributeEntry>().Points < 12)
-            {
-                this.DataContext.As<AttributeEntry>().Points++;
-                this.CanAdd = this.DataContext.As<AttributeEntry>().Points < 12;
                 this.CanSubtract = true;
-                this.AttributeChanged?.Invoke(this, this.DataContext.As<AttributeEntry>());
             }
-        }
 
-        private void HelpButton_Clicked(object sender, System.EventArgs e)
-        {
-            if (this.DataContext is AttributeEntry attributeEntry)
+            if (attributeEntry.Points < 12)
             {
-                this.HelpClicked?.Invoke(this, attributeEntry);
+                this.CanAdd = true;
             }
         }
     }
+
+    private void MinusButton_Clicked(object sender, System.EventArgs e)
+    {
+        if (this.DataContext.As<AttributeEntry>().Points > 0)
+        {
+            this.DataContext.As<AttributeEntry>().Points--;
+            this.CanSubtract = this.DataContext.As<AttributeEntry>().Points > 0;
+            this.CanAdd = true;
+            this.AttributeChanged?.Invoke(this, this.DataContext.As<AttributeEntry>());
+        }
+    }
+
+    private void AddButton_Clicked(object sender, System.EventArgs e)
+    {
+        if (this.DataContext.As<AttributeEntry>().Points < 12)
+        {
+            this.DataContext.As<AttributeEntry>().Points++;
+            this.CanAdd = this.DataContext.As<AttributeEntry>().Points < 12;
+            this.CanSubtract = true;
+            this.AttributeChanged?.Invoke(this, this.DataContext.As<AttributeEntry>());
+        }
+    }
+
+    private void HelpButton_Clicked(object sender, System.EventArgs e)
+    {
+        if (this.DataContext is AttributeEntry attributeEntry)
+        {
+            this.HelpClicked?.Invoke(this, attributeEntry);
+        }
+    }
 }

Daybreak/Controls/Templates/BuildEntryTemplate.xaml.cs

@@ -2,26 +2,25 @@
 using System;
 using System.Windows.Controls;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for BuildEntryTemplate.xaml
+/// </summary>
+public partial class BuildEntryTemplate : UserControl
 {
-    /// <summary>
-    /// Interaction logic for BuildEntryTemplate.xaml
-    /// </summary>
-    public partial class BuildEntryTemplate : UserControl
+    public event EventHandler<BuildEntry>? RemoveClicked;
+
+    public BuildEntryTemplate()
     {
-        public event EventHandler<BuildEntry> RemoveClicked;
+        this.InitializeComponent();
+    }
 
-        public BuildEntryTemplate()
+    private void BinButton_Clicked(object sender, EventArgs e)
+    {
+        if (this.DataContext is BuildEntry buildEntry)
         {
-            this.InitializeComponent();
-        }
-
-        private void BinButton_Clicked(object sender, EventArgs e)
-        {
-            if (this.DataContext is BuildEntry buildEntry)
-            {
-                this.RemoveClicked?.Invoke(this, buildEntry);
-            }
+            this.RemoveClicked?.Invoke(this, buildEntry);
         }
     }
 }

Daybreak/Controls/Templates/BuildTemplate.xaml.cs

@@ -1,7 +1,9 @@
 using Daybreak.Configuration;
 using Daybreak.Models.Builds;
+using Daybreak.Models.Guildwars;
 using Daybreak.Services.BuildTemplates;
 using Daybreak.Services.IconRetrieve;
+using Daybreak.Utils;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -15,462 +17,459 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Extensions;
-using Utils;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for BuildTemplate.xaml
+/// </summary>
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Fields used by source generator for DependencyProperty")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
+public partial class BuildTemplate : UserControl
 {
-    /// <summary>
-    /// Interaction logic for BuildTemplate.xaml
-    /// </summary>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Fields used by source generator for DependencyProperty")]
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
-    public partial class BuildTemplate : UserControl
+    private const string InfoNamePlaceholder = "[NAME]";
+    private const string BaseAddress = $"https://wiki.guildwars.com/wiki/{InfoNamePlaceholder}";
+
+    private bool suppressBuildChanged = false;
+    private bool loadedProperties = false;
+    private IIconBrowser? iconBrowser;
+    private BuildEntry? loadedBuild;
+    private SkillTemplate? selectingSkillTemplate;
+    private CancellationTokenSource? cancellationTokenSource = new();
+
+    public event EventHandler? BuildChanged;
+
+    [GenerateDependencyProperty]
+    private string skillSearchText = string.Empty;
+    [GenerateDependencyProperty]
+    private Profession primaryProfession = default!;
+    [GenerateDependencyProperty]
+    private Profession secondaryProfession = default!;
+    [GenerateDependencyProperty]
+    private Skill skill0 = default!;
+    [GenerateDependencyProperty]
+    private Skill skill1 = default!;
+    [GenerateDependencyProperty]
+    private Skill skill2 = default!;
+    [GenerateDependencyProperty]
+    private Skill skill3 = default!;
+    [GenerateDependencyProperty]
+    private Skill skill4 = default!;
+    [GenerateDependencyProperty]
+    private Skill skill5 = default!;
+    [GenerateDependencyProperty]
+    private Skill skill6 = default!;
+    [GenerateDependencyProperty]
+    private Skill skill7 = default!;
+    public ObservableCollection<Skill> AvailableSkills { get; } = new ObservableCollection<Skill>();
+    public ObservableCollection<AttributeEntry> Attributes { get; } = new ObservableCollection<AttributeEntry>();
+    public ObservableCollection<Profession> Professions { get; } = new ObservableCollection<Profession>(Profession.Professions);
+
+    public BuildTemplate()
     {
-        private const string InfoNamePlaceholder = "[NAME]";
-        private const string BaseAddress = $"https://wiki.guildwars.com/wiki/{InfoNamePlaceholder}";
+        this.InitializeComponent();
+        this.InitializeProperties();
+        this.DataContextChanged += this.BuildTemplate_DataContextChanged;
+    }
 
-        private bool suppressBuildChanged = false;
-        private bool loadedProperties = false;
-        private IIconBrowser iconBrowser;
-        private BuildEntry loadedBuild;
-        private SkillTemplate selectingSkillTemplate;
-        private CancellationTokenSource cancellationTokenSource = new();
+    public async void InitializeTemplate(
+        IIconCache iconRetriever,
+        IIconBrowser iconBrowser,
+        ILiveOptions<ApplicationConfiguration> liveOptions,
+        IBuildTemplateManager buildTemplateManager,
+        ILogger<ChromiumBrowserWrapper> logger)
+    {
+        this.iconBrowser = iconBrowser.ThrowIfNull();
+        await this.SkillBrowser.InitializeDefaultBrowser(liveOptions, buildTemplateManager, logger);
+        this.SkillTemplate0.InitializeSkillTemplate(iconRetriever);
+        this.SkillTemplate1.InitializeSkillTemplate(iconRetriever);
+        this.SkillTemplate2.InitializeSkillTemplate(iconRetriever);
+        this.SkillTemplate3.InitializeSkillTemplate(iconRetriever);
+        this.SkillTemplate4.InitializeSkillTemplate(iconRetriever);
+        this.SkillTemplate5.InitializeSkillTemplate(iconRetriever);
+        this.SkillTemplate6.InitializeSkillTemplate(iconRetriever);
+        this.SkillTemplate7.InitializeSkillTemplate(iconRetriever);
 
-        public event EventHandler BuildChanged;
+        this.HideSkillListView();
+        this.HideInfoBrowser();
+    }
 
-        [GenerateDependencyProperty]
-        private string skillSearchText;
-        [GenerateDependencyProperty]
-        private Profession primaryProfession;
-        [GenerateDependencyProperty]
-        private Profession secondaryProfession;
-        [GenerateDependencyProperty]
-        private Skill skill0;
-        [GenerateDependencyProperty]
-        private Skill skill1;
-        [GenerateDependencyProperty]
-        private Skill skill2;
-        [GenerateDependencyProperty]
-        private Skill skill3;
-        [GenerateDependencyProperty]
-        private Skill skill4;
-        [GenerateDependencyProperty]
-        private Skill skill5;
-        [GenerateDependencyProperty]
-        private Skill skill6;
-        [GenerateDependencyProperty]
-        private Skill skill7;
-        public ObservableCollection<Skill> AvailableSkills { get; } = new ObservableCollection<Skill>();
-        public ObservableCollection<AttributeEntry> Attributes { get; } = new ObservableCollection<AttributeEntry>();
-        public ObservableCollection<Profession> Professions { get; } = new ObservableCollection<Profession>(Profession.Professions);
-
-        public BuildTemplate()
+    protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
+    {
+        base.OnPropertyChanged(e);
+        if (this.loadedProperties is false)
         {
-            this.InitializeComponent();
-            this.InitializeProperties();
-            this.DataContextChanged += this.BuildTemplate_DataContextChanged;
+            return;
         }
 
-        public async void InitializeTemplate(
-            IIconCache iconRetriever,
-            IIconBrowser iconBrowser,
-            ILiveOptions<ApplicationConfiguration> liveOptions,
-            IBuildTemplateManager buildTemplateManager,
-            ILogger<ChromiumBrowserWrapper> logger)
+        if (e.Property == PrimaryProfessionProperty || e.Property == SecondaryProfessionProperty)
         {
-            this.iconBrowser = iconBrowser.ThrowIfNull();
-            await this.SkillBrowser.InitializeDefaultBrowser(liveOptions, buildTemplateManager, logger);
-            this.SkillTemplate0.InitializeSkillTemplate(iconRetriever);
-            this.SkillTemplate1.InitializeSkillTemplate(iconRetriever);
-            this.SkillTemplate2.InitializeSkillTemplate(iconRetriever);
-            this.SkillTemplate3.InitializeSkillTemplate(iconRetriever);
-            this.SkillTemplate4.InitializeSkillTemplate(iconRetriever);
-            this.SkillTemplate5.InitializeSkillTemplate(iconRetriever);
-            this.SkillTemplate6.InitializeSkillTemplate(iconRetriever);
-            this.SkillTemplate7.InitializeSkillTemplate(iconRetriever);
-
-            this.HideSkillListView();
-            this.HideInfoBrowser();
-        }
-
-        protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
-        {
-            base.OnPropertyChanged(e);
-            if (this.loadedProperties is false)
+            if (e.Property == PrimaryProfessionProperty)
             {
-                return;
+                this.loadedBuild!.Build!.Primary = this.PrimaryProfession;
+            }
+            else
+            {
+                this.loadedBuild!.Build!.Secondary = this.SecondaryProfession;
             }
 
-            if (e.Property == PrimaryProfessionProperty || e.Property == SecondaryProfessionProperty)
+            this.LoadSkills();
+            this.LoadAttributes();
+            if (this.suppressBuildChanged is false)
             {
-                if (e.Property == PrimaryProfessionProperty)
-                {
-                    this.loadedBuild.Build.Primary = this.PrimaryProfession;
-                }
-                else
-                {
-                    this.loadedBuild.Build.Secondary = this.SecondaryProfession;
-                }
-
-                this.LoadSkills();
-                this.LoadAttributes();
-                if (this.suppressBuildChanged is false)
-                {
-                    this.BuildChanged?.Invoke(this, new EventArgs());
-                }
-            }
-
-            if (e.Property == Skill0Property ||
-                e.Property == Skill1Property ||
-                e.Property == Skill2Property ||
-                e.Property == Skill3Property ||
-                e.Property == Skill4Property ||
-                e.Property == Skill5Property ||
-                e.Property == Skill6Property ||
-                e.Property == Skill7Property)
-            {
-                if (this.suppressBuildChanged is false)
-                {
-                    this.loadedBuild.Build.Skills[0] = this.Skill0;
-                    this.loadedBuild.Build.Skills[1] = this.Skill1;
-                    this.loadedBuild.Build.Skills[2] = this.Skill2;
-                    this.loadedBuild.Build.Skills[3] = this.Skill3;
-                    this.loadedBuild.Build.Skills[4] = this.Skill4;
-                    this.loadedBuild.Build.Skills[5] = this.Skill5;
-                    this.loadedBuild.Build.Skills[6] = this.Skill6;
-                    this.loadedBuild.Build.Skills[7] = this.Skill7;
-                    this.BuildChanged?.Invoke(this, new EventArgs());
-                }
+                this.BuildChanged?.Invoke(this, new EventArgs());
             }
         }
 
-        private void BuildTemplate_Unloaded(object sender, RoutedEventArgs e)
+        if (e.Property == Skill0Property ||
+            e.Property == Skill1Property ||
+            e.Property == Skill2Property ||
+            e.Property == Skill3Property ||
+            e.Property == Skill4Property ||
+            e.Property == Skill5Property ||
+            e.Property == Skill6Property ||
+            e.Property == Skill7Property)
         {
-            this.cancellationTokenSource.Cancel();
-        }
-
-        private void InitializeProperties()
-        {
-            this.PrimaryProfession = Profession.None;
-            this.SecondaryProfession = Profession.None;
-            this.Skill0 = Skill.NoSkill;
-            this.Skill1 = Skill.NoSkill;
-            this.Skill2 = Skill.NoSkill;
-            this.Skill3 = Skill.NoSkill;
-            this.Skill4 = Skill.NoSkill;
-            this.Skill5 = Skill.NoSkill;
-            this.Skill6 = Skill.NoSkill;
-            this.Skill7 = Skill.NoSkill;
-            this.loadedProperties = true;
-        }
-
-        private void BuildTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            if(e.NewValue is BuildEntry)
+            if (this.suppressBuildChanged is false)
             {
-                this.LoadBuild();
-                this.LoadSkills();
-                this.LoadAttributes();
+                this.loadedBuild!.Build!.Skills[0] = this.Skill0;
+                this.loadedBuild!.Build!.Skills[1] = this.Skill1;
+                this.loadedBuild!.Build!.Skills[2] = this.Skill2;
+                this.loadedBuild!.Build!.Skills[3] = this.Skill3;
+                this.loadedBuild!.Build!.Skills[4] = this.Skill4;
+                this.loadedBuild!.Build!.Skills[5] = this.Skill5;
+                this.loadedBuild!.Build!.Skills[6] = this.Skill6;
+                this.loadedBuild!.Build!.Skills[7] = this.Skill7;
+                this.BuildChanged?.Invoke(this, new EventArgs());
             }
         }
+    }
 
-        private void Grid_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+    private void BuildTemplate_Unloaded(object sender, RoutedEventArgs e)
+    {
+        this.cancellationTokenSource?.Cancel();
+    }
+
+    private void InitializeProperties()
+    {
+        this.PrimaryProfession = Profession.None;
+        this.SecondaryProfession = Profession.None;
+        this.Skill0 = Skill.NoSkill;
+        this.Skill1 = Skill.NoSkill;
+        this.Skill2 = Skill.NoSkill;
+        this.Skill3 = Skill.NoSkill;
+        this.Skill4 = Skill.NoSkill;
+        this.Skill5 = Skill.NoSkill;
+        this.Skill6 = Skill.NoSkill;
+        this.Skill7 = Skill.NoSkill;
+        this.loadedProperties = true;
+    }
+
+    private void BuildTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
+    {
+        if(e.NewValue is BuildEntry)
         {
-            this.HideSkillListView();
-            this.HideInfoBrowser();
+            this.LoadBuild();
+            this.LoadSkills();
+            this.LoadAttributes();
+        }
+    }
+
+    private void Grid_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+    {
+        this.HideSkillListView();
+        this.HideInfoBrowser();
+    }
+
+    private void LoadAttributes()
+    {
+        var possibleAttributes = new List<AttributeEntry>();
+        if (this.PrimaryProfession != Profession.None)
+        {
+            possibleAttributes.Add(new AttributeEntry { Attribute = this.PrimaryProfession.PrimaryAttribute });
+            possibleAttributes.AddRange(this.PrimaryProfession.Attributes!.Select(a => new AttributeEntry { Attribute = a }));
         }
 
-        private void LoadAttributes()
+        if (this.SecondaryProfession != Profession.None && this.SecondaryProfession != this.PrimaryProfession)
         {
-            var possibleAttributes = new List<AttributeEntry>();
-            if (this.PrimaryProfession != Profession.None)
-            {
-                possibleAttributes.Add(new AttributeEntry { Attribute = this.PrimaryProfession.PrimaryAttribute });
-                possibleAttributes.AddRange(this.PrimaryProfession.Attributes.Select(a => new AttributeEntry { Attribute = a }));
-            }
+            possibleAttributes.AddRange(this.SecondaryProfession.Attributes!.Select(a => new AttributeEntry { Attribute = a }));
+        }
 
-            if (this.SecondaryProfession != Profession.None && this.SecondaryProfession != this.PrimaryProfession)
+        this.Attributes.ClearAnd().AddRange(possibleAttributes.Select(entry =>
+        {
+            var maybePresentAttribute = this.loadedBuild!.Build!.Attributes.Where(buildEntry => entry.Attribute == buildEntry.Attribute).FirstOrDefault();
+            if (maybePresentAttribute is null)
             {
-                possibleAttributes.AddRange(this.SecondaryProfession.Attributes.Select(a => new AttributeEntry { Attribute = a }));
-            }
-
-            this.Attributes.ClearAnd().AddRange(possibleAttributes.Select(entry =>
-            {
-                var maybePresentAttribute = this.loadedBuild.Build.Attributes.Where(buildEntry => entry.Attribute == buildEntry.Attribute).FirstOrDefault();
-                if (maybePresentAttribute is null)
-                {
-                    return entry;
-                }
-
-                entry.Points = maybePresentAttribute.Points;
                 return entry;
-            }));
+            }
 
-            this.loadedBuild.Build.Attributes = this.Attributes.ToList();
+            entry.Points = maybePresentAttribute.Points;
+            return entry;
+        }));
+
+        this.loadedBuild!.Build!.Attributes = this.Attributes.ToList();
+    }
+
+    private async void LoadSkills()
+    {
+        if (this.Skill0.Profession != this.PrimaryProfession &&
+            this.Skill0.Profession != this.SecondaryProfession &&
+            this.Skill0.Profession != Profession.None)
+        {
+            this.Skill0 = Skill.NoSkill;
         }
 
-        private async void LoadSkills()
+        if (this.Skill1.Profession != this.PrimaryProfession &&
+            this.Skill1.Profession != this.SecondaryProfession &&
+            this.Skill1.Profession != Profession.None)
         {
-            if (this.Skill0.Profession != this.PrimaryProfession &&
-                this.Skill0.Profession != this.SecondaryProfession &&
-                this.Skill0.Profession != Profession.None)
-            {
-                this.Skill0 = Skill.NoSkill;
-            }
-
-            if (this.Skill1.Profession != this.PrimaryProfession &&
-                this.Skill1.Profession != this.SecondaryProfession &&
-                this.Skill1.Profession != Profession.None)
-            {
-                this.Skill1 = Skill.NoSkill;
-            }
-
-            if (this.Skill2.Profession != this.PrimaryProfession &&
-                this.Skill2.Profession != this.SecondaryProfession &&
-                this.Skill2.Profession != Profession.None)
-            {
-                this.Skill2 = Skill.NoSkill;
-            }
-
-            if (this.Skill3.Profession != this.PrimaryProfession &&
-                this.Skill3.Profession != this.SecondaryProfession &&
-                this.Skill3.Profession != Profession.None)
-            {
-                this.Skill3 = Skill.NoSkill;
-            }
-
-            if (this.Skill4.Profession != this.PrimaryProfession &&
-                this.Skill4.Profession != this.SecondaryProfession &&
-                this.Skill4.Profession != Profession.None)
-            {
-                this.Skill4 = Skill.NoSkill;
-            }
-
-            if (this.Skill5.Profession != this.PrimaryProfession &&
-                this.Skill5.Profession != this.SecondaryProfession &&
-                this.Skill5.Profession != Profession.None)
-            {
-                this.Skill5 = Skill.NoSkill;
-            }
-
-            if (this.Skill6.Profession != this.PrimaryProfession &&
-                this.Skill6.Profession != this.SecondaryProfession &&
-                this.Skill6.Profession != Profession.None)
-            {
-                this.Skill6 = Skill.NoSkill;
-            }
-
-            if (this.Skill7.Profession != this.PrimaryProfession &&
-                this.Skill7.Profession != this.SecondaryProfession &&
-                this.Skill7.Profession != Profession.None)
-            {
-                this.Skill7 = Skill.NoSkill;
-            }
-
-            var filteredSkills = await this.FilterSkills(this.SkillSearchText).ToListAsync().ConfigureAwait(true);
-            this.AvailableSkills.ClearAnd().AddRange(filteredSkills);
+            this.Skill1 = Skill.NoSkill;
         }
 
-
-        private void LoadBuild()
+        if (this.Skill2.Profession != this.PrimaryProfession &&
+            this.Skill2.Profession != this.SecondaryProfession &&
+            this.Skill2.Profession != Profession.None)
         {
-            this.suppressBuildChanged = true;
-            var build = this.DataContext.As<BuildEntry>();
-            this.loadedBuild = build;
-            this.PrimaryProfession = build.Build.Primary;
-            this.SecondaryProfession = build.Build.Secondary;
-            this.Skill0 = build.Build.Skills[0];
-            this.Skill1 = build.Build.Skills[1];
-            this.Skill2 = build.Build.Skills[2];
-            this.Skill3 = build.Build.Skills[3];
-            this.Skill4 = build.Build.Skills[4];
-            this.Skill5 = build.Build.Skills[5];
-            this.Skill6 = build.Build.Skills[6];
-            this.Skill7 = build.Build.Skills[7];
-            this.suppressBuildChanged = false;
+            this.Skill2 = Skill.NoSkill;
         }
 
-        private void BrowseToInfo(string infoName)
+        if (this.Skill3.Profession != this.PrimaryProfession &&
+            this.Skill3.Profession != this.SecondaryProfession &&
+            this.Skill3.Profession != Profession.None)
         {
-            var address = BaseAddress.Replace(InfoNamePlaceholder, infoName.Replace(" ", "_"));
-            this.SkillBrowser.Address = address;
-            this.ShowInfoBrowser();
+            this.Skill3 = Skill.NoSkill;
         }
 
-        private void ShowInfoBrowser()
+        if (this.Skill4.Profession != this.PrimaryProfession &&
+            this.Skill4.Profession != this.SecondaryProfession &&
+            this.Skill4.Profession != Profession.None)
         {
-            if (this.SkillBrowser.BrowserSupported is true)
-            {
-                this.SkillBrowser.Width = 400;
-                this.SkillListContainer.Width = 0;
-            }
+            this.Skill4 = Skill.NoSkill;
         }
 
-        private void HideInfoBrowser()
+        if (this.Skill5.Profession != this.PrimaryProfession &&
+            this.Skill5.Profession != this.SecondaryProfession &&
+            this.Skill5.Profession != Profession.None)
         {
-            if (this.SkillBrowser.BrowserSupported is true)
-            {
-                this.SkillBrowser.Width = 0;
-            }
+            this.Skill5 = Skill.NoSkill;
         }
 
-        private void ShowSkillListView()
+        if (this.Skill6.Profession != this.PrimaryProfession &&
+            this.Skill6.Profession != this.SecondaryProfession &&
+            this.Skill6.Profession != Profession.None)
         {
-            this.SkillBrowser.Width = 0;
-            this.SkillListContainer.Width = 400;
+            this.Skill6 = Skill.NoSkill;
         }
 
-        private void HideSkillListView()
+        if (this.Skill7.Profession != this.PrimaryProfession &&
+            this.Skill7.Profession != this.SecondaryProfession &&
+            this.Skill7.Profession != Profession.None)
         {
+            this.Skill7 = Skill.NoSkill;
+        }
+
+        var filteredSkills = await this.FilterSkills(this.SkillSearchText).ToListAsync().ConfigureAwait(true);
+        this.AvailableSkills.ClearAnd().AddRange(filteredSkills);
+    }
+
+    private void LoadBuild()
+    {
+        this.suppressBuildChanged = true;
+        var build = this.DataContext.As<BuildEntry>();
+        this.loadedBuild = build;
+        this.PrimaryProfession = build.Build!.Primary;
+        this.SecondaryProfession = build.Build.Secondary;
+        this.Skill0 = build.Build.Skills[0];
+        this.Skill1 = build.Build.Skills[1];
+        this.Skill2 = build.Build.Skills[2];
+        this.Skill3 = build.Build.Skills[3];
+        this.Skill4 = build.Build.Skills[4];
+        this.Skill5 = build.Build.Skills[5];
+        this.Skill6 = build.Build.Skills[6];
+        this.Skill7 = build.Build.Skills[7];
+        this.suppressBuildChanged = false;
+    }
+
+    private void BrowseToInfo(string infoName)
+    {
+        var address = BaseAddress.Replace(InfoNamePlaceholder, infoName.Replace(" ", "_"));
+        this.SkillBrowser.Address = address;
+        this.ShowInfoBrowser();
+    }
+
+    private void ShowInfoBrowser()
+    {
+        if (this.SkillBrowser.BrowserSupported is true)
+        {
+            this.SkillBrowser.Width = 400;
             this.SkillListContainer.Width = 0;
         }
+    }
 
-        private void HelpButtonPrimary_Clicked(object sender, System.EventArgs e)
+    private void HideInfoBrowser()
+    {
+        if (this.SkillBrowser.BrowserSupported is true)
         {
-            if (this.PrimaryProfession == Profession.None)
-            {
-                return;
-            }
+            this.SkillBrowser.Width = 0;
+        }
+    }
 
-            this.BrowseToInfo(this.PrimaryProfession.Name);
-            if (e is RoutedEventArgs routedEventArgs)
-            {
-                routedEventArgs.Handled = true;
-            }
+    private void ShowSkillListView()
+    {
+        this.SkillBrowser.Width = 0;
+        this.SkillListContainer.Width = 400;
+    }
+
+    private void HideSkillListView()
+    {
+        this.SkillListContainer.Width = 0;
+    }
+
+    private void HelpButtonPrimary_Clicked(object sender, System.EventArgs e)
+    {
+        if (this.PrimaryProfession == Profession.None)
+        {
+            return;
         }
 
-        private void HelpButtonSecondary_Clicked(object sender, System.EventArgs e)
+        this.BrowseToInfo(this.PrimaryProfession.Name!);
+        if (e is RoutedEventArgs routedEventArgs)
         {
-            if (this.SecondaryProfession == Profession.None)
-            {
-                return;
-            }
+            routedEventArgs.Handled = true;
+        }
+    }
 
-            this.BrowseToInfo(this.SecondaryProfession.Name);
-            if (e is RoutedEventArgs routedEventArgs)
-            {
-                routedEventArgs.Handled = true;
-            }
+    private void HelpButtonSecondary_Clicked(object sender, System.EventArgs e)
+    {
+        if (this.SecondaryProfession == Profession.None)
+        {
+            return;
         }
 
-        private void AttributeTemplate_HelpClicked(object _, AttributeEntry e)
+        this.BrowseToInfo(this.SecondaryProfession.Name!);
+        if (e is RoutedEventArgs routedEventArgs)
         {
-            this.BrowseToInfo(e.Attribute.Name);
+            routedEventArgs.Handled = true;
+        }
+    }
+
+    private void AttributeTemplate_HelpClicked(object _, AttributeEntry e)
+    {
+        this.BrowseToInfo(e.Attribute?.Name!);
+    }
+
+    private void AttributeTemplate_AttributeChanged(object _, AttributeEntry e)
+    {
+        e.ThrowIfNull();
+        this.BuildChanged?.Invoke(this, new EventArgs());
+    }
+
+    private void SkillTemplate_Clicked(object sender, RoutedEventArgs e)
+    {
+        var skill = sender.As<SkillTemplate>().DataContext.As<Skill>();
+        if (skill == Skill.NoSkill)
+        {
+            this.SkillSearchText = string.Empty;
+            this.ShowSkillListView();
+            this.selectingSkillTemplate = sender.As<SkillTemplate>();
+        }
+        else
+        {
+            this.BrowseToInfo(skill.Name!);
         }
 
-        private void AttributeTemplate_AttributeChanged(object _, AttributeEntry e)
+        e.Handled = true;
+    }
+
+    private void SearchTextBox_TextChanged(object _, string e)
+    {
+        e.ThrowIfNull();
+        this.LoadSkills();
+    }
+
+    private void SkillTemplate_RemoveClicked(object sender, System.EventArgs e)
+    {
+        sender.As<SkillTemplate>().DataContext = Skill.NoSkill;
+    }
+
+    private void ListView_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)
+    {
+        if (this.selectingSkillTemplate is null)
         {
-            e.ThrowIfNull();
-            this.BuildChanged?.Invoke(this, new EventArgs());
+            this.HideSkillListView();
+            return;
         }
 
-        private void SkillTemplate_Clicked(object sender, RoutedEventArgs e)
+        this.selectingSkillTemplate.DataContext = sender.As<ListView>().SelectedItem;
+        this.HideSkillListView();
+        this.loadedBuild!.Build!.Skills[0] = this.Skill0;
+        this.loadedBuild!.Build!.Skills[1] = this.Skill1;
+        this.loadedBuild!.Build!.Skills[2] = this.Skill2;
+        this.loadedBuild!.Build!.Skills[3] = this.Skill3;
+        this.loadedBuild!.Build!.Skills[4] = this.Skill4;
+        this.loadedBuild!.Build!.Skills[5] = this.Skill5;
+        this.loadedBuild!.Build!.Skills[6] = this.Skill6;
+        this.loadedBuild!.Build!.Skills[7] = this.Skill7;
+    }
+
+    private void ListView_NavigateWithMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+    {
+        e.Handled = true;
+        if (e.Delta > 0)
+        {
+            sender.As<ListView>().SelectedIndex = sender.As<ListView>().SelectedIndex > 0 ?
+                sender.As<ListView>().SelectedIndex - 1 :
+                0;
+        }
+        else
+        {
+            sender.As<ListView>().SelectedIndex = sender.As<ListView>().SelectedIndex < sender.As<ListView>().Items.Count - 1 ?
+                sender.As<ListView>().SelectedIndex + 1 :
+                sender.As<ListView>().Items.Count;
+        }
+    }
+
+    private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+    {
+        if (sender is not ScrollViewer scrollViewer)
+        {
+            return;
+        }
+
+        e.Handled = true;
+        scrollViewer.ScrollToVerticalOffset(scrollViewer.VerticalOffset - e.Delta);
+    }
+
+    private async IAsyncEnumerable<Skill> FilterSkills(string searchTerm)
+    {
+        // Replace symbols to ease search
+        searchTerm = searchTerm?.Replace("\"", "").Replace("!", "")!;
+        
+        foreach (var skill in Skill.Skills)
         {
-            var skill = sender.As<SkillTemplate>().DataContext.As<Skill>();
             if (skill == Skill.NoSkill)
             {
-                this.SkillSearchText = string.Empty;
-                this.ShowSkillListView();
-                this.selectingSkillTemplate = sender.As<SkillTemplate>();
-            }
-            else
-            {
-                this.BrowseToInfo(skill.Name);
+                continue;
             }
 
-            e.Handled = true;
-        }
-
-        private void SearchTextBox_TextChanged(object _, string e)
-        {
-            e.ThrowIfNull();
-            this.LoadSkills();
-        }
-
-        private void SkillTemplate_RemoveClicked(object sender, System.EventArgs e)
-        {
-            sender.As<SkillTemplate>().DataContext = Skill.NoSkill;
-        }
-
-        private void ListView_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)
-        {
-            if (this.selectingSkillTemplate is null)
+            if (skill.Profession != this.PrimaryProfession &&
+                skill.Profession != this.SecondaryProfession &&
+                skill.Profession != Profession.None)
             {
-                this.HideSkillListView();
-                return;
+                continue;
             }
 
-            this.selectingSkillTemplate.DataContext = sender.As<ListView>().SelectedItem;
-            this.HideSkillListView();
-            this.loadedBuild.Build.Skills[0] = this.Skill0;
-            this.loadedBuild.Build.Skills[1] = this.Skill1;
-            this.loadedBuild.Build.Skills[2] = this.Skill2;
-            this.loadedBuild.Build.Skills[3] = this.Skill3;
-            this.loadedBuild.Build.Skills[4] = this.Skill4;
-            this.loadedBuild.Build.Skills[5] = this.Skill5;
-            this.loadedBuild.Build.Skills[6] = this.Skill6;
-            this.loadedBuild.Build.Skills[7] = this.Skill7;
-        }
-
-        private void ListView_NavigateWithMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
-        {
-            e.Handled = true;
-            if (e.Delta > 0)
+            if (searchTerm.IsNullOrWhiteSpace())
             {
-                sender.As<ListView>().SelectedIndex = sender.As<ListView>().SelectedIndex > 0 ?
-                    sender.As<ListView>().SelectedIndex - 1 :
-                    0;
-            }
-            else
-            {
-                sender.As<ListView>().SelectedIndex = sender.As<ListView>().SelectedIndex < sender.As<ListView>().Items.Count - 1 ?
-                    sender.As<ListView>().SelectedIndex + 1 :
-                    sender.As<ListView>().Items.Count;
-            }
-        }
-
-        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
-        {
-            if (sender is not ScrollViewer scrollViewer)
-            {
-                return;
+                yield return skill;
+                continue;
             }
 
-            e.Handled = true;
-            scrollViewer.ScrollToVerticalOffset(scrollViewer.VerticalOffset - e.Delta);
-        }
-
-        private async IAsyncEnumerable<Skill> FilterSkills(string searchTerm)
-        {
-            // Replace symbols to ease search
-            searchTerm = searchTerm?.Replace("\"", "").Replace("!", "");
-            
-            foreach (var skill in Skill.Skills)
+            var matchesName = await Task.Run(() => StringUtils.MatchesSearchString(skill.Name!.Replace("\"", "").Replace("!", ""), searchTerm!));
+            if (matchesName)
             {
-                if (skill == Skill.NoSkill)
-                {
-                    continue;
-                }
-
-                if (skill.Profession != this.PrimaryProfession &&
-                    skill.Profession != this.SecondaryProfession &&
-                    skill.Profession != Profession.None)
-                {
-                    continue;
-                }
-
-                if (searchTerm.IsNullOrWhiteSpace())
-                {
-                    yield return skill;
-                    continue;
-                }
-
-                var matchesName = await Task.Run(() => StringUtils.MatchesSearchString(skill.Name.Replace("\"", "").Replace("!", ""), searchTerm));
-                if (matchesName)
-                {
-                    yield return skill;
-                    continue;
-                }
+                yield return skill;
+                continue;
             }
         }
     }

Daybreak/Controls/Templates/GuildwarsPathTemplate.xaml.cs

@@ -6,67 +6,66 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Extensions;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for GuildwarsPathTemplate.xaml
+/// </summary>
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Fields used by source generator for DependencyProperty")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
+public partial class GuildwarsPathTemplate : UserControl
 {
-    /// <summary>
-    /// Interaction logic for GuildwarsPathTemplate.xaml
-    /// </summary>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Fields used by source generator for DependencyProperty")]
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
-    public partial class GuildwarsPathTemplate : UserControl
+    public event EventHandler? RemoveClicked;
+    public event EventHandler? DefaultClicked;
+
+    [GenerateDependencyProperty]
+    private string path = string.Empty;
+    [GenerateDependencyProperty]
+    private bool isDefault;
+
+    public GuildwarsPathTemplate()
     {
-        public event EventHandler RemoveClicked;
-        public event EventHandler DefaultClicked;
+        this.InitializeComponent();
+        this.DataContextChanged += this.GuildwarsPathTemplate_DataContextChanged;
+    }
 
-        [GenerateDependencyProperty]
-        private string path;
-        [GenerateDependencyProperty]
-        private bool isDefault;
-
-        public GuildwarsPathTemplate()
+    private void GuildwarsPathTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
+    {
+        if (e.NewValue is GuildwarsPath guildwarsPath)
         {
-            this.InitializeComponent();
-            this.DataContextChanged += this.GuildwarsPathTemplate_DataContextChanged;
+            this.IsDefault = guildwarsPath.Default;
+            this.Path = guildwarsPath.Path;
         }
+    }
 
-        private void GuildwarsPathTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue is GuildwarsPath guildwarsPath)
-            {
-                this.IsDefault = guildwarsPath.Default;
-                this.Path = guildwarsPath.Path;
-            }
-        }
+    private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
+    {
+        this.DataContext.As<GuildwarsPath>().Path = this.Path;
+    }
 
-        private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            this.DataContext.As<GuildwarsPath>().Path = this.Path;
-        }
+    private void StarGlyph_Clicked(object sender, EventArgs e)
+    {
+        this.DefaultClicked?.Invoke(this, e);
+    }
 
-        private void StarGlyph_Clicked(object sender, EventArgs e)
-        {
-            this.DefaultClicked?.Invoke(this, e);
-        }
+    private void BinButton_Clicked(object sender, EventArgs e)
+    {
+        this.RemoveClicked?.Invoke(this, e);
+    }
 
-        private void BinButton_Clicked(object sender, EventArgs e)
+    private void FilePickerGlyph_Clicked(object sender, EventArgs e)
+    {
+        var filePicker = new OpenFileDialog()
         {
-            this.RemoveClicked?.Invoke(this, e);
-        }
-
-        private void FilePickerGlyph_Clicked(object sender, EventArgs e)
+            CheckFileExists = true,
+            CheckPathExists = true,
+            DefaultExt = "exe",
+            Multiselect = false
+        };
+        if (filePicker.ShowDialog() is true)
         {
-            var filePicker = new OpenFileDialog()
-            {
-                CheckFileExists = true,
-                CheckPathExists = true,
-                DefaultExt = "exe",
-                Multiselect = false
-            };
-            if (filePicker.ShowDialog() is true)
-            {
-                this.Path = filePicker.FileName;
-                this.DataContext.As<GuildwarsPath>().Path = filePicker.FileName;
-            }
+            this.Path = filePicker.FileName;
+            this.DataContext.As<GuildwarsPath>().Path = filePicker.FileName;
         }
     }
 }

Daybreak/Controls/Templates/LogMessageTemplate.xaml.cs

@@ -3,34 +3,33 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Extensions;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for LogTemplate.xaml
+/// </summary>
+public partial class LogMessageTemplate : UserControl
 {
-    /// <summary>
-    /// Interaction logic for LogTemplate.xaml
-    /// </summary>
-    public partial class LogMessageTemplate : UserControl
+    private bool expanded;
+
+    [GenerateDependencyProperty]
+    private string message = string.Empty;
+
+    public LogMessageTemplate()
     {
-        private bool expanded;
+        this.InitializeComponent();
+    }
 
-        [GenerateDependencyProperty]
-        private string message;
-
-        public LogMessageTemplate()
+    private void TextBox_MouseLeftButtonDown(object sender, MouseButtonEventArgs eventArgs)
+    {
+        this.expanded = !this.expanded;
+        if (this.expanded)
         {
-            this.InitializeComponent();
+            sender.As<TextBlock>().MaxHeight = double.MaxValue;
         }
-
-        private void TextBox_MouseLeftButtonDown(object sender, MouseButtonEventArgs eventArgs)
+        else
         {
-            this.expanded = !this.expanded;
-            if (this.expanded)
-            {
-                sender.As<TextBlock>().MaxHeight = double.MaxValue;
-            }
-            else
-            {
-                sender.As<TextBlock>().MaxHeight = 18;
-            }
+            sender.As<TextBlock>().MaxHeight = 18;
         }
     }
 }

Daybreak/Controls/Templates/ScreenTemplate.xaml.cs

@@ -6,58 +6,57 @@ using System.Windows.Controls;
 using System.Windows.Extensions;
 using System.Windows.Media;
 
-namespace Daybreak.Controls.Templates
+namespace Daybreak.Controls.Templates;
+
+/// <summary>
+/// Interaction logic for ScreenTemplate.xaml
+/// </summary>
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Fields used by source generator for DependencyProperty")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
+public partial class ScreenTemplate : UserControl
 {
-    /// <summary>
-    /// Interaction logic for ScreenTemplate.xaml
-    /// </summary>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Fields used by source generator for DependencyProperty")]
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
-    public partial class ScreenTemplate : UserControl
+    public event EventHandler<Screen>? Clicked;
+
+    [GenerateDependencyProperty]
+    private string screenId = string.Empty;
+    [GenerateDependencyProperty]
+    private Brush highlight = default!;
+
+    public ScreenTemplate()
     {
-        public event EventHandler<Screen> Clicked;
+        this.InitializeComponent();
+        this.DataContextChanged += this.ScreenTemplate_DataContextChanged;
+    }
 
-        [GenerateDependencyProperty]
-        private string screenId;
-        [GenerateDependencyProperty]
-        private Brush highlight;
-
-        public ScreenTemplate()
+    protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
+    {
+        base.OnPropertyChanged(e);
+        if (e.Property == ForegroundProperty)
         {
-            this.InitializeComponent();
-            this.DataContextChanged += this.ScreenTemplate_DataContextChanged;
-        }
-
-        protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
-        {
-            base.OnPropertyChanged(e);
-            if (e.Property == ForegroundProperty)
-            {
-                this.Highlight = e.NewValue.As<Brush>();
-            }
-        }
-
-        private void ScreenTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue is Screen screen)
-            {
-                this.ScreenId = screen.Id.ToString();
-            }
-        }
-
-        private void Rectangle_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
-        {
-            this.Highlight = Brushes.LightSteelBlue;
-        }
-
-        private void Rectangle_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
-        {
-            this.Highlight = this.Foreground;
-        }
-
-        private void Rectangle_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
-        {
-            this.Clicked?.Invoke(this, this.DataContext.As<Screen>());
+            this.Highlight = e.NewValue.As<Brush>();
         }
     }
+
+    private void ScreenTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
+    {
+        if (e.NewValue is Screen screen)
+        {
+            this.ScreenId = screen.Id.ToString();
+        }
+    }
+
+    private void Rectangle_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
+    {
+        this.Highlight = Brushes.LightSteelBlue;
+    }
+
+    private void Rectangle_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
+    {
+        this.Highlight = this.Foreground;
+    }
+
+    private void Rectangle_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+    {
+        this.Clicked?.Invoke(this, this.DataContext.As<Screen>());
+    }
 }

Daybreak/Controls/Templates/SkillTemplate.xaml.cs

@@ -1,4 +1,4 @@
-using Daybreak.Models.Builds;
+using Daybreak.Models.Guildwars;
 using Daybreak.Services.IconRetrieve;
 using System;
 using System.Windows;
@@ -7,88 +7,87 @@ using System.Windows.Extensions;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for SkillTemplate.xaml
+/// </summary>
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Fields used by source generator for DependencyProperty")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
+public partial class SkillTemplate : UserControl
 {
-    /// <summary>
-    /// Interaction logic for SkillTemplate.xaml
-    /// </summary>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Fields used by source generator for DependencyProperty")]
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
-    public partial class SkillTemplate : UserControl
+    public event EventHandler<RoutedEventArgs>? Clicked;
+    public event EventHandler? RemoveClicked;
+
+    private IIconCache? iconRetriever;
+
+    [GenerateDependencyProperty]
+    private ImageSource imageSource = default!;
+    [GenerateDependencyProperty]
+    private double borderOpacity;
+
+    public SkillTemplate()
     {
-        public event EventHandler<RoutedEventArgs> Clicked;
-        public event EventHandler RemoveClicked;
+        this.InitializeComponent();
+        this.DataContextChanged += this.SkillTemplate_DataContextChanged;
+    }
 
-        private IIconCache iconRetriever;
+    public void InitializeSkillTemplate(IIconCache iconRetriever)
+    {
+        this.iconRetriever = iconRetriever;
+        this.SkillTemplate_DataContextChanged(this, new DependencyPropertyChangedEventArgs(UserControl.DataContextProperty, null, this.DataContext));
+    }
 
-        [GenerateDependencyProperty]
-        private ImageSource imageSource;
-        [GenerateDependencyProperty]
-        private double borderOpacity;
-
-        public SkillTemplate()
+    private async void SkillTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
+    {
+        if (this.iconRetriever is null)
         {
-            this.InitializeComponent();
-            this.DataContextChanged += this.SkillTemplate_DataContextChanged;
+            return;
         }
 
-        public void InitializeSkillTemplate(IIconCache iconRetriever)
+        if (e.NewValue is Skill skill)
         {
-            this.iconRetriever = iconRetriever;
-            this.SkillTemplate_DataContextChanged(this, new DependencyPropertyChangedEventArgs(UserControl.DataContextProperty, null, this.DataContext));
-        }
-
-        private async void SkillTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            if (this.iconRetriever is null)
+            if (skill != Skill.NoSkill)
             {
-                return;
-            }
-
-            if (e.NewValue is Skill skill)
-            {
-                if (skill != Skill.NoSkill)
+                var maybeUri = await this.iconRetriever.GetIconUri(skill).ConfigureAwait(true);
+                if (maybeUri.ExtractValue() is Uri uri)
                 {
-                    var maybeUri = await this.iconRetriever.GetIconUri(skill).ConfigureAwait(true);
-                    if (maybeUri.ExtractValue() is Uri uri)
-                    {
-                        this.ImageSource = new BitmapImage(uri);
-                    }
-                }
-                else if (this.ImageSource is not null)
-                {
-                    this.ImageSource = null;
+                    this.ImageSource = new BitmapImage(uri);
                 }
             }
-        }
-
-        private void Border_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
-        {
-            this.BorderOpacity = 1;
-            this.CancelButton.Visibility = this.HasSkill() ? Visibility.Visible : Visibility.Hidden;
-        }
-        private void Border_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
-        {
-            this.BorderOpacity = 0;
-            this.CancelButton.Visibility = Visibility.Hidden;
-        }
-        private void Rectangle_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
-        {
-            this.Clicked?.Invoke(this, e);
-        }
-        private void CancelButton_Clicked(object sender, EventArgs e)
-        {
-            this.RemoveClicked?.Invoke(this, e);
-        }
-
-        private bool HasSkill()
-        {
-            if (this.DataContext is Skill skill)
+            else if (this.ImageSource is not null)
             {
-                return skill != Skill.NoSkill;
+                this.ImageSource = null;
             }
-
-            return false;
         }
     }
+
+    private void Border_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
+    {
+        this.BorderOpacity = 1;
+        this.CancelButton.Visibility = this.HasSkill() ? Visibility.Visible : Visibility.Hidden;
+    }
+    private void Border_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
+    {
+        this.BorderOpacity = 0;
+        this.CancelButton.Visibility = Visibility.Hidden;
+    }
+    private void Rectangle_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
+    }
+    private void CancelButton_Clicked(object sender, EventArgs e)
+    {
+        this.RemoveClicked?.Invoke(this, e);
+    }
+
+    private bool HasSkill()
+    {
+        if (this.DataContext is Skill skill)
+        {
+            return skill != Skill.NoSkill;
+        }
+
+        return false;
+    }
 }

Daybreak/Converters/BooleanToVisibilityConverter.cs

@@ -4,51 +4,50 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace Daybreak.Converters
+namespace Daybreak.Converters;
+
+public class BooleanToVisibilityConverter : IValueConverter
 {
-    public class BooleanToVisibilityConverter : IValueConverter
+    /// <summary>
+    /// Set to true if you want to show control when boolean value is true.
+    /// Set to false if you want to hide/collapse control when value is true.
+    /// </summary>
+    public bool TriggerValue { get; set; } = true;
+    /// <summary>
+    /// Set to true if you just want to hide the control, else set to false if you want to collapse the control.
+    /// </summary>
+    public bool IsHidden { get; set; }
+
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        /// <summary>
-        /// Set to true if you want to show control when boolean value is true.
-        /// Set to false if you want to hide/collapse control when value is true.
-        /// </summary>
-        public bool TriggerValue { get; set; } = true;
-        /// <summary>
-        /// Set to true if you just want to hide the control, else set to false if you want to collapse the control.
-        /// </summary>
-        public bool IsHidden { get; set; }
+        return this.GetVisibility(value);
+    }
 
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+
+    private object GetVisibility(object value)
+    {
+        if (value is not bool)
         {
-            return this.GetVisibility(value);
+            return this.IsHidden ?
+                Visibility.Hidden :
+                Visibility.Collapsed;
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        var objValue = value.Cast<bool>();
+        if ((objValue && this.TriggerValue && this.IsHidden) || (!objValue && !this.TriggerValue && this.IsHidden))
         {
-            throw new NotImplementedException();
+            return Visibility.Hidden;
         }
 
-        private object GetVisibility(object value)
+        if ((objValue && this.TriggerValue && !this.IsHidden) || (!objValue && !this.TriggerValue && !this.IsHidden))
         {
-            if (value is not bool)
-            {
-                return this.IsHidden ?
-                    Visibility.Hidden :
-                    Visibility.Collapsed;
-            }
-
-            var objValue = value.Cast<bool>();
-            if ((objValue && this.TriggerValue && this.IsHidden) || (!objValue && !this.TriggerValue && this.IsHidden))
-            {
-                return Visibility.Hidden;
-            }
-
-            if ((objValue && this.TriggerValue && !this.IsHidden) || (!objValue && !this.TriggerValue && !this.IsHidden))
-            {
-                return Visibility.Collapsed;
-            }
-
-            return Visibility.Visible;
+            return Visibility.Collapsed;
         }
+
+        return Visibility.Visible;
     }
 }

Daybreak/Converters/HiddenWhenNull.cs

@@ -3,30 +3,29 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace Daybreak.Converters
+namespace Daybreak.Converters;
+
+public class HiddenWhenNull : IValueConverter
 {
-    public class HiddenWhenNull : IValueConverter
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return this.GetVerticalAlignment(value);
-        }
+        return this.GetVerticalAlignment(value);
+    }
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
 
-        private object GetVerticalAlignment(object value)
+    private object GetVerticalAlignment(object value)
+    {
+        if (value is null)
         {
-            if (value is null)
-            {
-                return Visibility.Hidden;
-            }
-            else
-            {
-                return Visibility.Visible;
-            }
+            return Visibility.Hidden;
+        }
+        else
+        {
+            return Visibility.Visible;
         }
     }
 }

Daybreak/Converters/InverseBooleanConverter.cs

@@ -1,25 +1,24 @@
 using System;
 using System.Windows.Data;
 
-namespace Daybreak.Converters
+namespace Daybreak.Converters;
+
+public class InverseBooleanConverter : IValueConverter
 {
-    public class InverseBooleanConverter : IValueConverter
+    public object Convert(object value, Type targetType, object parameter,
+        System.Globalization.CultureInfo culture)
     {
-        public object Convert(object value, Type targetType, object parameter,
-            System.Globalization.CultureInfo culture)
+        if (targetType != typeof(bool))
         {
-            if (targetType != typeof(bool))
-            {
-                throw new InvalidOperationException("The target must be a boolean");
-            }
-
-            return !(bool)value;
+            throw new InvalidOperationException("The target must be a boolean");
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter,
-            System.Globalization.CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+        return !(bool)value;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter,
+        System.Globalization.CultureInfo culture)
+    {
+        throw new NotSupportedException();
     }
 }

Daybreak/Converters/MenuButtonHighlightConverter.cs

@@ -2,34 +2,33 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace Daybreak.Converters
-{
-    public class MenuButtonHighlightConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (targetType == typeof(double) &&
-                value is bool boolean)
-            {
-                return boolean ? 0.4 : 0;
-            }
-            else
-            {
-                throw new NotImplementedException();
-            }
-        }
+namespace Daybreak.Converters;
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+public class MenuButtonHighlightConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (targetType == typeof(double) &&
+            value is bool boolean)
         {
-            if (targetType == typeof(bool) &&
-                value is double doubleValue)
-            {
-                return doubleValue == 0.4;
-            }
-            else
-            {
-                throw new NotImplementedException();
-            }
+            return boolean ? 0.4 : 0;
+        }
+        else
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (targetType == typeof(bool) &&
+            value is double doubleValue)
+        {
+            return doubleValue == 0.4;
+        }
+        else
+        {
+            throw new NotImplementedException();
         }
     }
 }

Daybreak/Converters/TileButtonHighlightConverter.cs

@@ -2,34 +2,33 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace Daybreak.Converters
-{
-    public class TileButtonHighlightConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (targetType == typeof(double) &&
-                value is bool boolean)
-            {
-                return boolean ? 1 : 0.4;
-            }
-            else
-            {
-                throw new NotImplementedException();
-            }
-        }
+namespace Daybreak.Converters;
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+public class TileButtonHighlightConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (targetType == typeof(double) &&
+            value is bool boolean)
         {
-            if (targetType == typeof(bool) &&
-                value is double doubleValue)
-            {
-                return doubleValue == 1;
-            }
-            else
-            {
-                throw new NotImplementedException();
-            }
+            return boolean ? 1 : 0.4;
+        }
+        else
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (targetType == typeof(bool) &&
+            value is double doubleValue)
+        {
+            return doubleValue == 1;
+        }
+        else
+        {
+            throw new NotImplementedException();
         }
     }
 }

Daybreak/Daybreak.csproj

@@ -2,15 +2,18 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
+    <RootNamespace>Daybreak</RootNamespace>
+    <!--Unable to migrate to .net 7 due to issues with font families not being found #140-->
     <TargetFramework>net6.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
+    <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
-    <Platforms>AnyCPU</Platforms>
+    <Platforms>AnyCPU;x86</Platforms>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <Version>0.9.7</Version>
+    <Version>0.9.8</Version>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <UserSecretsId>cfb2a489-db80-448d-a969-80270f314c46</UserSecretsId>
   </PropertyGroup>
@@ -34,15 +37,14 @@
   </Target>
 	
   <ItemGroup>
-    <PackageReference Include="LiteDB" Version="5.0.12" />
+    <PackageReference Include="LiteDB" Version="5.0.15" />
     <PackageReference Include="Microsoft.CorrelationVector" Version="1.0.42" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1343.22" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1587.40" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NReco.Logging.File" Version="1.1.5" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageReference Include="Slim" Version="1.9.2" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
@@ -105,7 +107,7 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-
+	
   <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Release'">
     <Exec Command="echo.&gt;$(Version).version" />
   </Target>

Daybreak/Exceptions/CredentialsNotFoundException.cs

@@ -1,24 +1,23 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Daybreak.Exceptions
+namespace Daybreak.Exceptions;
+
+public sealed class CredentialsNotFoundException : Exception
 {
-    public sealed class CredentialsNotFoundException : Exception
+    public CredentialsNotFoundException()
     {
-        public CredentialsNotFoundException()
-        {
-        }
+    }
 
-        public CredentialsNotFoundException(string message) : base(message)
-        {
-        }
+    public CredentialsNotFoundException(string message) : base(message)
+    {
+    }
 
-        public CredentialsNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context)
-        {
-        }
+    public CredentialsNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context)
+    {
+    }
 
-        public CredentialsNotFoundException(string message, Exception innerException) : base(message, innerException)
-        {
-        }
+    public CredentialsNotFoundException(string message, Exception innerException) : base(message, innerException)
+    {
     }
 }

Daybreak/Exceptions/ExecutableNotFoundException.cs

@@ -1,24 +1,23 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Daybreak.Exceptions
+namespace Daybreak.Exceptions;
+
+public sealed class ExecutableNotFoundException : Exception
 {
-    public sealed class ExecutableNotFoundException : Exception
+    public ExecutableNotFoundException()
     {
-        public ExecutableNotFoundException()
-        {
-        }
+    }
 
-        public ExecutableNotFoundException(string message) : base(message)
-        {
-        }
+    public ExecutableNotFoundException(string message) : base(message)
+    {
+    }
 
-        public ExecutableNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context)
-        {
-        }
+    public ExecutableNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context)
+    {
+    }
 
-        public ExecutableNotFoundException(string message, Exception innerException) : base(message, innerException)
-        {
-        }
+    public ExecutableNotFoundException(string message, Exception innerException) : base(message, innerException)
+    {
     }
 }

Daybreak/Exceptions/FatalException.cs

@@ -1,24 +1,23 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Daybreak.Exceptions
+namespace Daybreak.Exceptions;
+
+public sealed class FatalException : Exception
 {
-    public sealed class FatalException : Exception
+    public FatalException()
     {
-        public FatalException()
-        {
-        }
+    }
 
-        public FatalException(string message) : base(message)
-        {
-        }
+    public FatalException(string message) : base(message)
+    {
+    }
 
-        public FatalException(SerializationInfo info, StreamingContext context) : base(info, context)
-        {
-        }
+    public FatalException(SerializationInfo info, StreamingContext context) : base(info, context)
+    {
+    }
 
-        public FatalException(string message, Exception innerException) : base(message, innerException)
-        {
-        }
+    public FatalException(string message, Exception innerException) : base(message, innerException)
+    {
     }
 }

Daybreak/Launch/Launcher.cs

@@ -1,17 +1,12 @@
 using Daybreak.Configuration;
 using Daybreak.Exceptions;
-using Daybreak.Services.IconRetrieve;
-using Daybreak.Services.Privilege;
-using Daybreak.Services.Screenshots;
-using Daybreak.Services.Updater;
+using Daybreak.Services.Navigation;
 using Daybreak.Services.Updater.PostUpdate;
-using Daybreak.Services.ViewManagement;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Slim;
 using Slim.Integration.ServiceCollection;
 using System;
-using System.Configuration;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -19,106 +14,105 @@ using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Extensions;
 
-namespace Daybreak.Launch
+namespace Daybreak.Launch;
+
+public sealed class Launcher : ExtendedApplication<MainWindow>
 {
-    public sealed class Launcher : ExtendedApplication<MainWindow>
+    public readonly static Launcher Instance = new();
+
+    private ILogger? logger;
+
+    public System.IServiceProvider ApplicationServiceProvider => this.ServiceProvider;
+
+    [STAThread]
+    public static int Main()
     {
-        public readonly static Launcher Instance = new();
+        return LaunchMainWindow();
+    }
 
-        private ILogger logger;
-
-        public System.IServiceProvider ApplicationServiceProvider => this.ServiceProvider;
-
-        [STAThread]
-        public static int Main()
+    protected override System.IServiceProvider SetupServiceProvider(IServiceCollection services)
+    {
+        var serviceManager = new ServiceManager();
+        ProjectConfiguration.RegisterResolvers(serviceManager);
+        return services.BuildSlimServiceProvider(serviceManager);
+    }
+    protected override void RegisterServices(IServiceCollection services)
+    {
+        ProjectConfiguration.RegisterServices(services);
+    }
+    protected override bool HandleException(Exception e)
+    {
+        if (e is null)
         {
-            return LaunchMainWindow();
+            return false;
         }
 
-        protected override System.IServiceProvider SetupServiceProvider(IServiceCollection services)
+        if (this.logger is null)
         {
-            var serviceManager = new ServiceManager();
-            ProjectConfiguration.RegisterResolvers(serviceManager);
-            return services.BuildSlimServiceProvider(serviceManager);
+            return false;
         }
-        protected override void RegisterServices(IServiceCollection services)
+
+        if (e is FatalException fatalException)
         {
-            ProjectConfiguration.RegisterServices(services);
+            this.logger.LogCritical(e, $"{nameof(FatalException)} encountered. Closing application");
+            MessageBox.Show(fatalException.ToString());
+            File.WriteAllText("crash.log", e.ToString());
+            return false;
         }
-        protected override bool HandleException(Exception e)
+        else if (e is TargetInvocationException targetInvocationException && e.InnerException is FatalException innerFatalException)
         {
-            if (e is null)
+            this.logger.LogCritical(e, $"{nameof(FatalException)} encountered. Closing application");
+            MessageBox.Show(innerFatalException.ToString());
+            File.WriteAllText("crash.log", e.ToString());
+            return false;
+        }
+        else if (e is AggregateException aggregateException)
+        {
+            if (aggregateException.InnerExceptions.FirstOrDefault() is COMException comException &&
+                comException.Message.Contains("Invalid window handle"))
             {
-                return false;
-            }
-
-            if (this.logger is null)
-            {
-                return false;
-            }
-
-            if (e is FatalException fatalException)
-            {
-                this.logger.LogCritical(e, $"{nameof(FatalException)} encountered. Closing application");
-                MessageBox.Show(fatalException.ToString());
-                File.WriteAllText("crash.log", e.ToString());
-                return false;
-            }
-            else if (e is TargetInvocationException targetInvocationException && e.InnerException is FatalException innerFatalException)
-            {
-                this.logger.LogCritical(e, $"{nameof(FatalException)} encountered. Closing application");
-                MessageBox.Show(innerFatalException.ToString());
-                File.WriteAllText("crash.log", e.ToString());
-                return false;
-            }
-            else if (e is AggregateException aggregateException)
-            {
-                if (aggregateException.InnerExceptions.FirstOrDefault() is COMException comException &&
-                    comException.Message.Contains("Invalid window handle"))
-                {
-                    /* 
-                     * Ignore exception caused by browser failing to initialize due to missing window.
-                     * Likely caused by switching views before browser was initialized.
-                     */
-                    this.logger.LogError(e, "Failed to initialize browser");
-                    return true;
-                }
-            }
-            else if (e.Message.Contains("Invalid window handle.") && e.StackTrace.Contains("CoreWebView2Environment.CreateCoreWebView2ControllerAsync"))
-            {
-                /*
+                /* 
                  * Ignore exception caused by browser failing to initialize due to missing window.
-                 * Likely caused by switching views before the browser was initialized.
+                 * Likely caused by switching views before browser was initialized.
                  */
                 this.logger.LogError(e, "Failed to initialize browser");
                 return true;
             }
-
-            this.logger.LogError(e, $"Unhandled exception caught {e.GetType()}");
-            MessageBox.Show(e.ToString());
+        }
+        else if (e.Message.Contains("Invalid window handle.") && e.StackTrace?.Contains("CoreWebView2Environment.CreateCoreWebView2ControllerAsync") is true)
+        {
+            /*
+             * Ignore exception caused by browser failing to initialize due to missing window.
+             * Likely caused by switching views before the browser was initialized.
+             */
+            this.logger.LogError(e, "Failed to initialize browser");
             return true;
         }
-        protected override void ApplicationStarting()
-        {
-            ProjectConfiguration.RegisterViews(this.ServiceProvider.GetService<IViewManager>());
-            ProjectConfiguration.RegisterPostUpdateActions(this.ServiceProvider.GetService<IPostUpdateActionProducer>());
 
-            this.logger = this.ServiceProvider.GetRequiredService<ILogger<Launcher>>();
-            this.RegisterViewContainer();
-        }
-        protected override void ApplicationClosing()
-        {
-        }
+        this.logger.LogError(e, $"Unhandled exception caught {e.GetType()}");
+        MessageBox.Show(e.ToString());
+        return true;
+    }
+    protected override void ApplicationStarting()
+    {
+        ProjectConfiguration.RegisterViews(this.ServiceProvider.GetService<IViewManager>()!);
+        ProjectConfiguration.RegisterPostUpdateActions(this.ServiceProvider.GetService<IPostUpdateActionProducer>()!);
 
-        private void RegisterViewContainer()
-        {
-            var viewManager = this.ServiceProvider.GetRequiredService<IViewManager>();
-            var mainWindow = this.ServiceProvider.GetRequiredService<MainWindow>();
-            viewManager.RegisterContainer(mainWindow.Container);
-        }
-        private static int LaunchMainWindow()
-        {
-            return Instance.Run();
-        }
+        this.logger = this.ServiceProvider.GetRequiredService<ILogger<Launcher>>();
+        this.RegisterViewContainer();
+    }
+    protected override void ApplicationClosing()
+    {
+    }
+
+    private void RegisterViewContainer()
+    {
+        var viewManager = this.ServiceProvider.GetRequiredService<IViewManager>();
+        var mainWindow = this.ServiceProvider.GetRequiredService<MainWindow>();
+        viewManager.RegisterContainer(mainWindow.Container);
+    }
+    private static int LaunchMainWindow()
+    {
+        return Instance.Run();
     }
 }

Daybreak/Launch/MainWindow.xaml

@@ -121,7 +121,8 @@
                   Background="#A0202020">
             <controls:MenuList Margin="0, 30, 0, 0"/>
         </Grid>
-        <ToggleButton Style="{StaticResource Window_SettingsButton}"
+        <ToggleButton x:Name="OpeningSettingsButton"
+                      Style="{StaticResource Window_SettingsButton}"
                       Width="50"
                       Height="30"
                       HorizontalAlignment="Left"
@@ -129,7 +130,8 @@
                       Grid.ColumnSpan="2"
                       Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
                       Click="SettingsButton_Clicked"></ToggleButton>
-        <ToggleButton Style="{StaticResource Window_SettingsButton}"
+        <ToggleButton x:Name="ClosingSettingsButton"
+                      Style="{StaticResource Window_SettingsButton}"
                       Width="50"
                       Height="30"
                       HorizontalAlignment="Left"

Daybreak/Launch/MainWindow.xaml.cs

@@ -1,12 +1,13 @@
 using Daybreak.Configuration;
 using Daybreak.Services.Bloogum;
 using Daybreak.Services.IconRetrieve;
+using Daybreak.Services.Menu;
+using Daybreak.Services.Navigation;
 using Daybreak.Services.Privilege;
 using Daybreak.Services.Screenshots;
 using Daybreak.Services.Updater;
-using Daybreak.Services.ViewManagement;
+using Daybreak.Utils;
 using Daybreak.Views;
-using Pepa.Wpf.Utilities;
 using System;
 using System.Configuration;
 using System.Core.Extensions;
@@ -23,266 +24,302 @@ using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 
-namespace Daybreak.Launch
+namespace Daybreak.Launch;
+
+/// <summary>
+/// Interaction logic for MainWindow.xaml
+/// </summary>
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Fields used by source generator for DependencyProperty")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
+public partial class MainWindow : Window
 {
-    /// <summary>
-    /// Interaction logic for MainWindow.xaml
-    /// </summary>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Fields used by source generator for DependencyProperty")]
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
-    public partial class MainWindow : Window
+    private readonly IMenuServiceInitializer menuServiceInitializer;
+    private readonly IViewManager viewManager;
+    private readonly IScreenshotProvider screenshotProvider;
+    private readonly IBloogumClient bloogumClient;
+    private readonly IApplicationUpdater applicationUpdater;
+    private readonly IPrivilegeManager privilegeManager;
+    private readonly IIconDownloader iconDownloader;
+    private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
+    private readonly CancellationTokenSource cancellationToken = new();
+
+    [GenerateDependencyProperty]
+    private string creditText = string.Empty;
+    [GenerateDependencyProperty]
+    private string currentVersionText = string.Empty;
+    [GenerateDependencyProperty]
+    private bool isRunningAsAdmin;
+    [GenerateDependencyProperty]
+    private bool isShowingDropdown;
+
+    public MainWindow(
+        IMenuServiceInitializer menuServiceInitializer,
+        IViewManager viewManager,
+        IScreenshotProvider screenshotProvider,
+        IBloogumClient bloogumClient,
+        IApplicationUpdater applicationUpdater,
+        IPrivilegeManager privilegeManager,
+        IIconDownloader iconDownloader,
+        ILiveOptions<ApplicationConfiguration> liveOptions)
     {
-        private readonly IViewManager viewManager;
-        private readonly IScreenshotProvider screenshotProvider;
-        private readonly IBloogumClient bloogumClient;
-        private readonly IApplicationUpdater applicationUpdater;
-        private readonly IPrivilegeManager privilegeManager;
-        private readonly IIconDownloader iconDownloader;
-        private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
-        private readonly CancellationTokenSource cancellationToken = new();
+        this.menuServiceInitializer = menuServiceInitializer.ThrowIfNull();
+        this.viewManager = viewManager.ThrowIfNull();
+        this.screenshotProvider = screenshotProvider.ThrowIfNull();
+        this.bloogumClient = bloogumClient.ThrowIfNull();
+        this.applicationUpdater = applicationUpdater.ThrowIfNull();
+        this.privilegeManager = privilegeManager.ThrowIfNull();
+        this.iconDownloader = iconDownloader.ThrowIfNull();
+        this.liveOptions = liveOptions.ThrowIfNull();
+        this.InitializeComponent();
+        this.CurrentVersionText = this.applicationUpdater.CurrentVersion.ToString();
+        this.IsRunningAsAdmin = this.privilegeManager.AdminPrivileges;
+        this.SetupMenuService();
+    }
 
-        [GenerateDependencyProperty]
-        private string creditText;
-        [GenerateDependencyProperty]
-        private string currentVersionText;
-        [GenerateDependencyProperty]
-        private bool isRunningAsAdmin;
-        [GenerateDependencyProperty]
-        private bool isShowingDropdown;
 
-        public MainWindow(
-            IViewManager viewManager,
-            IScreenshotProvider screenshotProvider,
-            IBloogumClient bloogumClient,
-            IApplicationUpdater applicationUpdater,
-            IPrivilegeManager privilegeManager,
-            IIconDownloader iconDownloader,
-            ILiveOptions<ApplicationConfiguration> liveOptions)
+    private void Window_Loaded(object sender, RoutedEventArgs e)
+    {
+        this.SetupImageCycle();
+        this.CheckForUpdates();
+        this.SetupBackgroundBrowser();
+    }
+
+    private void TitleBar_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.ChangedButton is not MouseButton.Left &&
+            e.LeftButton is not MouseButtonState.Pressed)
         {
-            this.viewManager = viewManager.ThrowIfNull();
-            this.screenshotProvider = screenshotProvider.ThrowIfNull();
-            this.bloogumClient = bloogumClient.ThrowIfNull();
-            this.applicationUpdater = applicationUpdater.ThrowIfNull();
-            this.privilegeManager = privilegeManager.ThrowIfNull();
-            this.iconDownloader = iconDownloader.ThrowIfNull();
-            this.liveOptions = liveOptions.ThrowIfNull();
-            this.InitializeComponent();
-            this.CurrentVersionText = this.applicationUpdater.CurrentVersion.ToString();
-            this.IsRunningAsAdmin = this.privilegeManager.AdminPrivileges;
+            return;
         }
 
+        this.DragMove();
+    }
 
-        private void Window_Loaded(object sender, RoutedEventArgs e)
-        {
-            this.SetupImageCycle();
-            this.CheckForUpdates();
-            this.SetupBackgroundBrowser();
-        }
+    private void TitleBar_MinimizeButtonClicked(object sender, EventArgs e)
+    {
+        this.WindowState = WindowState.Minimized;
+        this.Titlebar.WindowState = WindowState.Minimized;
+    }
 
-        private void TitleBar_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton is not MouseButton.Left &&
-                e.LeftButton is not MouseButtonState.Pressed)
+    private void TitleBar_MaximizeButtonClicked(object sender, EventArgs e)
+    {
+        this.WindowState = WindowState.Maximized;
+        this.Titlebar.WindowState = WindowState.Maximized;
+    }
+
+    private void TitleBar_RestoreButtonClicked(object sender, EventArgs e)
+    {
+        this.WindowState = WindowState.Normal;
+        this.Titlebar.WindowState = WindowState.Normal;
+    }
+
+    private void TitleBar_CloseButtonClicked(object sender, EventArgs e)
+    {
+        this.Close();
+    }
+
+    private void Border_OnResize(object sender, WCL.Border.ResizeDirection e)
+    {
+        NativeMethods.SendMessage(new WindowInteropHelper(this).Handle, NativeMethods.WM_SYSCOMMAND, (IntPtr)e, IntPtr.Zero);
+    }
+
+    private void SetupBackgroundBrowser()
+    {
+        this.iconDownloader.SetBrowser(this.BackgroundWebView);
+    }
+
+    private void SetupImageCycle()
+    {
+        TaskExtensions.RunPeriodicAsync(() => this.Dispatcher.Invoke(() => this.UpdateRandomImage()), TimeSpan.Zero, TimeSpan.FromSeconds(15), this.cancellationToken.Token);
+    }
+
+    private void UpdateRandomImage()
+    {
+        var maybeImage = this.screenshotProvider.GetRandomScreenShot();
+        maybeImage.Do(
+            onSome: (image) =>
             {
-                return;
-            }
-
-            this.DragMove();
-        }
-
-        private void TitleBar_MinimizeButtonClicked(object sender, EventArgs e)
-        {
-            this.WindowState = WindowState.Minimized;
-            this.Titlebar.WindowState = WindowState.Minimized;
-        }
-
-        private void TitleBar_MaximizeButtonClicked(object sender, EventArgs e)
-        {
-            this.WindowState = WindowState.Maximized;
-            this.Titlebar.WindowState = WindowState.Maximized;
-        }
-
-        private void TitleBar_RestoreButtonClicked(object sender, EventArgs e)
-        {
-            this.WindowState = WindowState.Normal;
-            this.Titlebar.WindowState = WindowState.Normal;
-        }
-
-        private void TitleBar_CloseButtonClicked(object sender, EventArgs e)
-        {
-            this.Close();
-        }
-
-        private void Border_OnResize(object sender, WCL.Border.ResizeDirection e)
-        {
-            NativeMethods.SendMessage(new WindowInteropHelper(this).Handle, NativeMethods.WM_SYSCOMMAND, (IntPtr)e, IntPtr.Zero);
-        }
-
-        private void SetupBackgroundBrowser()
-        {
-            this.iconDownloader.SetBrowser(this.BackgroundWebView);
-        }
-
-        private void SetupImageCycle()
-        {
-            TaskExtensions.RunPeriodicAsync(() => this.Dispatcher.Invoke(() => this.UpdateRandomImage()), TimeSpan.Zero, TimeSpan.FromSeconds(15), this.cancellationToken.Token);
-        }
-
-        private void UpdateRandomImage()
-        {
-            var maybeImage = this.screenshotProvider.GetRandomScreenShot();
-            maybeImage.Do(
-                onSome: (image) =>
-                {
-                    this.SetImage(image);
-                    this.CreditText = string.Empty;
-                },
-                onNone: async () =>
-                {
-                    var maybeImageStream = await this.bloogumClient.GetRandomScreenShot().ConfigureAwait(true);
-                    maybeImageStream.DoAny(
-                        onSome: (stream) =>
-                        {
-                            var bitmapImage = new BitmapImage();
-                            bitmapImage.BeginInit();
-                            bitmapImage.StreamSource = stream;
-                            bitmapImage.EndInit();
-                            this.SetImage(bitmapImage);
-                            this.CreditText = "http://bloogum.net/guildwars";
-                        });
-                });
-        }
-
-        private void SettingsButton_Clicked(object sender, EventArgs e)
-        {
-            sender.As<ToggleButton>().IsEnabled = false;
-            var widthAnimation = new DoubleAnimation
+                this.SetImage(image);
+                this.CreditText = string.Empty;
+            },
+            onNone: async () =>
             {
-                From = this.IsShowingDropdown ?
-                    this.MenuContainer.ActualWidth :
-                    0,
-                To = this.IsShowingDropdown ?
-                    0 :
-                    300,
-                Duration = new Duration(TimeSpan.FromMilliseconds(200)),
-                DecelerationRatio = 0.7
-            };
+                var maybeImageStream = await this.bloogumClient.GetRandomScreenShot().ConfigureAwait(true);
+                maybeImageStream.DoAny(
+                    onSome: (stream) =>
+                    {
+                        var bitmapImage = new BitmapImage();
+                        bitmapImage.BeginInit();
+                        bitmapImage.StreamSource = stream;
+                        bitmapImage.EndInit();
+                        this.SetImage(bitmapImage);
+                        this.CreditText = "http://bloogum.net/guildwars";
+                    });
+            });
+    }
 
-            var opacityAnimation = new DoubleAnimation
-            {
-                From = this.IsShowingDropdown ?
-                    this.MenuContainer.Opacity :
-                    0,
-                To = this.IsShowingDropdown ?
-                    0 :
-                    1,
-                Duration = new Duration(TimeSpan.FromMilliseconds(100)),
-                DecelerationRatio = 0.7
-            };
+    private void SettingsButton_Clicked(object sender, EventArgs e)
+    {
+        this.ToggleDropdownMenu();
+    }
 
-            var storyBoard = new Storyboard();
-            storyBoard.Children.Add(widthAnimation);
-            Storyboard.SetTarget(widthAnimation, this.MenuContainer);
-            Storyboard.SetTargetProperty(widthAnimation, new PropertyPath(Grid.WidthProperty));
-            storyBoard.Children.Add(opacityAnimation);
-            Storyboard.SetTarget(opacityAnimation, this.MenuContainer);
-            Storyboard.SetTargetProperty(opacityAnimation, new PropertyPath(Grid.OpacityProperty));
-
-            storyBoard.Completed += (_, _) =>
-            {
-                sender.As<ToggleButton>().IsEnabled = true;
-                this.IsShowingDropdown = !this.IsShowingDropdown;
-            };
-
-            storyBoard.Begin();
+    private void OpenDropdownMenu()
+    {
+        if (this.IsShowingDropdown)
+        {
+            return;
         }
 
-        private void CreditTextBox_MouseLeftButtonDown(object sender, EventArgs e)
+        this.ToggleDropdownMenu();
+    }
+
+    private void CloseDropdownMenu()
+    {
+        if (!this.IsShowingDropdown)
         {
-            if (Uri.TryCreate(this.CreditText, UriKind.Absolute, out var uri))
-            {
-                Process.Start("explorer.exe", uri.ToString());
-            }
+            return;
         }
 
-        private void VersionText_Clicked(object sender, EventArgs e)
-        {
-            this.viewManager.ShowView<VersionManagementView>();
-        }
+        this.ToggleDropdownMenu();
+    }
 
-        private void SetImage(ImageSource imageSource)
+    private void ToggleDropdownMenu()
+    {
+        var button = this.IsShowingDropdown ?
+            this.ClosingSettingsButton :
+            this.OpeningSettingsButton;
+        button.IsEnabled = false;
+        var widthAnimation = new DoubleAnimation
         {
-            this.ImageViewer.ShowImage(imageSource);
-            if (imageSource is BitmapImage bitmapImage)
-            {
-                var avgColor = GetAverageColor(bitmapImage);
-                var luminace = GetLuminace(avgColor);
-                if (luminace < 0.15)
-                {
-                    this.Foreground = Brushes.White;
-                }
-                else
-                {
-                    this.Foreground = Brushes.Black;
-                }
-            }
-        }
+            From = this.IsShowingDropdown ?
+                this.MenuContainer.ActualWidth :
+                0,
+            To = this.IsShowingDropdown ?
+                0 :
+                300,
+            Duration = new Duration(TimeSpan.FromMilliseconds(200)),
+            DecelerationRatio = 0.7
+        };
 
-        private async void CheckForUpdates()
+        var opacityAnimation = new DoubleAnimation
         {
-            var updateAvailable = this.liveOptions.Value.AutoCheckUpdate is true && await this.applicationUpdater.UpdateAvailable().ConfigureAwait(true);
-            if (updateAvailable)
+            From = this.IsShowingDropdown ?
+                this.MenuContainer.Opacity :
+                0,
+            To = this.IsShowingDropdown ?
+                0 :
+                1,
+            Duration = new Duration(TimeSpan.FromMilliseconds(100)),
+            DecelerationRatio = 0.7
+        };
+
+        var storyBoard = new Storyboard();
+        storyBoard.Children.Add(widthAnimation);
+        Storyboard.SetTarget(widthAnimation, this.MenuContainer);
+        Storyboard.SetTargetProperty(widthAnimation, new PropertyPath(Grid.WidthProperty));
+        storyBoard.Children.Add(opacityAnimation);
+        Storyboard.SetTarget(opacityAnimation, this.MenuContainer);
+        Storyboard.SetTargetProperty(opacityAnimation, new PropertyPath(Grid.OpacityProperty));
+
+        storyBoard.Completed += (_, _) =>
+        {
+            button.IsEnabled = true;
+            this.IsShowingDropdown = !this.IsShowingDropdown;
+        };
+
+        storyBoard.Begin();
+    }
+
+    private void CreditTextBox_MouseLeftButtonDown(object sender, EventArgs e)
+    {
+        if (Uri.TryCreate(this.CreditText, UriKind.Absolute, out var uri))
+        {
+            Process.Start("explorer.exe", uri.ToString());
+        }
+    }
+
+    private void VersionText_Clicked(object sender, EventArgs e)
+    {
+        this.viewManager.ShowView<VersionManagementView>();
+    }
+
+    private void SetImage(ImageSource imageSource)
+    {
+        this.ImageViewer.ShowImage(imageSource);
+        if (imageSource is BitmapImage bitmapImage)
+        {
+            var avgColor = GetAverageColor(bitmapImage);
+            var luminace = GetLuminace(avgColor);
+            if (luminace < 0.15)
             {
-                this.viewManager.ShowView<AskUpdateView>();
+                this.Foreground = Brushes.White;
             }
             else
             {
-                this.viewManager.ShowView<CompanionView>();
-                this.PeriodicallyCheckForUpdates();
+                this.Foreground = Brushes.Black;
             }
         }
+    }
 
-        private void PeriodicallyCheckForUpdates()
+    private async void CheckForUpdates()
+    {
+        var updateAvailable = this.liveOptions.Value.AutoCheckUpdate is true && await this.applicationUpdater.UpdateAvailable().ConfigureAwait(true);
+        if (updateAvailable)
         {
-            this.applicationUpdater.PeriodicallyCheckForUpdates();
+            this.viewManager.ShowView<AskUpdateView>();
         }
+        else
+        {
+            this.viewManager.ShowView<LauncherView>();
+            this.PeriodicallyCheckForUpdates();
+        }
+    }
 
-        private static Color GetAverageColor(BitmapSource bitmap)
-        {
-            var format = bitmap.Format;
-            if (format != PixelFormats.Bgr24 &&
-                    format != PixelFormats.Bgr32 &&
-                    format != PixelFormats.Bgra32 &&
-                    format != PixelFormats.Pbgra32)
-            {
-                throw new InvalidOperationException("BitmapSource must have Bgr24, Bgr32, Bgra32 or Pbgra32 format");
-            }
+    private void PeriodicallyCheckForUpdates()
+    {
+        this.applicationUpdater.PeriodicallyCheckForUpdates();
+    }
 
-            var width = bitmap.PixelWidth;
-            var height = bitmap.PixelHeight;
-            var numPixels = width * height;
-            var bytesPerPixel = format.BitsPerPixel / 8;
-            var pixelBuffer = new byte[numPixels * bytesPerPixel];
-            bitmap.CopyPixels(pixelBuffer, width * bytesPerPixel, 0);
-            long blue = 0;
-            long green = 0;
-            long red = 0;
-            for (int i = 0; i < pixelBuffer.Length; i += bytesPerPixel)
-            {
-                blue += pixelBuffer[i];
-                green += pixelBuffer[i + 1];
-                red += pixelBuffer[i + 2];
-            }
+    private void SetupMenuService()
+    {
+        this.menuServiceInitializer.InitializeMenuService(this.OpenDropdownMenu, this.CloseDropdownMenu, this.ToggleDropdownMenu);
+    }
 
-            return Color.FromRgb((byte)(red / numPixels), (byte)(green / numPixels), (byte)(blue / numPixels));
+    private static Color GetAverageColor(BitmapSource bitmap)
+    {
+        var format = bitmap.Format;
+        if (format != PixelFormats.Bgr24 &&
+                format != PixelFormats.Bgr32 &&
+                format != PixelFormats.Bgra32 &&
+                format != PixelFormats.Pbgra32)
+        {
+            throw new InvalidOperationException("BitmapSource must have Bgr24, Bgr32, Bgra32 or Pbgra32 format");
         }
 
-        private static double GetLuminace(Color color)
+        var width = bitmap.PixelWidth;
+        var height = bitmap.PixelHeight;
+        var numPixels = width * height;
+        var bytesPerPixel = format.BitsPerPixel / 8;
+        var pixelBuffer = new byte[numPixels * bytesPerPixel];
+        bitmap.CopyPixels(pixelBuffer, width * bytesPerPixel, 0);
+        long blue = 0;
+        long green = 0;
+        long red = 0;
+        for (int i = 0; i < pixelBuffer.Length; i += bytesPerPixel)
         {
-            double R = color.ScR;
-            double G = color.ScG;
-            double B = color.ScB;
-            return 0.299 * R + 0.587 * G + 0.114 * B;
+            blue += pixelBuffer[i];
+            green += pixelBuffer[i + 1];
+            red += pixelBuffer[i + 2];
         }
+
+        return Color.FromRgb((byte)(red / numPixels), (byte)(green / numPixels), (byte)(blue / numPixels));
+    }
+
+    private static double GetLuminace(Color color)
+    {
+        double R = color.ScR;
+        double G = color.ScG;
+        double B = color.ScB;
+        return 0.299 * R + 0.587 * G + 0.114 * B;
     }
 }

Daybreak/Models/Browser/BrowserPayload.cs

@@ -1,24 +1,23 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace Daybreak.Models.Browser
+namespace Daybreak.Models.Browser;
+
+public class BrowserPayload
 {
-    public class BrowserPayload
+    [JsonConverter(typeof(StringEnumConverter))]
+    public enum PayloadKeys
     {
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum PayloadKeys
-        {
-            None,
-            ContextMenu
-        }
-
-        [JsonProperty("Key")]
-        public PayloadKeys Key { get; set; }
+        None,
+        ContextMenu
     }
 
-    public sealed class BrowserPayload<T> : BrowserPayload
-    {
-        [JsonProperty("Value")]
-        public T Value { get; set; }
-    }
+    [JsonProperty("Key")]
+    public PayloadKeys Key { get; set; }
+}
+
+public sealed class BrowserPayload<T> : BrowserPayload
+{
+    [JsonProperty("Value")]
+    public T? Value { get; set; }
 }

Daybreak/Models/Browser/OnContextMenuPayload.cs

@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
 
-namespace Daybreak.Models.Browser
+namespace Daybreak.Models.Browser;
+
+public sealed class OnContextMenuPayload
 {
-    public sealed class OnContextMenuPayload
-    {
-        [JsonProperty("X")]
-        public double X { get; set; }
-        [JsonProperty("Y")]
-        public double Y { get; set; }
-        [JsonProperty("Selection")]
-        public string Selection { get; set; }
-    }
+    [JsonProperty("X")]
+    public double X { get; set; }
+    [JsonProperty("Y")]
+    public double Y { get; set; }
+    [JsonProperty("Selection")]
+    public string? Selection { get; set; }
 }

Daybreak/Models/BuildWithTemplateCode.cs

@@ -4,6 +4,6 @@ namespace Daybreak.Models;
 
 public sealed class BuildWithTemplateCode
 {
-    public BuildEntry Build { get; set; }
-    public string TemplateCode { get; set; }
+    public BuildEntry? Build { get; set; }
+    public string? TemplateCode { get; set; }
 }

Daybreak/Models/Builds/Attribute.cs

@@ -1,143 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Daybreak.Models.Builds
-{
-    public sealed class Attribute
-    {
-        public static Attribute FastCasting { get; } = new() { Name = "Fast Casting", Id = 0 };
-        public static Attribute IllusionMagic { get; } = new() { Name = "Illusion Magic", Id = 1 };
-        public static Attribute DominationMagic { get; } = new() { Name = "Domination Magic", Id = 2 };
-        public static Attribute InspirationMagic { get; } = new() { Name = "Inspiration Magic", Id = 3 };
-        public static Attribute BloodMagic { get; } = new() { Name = "Blood Magic", Id = 4 };
-        public static Attribute DeathMagic { get; } = new() { Name = "Death Magic", Id = 5 };
-        public static Attribute SoulReaping { get; } = new() { Name = "Soul Reaping", Id = 6 };
-        public static Attribute Curses { get; } = new() { Name = "Curses", Id = 7 };
-        public static Attribute AirMagic { get; } = new() { Name = "Air Magic", Id = 8 };
-        public static Attribute EarthMagic { get; } = new() { Name = "Earth Magic", Id = 9 };
-        public static Attribute FireMagic { get; } = new() { Name = "Fire Magic", Id = 10 };
-        public static Attribute WaterMagic { get; } = new() { Name = "Water Magic", Id = 11 };
-        public static Attribute EnergyStorage { get; } = new() { Name = "Energy Storage", Id = 12 };
-        public static Attribute HealingPrayers { get; } = new() { Name = "Healing Prayers", Id = 13 };
-        public static Attribute SmitingPrayers { get; } = new() { Name = "Smiting Prayers", Id = 14 };
-        public static Attribute ProtectionPrayers { get; } = new() { Name = "Protection Prayers", Id = 15 };
-        public static Attribute DivineFavor { get; } = new() { Name = "Divine Favor", Id = 16 };
-        public static Attribute Strength { get; } = new() { Name = "Strength", Id = 17 };
-        public static Attribute AxeMastery { get; } = new() { Name = "Axe Mastery", Id = 18 };
-        public static Attribute HammerMastery { get; } = new() { Name = "Hammer Mastery", Id = 19 };
-        public static Attribute Swordsmanship { get; } = new() { Name = "Swordsmanship", Id = 20};
-        public static Attribute Tactics { get; } = new() { Name = "Tactics", Id = 21 };
-        public static Attribute BeastMastery { get; } = new() { Name = "Beast Mastery", Id = 22 };
-        public static Attribute Expertise { get; } = new() { Name = "Expertise", Id = 23 };
-        public static Attribute WildernessSurvival { get; } = new() { Name = "Wilderness Survival", Id = 24 };
-        public static Attribute Marksmanship { get; } = new() { Name = "Marksmanship", Id = 25 };
-        public static Attribute DaggerMastery { get; } = new() { Name = "Dagger Mastery", Id = 29 };
-        public static Attribute DeadlyArts { get; } = new() { Name = "Deadly Arts", Id = 30 };
-        public static Attribute ShadowArts { get; } = new() { Name = "Shadow Arts", Id = 31 };
-        public static Attribute Communing { get; } = new() { Name = "Communing", Id = 32 };
-        public static Attribute RestorationMagic { get; } = new() { Name = "Restoration Magic", Id = 33 };
-        public static Attribute ChannelingMagic { get; } = new() { Name = "Channeling Magic", Id = 34 };
-        public static Attribute CriticalStrikes { get; } = new() { Name = "Critical Strikes", Id = 35 };
-        public static Attribute SpawningPower { get; } = new() { Name = "Spawning Power", Id = 36 };
-        public static Attribute SpearMastery { get; } = new() { Name = "Spear Mastery", Id = 37 };
-        public static Attribute Command { get; } = new() { Name = "Command", Id = 38 };
-        public static Attribute Motivation { get; } = new() { Name = "Motivation", Id = 39 };
-        public static Attribute Leadership { get; } = new() { Name = "Leadership", Id = 40 };
-        public static Attribute ScytheMastery { get; } = new() { Name = "Scythe Mastery", Id = 41 };
-        public static Attribute WindPrayers { get; } = new() { Name = "Wind Prayers", Id = 42 };
-        public static Attribute EarthPrayers { get; } = new() { Name = "Earth Prayers", Id = 43 };
-        public static Attribute Mysticism { get; } = new() { Name = "Mysticism", Id = 44 };
-        public static IEnumerable<Attribute> Attributes { get; } = new List<Attribute>
-        {
-            FastCasting,
-            IllusionMagic,
-            DominationMagic,
-            InspirationMagic,
-            BloodMagic,
-            DeathMagic,
-            SoulReaping,
-            Curses,
-            AirMagic,
-            EarthMagic,
-            FireMagic,
-            WaterMagic,
-            EnergyStorage,
-            HealingPrayers,
-            SmitingPrayers,
-            ProtectionPrayers,
-            DivineFavor,
-            Strength,
-            AxeMastery,
-            HammerMastery,
-            Swordsmanship,
-            Tactics,
-            BeastMastery,
-            Expertise,
-            WildernessSurvival,
-            Marksmanship,
-            DaggerMastery,
-            DeadlyArts,
-            ShadowArts,
-            Communing,
-            RestorationMagic,
-            ChannelingMagic,
-            CriticalStrikes,
-            SpawningPower,
-            SpearMastery,
-            Command,
-            Motivation,
-            Leadership,
-            ScytheMastery,
-            EarthPrayers,
-            WindPrayers,
-            EarthMagic,
-            Mysticism
-        };
-
-        public static bool TryParse(int id, out Attribute attribute)
-        {
-            attribute = Attributes.Where(attr => attr.Id == id).FirstOrDefault();
-            if (attribute is null)
-            {
-                return false;
-            }
-
-            return true;
-        }
-        public static bool TryParse(string name, out Attribute attribute)
-        {
-            attribute = Attributes.Where(attr => attr.Name == name).FirstOrDefault();
-            if (attribute is null)
-            {
-                return false;
-            }
-
-            return true;
-        }
-        public static Attribute Parse(int id)
-        {
-            if (TryParse(id, out var attribute) is false)
-            {
-                throw new InvalidOperationException($"Could not find an attribute with id {id}");
-            }
-
-            return attribute;
-        }
-        public static Attribute Parse(string name)
-        {
-            if (TryParse(name, out var attribute) is false)
-            {
-                throw new InvalidOperationException($"Could not find an attribute with name {name}");
-            }
-
-            return attribute;
-        }
-
-        public int Id { get; private set; }
-        public string Name { get; private set; }
-        private Attribute()
-        {
-        }
-    }
-}

Daybreak/Models/Builds/AttributeEntry.cs

@@ -1,31 +1,31 @@
 using System.ComponentModel;
+using Daybreak.Models.Guildwars;
 
-namespace Daybreak.Models.Builds
+namespace Daybreak.Models.Builds;
+
+public sealed class AttributeEntry : INotifyPropertyChanged
 {
-    public sealed class AttributeEntry : INotifyPropertyChanged
+    private Attribute? attribute;
+    private int points;
+
+    public Attribute? Attribute
     {
-        private Attribute attribute;
-        private int points;
-
-        public Attribute Attribute
+        get => this.attribute;
+        set
         {
-            get => this.attribute;
-            set
-            {
-                this.attribute = value;
-                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.Attribute)));
-            }
+            this.attribute = value;
+            this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.Attribute)));
         }
-        public int Points
-        {
-            get => this.points;
-            set
-            {
-                this.points = value;
-                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.Points)));
-            }
-        }
-
-        public event PropertyChangedEventHandler PropertyChanged;
     }
+    public int Points
+    {
+        get => this.points;
+        set
+        {
+            this.points = value;
+            this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.Points)));
+        }
+    }
+
+    public event PropertyChangedEventHandler? PropertyChanged;
 }

Daybreak/Models/Builds/Build.cs

@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-
-namespace Daybreak.Models.Builds
-{
-    public sealed class Build
-    {
-        public BuildMetadata BuildMetadata { get; set; }
-        public Profession Primary { get; set; } = Profession.None;
-        public Profession Secondary { get; set; } = Profession.None;
-        public List<AttributeEntry> Attributes { get; set; } = new();
-        public List<Skill> Skills { get; set; } = new() { Skill.NoSkill, Skill.NoSkill, Skill.NoSkill, Skill.NoSkill, Skill.NoSkill, Skill.NoSkill, Skill.NoSkill, Skill.NoSkill };
-    }
-}

Daybreak/Models/Builds/BuildEntry.cs

@@ -1,31 +1,31 @@
-using System.ComponentModel;
+using Daybreak.Models.Guildwars;
+using System.ComponentModel;
 
-namespace Daybreak.Models.Builds
+namespace Daybreak.Models.Builds;
+
+public sealed class BuildEntry : INotifyPropertyChanged
 {
-    public sealed class BuildEntry : INotifyPropertyChanged
-    {
-        public event PropertyChangedEventHandler PropertyChanged;
-        private string name;
-        private Build build;
+    public event PropertyChangedEventHandler? PropertyChanged;
+    private string? name;
+    private Build? build;
 
-        public string PreviousName { get; set; }
-        public string Name
+    public string? PreviousName { get; set; }
+    public string? Name
+    {
+        get => this.name;
+        set
         {
-            get => this.name;
-            set
-            {
-                this.name = value;
-                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.Name)));
-            }
+            this.name = value;
+            this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.Name)));
         }
-        public Build Build
+    }
+    public Build? Build
+    {
+        get => this.build;
+        set
         {
-            get => this.build;
-            set
-            {
-                this.build = value;
-                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.Build)));
-            }
+            this.build = value;
+            this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.Build)));
         }
     }
 }

Daybreak/Models/Builds/BuildMetadata.cs

@@ -1,23 +0,0 @@
-using System.Collections.Generic;
-
-namespace Daybreak.Models.Builds
-{
-    public sealed class BuildMetadata
-    {
-        public List<int> Base64Decoded { get; set; }
-        public List<string> BinaryDecoded { get; set; }
-        public int Header { get; set; }
-        public int VersionNumber { get; set; }
-        public int ProfessionIdLength { get; set; }
-        public int PrimaryProfessionId { get; set; }
-        public int SecondaryProfessionId { get; set; }
-        public int AttributeCount { get; set; }
-        public int AttributesLength { get; set; }
-        public int SkillsLength { get; set; }
-        public bool TailPresent { get; set; }
-        public bool NewTemplate { get; set; }
-        public List<int> SkillIds { get; set; } = new();
-        public List<int> AttributesIds { get; set; } = new();
-        public List<int> AttributePoints { get; set; } = new();
-    }
-}

Daybreak/Models/Builds/Profession.cs

@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Daybreak.Models.Builds
-{
-    public sealed class Profession
-    {
-        public static Profession None { get; } = new() { Name = "None", Id = 0, };
-        public static Profession Warrior { get; } = new() { Name = "Warrior", Id = 1, PrimaryAttribute = Attribute.Strength, Attributes = new List<Attribute> { Attribute.AxeMastery, Attribute.HammerMastery, Attribute.Swordsmanship, Attribute.Tactics } };
-        public static Profession Ranger { get; } = new() { Name = "Ranger", Id = 2, PrimaryAttribute = Attribute.Expertise, Attributes = new List<Attribute> { Attribute.BeastMastery, Attribute.Marksmanship, Attribute.WildernessSurvival } };
-        public static Profession Monk { get; } = new() { Name = "Monk", Id = 3, PrimaryAttribute = Attribute.DivineFavor, Attributes = new List<Attribute> { Attribute.HealingPrayers, Attribute.SmitingPrayers, Attribute.ProtectionPrayers } };
-        public static Profession Necromancer { get; } = new() { Name = "Necromancer", Id = 4, PrimaryAttribute = Attribute.SoulReaping, Attributes = new List<Attribute> { Attribute.Curses, Attribute.BloodMagic, Attribute.DeathMagic } };
-        public static Profession Mesmer { get; } = new() { Name = "Mesmer", Id = 5, PrimaryAttribute = Attribute.FastCasting, Attributes = new List<Attribute> { Attribute.DominationMagic, Attribute.IllusionMagic, Attribute.InspirationMagic } };
-        public static Profession Elementalist { get; } = new() { Name = "Elementalist", Id = 6, PrimaryAttribute = Attribute.EnergyStorage, Attributes = new List<Attribute> { Attribute.AirMagic, Attribute.EarthMagic, Attribute.FireMagic, Attribute.WaterMagic } };
-        public static Profession Assassin { get; } = new() { Name = "Assassin", Id = 7, PrimaryAttribute = Attribute.CriticalStrikes, Attributes = new List<Attribute> { Attribute.DaggerMastery, Attribute.DeadlyArts, Attribute.ShadowArts } };
-        public static Profession Ritualist { get; } = new() { Name = "Ritualist", Id = 8, PrimaryAttribute = Attribute.SpawningPower, Attributes = new List<Attribute> { Attribute.ChannelingMagic, Attribute.Communing, Attribute.RestorationMagic } };
-        public static Profession Paragon { get; } = new() { Name = "Paragon", Id = 9, PrimaryAttribute = Attribute.Leadership, Attributes = new List<Attribute> { Attribute.Command, Attribute.Motivation, Attribute.SpearMastery } };
-        public static Profession Dervish { get; } = new() { Name = "Dervish", Id = 10, PrimaryAttribute = Attribute.Mysticism, Attributes = new List<Attribute> { Attribute.EarthPrayers, Attribute.ScytheMastery, Attribute.WindPrayers } };
-        public static IEnumerable<Profession> Professions { get; } = new List<Profession>
-        {
-            None,
-            Warrior,
-            Ranger,
-            Monk,
-            Necromancer,
-            Mesmer,
-            Elementalist,
-            Assassin,
-            Ritualist,
-            Paragon,
-            Dervish
-        };
-        public static bool TryParse(int id, out Profession profession)
-        {
-            profession = Professions.Where(prof => prof.Id == id).FirstOrDefault();
-            if (profession is null)
-            {
-                return false;
-            }
-
-            return true;
-        }
-        public static bool TryParse(string name, out Profession profession)
-        {
-            profession = Professions.Where(prof => prof.Name == name).FirstOrDefault();
-            if (profession is null)
-            {
-                return false;
-            }
-
-            return true;
-        }
-        public static Profession Parse(int id)
-        {
-            if (TryParse(id, out var profession) is false)
-            {
-                throw new InvalidOperationException($"Could not find a profession with id {id}");
-            }
-
-            return profession;
-        }
-        public static Profession Parse(string name)
-        {
-            if (TryParse(name, out var profession) is false)
-            {
-                throw new InvalidOperationException($"Could not find a profession with name {name}");
-            }
-
-            return profession;
-        }
-
-        public string Name { get; private set; }
-        public int Id { get; set; }
-        public Attribute PrimaryAttribute { get; private set; }
-        public List<Attribute> Attributes { get; private set; }
-        private Profession()
-        {
-        }
-    }
-}

Daybreak/Models/ElevationRequest.cs

@@ -1,11 +1,10 @@
 using System;
 
-namespace Daybreak.Models
+namespace Daybreak.Models;
+
+public sealed class ElevationRequest
 {
-    public sealed class ElevationRequest
-    {
-        public object DataContext { get; set; }
-        public Type View { get; set; }
-        public string MessageToUser { get; set; }
-    }
+    public object? DataContext { get; set; }
+    public Type? View { get; set; }
+    public string? MessageToUser { get; set; }
 }

Daybreak/Models/ExecutionPolicies.cs

@@ -1,13 +1,12 @@
-namespace Daybreak.Models
+namespace Daybreak.Models;
+
+public enum ExecutionPolicies
 {
-    public enum ExecutionPolicies
-    {
-        AllSigned,
-        Bypass,
-        Default,
-        RemoteSigned,
-        Restricted,
-        Undefined,
-        Unrestricted
-    }
+    AllSigned,
+    Bypass,
+    Default,
+    RemoteSigned,
+    Restricted,
+    Undefined,
+    Unrestricted
 }

Daybreak/Models/GameData.cs

@@ -0,0 +1,30 @@
+using Daybreak.Models.Guildwars;
+
+namespace Daybreak.Models;
+
+public sealed class GameData
+{
+    public string? Email { get; init; }
+    public string? CharacterName { get; init; }
+    public Quest? Quest { get; init; }
+    public bool HardModeUnlocked { get; init; }
+    public uint Experience { get; init; }
+    public uint CurrentKurzickPoints { get; init; }
+    public uint TotalKurzickPoints { get; init; }
+    public uint CurrentLuxonPoints { get; init; }
+    public uint TotalLuxonPoints { get; init; }
+    public uint CurrentImperialPoints { get; init; }
+    public uint TotalImperialPoints { get; init; }
+    public uint Level { get; init; }
+    public uint Morale { get; init; }
+    public uint CurrentBalthazarPoints { get; init; }
+    public uint TotalBalthazarPoints { get; init; }
+    public uint CurrentSkillPoints { get; init; }
+    public uint TotalSkillPoints { get; init; }
+    public uint MaxKurzickPoints { get; init; }
+    public uint MaxLuxonPoints { get; init; }
+    public uint MaxImperialPoints { get; init; }
+    public uint MaxBalthazarPoints { get; init; }
+    public uint FoesKilled { get; init; }
+    public uint FoesToKill { get; init; }
+}

Daybreak/Models/Github/GithubRefTag.cs

@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
 
-namespace Daybreak.Models.Github
+namespace Daybreak.Models.Github;
+
+public sealed class GithubRefTag
 {
-    public sealed class GithubRefTag
-    {
-        [JsonProperty("ref")]
-        public string Ref;
-        [JsonProperty("node_id")]
-        public string NodeId;
-        [JsonProperty("url")]
-        public string Url;
-    }
+    [JsonProperty("ref")]
+    public string? Ref;
+    [JsonProperty("node_id")]
+    public string? NodeId;
+    [JsonProperty("url")]
+    public string? Url;
 }

Daybreak/Models/Guildwars/Attribute.cs

@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Daybreak.Models.Guildwars;
+
+public sealed class Attribute
+{
+    public static Attribute FastCasting { get; } = new() { Name = "Fast Casting", Id = 0 };
+    public static Attribute IllusionMagic { get; } = new() { Name = "Illusion Magic", Id = 1 };
+    public static Attribute DominationMagic { get; } = new() { Name = "Domination Magic", Id = 2 };
+    public static Attribute InspirationMagic { get; } = new() { Name = "Inspiration Magic", Id = 3 };
+    public static Attribute BloodMagic { get; } = new() { Name = "Blood Magic", Id = 4 };
+    public static Attribute DeathMagic { get; } = new() { Name = "Death Magic", Id = 5 };
+    public static Attribute SoulReaping { get; } = new() { Name = "Soul Reaping", Id = 6 };
+    public static Attribute Curses { get; } = new() { Name = "Curses", Id = 7 };
+    public static Attribute AirMagic { get; } = new() { Name = "Air Magic", Id = 8 };
+    public static Attribute EarthMagic { get; } = new() { Name = "Earth Magic", Id = 9 };
+    public static Attribute FireMagic { get; } = new() { Name = "Fire Magic", Id = 10 };
+    public static Attribute WaterMagic { get; } = new() { Name = "Water Magic", Id = 11 };
+    public static Attribute EnergyStorage { get; } = new() { Name = "Energy Storage", Id = 12 };
+    public static Attribute HealingPrayers { get; } = new() { Name = "Healing Prayers", Id = 13 };
+    public static Attribute SmitingPrayers { get; } = new() { Name = "Smiting Prayers", Id = 14 };
+    public static Attribute ProtectionPrayers { get; } = new() { Name = "Protection Prayers", Id = 15 };
+    public static Attribute DivineFavor { get; } = new() { Name = "Divine Favor", Id = 16 };
+    public static Attribute Strength { get; } = new() { Name = "Strength", Id = 17 };
+    public static Attribute AxeMastery { get; } = new() { Name = "Axe Mastery", Id = 18 };
+    public static Attribute HammerMastery { get; } = new() { Name = "Hammer Mastery", Id = 19 };
+    public static Attribute Swordsmanship { get; } = new() { Name = "Swordsmanship", Id = 20};
+    public static Attribute Tactics { get; } = new() { Name = "Tactics", Id = 21 };
+    public static Attribute BeastMastery { get; } = new() { Name = "Beast Mastery", Id = 22 };
+    public static Attribute Expertise { get; } = new() { Name = "Expertise", Id = 23 };
+    public static Attribute WildernessSurvival { get; } = new() { Name = "Wilderness Survival", Id = 24 };
+    public static Attribute Marksmanship { get; } = new() { Name = "Marksmanship", Id = 25 };
+    public static Attribute DaggerMastery { get; } = new() { Name = "Dagger Mastery", Id = 29 };
+    public static Attribute DeadlyArts { get; } = new() { Name = "Deadly Arts", Id = 30 };
+    public static Attribute ShadowArts { get; } = new() { Name = "Shadow Arts", Id = 31 };
+    public static Attribute Communing { get; } = new() { Name = "Communing", Id = 32 };
+    public static Attribute RestorationMagic { get; } = new() { Name = "Restoration Magic", Id = 33 };
+    public static Attribute ChannelingMagic { get; } = new() { Name = "Channeling Magic", Id = 34 };
+    public static Attribute CriticalStrikes { get; } = new() { Name = "Critical Strikes", Id = 35 };
+    public static Attribute SpawningPower { get; } = new() { Name = "Spawning Power", Id = 36 };
+    public static Attribute SpearMastery { get; } = new() { Name = "Spear Mastery", Id = 37 };
+    public static Attribute Command { get; } = new() { Name = "Command", Id = 38 };
+    public static Attribute Motivation { get; } = new() { Name = "Motivation", Id = 39 };
+    public static Attribute Leadership { get; } = new() { Name = "Leadership", Id = 40 };
+    public static Attribute ScytheMastery { get; } = new() { Name = "Scythe Mastery", Id = 41 };
+    public static Attribute WindPrayers { get; } = new() { Name = "Wind Prayers", Id = 42 };
+    public static Attribute EarthPrayers { get; } = new() { Name = "Earth Prayers", Id = 43 };
+    public static Attribute Mysticism { get; } = new() { Name = "Mysticism", Id = 44 };
+    public static IEnumerable<Attribute> Attributes { get; } = new List<Attribute>
+    {
+        FastCasting,
+        IllusionMagic,
+        DominationMagic,
+        InspirationMagic,
+        BloodMagic,
+        DeathMagic,
+        SoulReaping,
+        Curses,
+        AirMagic,
+        EarthMagic,
+        FireMagic,
+        WaterMagic,
+        EnergyStorage,
+        HealingPrayers,
+        SmitingPrayers,
+        ProtectionPrayers,
+        DivineFavor,
+        Strength,
+        AxeMastery,
+        HammerMastery,
+        Swordsmanship,
+        Tactics,
+        BeastMastery,
+        Expertise,
+        WildernessSurvival,
+        Marksmanship,
+        DaggerMastery,
+        DeadlyArts,
+        ShadowArts,
+        Communing,
+        RestorationMagic,
+        ChannelingMagic,
+        CriticalStrikes,
+        SpawningPower,
+        SpearMastery,
+        Command,
+        Motivation,
+        Leadership,
+        ScytheMastery,
+        EarthPrayers,
+        WindPrayers,
+        EarthMagic,
+        Mysticism
+    };
+
+    public static bool TryParse(int id, out Attribute attribute)
+    {
+        attribute = Attributes.Where(attr => attr.Id == id).FirstOrDefault()!;
+        if (attribute is null)
+        {
+            return false;
+        }
+
+        return true;
+    }
+    public static bool TryParse(string name, out Attribute attribute)
+    {
+        attribute = Attributes.Where(attr => attr.Name == name).FirstOrDefault()!;
+        if (attribute is null)
+        {
+            return false;
+        }
+
+        return true;
+    }
+    public static Attribute Parse(int id)
+    {
+        if (TryParse(id, out var attribute) is false)
+        {
+            throw new InvalidOperationException($"Could not find an attribute with id {id}");
+        }
+
+        return attribute;
+    }
+    public static Attribute Parse(string name)
+    {
+        if (TryParse(name, out var attribute) is false)
+        {
+            throw new InvalidOperationException($"Could not find an attribute with name {name}");
+        }
+
+        return attribute;
+    }
+
+    public int Id { get; private set; }
+    public string? Name { get; private set; }
+    private Attribute()
+    {
+    }
+}

Daybreak/Models/Guildwars/Build.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using Daybreak.Models.Builds;
+
+namespace Daybreak.Models.Guildwars;
+
+public sealed class Build
+{
+    public BuildMetadata? BuildMetadata { get; set; }
+    public Profession Primary { get; set; } = Profession.None;
+    public Profession Secondary { get; set; } = Profession.None;
+    public List<AttributeEntry> Attributes { get; set; } = new();
+    public List<Skill> Skills { get; set; } = new() { Skill.NoSkill, Skill.NoSkill, Skill.NoSkill, Skill.NoSkill, Skill.NoSkill, Skill.NoSkill, Skill.NoSkill, Skill.NoSkill };
+}

Daybreak/Models/Guildwars/BuildMetadata.cs

@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+
+namespace Daybreak.Models.Guildwars;
+
+public sealed class BuildMetadata
+{
+    public List<int>? Base64Decoded { get; set; }
+    public List<string>? BinaryDecoded { get; set; }
+    public int Header { get; set; }
+    public int VersionNumber { get; set; }
+    public int ProfessionIdLength { get; set; }
+    public int PrimaryProfessionId { get; set; }
+    public int SecondaryProfessionId { get; set; }
+    public int AttributeCount { get; set; }
+    public int AttributesLength { get; set; }
+    public int SkillsLength { get; set; }
+    public bool TailPresent { get; set; }
+    public bool NewTemplate { get; set; }
+    public List<int> SkillIds { get; set; } = new();
+    public List<int> AttributesIds { get; set; } = new();
+    public List<int> AttributePoints { get; set; } = new();
+}

Daybreak/Models/Guildwars/CharContext.cs

@@ -0,0 +1,20 @@
+using System.Runtime.InteropServices;
+
+namespace Daybreak.Models.Guildwars;
+
+[StructLayout(LayoutKind.Explicit)]
+public readonly struct CharContext
+{
+    public const int BaseOffset = 0x0074;
+
+    [FieldOffset(0x0000)]
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x28)]
+    public readonly byte[] PlayerNameBytes;
+    
+    [FieldOffset(0x01B0)]
+    public readonly int Language;
+    
+    [FieldOffset(0x0344)]
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x80)]
+    public readonly byte[] PlayerEmailBytes;
+}

Daybreak/Models/Guildwars/GameContext.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Daybreak.Models.Guildwars;
+
+[StructLayout(LayoutKind.Explicit)]
+public readonly struct GameContext
+{
+    [FieldOffset(0x002C)]
+    public readonly IntPtr WorldContext;
+    
+    [FieldOffset(0x0044)]
+    public readonly IntPtr CharContext;
+}

Daybreak/Models/Guildwars/Profession.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Daybreak.Models.Guildwars;
+
+public sealed class Profession
+{
+    public static Profession None { get; } = new() { Name = "None", Id = 0, };
+    public static Profession Warrior { get; } = new() { Name = "Warrior", Id = 1, PrimaryAttribute = Attribute.Strength, Attributes = new List<Attribute> { Attribute.AxeMastery, Attribute.HammerMastery, Attribute.Swordsmanship, Attribute.Tactics } };
+    public static Profession Ranger { get; } = new() { Name = "Ranger", Id = 2, PrimaryAttribute = Attribute.Expertise, Attributes = new List<Attribute> { Attribute.BeastMastery, Attribute.Marksmanship, Attribute.WildernessSurvival } };
+    public static Profession Monk { get; } = new() { Name = "Monk", Id = 3, PrimaryAttribute = Attribute.DivineFavor, Attributes = new List<Attribute> { Attribute.HealingPrayers, Attribute.SmitingPrayers, Attribute.ProtectionPrayers } };
+    public static Profession Necromancer { get; } = new() { Name = "Necromancer", Id = 4, PrimaryAttribute = Attribute.SoulReaping, Attributes = new List<Attribute> { Attribute.Curses, Attribute.BloodMagic, Attribute.DeathMagic } };
+    public static Profession Mesmer { get; } = new() { Name = "Mesmer", Id = 5, PrimaryAttribute = Attribute.FastCasting, Attributes = new List<Attribute> { Attribute.DominationMagic, Attribute.IllusionMagic, Attribute.InspirationMagic } };
+    public static Profession Elementalist { get; } = new() { Name = "Elementalist", Id = 6, PrimaryAttribute = Attribute.EnergyStorage, Attributes = new List<Attribute> { Attribute.AirMagic, Attribute.EarthMagic, Attribute.FireMagic, Attribute.WaterMagic } };
+    public static Profession Assassin { get; } = new() { Name = "Assassin", Id = 7, PrimaryAttribute = Attribute.CriticalStrikes, Attributes = new List<Attribute> { Attribute.DaggerMastery, Attribute.DeadlyArts, Attribute.ShadowArts } };
+    public static Profession Ritualist { get; } = new() { Name = "Ritualist", Id = 8, PrimaryAttribute = Attribute.SpawningPower, Attributes = new List<Attribute> { Attribute.ChannelingMagic, Attribute.Communing, Attribute.RestorationMagic } };
+    public static Profession Paragon { get; } = new() { Name = "Paragon", Id = 9, PrimaryAttribute = Attribute.Leadership, Attributes = new List<Attribute> { Attribute.Command, Attribute.Motivation, Attribute.SpearMastery } };
+    public static Profession Dervish { get; } = new() { Name = "Dervish", Id = 10, PrimaryAttribute = Attribute.Mysticism, Attributes = new List<Attribute> { Attribute.EarthPrayers, Attribute.ScytheMastery, Attribute.WindPrayers } };
+    public static IEnumerable<Profession> Professions { get; } = new List<Profession>
+    {
+        None,
+        Warrior,
+        Ranger,
+        Monk,
+        Necromancer,
+        Mesmer,
+        Elementalist,
+        Assassin,
+        Ritualist,
+        Paragon,
+        Dervish
+    };
+    public static bool TryParse(int id, out Profession profession)
+    {
+        profession = Professions.Where(prof => prof.Id == id).FirstOrDefault()!;
+        if (profession is null)
+        {
+            return false;
+        }
+
+        return true;
+    }
+    public static bool TryParse(string name, out Profession profession)
+    {
+        profession = Professions.Where(prof => prof.Name == name).FirstOrDefault()!;
+        if (profession is null)
+        {
+            return false;
+        }
+
+        return true;
+    }
+    public static Profession Parse(int id)
+    {
+        if (TryParse(id, out var profession) is false)
+        {
+            throw new InvalidOperationException($"Could not find a profession with id {id}");
+        }
+
+        return profession;
+    }
+    public static Profession Parse(string name)
+    {
+        if (TryParse(name, out var profession) is false)
+        {
+            throw new InvalidOperationException($"Could not find a profession with name {name}");
+        }
+
+        return profession;
+    }
+
+    public string? Name { get; private set; }
+    public int Id { get; set; }
+    public Attribute? PrimaryAttribute { get; private set; }
+    public List<Attribute>? Attributes { get; private set; }
+    private Profession()
+    {
+    }
+}

Daybreak/Models/Guildwars/WorldContext.cs

@@ -0,0 +1,72 @@
+using System.Runtime.InteropServices;
+
+namespace Daybreak.Models.Guildwars;
+
+[StructLayout(LayoutKind.Explicit)]
+public readonly struct WorldContext
+{
+    public const int BaseOffset = 0x0528;
+
+    [FieldOffset(0x0000)]
+    public readonly uint QuestId;
+
+    [FieldOffset(0x015C)]
+    public readonly uint HardModeUnlocked;
+
+    [FieldOffset(0x0218)]
+    public readonly uint Experience;
+
+    [FieldOffset(0x0220)]
+    public readonly uint CurrentKurzick;
+
+    [FieldOffset(0x0228)]
+    public readonly uint TotalKurzick;
+
+    [FieldOffset(0x0230)]
+    public readonly uint CurrentLuxon;
+    
+    [FieldOffset(0x0238)]
+    public readonly uint TotalLuxon;
+    
+    [FieldOffset(0x0240)]
+    public readonly uint CurrentImperial;
+    
+    [FieldOffset(0x0248)]
+    public readonly uint TotalImperial;
+    
+    [FieldOffset(0x0260)]
+    public readonly uint Level;
+    
+    [FieldOffset(0x0268)]
+    public readonly uint Morale;
+    
+    [FieldOffset(0x0270)]
+    public readonly uint CurrentBalthazar;
+    
+    [FieldOffset(0x0278)]
+    public readonly uint TotalBalthazar;
+    
+    [FieldOffset(0x0280)]
+    public readonly uint CurrentSkillPoints;
+    
+    [FieldOffset(0x0288)]
+    public readonly uint TotalSkillPoints;
+    
+    [FieldOffset(0x0290)]
+    public readonly uint MaxKurzick;
+    
+    [FieldOffset(0x0294)]
+    public readonly uint MaxLuxon;
+    
+    [FieldOffset(0x0298)]
+    public readonly uint MaxBalthazar;
+    
+    [FieldOffset(0x029C)]
+    public readonly uint MaxImperial;
+    
+    [FieldOffset(0x0324)]
+    public readonly uint FoesKilled;
+    
+    [FieldOffset(0x0328)]
+    public readonly uint FoesToKill;
+}

Daybreak/Models/GuildwarsPath.cs

@@ -1,12 +1,11 @@
 using Newtonsoft.Json;
 
-namespace Daybreak.Models
+namespace Daybreak.Models;
+
+public sealed class GuildwarsPath
 {
-    public sealed class GuildwarsPath
-    {
-        [JsonProperty("path")]
-        public string Path { get; set; }
-        [JsonProperty("default")]
-        public bool Default { get; set; }
-    }
+    [JsonProperty("path")]
+    public string? Path { get; set; }
+    [JsonProperty("default")]
+    public bool Default { get; set; }
 }

Daybreak/Models/IconPayload.cs

@@ -1,8 +1,7 @@
-namespace Daybreak.Models
+namespace Daybreak.Models;
+
+public sealed class IconPayload
 {
-    public sealed class IconPayload
-    {
-        public string SkillUrl { get; set; }
-        public string SkillImage { get; set; }
-    }
+    public string? SkillUrl { get; set; }
+    public string? SkillImage { get; set; }
 }

Daybreak/Models/IconRequest.cs

@@ -1,11 +1,10 @@
-using Daybreak.Models.Builds;
+using Daybreak.Models.Guildwars;
 
-namespace Daybreak.Models
+namespace Daybreak.Models;
+
+public sealed class IconRequest
 {
-    public sealed class IconRequest
-    {
-        public Skill Skill { get; set; }
-        public string IconBase64 { get; set; }
-        public bool Finished { get; set; }
-    }
+    public Skill? Skill { get; set; }
+    public string? IconBase64 { get; set; }
+    public bool Finished { get; set; }
 }

Daybreak/Models/KeyMacro.cs

@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 
-namespace Daybreak.Models
+namespace Daybreak.Models;
+
+public sealed class KeyMacro
 {
-    public sealed class KeyMacro
-    {
-        public List<Keys> Keys { get; set; }
-        public Keys TargetKey { get; set; }
-    }
+    public List<Keys>? Keys { get; set; }
+    public Keys TargetKey { get; set; }
 }

Daybreak/Models/KeyboardHookEventArgs.cs

@@ -1,17 +1,16 @@
-namespace Daybreak.Models
-{
-    public sealed class KeyboardHookEventArgs
-    {
-        public bool Handled { get; set; }
-        public KeyboardState KeyboardState { get; }
-        public KeyboardInput KeyboardInput { get; }
+namespace Daybreak.Models;
 
-        public KeyboardHookEventArgs(
-            KeyboardState keyboardState,
-            KeyboardInput keyboardInput)
-        {
-            this.KeyboardState = keyboardState;
-            this.KeyboardInput = keyboardInput;
-        }
+public sealed class KeyboardHookEventArgs
+{
+    public bool Handled { get; set; }
+    public KeyboardState KeyboardState { get; }
+    public KeyboardInput KeyboardInput { get; }
+
+    public KeyboardHookEventArgs(
+        KeyboardState keyboardState,
+        KeyboardInput keyboardInput)
+    {
+        this.KeyboardState = keyboardState;
+        this.KeyboardInput = keyboardInput;
     }
 }

Daybreak/Models/KeyboardInput.cs

@@ -2,40 +2,39 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
-namespace Daybreak.Models
+namespace Daybreak.Models;
+
+[StructLayout(LayoutKind.Sequential)]
+public struct KeyboardInput
 {
-    [StructLayout(LayoutKind.Sequential)]
-    public struct KeyboardInput
-    {
-        /// <summary>
-        /// A virtual-key code. The code must be a value in the range 1 to 254.
-        /// </summary>
-        public int VirtualCode;
+    /// <summary>
+    /// A virtual-key code. The code must be a value in the range 1 to 254.
+    /// </summary>
+    public int VirtualCode;
 
-        // EDT: added a conversion from VirtualCode to Keys.
-        /// <summary>
-        /// The VirtualCode converted to typeof(Keys) for higher usability.
-        /// </summary>
-        public Keys Key { get { return (Keys)this.VirtualCode; } }
+    // EDT: added a conversion from VirtualCode to Keys.
+    /// <summary>
+    /// The VirtualCode converted to typeof(Keys) for higher usability.
+    /// </summary>
+    public Keys Key { get { return (Keys)this.VirtualCode; } }
 
-        /// <summary>
-        /// A hardware scan code for the key. 
-        /// </summary>
-        public int HardwareScanCode;
+    /// <summary>
+    /// A hardware scan code for the key. 
+    /// </summary>
+    public int HardwareScanCode;
 
-        /// <summary>
-        /// The extended-key flag, event-injected Flags, context code, and transition-state flag. This member is specified as follows. An application can use the following values to test the keystroke Flags. Testing LLKHF_INJECTED (bit 4) will tell you whether the event was injected. If it was, then testing LLKHF_LOWER_IL_INJECTED (bit 1) will tell you whether or not the event was injected from a process running at lower integrity level.
-        /// </summary>
-        public int Flags;
+    /// <summary>
+    /// The extended-key flag, event-injected Flags, context code, and transition-state flag. This member is specified as follows. An application can use the following values to test the keystroke Flags. Testing LLKHF_INJECTED (bit 4) will tell you whether the event was injected. If it was, then testing LLKHF_LOWER_IL_INJECTED (bit 1) will tell you whether or not the event was injected from a process running at lower integrity level.
+    /// </summary>
+    public int Flags;
 
-        /// <summary>
-        /// The time stamp stamp for this message, equivalent to what GetMessageTime would return for this message.
-        /// </summary>
-        public int TimeStamp;
+    /// <summary>
+    /// The time stamp stamp for this message, equivalent to what GetMessageTime would return for this message.
+    /// </summary>
+    public int TimeStamp;
 
-        /// <summary>
-        /// Additional information associated with the message. 
-        /// </summary>
-        public IntPtr AdditionalInformation;
-    }
+    /// <summary>
+    /// Additional information associated with the message. 
+    /// </summary>
+    public IntPtr AdditionalInformation;
 }

Daybreak/Models/KeyboardState.cs

@@ -1,10 +1,9 @@
-namespace Daybreak.Models
+namespace Daybreak.Models;
+
+public enum KeyboardState
 {
-    public enum KeyboardState
-    {
-        KeyDown = 0x0100,
-        KeyUp = 0x0101,
-        SysKeyDown = 0x0104,
-        SysKeyUp = 0x0105
-    }
+    KeyDown = 0x0100,
+    KeyUp = 0x0101,
+    SysKeyDown = 0x0104,
+    SysKeyUp = 0x0105
 }

Daybreak/Models/Log.cs

@@ -1,15 +1,14 @@
 using Microsoft.Extensions.Logging;
 using System;
 
-namespace Daybreak.Models
+namespace Daybreak.Models;
+
+public sealed class Log
 {
-    public sealed class Log
-    {
-        public string Message { get; set; }
-        public string Category { get; set; }
-        public LogLevel LogLevel { get; set; }
-        public string CorrelationVector { get; set; }
-        public string EventId { get; set; }
-        public DateTime LogTime { get; set; }
-    }
+    public string? Message { get; set; }
+    public string? Category { get; set; }
+    public LogLevel LogLevel { get; set; }
+    public string? CorrelationVector { get; set; }
+    public string? EventId { get; set; }
+    public DateTime LogTime { get; set; }
 }

Daybreak/Models/LoginCredentials.cs

@@ -1,10 +1,9 @@
-namespace Daybreak.Models
+namespace Daybreak.Models;
+
+public sealed class LoginCredentials
 {
-    public sealed class LoginCredentials
-    {
-        public string Username { get; set; }
-        public string Password { get; set; }
-        public string CharacterName { get; set; }
-        public bool Default { get; set; }
-    }
+    public string? Username { get; set; }
+    public string? Password { get; set; }
+    public string? CharacterName { get; set; }
+    public bool Default { get; set; }
 }

Daybreak/Models/OnboardingStage.cs

@@ -0,0 +1,9 @@
+namespace Daybreak.Models;
+
+public enum OnboardingStage
+{
+    Default,
+    NeedsCredentials,
+    NeedsExecutable,
+    Complete
+}