Alexmacocian/fix secret build (#76)

* Fix pre-build secret building action

* Update version

.editorconfig

@@ -0,0 +1,134 @@
+[*.cs]
+
+# CA2254: Template should be a static expression
+dotnet_diagnostic.CA2254.severity = none
+csharp_indent_labels = one_less_than_current
+csharp_using_directive_placement = outside_namespace:error
+csharp_prefer_simple_using_statement = true:error
+csharp_prefer_braces = true:silent
+csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_indent_braces = false
+insert_final_newline = true
+csharp_space_around_binary_operators = before_and_after
+csharp_style_throw_expression = true:suggestion
+csharp_style_prefer_null_check_over_type_check = true:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_prefer_local_over_anonymous_function = true:error
+csharp_style_prefer_index_operator = true:suggestion
+csharp_style_prefer_range_operator = true:suggestion
+csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
+csharp_style_prefer_tuple_swap = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+csharp_style_deconstructed_variable_declaration = true:error
+csharp_style_unused_value_assignment_preference = discard_variable:error
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+csharp_prefer_static_local_function = true:suggestion
+csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+csharp_style_prefer_parameter_null_checking = true:suggestion
+csharp_style_prefer_switch_expression = true:suggestion
+csharp_style_prefer_pattern_matching = true:silent
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_prefer_not_pattern = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_prefer_extended_property_pattern = true:suggestion
+csharp_style_var_for_built_in_types = false:silent
+csharp_style_var_when_type_is_apparent = false:silent
+csharp_style_var_elsewhere = false:silent
+
+[*.{cs,vb}]
+#### Naming styles ####
+
+# Naming rules
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = error
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = error
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = error
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+# Symbol specifications
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+# Naming styles
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+indent_size = 4
+end_of_line = crlf
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:error
+dotnet_style_prefer_auto_properties = true:error
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+dotnet_style_namespace_match_folder = true:suggestion
+dotnet_style_readonly_field = true:suggestion
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent
+dotnet_style_predefined_type_for_member_access = true:silent
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+dotnet_style_allow_multiple_blank_lines_experimental = true:silent
+dotnet_style_allow_statement_immediately_after_block_experimental = false:suggestion
+dotnet_code_quality_unused_parameters = all:error
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:suggestion
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:suggestion
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:suggestion
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:suggestion
+dotnet_style_qualification_for_field = true:error
+dotnet_style_qualification_for_property = true:error
+dotnet_style_qualification_for_method = true:error
+dotnet_style_qualification_for_event = true:error
+dotnet_diagnostic.CA1000.severity = error
+
+[*.vb]
+dotnet_diagnostic.CA1047.severity = error

.github/CODEOWNERS

@@ -0,0 +1 @@
+*	amacocian@yahoo.com

.github/dependabot.yml

@@ -0,0 +1,16 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "nuget"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/cd.yaml

@@ -9,6 +9,9 @@ on:
   push:
     branches:
       - master
+    paths:
+      - "Daybreak/**"
+      - "Daybreak.Installer/**"
       
 jobs:
 
@@ -24,12 +27,12 @@ jobs:
       Configuration: Release
       Solution_Path: Daybreak.sln
       Test_Project_Path: Daybreak.Tests\Daybreak.Tests.csproj
-      Wpf_Project_Path: Daybreak\Daybreal.csproj
+      Wpf_Project_Path: Daybreak\Daybreak.csproj
       Actions_Allow_Unsecure_Commands: true
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
@@ -50,13 +53,18 @@ jobs:
         echo "${{ env.Changelog }}"
 
     - name: Install .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v2
       with:
         dotnet-version: '6.x'
 
     - name: Setup MSBuild.exe
       uses: microsoft/setup-msbuild@v1.0.1
 
+    - name: Setup project secrets
+      run: |
+        dotnet user-secrets --project Daybreak\Daybreak.csproj set AadApplicationId "${{ secrets.AadApplicationId }}"
+        dotnet user-secrets --project Daybreak\Daybreak.csproj set AadTenantId "${{ secrets.AadTenantId }}"
+
     - name:  Restore project
       run: msbuild $env:Solution_Path /t:Restore /p:Configuration=$env:Configuration /p:RuntimeIdentifier=$env:RuntimeIdentifier
       env:
@@ -70,11 +78,16 @@ jobs:
         $version = .\Scripts\GetBuildVersion.ps1
         echo "::set-env name=Version::$version"
 
-    - name: Create publish files
+    - name: Create publish launcher files
       run: dotnet publish .\Daybreak\Daybreak.csproj -c $env:Configuration -r $env:RuntimeIdentifier -p:PublishReadyToRun=true -p:PublishSingleFile=true --self-contained true -o .\Publish
       env:
         RuntimeIdentifier: win-${{ matrix.targetplatform }}
 
+    - name: Create publish installer files
+      run: dotnet publish .\Daybreak.Installer\Daybreak.Installer.csproj -c $env:Configuration -r $env:RuntimeIdentifier -p:PublishReadyToRun=true -p:PublishSingleFile=true --self-contained true -o .\Publish
+      env:
+        RuntimeIdentifier: win-${{ matrix.targetplatform }}
+
     - name: Pack publish files
       run: |
         Write-Host $env
@@ -82,7 +95,7 @@ jobs:
       shell: pwsh
 
     - name: Publish release
-      uses: Xotl/cool-github-releases@v1.1.2
+      uses: Xotl/cool-github-releases@v1.1.7
       with:
         mode: update
         tag_name: v${{ env.Version }}

.github/workflows/ci.yaml

@@ -31,12 +31,12 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
     - name: Install .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v2
       with:
         dotnet-version: '6.x'
 

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,78 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
+  schedule:
+    - cron: '41 12 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: windows-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+        
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # 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
+      with:
+        dotnet-version: '6.x'
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

.github/workflows/version_check.yaml

@@ -0,0 +1,48 @@
+name:  Daybreak Version Check
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths:
+      - "Daybreak/**"
+      - "Daybreak.Installer/**"
+
+jobs:
+
+  check_version:
+
+    strategy:
+      matrix:
+        targetplatform: [x64]
+
+    runs-on: windows-latest
+
+    env:
+      Configuration: Release
+      Solution_Path: Daybreak.sln
+      Actions_Allow_Unsecure_Commands: true
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    
+    - name: Get Latest Tag
+      id: getLatestTag
+      uses: WyriHaximus/github-action-get-previous-tag@v1
+
+    - name: Build Daybreak project
+      run: dotnet build Daybreak -c $env:Configuration
+
+    - name: Set version variable
+      run: |
+        $version = .\Scripts\GetBuildVersion.ps1
+        echo "::set-env name=Version::$version"
+
+    - name: Check version difference
+      run: |
+        .\Scripts\CompareVersions -currentVersion ${{ env.Version }} -lastVersion ${{ env.LatestReleaseTag }}
+      env:
+        LatestReleaseTag: ${{ steps.getLatestTag.outputs.tag }}

Daybreak.Installer/Daybreak.Installer.csproj

@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

Daybreak.Installer/Program.cs

@@ -0,0 +1,46 @@
+// See https://aka.ms/new-console-template for more information
+using System.Diagnostics;
+using System.IO.Compression;
+
+const string tempFile = "tempfile.zip";
+const string executableName = "Daybreak.exe";
+Console.Title = "Daybreak Installer";
+Console.WriteLine("Starting installation...");
+if (File.Exists(tempFile) is false)
+{
+    Console.ForegroundColor = ConsoleColor.Red;
+    Console.WriteLine("Unable to find launcher package. Aborting installation");
+    Console.ReadKey();
+    return;
+}
+
+Console.WriteLine("Unpacking files...");
+try
+{
+    ZipFile.ExtractToDirectory(tempFile, AppContext.BaseDirectory, true);
+}
+catch
+{
+
+}
+Console.WriteLine("Deleting package");
+File.Delete(tempFile);
+
+Console.WriteLine("Deleting browser caches");
+Directory.Delete("BrowserData", true);
+Directory.Delete("Daybreak.exe.WebView2", true);
+
+Console.WriteLine("Launching application");
+var process = new Process
+{
+    StartInfo = new ProcessStartInfo
+    {
+        FileName = executableName
+    }
+};
+
+if (process.Start() is false)
+{
+    Console.WriteLine("Failed to launch application");
+    Console.ReadKey();
+}

Daybreak.Tests/Daybreak.Tests.csproj

@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0-preview-20220707-01" />
+    <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" />

Daybreak.Tests/Services/BuildTemplateManagerTests.cs

@@ -17,7 +17,7 @@ namespace Daybreak.Tests.Services
         [TestInitialize]
         public void Initialize()
         {
-            buildTemplateManager = new BuildTemplateManager(new Mock<ILogger<BuildTemplateManager>>().Object);
+            this.buildTemplateManager = new BuildTemplateManager(new Mock<ILogger<BuildTemplateManager>>().Object);
         }
 
         [TestMethod]

Daybreak.sln

@@ -11,6 +11,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pipelines", "Pipelines", "{
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\cd.yaml = .github\workflows\cd.yaml
 		.github\workflows\ci.yaml = .github\workflows\ci.yaml
+		.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
+		.github\dependabot.yml = .github\dependabot.yml
+		.github\workflows\version_check.yaml = .github\workflows\version_check.yaml
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Daybreak.Installer", "Daybreak.Installer\Daybreak.Installer.csproj", "{4E2BB805-135D-4F02-8C53-3D8B6876D323}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{41AE8C5D-25E1-4B08-8D65-868552421A63}"
+	ProjectSection(SolutionItems) = preProject
+		Scripts\BuildRelease.ps1 = Scripts\BuildRelease.ps1
+		Scripts\CompareVersions.ps1 = Scripts\CompareVersions.ps1
+		Scripts\GetBuildVersion.ps1 = Scripts\GetBuildVersion.ps1
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0E30DDA0-2111-4E6C-851E-01DC34124FC2}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		.github\CODEOWNERS = .github\CODEOWNERS
 	EndProjectSection
 EndProject
 Global
@@ -37,6 +55,14 @@ Global
 		{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
+		{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}.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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Daybreak/Behaviors/ScaleFontWithSize.cs

@@ -1,9 +1,9 @@
-using System;
+using Microsoft.Xaml.Behaviors;
+using System;
 using System.ComponentModel;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Interactivity;
 using System.Windows.Media;
 
 namespace Daybreak.Behaviors

Daybreak/Behaviors/ScrollIntoView.cs

@@ -1,7 +1,7 @@
-using System;
+using Microsoft.Xaml.Behaviors;
+using System;
 using System.Extensions;
 using System.Windows.Controls;
-using System.Windows.Interactivity;
 
 namespace Daybreak.Behaviors
 {
@@ -13,7 +13,7 @@ namespace Daybreak.Behaviors
         protected override void OnAttached()
         {
             base.OnAttached();
-            this.AssociatedObject.SelectionChanged += AssociatedObject_SelectionChanged;
+            this.AssociatedObject.SelectionChanged += this.AssociatedObject_SelectionChanged;
         }
 
         /// <summary>
@@ -48,7 +48,7 @@ namespace Daybreak.Behaviors
         {
             base.OnDetaching();
             this.AssociatedObject.SelectionChanged -=
-                AssociatedObject_SelectionChanged;
+                this.AssociatedObject_SelectionChanged;
 
         }
     }

Daybreak/Configuration/ApplicationConfiguration.cs

@@ -37,7 +37,7 @@ namespace Daybreak.Configuration
         public bool PlaceShortcut { get; set; }
         [JsonProperty("AutoCheckUpdate")]
         public bool AutoCheckUpdate { get; set; } = true;
-        [JsonProperty("KeepLocalIconCache")]
-        public bool KeepLocalIconCache { get; set; } = true;
+        [JsonProperty("ProtectedGraphAccessToken")]
+        public string ProtectedGraphAccessToken { get; set; }
     }
 }

Daybreak/Configuration/ExperimentalFeatures.cs

@@ -16,6 +16,8 @@ namespace Daybreak.Configuration
         public bool LaunchGuildwarsAsCurrentUser { get; set; } = true;
         [JsonProperty("CanInterceptKeys")]
         public bool CanInterceptKeys { get; set; }
+        [JsonProperty("DownloadIcons")]
+        public bool DownloadIcons { get; set; }
         [JsonProperty("Macros")]
         public List<KeyMacro> Macros { get; set; } = new();
     }

Daybreak/Configuration/ProjectConfiguration.cs

@@ -22,6 +22,11 @@ using LiteDB;
 using Daybreak.Services.Options;
 using Daybreak.Models;
 using Microsoft.CorrelationVector;
+using System.Logging;
+using Daybreak.Services.Updater.PostUpdate;
+using System.Core.Extensions;
+using Daybreak.Services.Updater.PostUpdate.Actions;
+using Daybreak.Services.Graph;
 
 namespace Daybreak.Configuration
 {
@@ -29,7 +34,7 @@ namespace Daybreak.Configuration
     {
         public static void RegisterResolvers(IServiceManager serviceManager)
         {
-            serviceManager.ThrowIfNull(nameof(serviceManager));
+            serviceManager.ThrowIfNull();
 
             serviceManager.RegisterHttpFactory((serviceProvider, categoryType) =>
             {
@@ -43,29 +48,44 @@ namespace Daybreak.Configuration
 
         public static void RegisterServices(IServiceProducer serviceProducer)
         {
-            serviceProducer.ThrowIfNull(nameof(serviceProducer));
+            serviceProducer.ThrowIfNull();
 
+            serviceProducer.RegisterSingleton<ILogsManager, JsonLogsManager>();
+            serviceProducer.RegisterSingleton<IDebugLogsWriter, Services.Logging.DebugLogsWriter>();
+            serviceProducer.RegisterSingleton<ILoggerFactory, LoggerFactory>(sp =>
+            {
+                var factory = new LoggerFactory();
+                factory.AddProvider(new CVLoggerProvider(sp.GetService<ILogsWriter>()));
+                return factory;
+            });
+            serviceProducer.RegisterSingleton<ILogsWriter, CompositeLogsWriter>(sp => new CompositeLogsWriter(
+                sp.GetService<ILogsManager>(),
+                sp.GetService<IDebugLogsWriter>()));
+
+            serviceProducer.RegisterScoped((sp) => new ScopeMetadata(new CorrelationVector()));
             serviceProducer.RegisterSingleton<ViewManager>(registerAllInterfaces: true);
+            serviceProducer.RegisterSingleton<PostUpdateActionManager>(registerAllInterfaces: true);
             serviceProducer.RegisterSingleton<IConfigurationManager, ConfigurationManager>();
             serviceProducer.RegisterSingleton<ILiteDatabase, LiteDatabase>(sp => new LiteDatabase("Daybreak.db"));
             serviceProducer.RegisterSingleton<IMutexHandler, MutexHandler>();
             serviceProducer.RegisterSingleton<IShortcutManager, ShortcutManager>();
+            serviceProducer.RegisterSingleton<IIconBrowser, IconBrowser>();
+            serviceProducer.RegisterSingleton<IIconDownloader, IconDownloader>();
             serviceProducer.RegisterScoped<ICredentialManager, CredentialManager>();
             serviceProducer.RegisterScoped<IApplicationLauncher, ApplicationLauncher>();
             serviceProducer.RegisterScoped<IScreenshotProvider, ScreenshotProvider>();
             serviceProducer.RegisterScoped<IBloogumClient, BloogumClient>();
             serviceProducer.RegisterScoped<IApplicationUpdater, ApplicationUpdater>();
             serviceProducer.RegisterScoped<IBuildTemplateManager, BuildTemplateManager>();
-            serviceProducer.RegisterScoped<IIconRetriever, IconRetriever>();
+            serviceProducer.RegisterScoped<IIconCache, IconCache>();
             serviceProducer.RegisterScoped<IPrivilegeManager, PrivilegeManager>();
             serviceProducer.RegisterScoped<IScreenManager, ScreenManager>();
-            serviceProducer.RegisterLogWriter<ILogsManager, JsonLogsManager>();
-            serviceProducer.RegisterScoped((sp) => new ScopeMetadata(new CorrelationVector()));
+            serviceProducer.RegisterScoped<IGraphClient, GraphClient>();
         }
 
         public static void RegisterViews(IViewProducer viewProducer)
         {
-            viewProducer.ThrowIfNull(nameof(viewProducer));
+            viewProducer.ThrowIfNull();
 
             viewProducer.RegisterView<MainView>();
             viewProducer.RegisterView<SettingsView>();
@@ -81,6 +101,16 @@ namespace Daybreak.Configuration
             viewProducer.RegisterView<ScreenChoiceView>();
             viewProducer.RegisterView<VersionManagementView>();
             viewProducer.RegisterView<LogsView>();
+            viewProducer.RegisterView<IconDownloadView>();
+            viewProducer.RegisterView<GraphAuthorizationView>();
+            viewProducer.RegisterView<BuildsSynchronizationView>();
+        }
+
+        public static void RegisterPostUpdateActions(IPostUpdateActionProducer postUpdateActionProducer)
+        {
+            postUpdateActionProducer.ThrowIfNull();
+
+            postUpdateActionProducer.AddPostUpdateAction<RenameInstallerAction>();
         }
     }
 }

Daybreak/Configuration/SecretKeys.cs

@@ -0,0 +1,12 @@
+namespace Daybreak.Configuration;
+
+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; }
+    private SecretKeys()
+    {
+    }
+}

Daybreak/Configuration/SecretManager.cs

@@ -0,0 +1,49 @@
+using Newtonsoft.Json.Linq;
+using System.Extensions;
+using System.Linq;
+using System.Reflection;
+
+namespace Daybreak.Configuration;
+
+public static class SecretManager
+{
+    private static JObject SecretsHolder;
+
+    public static string GetSecret(SecretKeys secretKey)
+    {
+        if (SecretsHolder is null)
+        {
+            LoadSecrets();
+        }
+
+        return SecretsHolder.Value<string>(secretKey.Key);
+    }
+
+    public static T GetSecret<T>(SecretKeys secretKey)
+    {
+        if (SecretsHolder is null)
+        {
+            LoadSecrets();
+        }
+
+        return SecretsHolder.Value<T>(secretKey.Key);
+    }
+
+    private static void LoadSecrets()
+    {
+        var serializedSecrets = Assembly.GetExecutingAssembly().GetManifestResourceStream("Daybreak.secrets.json").ReadAllBytes().GetString();
+        serializedSecrets = TrimUnwantedCharacters(serializedSecrets);
+        SecretsHolder = JObject.Parse(serializedSecrets);
+    }
+
+    private static string TrimUnwantedCharacters(string s)
+    {
+        return new string(s.Where(c =>
+            char.IsWhiteSpace(c) ||
+            char.IsLetterOrDigit(c) ||
+            char.IsSymbol(c) ||
+            char.IsSeparator(c) ||
+            char.IsPunctuation(c))
+            .ToArray());
+    }
+}

Daybreak/Controls/Buttons/AddButton.xaml.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Controls
 
         public AddButton()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Ellipse_MouseEnter(object sender, MouseEventArgs e)

Daybreak/Controls/Buttons/BackButton.xaml.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Controls
 
         public BackButton()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Ellipse_MouseEnter(object sender, MouseEventArgs e)

Daybreak/Controls/Buttons/BinButton.xaml.cs

@@ -12,7 +12,7 @@ namespace Daybreak.Controls
         public event EventHandler Clicked;
         public BinButton()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)

Daybreak/Controls/Buttons/CancelButton.xaml.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Controls
 
         public CancelButton()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Ellipse_MouseEnter(object sender, MouseEventArgs e)

Daybreak/Controls/Buttons/HelpButton.xaml.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Controls
 
         public HelpButton()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Ellipse_MouseEnter(object sender, MouseEventArgs e)

Daybreak/Controls/Buttons/MaximizeButton.xaml.cs

@@ -13,17 +13,17 @@ namespace Daybreak.Controls
 
         public MaximizeButton()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
         {
-            BackgroundEllipse.Visibility = System.Windows.Visibility.Visible;
+            this.BackgroundEllipse.Visibility = System.Windows.Visibility.Visible;
         }
 
         private void Ellipse_MouseLeave(object sender, MouseEventArgs e)
         {
-            BackgroundEllipse.Visibility = System.Windows.Visibility.Hidden;
+            this.BackgroundEllipse.Visibility = System.Windows.Visibility.Hidden;
         }
 
         private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)

Daybreak/Controls/Buttons/MinusButton.xaml.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Controls
 
         public MinusButton()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Ellipse_MouseEnter(object sender, MouseEventArgs e)

Daybreak/Controls/Buttons/OpaqueButton.xaml.cs

@@ -70,7 +70,7 @@ namespace Daybreak.Controls
 
         public OpaqueButton()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Rectangle_MouseEnter(object sender, MouseEventArgs e)

Daybreak/Controls/Buttons/SaveButton.xaml.cs

@@ -13,17 +13,17 @@ namespace Daybreak.Controls
 
         public SaveButton()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
         {
-            BackgroundEllipse.Visibility = System.Windows.Visibility.Visible;
+            this.BackgroundEllipse.Visibility = System.Windows.Visibility.Visible;
         }
 
         private void Ellipse_MouseLeave(object sender, MouseEventArgs e)
         {
-            BackgroundEllipse.Visibility = System.Windows.Visibility.Hidden;
+            this.BackgroundEllipse.Visibility = System.Windows.Visibility.Hidden;
         }
 
         private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)

Daybreak/Controls/Buttons/SynchronizeButton.xaml

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

Daybreak/Controls/Buttons/SynchronizeButton.xaml.cs

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

Daybreak/Controls/Buttons/TileButton.xaml

@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Daybreak.Controls"
-             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:behaviors="clr-namespace:Daybreak.Behaviors"
              xmlns:converters="clr-namespace:Daybreak.Converters"
              x:Name="_this"
@@ -18,8 +18,8 @@
             <RowDefinition Height="*"></RowDefinition>
             <RowDefinition Height="auto"></RowDefinition>
         </Grid.RowDefinitions>
-        <ContentPresenter x:Name="Content" Margin="5" 
-                              Content="{Binding ElementName=_this, Path=InnerContent}"></ContentPresenter>
+        <ContentPresenter Margin="5" 
+                          Content="{Binding ElementName=_this, Path=InnerContent}"></ContentPresenter>
         <Border BorderBrush="{Binding ElementName=_this, Path=BorderBrush}" 
                 BorderThickness="{Binding ElementName=_this, Path=BorderThickness}"
                 Opacity="{Binding ElementName=_this, Path=Highlighted, Converter={StaticResource HighlightConverter}}"

Daybreak/Controls/ChromiumBrowserWrapper.xaml.cs

@@ -28,6 +28,8 @@ namespace Daybreak.Controls
         
         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;
@@ -35,16 +37,15 @@ namespace Daybreak.Controls
         private ILiveOptions<ApplicationConfiguration> liveOptions;
         private ILogger<ChromiumBrowserWrapper> logger;
         private IBuildTemplateManager buildTemplateManager;
-        private CoreWebView2Environment coreWebView2Environment;
-
+        
         [GenerateDependencyProperty(InitialValue = true)]
         private bool canDownloadBuild;
         [GenerateDependencyProperty(InitialValue = true)]
         private bool canNavigate;
         [GenerateDependencyProperty(InitialValue = true)]
         private bool controlsEnabled;
-        [GenerateDependencyProperty]
-        private bool browserSupported;
+        [GenerateDependencyProperty(InitialValue = null)]
+        private bool? browserSupported;
         [GenerateDependencyProperty]
         private bool addressBarReadonly;
         [GenerateDependencyProperty]
@@ -80,7 +81,16 @@ namespace Daybreak.Controls
             }
         }
 
-        public async void InitializeBrowser(
+        public async Task InitializeDefaultBrowser()
+        {
+            var options = Launch.Launcher.Instance.ApplicationServiceManager.GetService<ILiveOptions<ApplicationConfiguration>>();
+            var buildTemplateManager = Launch.Launcher.Instance.ApplicationServiceManager.GetService<IBuildTemplateManager>();
+            var logger = Launch.Launcher.Instance.ApplicationServiceManager.GetService<ILogger<ChromiumBrowserWrapper>>();
+
+            await this.InitializeDefaultBrowser(options, buildTemplateManager, logger);
+        }
+
+        public async Task InitializeDefaultBrowser(
             ILiveOptions<ApplicationConfiguration> liveOptions,
             IBuildTemplateManager buildTemplateManager,
             ILogger<ChromiumBrowserWrapper> logger)
@@ -107,7 +117,11 @@ namespace Daybreak.Controls
 
             try
             {
-                this.coreWebView2Environment = System.Extensions.TaskExtensions.RunSync(() => CoreWebView2Environment.CreateAsync(null, "BrowserData", null));
+                if (coreWebView2Environment is null)
+                {
+                    coreWebView2Environment = System.Extensions.TaskExtensions.RunSync(() => CoreWebView2Environment.CreateAsync(null, "BrowserData", null));
+                }
+
                 this.BrowserSupported = true;
             }
             catch(Exception e)
@@ -122,7 +136,8 @@ namespace Daybreak.Controls
             if (this.BrowserSupported is true)
             {
                 this.WebBrowser.IsEnabled = true;
-                await this.WebBrowser.EnsureCoreWebView2Async(this.coreWebView2Environment);
+                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;
@@ -207,6 +222,11 @@ namespace Daybreak.Controls
                     return;
                 }
 
+                if (this.buildTemplateManager is null)
+                {
+                    return;
+                }
+
                 if (this.buildTemplateManager.IsTemplate(maybeTemplate) is false)
                 {
                     return;

Daybreak/Controls/CircularLoadingWidget.xaml.cs

@@ -10,7 +10,7 @@ namespace Daybreak.Controls
     {
         public CircularLoadingWidget()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)

Daybreak/Controls/Glyphs/AvatarGlyph.xaml.cs

@@ -22,7 +22,7 @@ namespace Daybreak.Controls
     {
         public AvatarGlyph()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
     }
 }

Daybreak/Controls/Glyphs/ExperimentGlyph.xaml.cs

@@ -22,7 +22,7 @@ namespace Daybreak.Controls
     {
         public ExperimentGlyph()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
     }
 }

Daybreak/Controls/Glyphs/FileGlyph.xaml.cs

@@ -9,7 +9,7 @@ namespace Daybreak.Controls
     {
         public FileGlyph()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
     }
 }

Daybreak/Controls/Glyphs/FireballGlyph.xaml.cs

@@ -22,7 +22,7 @@ namespace Daybreak.Controls
     {
         public FireballGlyph()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
     }
 }

Daybreak/Controls/Glyphs/GoldenArrowGlyph.xaml.cs

@@ -22,7 +22,7 @@ namespace Daybreak.Controls
     {
         public GoldenArrowGlyph()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
     }
 }

Daybreak/Controls/Glyphs/LogsGlyph.xaml.cs

@@ -9,7 +9,7 @@ namespace Daybreak.Controls
     {
         public LogsGlyph()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
     }
 }

Daybreak/Controls/Glyphs/StarGlyph.xaml.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Controls
 
         public StarGlyph()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Ellipse_MouseEnter(object sender, MouseEventArgs e)

Daybreak/Controls/ImageViewer.xaml.cs

@@ -20,7 +20,7 @@ namespace Daybreak.Controls
 
         public ImageViewer()
         {
-            InitializeComponent();
+            this.InitializeComponent();
             this.Image1.Visibility = Visibility.Visible;
             this.Image1.Opacity = 1;
             this.Image2.Visibility = Visibility.Hidden;

Daybreak/Controls/SearchTextBox.xaml

@@ -0,0 +1,35 @@
+<UserControl x:Class="Daybreak.Controls.SearchTextBox"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls"
+             x:Name="_this"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"></BooleanToVisibilityConverter>
+    </UserControl.Resources>
+    <Grid>
+        <TextBox Foreground="{Binding RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, Path=Foreground, Mode=OneWay}"
+                 FontSize="{Binding RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, Path=FontSize, Mode=OneWay}"
+                 FontFamily="{Binding RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, Path=FontFamily, Mode=OneWay}"
+                 FontStretch="{Binding RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, Path=FontStretch, Mode=OneWay}"
+                 FontWeight="{Binding RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, Path=FontWeight, Mode=OneWay}"
+                 FontStyle="{Binding RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, Path=FontStyle, Mode=OneWay}"
+                 TextChanged="TextBox_TextChanged"
+                 Background="Transparent"/>
+        <TextBlock  Margin="5, 0, 0, 0"
+                    Text="Search"
+                    Background="Transparent"
+                    Opacity="0.5"
+                    IsHitTestVisible="False"
+                    FontSize="{Binding RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, Path=FontSize, Mode=OneWay}"
+                    FontFamily="{Binding RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, Path=FontFamily, Mode=OneWay}"
+                    FontStretch="{Binding RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, Path=FontStretch, Mode=OneWay}"
+                    FontWeight="{Binding RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, Path=FontWeight, Mode=OneWay}"
+                    FontStyle="{Binding RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, Path=FontStyle, Mode=OneWay}"
+                    Foreground="{Binding RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, Path=Foreground, Mode=OneWay}"
+                    Visibility="{Binding RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, Path=PlaceholderVisibility, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+    </Grid>
+</UserControl>

Daybreak/Controls/SearchTextBox.xaml.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Extensions;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Extensions;
+
+namespace Daybreak.Controls
+{
+    /// <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;
+
+        public SearchTextBox()
+        {
+            this.InitializeComponent();
+        }
+
+        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);
+        }
+    }
+}

Daybreak/Controls/Templates/AccountTemplate.xaml.cs

@@ -29,7 +29,7 @@ namespace Daybreak.Controls
         public AccountTemplate()
         {
             this.InitializeComponent();
-            this.DataContextChanged += AccountTemplate_DataContextChanged;
+            this.DataContextChanged += this.AccountTemplate_DataContextChanged;
         }
 
         private void AccountTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)

Daybreak/Controls/Templates/AttributeTemplate.xaml.cs

@@ -25,7 +25,7 @@ namespace Daybreak.Controls
         public AttributeTemplate()
         {
             this.InitializeComponent();
-            this.DataContextChanged += AttributeTemplate_DataContextChanged;
+            this.DataContextChanged += this.AttributeTemplate_DataContextChanged;
         }
 
         private void AttributeTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)

Daybreak/Controls/Templates/BuildEntryTemplate.xaml.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Controls
 
         public BuildEntryTemplate()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void BinButton_Clicked(object sender, EventArgs e)

Daybreak/Controls/Templates/BuildTemplate.xaml

@@ -4,11 +4,12 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Daybreak.Controls"
-             xmlns:interactivity="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:interactivity="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:behaviors="clr-namespace:Daybreak.Behaviors"
              xmlns:converters="clr-namespace:Daybreak.Converters"
              mc:Ignorable="d"
              x:Name="_this"
+             Unloaded="BuildTemplate_Unloaded"
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid Background="Transparent" MouseLeftButtonDown="Grid_MouseLeftButtonDown">
         <Grid.RowDefinitions>
@@ -156,14 +157,36 @@
             <local:ChromiumBrowserWrapper x:Name="SkillBrowser" ControlsEnabled="False" Width="0" AddressBarReadonly="True" CanNavigate="True"></local:ChromiumBrowserWrapper>
         </Grid>
         <Grid Grid.Column="1" Grid.RowSpan="6">
-            <ListView x:Name="SkillsListView" Background="Transparent" Width="0"
-                ItemsSource="{Binding ElementName=_this, Path=AvailableSkills, Mode=OneWay}" MouseDoubleClick="ListView_MouseDoubleClick">
-                <ListView.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock FontSize="16" Foreground="White" TextWrapping="Wrap" Text="{Binding Name}"></TextBlock>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
+            <Grid x:Name="SkillListContainer">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto"></RowDefinition>
+                    <RowDefinition Height="*"></RowDefinition>
+                </Grid.RowDefinitions>
+                <local:SearchTextBox    FontSize="20"
+                                        Foreground="White"
+                                        Background="Transparent"
+                                        SearchText="{Binding ElementName=_this, Path=SkillSearchText, Mode=TwoWay}"
+                                        TextChanged="SearchTextBox_TextChanged"></local:SearchTextBox>
+                <ListView x:Name="SkillsListView"
+                          Grid.Row="1"
+                          ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                          ScrollViewer.VerticalScrollBarVisibility="Hidden"
+                          Background="Transparent"
+                          ItemsSource="{Binding ElementName=_this, Path=AvailableSkills, Mode=OneWay}"
+                          MouseDoubleClick="ListView_MouseDoubleClick">
+                    <ListView.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <VirtualizingStackPanel>
+                            </VirtualizingStackPanel>
+                        </ItemsPanelTemplate>
+                    </ListView.ItemsPanel>
+                    <ListView.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock FontSize="16" Foreground="White" TextWrapping="Wrap" Text="{Binding Name}"></TextBlock>
+                        </DataTemplate>
+                    </ListView.ItemTemplate>
+                </ListView>
+            </Grid>
         </Grid>
     </Grid>
 </UserControl>

Daybreak/Controls/Templates/BuildTemplate.xaml.cs

@@ -7,11 +7,15 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Configuration;
+using System.Core.Extensions;
 using System.Extensions;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Extensions;
+using Utils;
 
 namespace Daybreak.Controls
 {
@@ -27,11 +31,15 @@ namespace Daybreak.Controls
 
         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;
         [GenerateDependencyProperty]
         private Profession primaryProfession;
         [GenerateDependencyProperty]
@@ -63,13 +71,15 @@ namespace Daybreak.Controls
             this.DataContextChanged += this.BuildTemplate_DataContextChanged;
         }
 
-        public void InitializeTemplate(
-            IIconRetriever iconRetriever,
+        public async void InitializeTemplate(
+            IIconCache iconRetriever,
+            IIconBrowser iconBrowser,
             ILiveOptions<ApplicationConfiguration> liveOptions,
             IBuildTemplateManager buildTemplateManager,
             ILogger<ChromiumBrowserWrapper> logger)
         {
-            this.SkillBrowser.InitializeBrowser(liveOptions, buildTemplateManager, logger);
+            this.iconBrowser = iconBrowser.ThrowIfNull();
+            await this.SkillBrowser.InitializeDefaultBrowser(liveOptions, buildTemplateManager, logger);
             this.SkillTemplate0.InitializeSkillTemplate(iconRetriever);
             this.SkillTemplate1.InitializeSkillTemplate(iconRetriever);
             this.SkillTemplate2.InitializeSkillTemplate(iconRetriever);
@@ -78,6 +88,9 @@ namespace Daybreak.Controls
             this.SkillTemplate5.InitializeSkillTemplate(iconRetriever);
             this.SkillTemplate6.InitializeSkillTemplate(iconRetriever);
             this.SkillTemplate7.InitializeSkillTemplate(iconRetriever);
+
+            this.HideSkillListView();
+            this.HideInfoBrowser();
         }
 
         protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
@@ -131,6 +144,11 @@ namespace Daybreak.Controls
             }
         }
 
+        private void BuildTemplate_Unloaded(object sender, RoutedEventArgs e)
+        {
+            this.cancellationTokenSource.Cancel();
+        }
+
         private void InitializeProperties()
         {
             this.PrimaryProfession = Profession.None;
@@ -191,14 +209,8 @@ namespace Daybreak.Controls
             this.loadedBuild.Build.Attributes = this.Attributes.ToList();
         }
 
-        private void LoadSkills()
+        private async void LoadSkills()
         {
-            var possibleSkills = Skill.Skills
-                .Where(s => s.Profession == this.PrimaryProfession || s.Profession == this.SecondaryProfession || s.Profession == Profession.None)
-                .Where(s => s != Skill.NoSkill)
-                .OrderBy(s => s.Name);
-            this.AvailableSkills.ClearAnd().AddRange(possibleSkills);
-
             if (this.Skill0.Profession != this.PrimaryProfession &&
                 this.Skill0.Profession != this.SecondaryProfession &&
                 this.Skill0.Profession != Profession.None)
@@ -254,8 +266,12 @@ namespace Daybreak.Controls
             {
                 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;
@@ -286,7 +302,7 @@ namespace Daybreak.Controls
             if (this.SkillBrowser.BrowserSupported is true)
             {
                 this.SkillBrowser.Width = 400;
-                this.SkillsListView.Width = 0;
+                this.SkillListContainer.Width = 0;
             }
         }
 
@@ -301,12 +317,12 @@ namespace Daybreak.Controls
         private void ShowSkillListView()
         {
             this.SkillBrowser.Width = 0;
-            this.SkillsListView.Width = 400;
+            this.SkillListContainer.Width = 400;
         }
 
         private void HideSkillListView()
         {
-            this.SkillsListView.Width = 0;
+            this.SkillListContainer.Width = 0;
         }
 
         private void HelpButtonPrimary_Clicked(object sender, System.EventArgs e)
@@ -337,13 +353,14 @@ namespace Daybreak.Controls
             }
         }
 
-        private void AttributeTemplate_HelpClicked(object sender, AttributeEntry e)
+        private void AttributeTemplate_HelpClicked(object _, AttributeEntry e)
         {
             this.BrowseToInfo(e.Attribute.Name);
         }
 
-        private void AttributeTemplate_AttributeChanged(object sender, AttributeEntry e)
+        private void AttributeTemplate_AttributeChanged(object _, AttributeEntry e)
         {
+            e.ThrowIfNull();
             this.BuildChanged?.Invoke(this, new EventArgs());
         }
 
@@ -352,6 +369,7 @@ namespace Daybreak.Controls
             var skill = sender.As<SkillTemplate>().DataContext.As<Skill>();
             if (skill == Skill.NoSkill)
             {
+                this.SkillSearchText = string.Empty;
                 this.ShowSkillListView();
                 this.selectingSkillTemplate = sender.As<SkillTemplate>();
             }
@@ -363,6 +381,12 @@ namespace Daybreak.Controls
             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;
@@ -404,5 +428,50 @@ namespace Daybreak.Controls
                     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)
+            {
+                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;
+                }
+            }
+        }
     }
 }

Daybreak/Controls/Templates/GuildwarsPathTemplate.xaml.cs

@@ -26,7 +26,7 @@ namespace Daybreak.Controls
         public GuildwarsPathTemplate()
         {
             this.InitializeComponent();
-            this.DataContextChanged += GuildwarsPathTemplate_DataContextChanged;
+            this.DataContextChanged += this.GuildwarsPathTemplate_DataContextChanged;
         }
 
         private void GuildwarsPathTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)

Daybreak/Controls/Templates/ScreenTemplate.xaml.cs

@@ -25,7 +25,7 @@ namespace Daybreak.Controls.Templates
         public ScreenTemplate()
         {
             this.InitializeComponent();
-            this.DataContextChanged += ScreenTemplate_DataContextChanged;
+            this.DataContextChanged += this.ScreenTemplate_DataContextChanged;
         }
 
         protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)

Daybreak/Controls/Templates/SkillTemplate.xaml

@@ -1,8 +1,9 @@
 <UserControl x:Class="Daybreak.Controls.SkillTemplate"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:webview="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
              xmlns:local="clr-namespace:Daybreak.Controls"
              mc:Ignorable="d" 
              x:Name="_this"

Daybreak/Controls/Templates/SkillTemplate.xaml.cs

@@ -1,10 +1,6 @@
-using Daybreak.Launch;
-using Daybreak.Models.Builds;
+using Daybreak.Models.Builds;
 using Daybreak.Services.IconRetrieve;
 using System;
-using System.Extensions;
-using System.IO;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Extensions;
@@ -23,7 +19,7 @@ namespace Daybreak.Controls
         public event EventHandler<RoutedEventArgs> Clicked;
         public event EventHandler RemoveClicked;
 
-        private IIconRetriever iconRetriever;
+        private IIconCache iconRetriever;
 
         [GenerateDependencyProperty]
         private ImageSource imageSource;
@@ -33,27 +29,31 @@ namespace Daybreak.Controls
         public SkillTemplate()
         {
             this.InitializeComponent();
-            this.DataContextChanged += SkillTemplate_DataContextChanged;
+            this.DataContextChanged += this.SkillTemplate_DataContextChanged;
         }
 
-        public void InitializeSkillTemplate(IIconRetriever iconRetriever)
+        public void InitializeSkillTemplate(IIconCache iconRetriever)
         {
             this.iconRetriever = iconRetriever;
+            this.SkillTemplate_DataContextChanged(this, new DependencyPropertyChangedEventArgs(UserControl.DataContextProperty, null, this.DataContext));
         }
 
-        private void SkillTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
+        private async void SkillTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
+            if (this.iconRetriever is null)
+            {
+                return;
+            }
+
             if (e.NewValue is Skill skill)
             {
                 if (skill != Skill.NoSkill)
                 {
-                    Task.Run(() => this.GetImageStream(skill)).ContinueWith((previousTask) =>
+                    var maybeUri = await this.iconRetriever.GetIconUri(skill).ConfigureAwait(true);
+                    if (maybeUri.ExtractValue() is Uri uri)
                     {
-                        this.Dispatcher.Invoke(() =>
-                        {
-                            this.ImageSource = this.GetImageSource(previousTask.Result);
-                        });
-                    });
+                        this.ImageSource = new BitmapImage(uri);
+                    }
                 }
                 else if (this.ImageSource is not null)
                 {
@@ -90,32 +90,5 @@ namespace Daybreak.Controls
 
             return false;
         }
-        private async Task<Stream> GetImageStream(Skill skill)
-        {
-            if (this.iconRetriever is null)
-            {
-                return null;
-            }
-
-            var maybeStream = await this.iconRetriever.GetIcon(skill);
-            return maybeStream.ExtractValue();
-        }
-        private ImageSource GetImageSource(Stream stream)
-        {
-            if (stream is null)
-            {
-                return null;
-            }
-
-            return this.Dispatcher.Invoke(() =>
-            {
-                var bitmapImage = new BitmapImage();
-                bitmapImage.BeginInit();
-                bitmapImage.StreamSource = stream;
-                bitmapImage.CacheOption = BitmapCacheOption.OnDemand;
-                bitmapImage.EndInit();
-                return bitmapImage;
-            });
-        }
     }
 }

Daybreak/Converters/BooleanToVisibilityConverter.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Extensions;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
@@ -19,7 +20,7 @@ namespace Daybreak.Converters
 
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return GetVisibility(value);
+            return this.GetVisibility(value);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
@@ -29,17 +30,24 @@ namespace Daybreak.Converters
 
         private object GetVisibility(object value)
         {
-            if (!(value is bool))
-                return DependencyProperty.UnsetValue;
-            bool objValue = (bool)value;
-            if ((objValue && TriggerValue && IsHidden) || (!objValue && !TriggerValue && 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 && TriggerValue && !IsHidden) || (!objValue && !TriggerValue && !IsHidden))
+
+            if ((objValue && this.TriggerValue && !this.IsHidden) || (!objValue && !this.TriggerValue && !this.IsHidden))
             {
                 return Visibility.Collapsed;
             }
+
             return Visibility.Visible;
         }
     }

Daybreak/Converters/HiddenWhenNull.cs

@@ -9,7 +9,7 @@ namespace Daybreak.Converters
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return GetVerticalAlignment(value);
+            return this.GetVerticalAlignment(value);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

Daybreak/Daybreak.csproj

@@ -10,21 +10,43 @@
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <Version>0.9.2.9</Version>
+    <Version>0.9.6.2</Version>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
+    <UserSecretsId>cfb2a489-db80-448d-a969-80270f314c46</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.43" />
+    <None Include="..\.editorconfig" Link=".editorconfig" />
+  </ItemGroup>
+
+  <Target Name="AddUserSecrets" BeforeTargets="PrepareForBuild" Condition=" '$(UserSecretsId)' != '' ">
+    <PropertyGroup>
+      <UserSecretsFilePath Condition=" '$(OS)' == 'Windows_NT' ">
+		$([System.Environment]::GetFolderPath(SpecialFolder.UserProfile))\AppData\Roaming\Microsoft\UserSecrets\$(UserSecretsId)\secrets.json
+	  </UserSecretsFilePath>
+	  <UserSecretsFilePath Condition=" '$(OS)' == 'Unix' ">
+		$([System.Environment]::GetFolderPath(SpecialFolder.UserProfile))/.microsoft/usersecrets/$(UserSecretsId)/secrets.json
+	  </UserSecretsFilePath>
+    </PropertyGroup>
+    <ItemGroup>
+      <EmbeddedResource Include="$(UserSecretsFilePath)" Condition="Exists($(UserSecretsFilePath))" />
+    </ItemGroup>
+  </Target>
+	
+  <ItemGroup>
     <PackageReference Include="LiteDB" Version="5.0.12" />
     <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.1" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1264.42" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1293.44" />
+    <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="securifybv.ShellLink" Version="0.1.0" />
     <PackageReference Include="Slim" Version="1.7.3" />
-    <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
+    <PackageReference Include="System.Linq.Async" Version="6.0.1" />
+    <PackageReference Include="SystemExtensions.NetCore" Version="1.0.1" />
     <PackageReference Include="SystemExtensions.NetStandard" Version="1.5.0" />
     <PackageReference Include="WCL" Version="1.0.2" />
     <PackageReference Include="WpfExtended" Version="0.6.2" />
@@ -33,6 +55,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Update="Controls\Buttons\SynchronizeButton.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="Controls\Buttons\HelpButton.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -45,9 +70,16 @@
     <Compile Update="Controls\Buttons\CancelButton.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="Views\IconDownloadView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
+    <Page Update="Controls\Buttons\SynchronizeButton.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="Controls\Buttons\HelpButton.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
       <SubType>Designer</SubType>
@@ -68,6 +100,10 @@
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="Views\IconDownloadView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+      <SubType>Designer</SubType>
+    </Page>
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Release'">

Daybreak/Launch/Launcher.cs

@@ -1,5 +1,6 @@
 using Daybreak.Configuration;
 using Daybreak.Exceptions;
+using Daybreak.Services.Updater.PostUpdate;
 using Daybreak.Services.ViewManagement;
 using Microsoft.Extensions.Logging;
 using Slim;
@@ -15,8 +16,11 @@ namespace Daybreak.Launch
 {
     public sealed class Launcher : ExtendedApplication<MainWindow>
     {
+        public readonly static Launcher Instance = new();
+
         private ILogger logger;
-        private readonly static Launcher launcher = new();
+
+        public IServiceManager ApplicationServiceManager => this.ServiceManager;
 
         [STAThread]
         public static int Main()
@@ -31,8 +35,9 @@ namespace Daybreak.Launch
         protected override void RegisterServices(IServiceProducer serviceProducer)
         {
             ProjectConfiguration.RegisterServices(this.ServiceManager);
-            ServiceManager.BuildSingletons();
+            this.ServiceManager.BuildSingletons();
             ProjectConfiguration.RegisterViews(this.ServiceManager.GetService<IViewManager>());
+            ProjectConfiguration.RegisterPostUpdateActions(this.ServiceManager.GetService<IPostUpdateActionProducer>());
         }
         protected override bool HandleException(Exception e)
         {
@@ -104,7 +109,7 @@ namespace Daybreak.Launch
         }
         private static int LaunchMainWindow()
         {
-            return launcher.Run();
+            return Instance.Run();
         }
     }
 }

Daybreak/Launch/MainWindow.xaml

@@ -2,7 +2,8 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:webview="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
         xmlns:local="clr-namespace:Daybreak.Launch"
         xmlns:wcl="clr-namespace:WCL;assembly=WCL"
         mc:Ignorable="d"
@@ -102,5 +103,13 @@
         <Grid x:Name="Container" Grid.Row="1">
         </Grid>
         <wcl:Border OnResize="Border_OnResize" Grid.RowSpan="2" Active="True"></wcl:Border>
+        <controls:ChromiumBrowserWrapper x:Name="BackgroundWebView"
+                                         VerticalAlignment="Center"
+                                         HorizontalAlignment="Center"
+                                         Visibility="Visible"
+                                         ControlsEnabled="False"
+                                         CanNavigate="False"
+                                         CanDownloadBuild="False"
+                                         Grid.Row="1"></controls:ChromiumBrowserWrapper>
     </Grid>
 </Window>

Daybreak/Launch/MainWindow.xaml.cs

@@ -1,5 +1,6 @@
 using Daybreak.Configuration;
 using Daybreak.Services.Bloogum;
+using Daybreak.Services.IconRetrieve;
 using Daybreak.Services.Privilege;
 using Daybreak.Services.Screenshots;
 using Daybreak.Services.Updater;
@@ -8,6 +9,7 @@ using Daybreak.Views;
 using Pepa.Wpf.Utilities;
 using System;
 using System.Configuration;
+using System.Core.Extensions;
 using System.Diagnostics;
 using System.Extensions;
 using System.Threading;
@@ -32,6 +34,7 @@ namespace Daybreak.Launch
         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();
 
@@ -48,14 +51,16 @@ namespace Daybreak.Launch
             IBloogumClient bloogumClient,
             IApplicationUpdater applicationUpdater,
             IPrivilegeManager privilegeManager,
+            IIconDownloader iconDownloader,
             ILiveOptions<ApplicationConfiguration> liveOptions)
         {
-            this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
-            this.screenshotProvider = screenshotProvider.ThrowIfNull(nameof(screenshotProvider));
-            this.bloogumClient = bloogumClient.ThrowIfNull(nameof(bloogumClient));
-            this.applicationUpdater = applicationUpdater.ThrowIfNull(nameof(applicationUpdater));
-            this.privilegeManager = privilegeManager.ThrowIfNull(nameof(privilegeManager));
-            this.liveOptions = liveOptions.ThrowIfNull(nameof(liveOptions));
+            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;
@@ -66,6 +71,7 @@ namespace Daybreak.Launch
         {
             this.SetupImageCycle();
             this.CheckForUpdates();
+            this.SetupBackgroundBrowser();
         }
 
         private void TitleBar_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
@@ -101,6 +107,11 @@ namespace Daybreak.Launch
             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);

Daybreak/Models/Browser/BrowserPayload.cs

@@ -8,6 +8,7 @@ namespace Daybreak.Models.Browser
         [JsonConverter(typeof(StringEnumConverter))]
         public enum PayloadKeys
         {
+            None,
             ContextMenu
         }
 

Daybreak/Models/Builds/AttributeEntry.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Models.Builds
             set
             {
                 this.attribute = value;
-                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Attribute)));
+                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.Attribute)));
             }
         }
         public int Points
@@ -22,7 +22,7 @@ namespace Daybreak.Models.Builds
             set
             {
                 this.points = value;
-                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Points)));
+                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.Points)));
             }
         }
 

Daybreak/Models/Builds/BuildEntry.cs

@@ -15,7 +15,7 @@ namespace Daybreak.Models.Builds
             set
             {
                 this.name = value;
-                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Name)));
+                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.Name)));
             }
         }
         public Build Build
@@ -24,7 +24,7 @@ namespace Daybreak.Models.Builds
             set
             {
                 this.build = value;
-                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Build)));
+                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.Build)));
             }
         }
     }

Daybreak/Models/Builds/Skill.cs

@@ -143,7 +143,7 @@ namespace Daybreak.Models.Builds
         public static Skill Flurry { get; } = new() { Id = 344, Name = "Flurry", Profession = Profession.Warrior };
         public static Skill Frenzy { get; } = new() { Id = 346, Name = "Frenzy", Profession = Profession.Warrior };
         public static Skill Coward { get; } = new() { Id = 869, Name = "\"Coward!\"", Profession = Profession.Warrior };
-        public static Skill OnYourKnees { get; } = new() { Id = 906, Name = "On Your Knees!", Profession = Profession.Warrior };
+        public static Skill OnYourKnees { get; } = new() { Id = 906, Name = "\"On Your Knees!\"", Profession = Profession.Warrior };
         public static Skill YoureAllAlone { get; } = new() { Id = 1412, Name = "\"You're All Alone!\"", Profession = Profession.Warrior };
         public static Skill FrenziedDefense { get; } = new() { Id = 1700, Name = "Frenzied Defense", Profession = Profession.Warrior };
         public static Skill Grapple { get; } = new() { Id = 2011, Name = "Grapple", Profession = Profession.Warrior };
@@ -702,7 +702,7 @@ namespace Daybreak.Models.Builds
         public static Skill Echo { get; } = new() { Id = 74, Name = "Echo", Profession = Profession.Mesmer };
         public static Skill ArcaneEcho { get; } = new() { Id = 75, Name = "Arcane Echo", Profession = Profession.Mesmer };
         public static Skill Epidemic { get; } = new() { Id = 78, Name = "Epidemic", Profession = Profession.Mesmer };
-        public static Skill LyssasBalance { get; } = new() { Id = 877, Name = "Lyssa's Balance, Profession = Profession.Mesmer" };
+        public static Skill LyssasBalance { get; } = new() { Id = 877, Name = "Lyssa's Balance", Profession = Profession.Mesmer };
         public static Skill SignetofDisenchantment { get; } = new() { Id = 882, Name = "Signet of Disenchantment", Profession = Profession.Mesmer };
         public static Skill ShatterStorm { get; } = new() { Id = 933, Name = "Shatter Storm", Profession = Profession.Mesmer };
         public static Skill ExpelHexes { get; } = new() { Id = 954, Name = "Expel Hexes", Profession = Profession.Mesmer };
@@ -1053,7 +1053,7 @@ namespace Daybreak.Models.Builds
         public static Skill FeastofSouls { get; } = new() { Id = 980, Name = "Feast of Souls", Profession = Profession.Ritualist };
         public static Skill RitualLord { get; } = new() { Id = 1217, Name = "Ritual Lord", Profession = Profession.Ritualist };
         public static Skill AttunedWasSongkai { get; } = new() { Id = 1220, Name = "Attuned Was Songkai", Profession = Profession.Ritualist };
-        public static Skill AnguishedWasLingwah { get; } = new() { Id = 1223, Name = "Anguished Was Lingwah, Profession = Profession.Ritualist" };
+        public static Skill AnguishedWasLingwah { get; } = new() { Id = 1223, Name = "Anguished Was Lingwah", Profession = Profession.Ritualist };
         public static Skill ExplosiveGrowth { get; } = new() { Id = 1229, Name = "Explosive Growth", Profession = Profession.Ritualist };
         public static Skill BoonofCreation { get; } = new() { Id = 1230, Name = "Boon of Creation", Profession = Profession.Ritualist };
         public static Skill SpiritChanneling { get; } = new() { Id = 1231, Name = "Spirit Channeling", Profession = Profession.Ritualist };
@@ -1483,8 +1483,8 @@ namespace Daybreak.Models.Builds
         public static Skill VolfenBlessing { get; } = new() { Id = 2379, Name = "Volfen Blessing", Profession = Profession.None };
         public static Skill TimeWard { get; } = new() { Id = 3422, Name = "Time Ward", Profession = Profession.Mesmer };
         public static Skill SoulTaker { get; } = new() { Id = 3423, Name = "Soul Taker", Profession = Profession.Necromancer };
-        public static Skill OverTheLimit { get; } = new() { Id = 3424, Name = "Over The Limit", Profession = Profession.Elementalist };
-        public static Skill JudgementStrike { get; } = new() { Id = 3425, Name = "Judgement Strike", Profession = Profession.Monk };
+        public static Skill OverTheLimit { get; } = new() { Id = 3424, Name = "Over The Limit", AlternativeName = "Over the Limit", Profession = Profession.Elementalist };
+        public static Skill JudgementStrike { get; } = new() { Id = 3425, Name = "Judgement Strike", AlternativeName = "Judgment Strike", Profession = Profession.Monk };
         public static Skill SevenWeaponsStance { get; } = new() { Id = 3426, Name = "Seven Weapons Stance", Profession = Profession.Warrior };
         public static Skill Togetherasone { get; } = new() { Id = 3427, Name = "\"Together as one!\"", Profession = Profession.Ranger };
         public static Skill ShadowTheft { get; } = new() { Id = 3428, Name = "Shadow Theft", Profession = Profession.Assassin };
@@ -2978,7 +2978,7 @@ namespace Daybreak.Models.Builds
             WeaponsofThreeForges,
             VowofRevolution,
             HeroicRefrain,
-        };
+        }.OrderBy(s => s.Name).ToList();
 
         public static bool TryParse(int id, out Skill skill)
         {
@@ -3022,6 +3022,7 @@ namespace Daybreak.Models.Builds
         public Profession Profession { get; private set; }
         public string Name { get; private set; }
         public int Id { get; private set; }
+        public string AlternativeName { get; private set; }
         private Skill()
         {
         }

Daybreak/Models/IconPayload.cs

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

Daybreak/Models/IconRequest.cs

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

Daybreak/Models/KeyboardInput.cs

@@ -16,7 +16,7 @@ namespace Daybreak.Models
         /// <summary>
         /// The VirtualCode converted to typeof(Keys) for higher usability.
         /// </summary>
-        public Keys Key { get { return (Keys)VirtualCode; } }
+        public Keys Key { get { return (Keys)this.VirtualCode; } }
 
         /// <summary>
         /// A hardware scan code for the key. 

Daybreak/Models/Progress/IconDownloadStatus.cs

@@ -0,0 +1,78 @@
+using System.ComponentModel;
+
+namespace Daybreak.Models.Progress
+{
+    public sealed class IconDownloadStatus : INotifyPropertyChanged
+    {
+        public static readonly IconDownloadStep StartingStep = new StartingIconDownloadStep();
+        public static readonly IconDownloadStep Finished = new FinishedIconDownloadStep();
+        public static readonly IconDownloadStep BrowserNotSupported = new NotSupportedIconDownloadStep();
+        public static IconDownloadStep Checking(string iconName, double progress) => new CheckingIconDownloadStep(iconName, progress);
+        public static IconDownloadStep Downloading(string iconName, double progress) => new DownloadingIconDownloadStep(iconName, progress);
+        public static IconDownloadStep Stopped(double progress) => new StoppedIconDownloadStep(progress);
+
+        private IconDownloadStep currentStep = StartingStep;
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public IconDownloadStep CurrentStep
+        {
+            get => this.currentStep;
+            set
+            {
+                this.currentStep = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.CurrentStep)));
+            }
+        }
+
+        public abstract class IconDownloadStep : LoadStatus
+        {
+            public IconDownloadStep(string name, double progress) : base(name)
+            {
+                this.Progress = progress;
+            }
+        }
+
+        public class StoppedIconDownloadStep : IconDownloadStep
+        {
+            public StoppedIconDownloadStep(double progress) : base("Download stopped", progress)
+            {
+            }
+        }
+
+        public class DownloadingIconDownloadStep : IconDownloadStep
+        {
+            public DownloadingIconDownloadStep(string skillName, double progress) : base($"Downloading [{skillName}] icon", progress)
+            {
+            }
+        }
+
+        public class CheckingIconDownloadStep : IconDownloadStep
+        {
+            public CheckingIconDownloadStep(string skillName, double progress) : base($"Checking [{skillName}] icon", progress)
+            {
+            }
+        }
+
+        public class NotSupportedIconDownloadStep : IconDownloadStep
+        {
+            public NotSupportedIconDownloadStep() : base("Cannot download icons. The WebView2 browser is not supported", 0d)
+            {
+            }
+        }
+
+        public class FinishedIconDownloadStep : IconDownloadStep
+        {
+            public FinishedIconDownloadStep() : base("Download finished", 100d)
+            {
+            }
+        }
+
+        public class StartingIconDownloadStep : IconDownloadStep
+        {
+            public StartingIconDownloadStep() : base("Download starting", 0d)
+            {
+            }
+        }
+    }
+}

Daybreak/Models/Progress/LoadStatus.cs

@@ -0,0 +1,12 @@
+namespace Daybreak.Models.Progress
+{
+    public abstract class LoadStatus
+    {
+        public string Description { get; set; }
+        public double Progress { get; set; }
+        public LoadStatus(string description)
+        {
+            this.Description = description;
+        }
+    }
+}

Daybreak/Models/Progress/UpdateStatus.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Daybreak.Models
+namespace Daybreak.Models.Progress
 {
     public sealed class UpdateStatus : INotifyPropertyChanged
     {
@@ -21,16 +21,14 @@ namespace Daybreak.Models
             set
             {
                 this.currentStep = value;
-                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(CurrentStep)));
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.CurrentStep)));
             }
         }
 
-        public class UpdateStep
+        public class UpdateStep : LoadStatus
         {
-            public string Name { get; }
-            internal UpdateStep(string name)
+            public UpdateStep(string name) : base(name)
             {
-                this.Name = name;
             }
         }
         public class DownloadUpdateStep : UpdateStep
@@ -39,8 +37,6 @@ namespace Daybreak.Models
             {
                 this.Progress = progress;
             }
-
-            public double Progress { get; }
         }
     }
 }

Daybreak/Models/SecureString.cs

@@ -16,33 +16,33 @@ namespace Daybreak.Models
 
         private byte[] DecryptedValue
         {
-            get => this.encryptedBytes.DecryptBytes(key);
-            set => this.encryptedBytes = value.EncryptBytes(key);
+            get => this.encryptedBytes.DecryptBytes(this.key);
+            set => this.encryptedBytes = value.EncryptBytes(this.key);
         }
         [JsonProperty("value")]
         public string Value
         {
             get
             {
-                return this.encryptedBytes.DecryptBytes(key).AsString();
+                return this.encryptedBytes.DecryptBytes(this.key).AsString();
             }
             set
             {
-                this.encryptedBytes = value.AsBytes().EncryptBytes(key);
+                this.encryptedBytes = value.AsBytes().EncryptBytes(this.key);
             }
         }
         private SecureString(byte[] value)
         {
             this.key = new byte[32];
             using var crypto = RandomNumberGenerator.Create();
-            crypto.GetBytes(key);
+            crypto.GetBytes(this.key);
             this.DecryptedValue = value;
         }
         public SecureString(string value)
         {
             this.key = new byte[32];
             using var crypto = RandomNumberGenerator.Create();
-            crypto.GetBytes(key);
+            crypto.GetBytes(this.key);
             this.Value = value;
         }
 

Daybreak/Models/Versioning/Version.cs

@@ -30,10 +30,10 @@ namespace Daybreak.Models.Versioning
 
         public override string ToString()
         {
-            var version = string.Join('.', parts.OfType<VersionNumberToken>());
-            if (parts.Last() is VersionStringToken)
+            var version = string.Join('.', this.parts.OfType<VersionNumberToken>());
+            if (this.parts.Last() is VersionStringToken)
             {
-                version += "-" + parts.Last();
+                version += "-" + this.parts.Last();
             }
 
             if (this.HasPrefix)

Daybreak/Services/Bloogum/BloogumClient.cs

@@ -38,7 +38,7 @@ namespace Daybreak.Services.Bloogum
             this.logger.LogInformation($"Retrieving image from {BaseAddress}/{url}");
             try
             {
-                var response = await httpClient.GetAsync($"{BaseAddress}/{url}").ConfigureAwait(false);
+                var response = await this.httpClient.GetAsync($"{BaseAddress}/{url}").ConfigureAwait(false);
                 if (response.IsSuccessStatusCode)
                 {
                     this.logger.LogInformation("Received success status code");

Daybreak/Services/BuildTemplates/BuildTemplateManager.cs

@@ -7,6 +7,7 @@ using System.Extensions;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace Daybreak.Services.BuildTemplates
 {
@@ -41,16 +42,7 @@ namespace Daybreak.Services.BuildTemplates
         public BuildEntry CreateBuild()
         {
             var emptyBuild = new Build();
-            var builds = GetBuilds();
-            var baseName = "New build";
-            var name = baseName;
-            int count = 0;
-            while(builds.Where(b => b.Name.Equals(name, StringComparison.OrdinalIgnoreCase)).Any())
-            {
-                name = baseName + count;
-                count++;
-            }
-
+            var name = Guid.NewGuid().ToString();
             var entry = new BuildEntry { Build = emptyBuild, Name = name, PreviousName = string.Empty };
             this.SaveBuild(entry);
             return entry;
@@ -88,19 +80,26 @@ namespace Daybreak.Services.BuildTemplates
             }
         }
 
-        public IEnumerable<BuildEntry> GetBuilds()
+        public void ClearBuilds()
+        {
+            foreach(var file in Directory.GetFiles(BuildsPath))
+            {
+                File.Delete(file);
+            }
+        }
+
+        public async IAsyncEnumerable<BuildEntry> GetBuilds()
         {
             foreach (var file in Directory.GetFiles(BuildsPath))
             {
-                Build build = default;
-                try
-                {
-                    build = this.DecodeTemplate(File.ReadAllText(file));
-                }
-                catch(Exception e)
-                {
-                    this.logger.LogError($"Failed to decode template from file {file}. Details: {e}");
-                }
+                var maybeBuild = this.DecodeTemplateInner(await File.ReadAllTextAsync(file));
+                var build = maybeBuild.Switch(
+                    onSuccess: build => build,
+                    onFailure: exception =>
+                    {
+                        this.logger.LogError(exception, "Failed to parse build");
+                        return default;
+                    });
                 
                 if (build is not null)
                 {
@@ -111,7 +110,21 @@ namespace Daybreak.Services.BuildTemplates
 
         public Build DecodeTemplate(string template)
         {
-            return this.DecodeTemplateInner(template);
+            var maybeTemplate = this.DecodeTemplateInner(template);
+            return maybeTemplate.Switch(
+                onSuccess: build => build,
+                onFailure: exception => throw exception);
+        }
+
+        public bool TryDecodeTemplate(string template, out Build build)
+        {
+            var maybeBuild = this.DecodeTemplateInner(template);
+            (var result, var parsedBuild) = maybeBuild.Switch(
+                onSuccess: parsedBuild => (true, parsedBuild),
+                onFailure: _ => (false, null));
+
+            build = parsedBuild;
+            return result;
         }
 
         public string EncodeTemplate(Build build)
@@ -119,7 +132,7 @@ namespace Daybreak.Services.BuildTemplates
             return this.EncodeTemplateInner(build);
         }
 
-        private Build DecodeTemplateInner(string template)
+        private Result<Build, Exception> DecodeTemplateInner(string template)
         {
             this.logger.LogInformation("Attempting to decode template");
             var buildMetadata = ParseEncodedTemplate(template);
@@ -127,7 +140,7 @@ namespace Daybreak.Services.BuildTemplates
             if (buildMetadata.VersionNumber != 0)
             {
                 this.logger.LogError($"Expected version number to be 0 but found {buildMetadata.VersionNumber}");
-                throw new InvalidOperationException($"Failed to parse template");
+                return new InvalidOperationException($"Failed to parse template");
             }
 
             var build = new Build()
@@ -139,14 +152,14 @@ namespace Daybreak.Services.BuildTemplates
             if (Profession.TryParse(buildMetadata.PrimaryProfessionId, out var primaryProfession) is false)
             {
                 this.logger.LogError($"Failed to parse profession with id {buildMetadata.PrimaryProfessionId}");
-                throw new InvalidOperationException($"Failed to parse template");
+                return new InvalidOperationException($"Failed to parse template");
             }
 
             build.Primary = primaryProfession;
             if (Profession.TryParse(buildMetadata.SecondaryProfessionId, out var secondaryProfession) is false)
             {
                 this.logger.LogError($"Failed to parse profession with id {buildMetadata.SecondaryProfessionId}");
-                throw new InvalidOperationException($"Failed to parse template");
+                return new InvalidOperationException($"Failed to parse template");
             }
 
             build.Secondary = secondaryProfession;
@@ -155,7 +168,7 @@ namespace Daybreak.Services.BuildTemplates
                 if (Daybreak.Models.Builds.Attribute.TryParse(buildMetadata.AttributesIds[i], out var attribute) is false)
                 {
                     this.logger.LogError($"Failed to parse attribute with id {buildMetadata.AttributesIds[i]}");
-                    throw new InvalidOperationException($"Failed to parse template");
+                    return new InvalidOperationException($"Failed to parse template");
                 }
 
                 build.Attributes.Add(new AttributeEntry { Attribute = attribute, Points = buildMetadata.AttributePoints[i] });
@@ -166,7 +179,7 @@ namespace Daybreak.Services.BuildTemplates
                 if (Skill.TryParse(buildMetadata.SkillIds[i], out var skill) is false)
                 {
                     this.logger.LogError($"Failed to parse skill with id {buildMetadata.SkillIds[i]}");
-                    throw new InvalidOperationException($"Failed to parse template");
+                    return new InvalidOperationException($"Failed to parse template");
                 }
 
                 build.Skills.Add(skill);

Daybreak/Services/BuildTemplates/IBuildTemplateManager.cs

@@ -8,10 +8,12 @@ namespace Daybreak.Services.BuildTemplates
         bool IsTemplate(string template);
         BuildEntry CreateBuild();
         BuildEntry CreateBuild(string name);
+        void ClearBuilds();
         void SaveBuild(BuildEntry buildEntry);
         void RemoveBuild(BuildEntry buildEntry);
-        IEnumerable<BuildEntry> GetBuilds();
+        IAsyncEnumerable<BuildEntry> GetBuilds();
         Build DecodeTemplate(string template);
+        bool TryDecodeTemplate(string template, out Build build);
         string EncodeTemplate(Build build);
     }
 }

Daybreak/Services/BuildTemplates/Models/EncodeCharStream.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Services.BuildTemplates.Models
 
         public string GetEncodedString()
         {
-            return innerStringBuilder.ToString();
+            return this.innerStringBuilder.ToString();
         }
 
         private void EncodeToBinary(int value, int count)

Daybreak/Services/Graph/GraphClient.cs

@@ -0,0 +1,360 @@
+using Daybreak.Configuration;
+using Daybreak.Controls;
+using Daybreak.Models.Builds;
+using Daybreak.Services.BuildTemplates;
+using Daybreak.Services.Graph.Models;
+using Daybreak.Services.ViewManagement;
+using Daybreak.Views;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Core.Extensions;
+using System.Extensions;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Web;
+using System.Windows.Controls;
+
+namespace Daybreak.Services.Graph;
+
+public sealed class GraphClient : IGraphClient
+{
+    private const string Scopes = "Files.Read Files.Read.All Files.ReadWrite Files.ReadWrite.All User.Read";
+    private const string RedirectUri = "http://localhost";
+
+    private const string QueryStateKey = "state";
+    private const string QueryCodeKey = "code";
+    private const string ClientIdPlaceholder = "[ClientID]";
+    private const string RedirectUriPlaceholder = "[RedirectUri]";
+    private const string ScopesPlaceholder = "[Scopes]";
+    private const string StatePlaceholder = "[State]";
+    private const string ProfileEndpoint = "me";
+    private const string GraphBaseUrl = "https://graph.microsoft.com/v1.0/";
+    private const string TokenUrlPlaceholder = $"https://login.microsoftonline.com/consumers/oauth2/v2.0/token";
+    private const string AuthorizationUrlPlaceholder = $"https://login.microsoftonline.com/consumers/oauth2/v2.0/authorize?client_id={ClientIdPlaceholder}&response_type=code&redirect_uri={RedirectUriPlaceholder}&response_mode=query&scope={ScopesPlaceholder}&state={StatePlaceholder}";
+    private const string SyncFileUri = $"me/drive/root:/Daybreak/{BackupFileName}";
+    private const string ContentSuffix = ":/content";
+    private const string BackupFileName = "daybreak_backup.json";
+
+    private static readonly byte[] Entropy = Convert.FromBase64String("R3VpbGR3YXJz");
+    private static readonly string ApplicationId = SecretManager.GetSecret(SecretKeys.AadApplicationId);
+    private static readonly string TenantId = SecretManager.GetSecret(SecretKeys.AadTenantId);
+
+    private readonly IBuildTemplateManager buildTemplateManager;
+    private readonly IViewManager viewManager;
+    private readonly ILiveUpdateableOptions<ApplicationConfiguration> liveUpdateableOptions;
+    private readonly IHttpClient<GraphClient> httpClient;
+    private readonly ILogger<GraphClient> logger;
+
+    public GraphClient(
+        IBuildTemplateManager buildTemplateManager,
+        IViewManager viewManager,
+        ILiveUpdateableOptions<ApplicationConfiguration> liveUpdateableOptions,
+        IHttpClient<GraphClient> httpClient,
+        ILogger<GraphClient> logger)
+    {
+        this.buildTemplateManager = buildTemplateManager.ThrowIfNull();
+        this.viewManager = viewManager.ThrowIfNull();
+        this.liveUpdateableOptions = liveUpdateableOptions.ThrowIfNull();
+        this.httpClient = httpClient.ThrowIfNull();
+        this.logger = logger.ThrowIfNull();
+
+        this.httpClient.BaseAddress = new Uri(GraphBaseUrl);
+        this.httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+    }
+
+    public async Task<Result<bool, Exception>> PerformAuthorizationFlow(
+        ChromiumBrowserWrapper chromiumBrowserWrapper,
+        CancellationToken cancellationToken = default)
+    {
+        var maybeAuthCode = await this.RetrieveAuthorizationCode(chromiumBrowserWrapper, cancellationToken);
+        if (maybeAuthCode.TryExtractSuccess(out var authCode) is false)
+        {
+            return maybeAuthCode.SwitchAny(onFailure: exception => exception);
+        }
+
+        var maybeAccessToken = await this.RetrieveAccessToken(authCode);
+
+        return maybeAccessToken.Switch(
+            onSuccess: token =>
+            {
+                var accessToken = AccessToken.FromTokenResponse(token);
+                this.SaveAccessToken(accessToken);
+                return true;
+            },
+            onFailure: exception => exception);
+    }
+
+    public async Task<Result<User, Exception>> GetUserProfile<TViewType>()
+        where TViewType : UserControl
+    {
+        var authCode = this.LoadAccessToken();
+        if (authCode.ExtractValue() is not AccessToken accessToken)
+        {
+            this.viewManager.ShowView<GraphAuthorizationView>(new ViewRedirectContext { CallingView = typeof(TViewType) });
+            return new InvalidOperationException("Client is not authorized");
+        }
+
+        if (DateTime.Now > accessToken.ExpirationDate)
+        {
+            this.viewManager.ShowView<GraphAuthorizationView>(new ViewRedirectContext { CallingView = typeof(TViewType) });
+            return new InvalidOperationException("Client authorization expired");
+        }
+
+        this.httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken.Token);
+        var response = await this.httpClient.GetAsync(ProfileEndpoint);
+        if (response.IsSuccessStatusCode is false)
+        {
+            this.viewManager.ShowView<GraphAuthorizationView>(new ViewRedirectContext { CallingView = typeof(TViewType) });
+            return new InvalidOperationException($"Failed to load profile. Response status code [{response.StatusCode}]");
+        }
+
+        try
+        {
+            var profile = JsonConvert.DeserializeObject<User>(await response.Content.ReadAsStringAsync());
+            return profile;
+        }
+        catch(Exception e)
+        {
+            return e;
+        }
+    }
+
+    public async Task<Result<bool, Exception>> UploadBuilds()
+    {
+        var compiledBuilds = await this.buildTemplateManager.GetBuilds().Select(b => new BuildFile { FileName = b.Name, TemplateCode = this.buildTemplateManager.EncodeTemplate(b.Build) }).ToListAsync();
+        var serializedBuilds = JsonConvert.SerializeObject(compiledBuilds);
+        await this.UploadBackupItem(serializedBuilds);
+        return true;
+    }
+
+    public async Task<Result<bool, Exception>> DownloadBuilds()
+    {
+        var maybeBuilds = await this.RetrieveBuildsList();
+        if (maybeBuilds.TryExtractSuccess(out var builds) is false)
+        {
+            return maybeBuilds.SwitchAny(onFailure: exception => exception);
+        }
+
+        this.buildTemplateManager.ClearBuilds();
+        _ = builds.Select(buildFile =>
+        {
+            if (this.buildTemplateManager.TryDecodeTemplate(buildFile.TemplateCode, out var build) is false)
+            {
+                return null;
+            }
+
+            return new BuildEntry
+            {
+                Build = build,
+                Name = buildFile.FileName,
+                PreviousName = buildFile.FileName
+            };
+        }).Where(entry => entry is not null)
+          .Do(this.buildTemplateManager.SaveBuild).ToList();
+
+        return true;
+    }
+
+    public async Task<Result<List<BuildFile>, Exception>> RetrieveBuildsList()
+    {
+        var maybeCompiledBuilds = await this.GetBackupItemContent();
+        if (maybeCompiledBuilds.ExtractValue() is not string compiledBuilds)
+        {
+            return new InvalidOperationException("No backup found");
+        }
+
+        var builds = JsonConvert.DeserializeObject<List<BuildFile>>(compiledBuilds);
+        return builds;
+    }
+
+    public async Task<Result<DateTime, Exception>> GetLastUpdateTime()
+    {
+        var maybeDriveItem = await this.GetDriveItem();
+        if (maybeDriveItem.ExtractValue() is not DriveItem driveItem)
+        {
+            return new InvalidOperationException("Unable to retrieve the drive file");
+        }
+
+        return driveItem.LastModifiedDateTime;
+    }
+
+    public void ResetAuthorization()
+    {
+        this.ResetAccessToken();
+    }
+
+    private async Task<Optional<string>> GetBackupItemContent()
+    {
+        var maybeDriveItem = await this.GetDriveItem();
+        if (maybeDriveItem.ExtractValue() is not DriveItem driveItem)
+        {
+            return Optional.None<string>();
+        }
+
+        if (driveItem.Name != BackupFileName)
+        {
+            return Optional.None<string>();
+        }
+
+        var response = await this.httpClient.GetAsync(driveItem.DownloadUrl);
+        if (response.IsSuccessStatusCode is false)
+        {
+            return Optional.None<string>();
+        }
+
+        return await response.Content.ReadAsStringAsync();
+    }
+
+    private async Task<bool> UploadBackupItem(string serializedBuilds)
+    {
+        using var stringContent = new StringContent(serializedBuilds);
+        var response = await this.httpClient.PutAsync(SyncFileUri + ContentSuffix, stringContent);
+        return response.IsSuccessStatusCode;
+    }
+
+    private async Task<Optional<DriveItem>> GetDriveItem()
+    {
+        var response = await this.httpClient.GetAsync(SyncFileUri);
+        if (response.IsSuccessStatusCode is false)
+        {
+            return Optional.None<DriveItem>();
+        }
+
+        var driveItemContent = await response.Content.ReadAsStringAsync();
+        return JsonConvert.DeserializeObject<DriveItem>(driveItemContent);
+    }
+
+    private async Task<Result<string, Exception>> RetrieveAuthorizationCode(
+        ChromiumBrowserWrapper chromiumBrowserWrapper,
+        CancellationToken cancellationToken = default)
+    {
+        chromiumBrowserWrapper.ThrowIfNull();
+        await chromiumBrowserWrapper.InitializeDefaultBrowser();
+
+        var state = GetNewState();
+
+        chromiumBrowserWrapper.Address = AuthorizationUrlPlaceholder
+            .Replace(ClientIdPlaceholder, ApplicationId)
+            .Replace(RedirectUriPlaceholder, RedirectUri
+                .Replace(":", "%3a")
+                .Replace("/", "%2f"))
+            .Replace(ScopesPlaceholder, Scopes
+                .Replace(' ', '+'))
+            .Replace(StatePlaceholder, state);
+
+        while (chromiumBrowserWrapper.Address.StartsWith(RedirectUri) is false)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return new TaskCanceledException();
+            }
+
+            await Task.Delay(1000).ConfigureAwait(true);
+        }
+
+        var query = HttpUtility.ParseQueryString(chromiumBrowserWrapper.Address.Split('?').Skip(1).FirstOrDefault());
+        if (query.GetValues(QueryStateKey) is string[] states is false)
+        {
+            throw new InvalidOperationException("Response doesn't have state key in response");
+        }
+
+        if (states.Length < 1 || states.Length > 1)
+        {
+            throw new InvalidOperationException("Response contains invalid state");
+        }
+
+        if (states.First() != state)
+        {
+            throw new InvalidOperationException("Response contains incorrect state");
+        }
+
+        if (query.GetValues(QueryCodeKey) is string[] codes is false)
+        {
+            throw new InvalidOperationException("Response doesn't have code key in response");
+        }
+
+        if (codes.Length < 1 || codes.Length > 1)
+        {
+            throw new InvalidOperationException("Response contains invalid code");
+        }
+
+        var authCode = codes.First();
+        return authCode;
+    }
+
+    private async Task<Result<TokenResponse, Exception>> RetrieveAccessToken(string authorizationCode)
+    {
+        using var formContent = new FormUrlEncodedContent(
+                new Dictionary<string, string>
+                {
+                    { "grant_type", "authorization_code" },
+                    { "code", authorizationCode },
+                    { "redirect_uri", RedirectUri },
+                    { "client_id", ApplicationId },
+                    { "scope", Scopes }
+                });
+
+        using var httpRequest = new HttpRequestMessage
+        {
+            Content = formContent,
+            Method = HttpMethod.Post,
+            RequestUri = new Uri(TokenUrlPlaceholder)
+        };
+
+        using var response = await this.httpClient.SendAsync(httpRequest);
+        if (response.IsSuccessStatusCode is false)
+        {
+            return new InvalidOperationException($"Invalid access token response. Status code [{response.StatusCode}]");
+        }
+
+        return JsonConvert.DeserializeObject<TokenResponse>(await response.Content.ReadAsStringAsync());
+    }
+
+    private void ResetAccessToken()
+    {
+        this.liveUpdateableOptions.Value.ProtectedGraphAccessToken = null;
+        this.liveUpdateableOptions.UpdateOption();
+    }
+
+    private void SaveAccessToken(AccessToken token)
+    {
+        var codeBytes = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(token));
+        this.liveUpdateableOptions.Value.ProtectedGraphAccessToken = Convert.ToBase64String(ProtectedData.Protect(codeBytes, Entropy, DataProtectionScope.CurrentUser));
+        this.liveUpdateableOptions.UpdateOption();
+    }
+
+    private Optional<AccessToken> LoadAccessToken()
+    {
+        var protectedCode = this.liveUpdateableOptions.Value.ProtectedGraphAccessToken;
+        if (protectedCode.IsNullOrWhiteSpace())
+        {
+            return Optional.None<AccessToken>();
+        }
+
+        var codeBytes = ProtectedData.Unprotect(Convert.FromBase64String(protectedCode), Entropy, DataProtectionScope.CurrentUser);
+        try
+        {
+            return JsonConvert.DeserializeObject<AccessToken>(Encoding.UTF8.GetString(codeBytes));
+        }
+        catch(Exception e)
+        {
+            this.logger.LogError(e, "Failed to load access token. Resetting access token");
+            this.ResetAccessToken();
+            return Optional.None<AccessToken>();
+        }
+    }
+
+    private static string GetNewState()
+    {
+        return Guid.NewGuid().ToString();
+    }
+}

Daybreak/Services/Graph/IGraphClient.cs

@@ -0,0 +1,22 @@
+using Daybreak.Controls;
+using Daybreak.Services.Graph.Models;
+using System;
+using System.Collections.Generic;
+using System.Extensions;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+namespace Daybreak.Services.Graph;
+
+public interface IGraphClient
+{
+    Task<Result<User, Exception>> GetUserProfile<TViewType>()
+        where TViewType : UserControl;
+    Task<Result<bool, Exception>> PerformAuthorizationFlow(ChromiumBrowserWrapper chromiumBrowserWrapper, CancellationToken cancellationToken = default);
+    Task<Result<bool, Exception>> UploadBuilds();
+    Task<Result<bool, Exception>> DownloadBuilds();
+    Task<Result<List<BuildFile>, Exception>> RetrieveBuildsList();
+    Task<Result<DateTime, Exception>> GetLastUpdateTime();
+    void ResetAuthorization();
+}

Daybreak/Services/Graph/Models/AccessToken.cs

@@ -0,0 +1,18 @@
+using System;
+
+namespace Daybreak.Services.Graph.Models;
+
+public sealed class AccessToken
+{
+    public string Token { get; set; }
+    public DateTime ExpirationDate { get; set; }
+
+    public static AccessToken FromTokenResponse(TokenResponse tokenResponse)
+    {
+        return new AccessToken
+        {
+            Token = tokenResponse.AccessToken,
+            ExpirationDate = DateTime.Now + TimeSpan.FromSeconds(tokenResponse.ExpiresIn)
+        };
+    }
+}

Daybreak/Services/Graph/Models/BuildFile.cs

@@ -0,0 +1,7 @@
+namespace Daybreak.Services.Graph.Models;
+
+public sealed class BuildFile
+{
+    public string TemplateCode { get; set; }
+    public string FileName { get; set; }
+}

Daybreak/Services/Graph/Models/BuildFilesPayload.cs

@@ -0,0 +1,6 @@
+namespace Daybreak.Services.Graph.Models;
+
+public sealed class BuildFilesPayload
+{
+
+}

Daybreak/Services/Graph/Models/DriveItem.cs

@@ -0,0 +1,14 @@
+using Newtonsoft.Json;
+using System;
+
+namespace Daybreak.Services.Graph.Models;
+
+public sealed class DriveItem
+{
+    [JsonProperty("@microsoft.graph.downloadUrl")]
+    public string DownloadUrl { get; set; }
+    [JsonProperty("name")]
+    public string Name { get; set; }
+    [JsonProperty("lastModifiedDateTime")]
+    public DateTime LastModifiedDateTime { get; set; }
+}

Daybreak/Services/Graph/Models/TokenResponse.cs

@@ -0,0 +1,17 @@
+using Newtonsoft.Json;
+
+namespace Daybreak.Services.Graph.Models;
+
+public sealed class TokenResponse
+{
+    [JsonProperty("token_type")]
+    public string TokenType { get; set; }
+    [JsonProperty("scope")]
+    public string Scope { get; set; }
+    [JsonProperty("expires_in")]
+    public int ExpiresIn { get; set; }
+    [JsonProperty("access_token")]
+    public string AccessToken { get; set; }
+    [JsonProperty("refresh_token")]
+    public string RefreshToken { get; set; }
+}

Daybreak/Services/Graph/Models/User.cs

@@ -0,0 +1,12 @@
+using Newtonsoft.Json;
+
+namespace Daybreak.Services.Graph.Models;
+
+public sealed class User
+{
+    [JsonProperty("displayName")]
+    public string DisplayName { get; set; }
+
+    [JsonProperty("mail")]
+    public string Email { get; set; }
+}

Daybreak/Services/Graph/Models/ViewRedirectContext.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace Daybreak.Services.Graph.Models;
+
+public sealed class ViewRedirectContext
+{
+    public Type CallingView { get; set; }
+}

Daybreak/Services/IconRetrieve/IIconBrowser.cs

@@ -0,0 +1,16 @@
+using Daybreak.Controls;
+using Daybreak.Models;
+using System.Threading;
+
+namespace Daybreak.Services.IconRetrieve
+{
+    public interface IIconBrowser
+    {
+        void InitializeWebView(ChromiumBrowserWrapper webView2, CancellationToken cancellationToken);
+        /// <summary>
+        /// Queue an icon request. The browser will attempt to download the icon. Monitor the <see cref="IconRequest.Finished"/> to be notified when the request has been served.
+        /// </summary>
+        /// <param name="iconRequest">Request model.</param>
+        void QueueIconRequest(IconRequest iconRequest);
+    }
+}

Daybreak/Services/IconRetrieve/IIconCache.cs

@@ -1,12 +1,12 @@
 using Daybreak.Models.Builds;
+using System;
 using System.Extensions;
-using System.IO;
 using System.Threading.Tasks;
 
 namespace Daybreak.Services.IconRetrieve
 {
-    public interface IIconRetriever
+    public interface IIconCache
     {
-        Task<Optional<Stream>> GetIcon(Skill skill);
+        Task<Optional<Uri>> GetIconUri(Skill skill);
     }
 }

Daybreak/Services/IconRetrieve/IIconDownloader.cs

@@ -0,0 +1,15 @@
+using Daybreak.Controls;
+using Daybreak.Models.Progress;
+using System.Threading.Tasks;
+
+namespace Daybreak.Services.IconRetrieve
+{
+    public interface IIconDownloader
+    {
+        void SetBrowser(ChromiumBrowserWrapper chromiumBrowserWrapper);
+
+        bool DownloadComplete { get; }
+        Task<IconDownloadStatus> StartIconDownload();
+        void CancelIconDownload();
+    }
+}

Daybreak/Services/IconRetrieve/IconBrowser.cs

@@ -0,0 +1,181 @@
+using Daybreak.Configuration;
+using Daybreak.Controls;
+using Daybreak.Models;
+using Daybreak.Models.Builds;
+using Daybreak.Utils;
+using Microsoft.Extensions.Logging;
+using Microsoft.Web.WebView2.Core;
+using Microsoft.Web.WebView2.Wpf;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Concurrent;
+using System.Configuration;
+using System.Core.Extensions;
+using System.Extensions;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace Daybreak.Services.IconRetrieve
+{
+    public sealed class IconBrowser : IIconBrowser
+    {
+        // Sometimes due to browser issues, retrieved base64 is just a blank jpeg. This is the base64 of the image.
+        private const string FaultyBase64 = "/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEUAAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAA9tYAAQAAAADTLQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlkZXNjAAAA8AAAAHRyWFlaAAABZAAAABRnWFlaAAABeAAAABRiWFlaAAABjAAAABRyVFJDAAABoAAAAChnVFJDAAABoAAAAChiVFJDAAABoAAAACh3dHB0AAAByAAAABRjcHJ0AAAB3AAAADxtbHVjAAAAAAAAAAEAAAAMZW5VUwAAAFgAAAAcAHMAUgBHAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFhZWiAAAAAAAABvogAAOPUAAAOQWFlaIAAAAAAAAGKZAAC3hQAAGNpYWVogAAAAAAAAJKAAAA+EAAC2z3BhcmEAAAAAAAQAAAACZmYAAPKnAAANWQAAE9AAAApbAAAAAAAAAABYWVogAAAAAAAA9tYAAQAAAADTLW1sdWMAAAAAAAAAAQAAAAxlblVTAAAAIAAAABwARwBvAG8AZwBsAGUAIABJAG4AYwAuACAAMgAwADEANv/bAEMAAwICAgICAwICAgMDAwMEBgQEBAQECAYGBQYJCAoKCQgJCQoMDwwKCw4LCQkNEQ0ODxAQERAKDBITEhATDxAQEP/bAEMBAwMDBAMECAQECBALCQsQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEP/AABEIAEAAQAMBIgACEQEDEQH/xAAVAAEBAAAAAAAAAAAAAAAAAAAACf/EABQQAQAAAAAAAAAAAAAAAAAAAAD/xAAUAQEAAAAAAAAAAAAAAAAAAAAA/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8AlUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//2Q==";
+        private const string LargeFaultyBase64 = "/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEUAAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAA9tYAAQAAAADTLQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlkZXNjAAAA8AAAAHRyWFlaAAABZAAAABRnWFlaAAABeAAAABRiWFlaAAABjAAAABRyVFJDAAABoAAAAChnVFJDAAABoAAAAChiVFJDAAABoAAAACh3dHB0AAAByAAAABRjcHJ0AAAB3AAAADxtbHVjAAAAAAAAAAEAAAAMZW5VUwAAAFgAAAAcAHMAUgBHAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFhZWiAAAAAAAABvogAAOPUAAAOQWFlaIAAAAAAAAGKZAAC3hQAAGNpYWVogAAAAAAAAJKAAAA+EAAC2z3BhcmEAAAAAAAQAAAACZmYAAPKnAAANWQAAE9AAAApbAAAAAAAAAABYWVogAAAAAAAA9tYAAQAAAADTLW1sdWMAAAAAAAAAAQAAAAxlblVTAAAAIAAAABwARwBvAG8AZwBsAGUAIABJAG4AYwAuACAAMgAwADEANv/bAEMAAwICAgICAwICAgMDAwMEBgQEBAQECAYGBQYJCAoKCQgJCQoMDwwKCw4LCQkNEQ0ODxAQERAKDBITEhATDxAQEP/bAEMBAwMDBAMECAQECBALCQsQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEP/AABEIAIAAQAMBIgACEQEDEQH/xAAVAAEBAAAAAAAAAAAAAAAAAAAACf/EABQQAQAAAAAAAAAAAAAAAAAAAAD/xAAUAQEAAAAAAAAAAAAAAAAAAAAA/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8AlUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//2Q==";
+        private const string BaseUrl = "https://wiki.guildwars.com";
+        private const string QueryUrl = $"wiki/File:{NamePlaceholder}.jpg";
+        private const string NamePlaceholder = "[SKILLNAME]";
+        private const string IconsDirectoryName = "Icons";
+        private const string IconsLocation = $"{IconsDirectoryName}/{NamePlaceholder}.jpg";
+
+        private readonly ConcurrentQueue<IconRequest> iconRequests = new();
+        private readonly ILogger<IconBrowser> logger;
+
+        private ChromiumBrowserWrapper browserWrapper;
+        private CancellationToken cancellationToken;
+
+        public IconBrowser(
+            ILogger<IconBrowser> logger)
+        {
+            this.logger = logger.ThrowIfNull();
+        }
+
+        public void InitializeWebView(ChromiumBrowserWrapper webView2, CancellationToken cancellationToken)
+        {
+            this.browserWrapper = webView2.ThrowIfNull();
+            this.cancellationToken = cancellationToken;
+            Task.Run(this.PeriodicallyServeRequests, cancellationToken);
+        }
+
+        public void QueueIconRequest(IconRequest iconRequest)
+        {
+            this.iconRequests.Enqueue(iconRequest);
+        }
+
+        private async Task PeriodicallyServeRequests()
+        {
+            while(this.cancellationToken.IsCancellationRequested is false)
+            {
+                await Application.Current.Dispatcher.InvokeAsync(async () =>
+                {
+                    await this.ServeRequest();
+                });
+            }
+        }
+
+        private async Task ServeRequest()
+        {
+            if (this.cancellationToken.IsCancellationRequested)
+            {
+                return;
+            }
+
+            if (this.iconRequests.TryDequeue(out var request) is false)
+            {
+                await Task.Delay(1000);
+                return;
+            }
+
+            var logger = this.logger.CreateScopedLogger(nameof(this.PeriodicallyServeRequests), request.Skill?.Name);
+            logger.LogInformation($"Retrieving icon");
+            while (this.browserWrapper is null)
+            {
+                if (this.cancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
+
+                logger.LogInformation($"Browser is not yet initialized. Waiting");
+                await Task.Delay(1000);
+            }
+
+            try
+            {
+                await this.browserWrapper.InitializeDefaultBrowser();
+            }
+            catch(Exception e)
+            {
+                this.logger.LogError(e, "Encountered error when initializing browser");
+            }
+
+            var curedSkillName = request.Skill.AlternativeName.IsNullOrWhiteSpace() ?
+                request.Skill.Name.Replace(" ", "_") :
+                request.Skill.AlternativeName.Replace(" ", "_");
+            var skillIconUrl = $"{BaseUrl}/{QueryUrl.Replace(NamePlaceholder, curedSkillName)}";
+            logger.LogInformation($"Looking for icon at {skillIconUrl}");
+
+            this.browserWrapper.Address = skillIconUrl;
+
+            for (var i = 0; i < 5; i++)
+            {
+                if (this.cancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
+
+                logger.LogInformation("Executing extraction script");
+                var responseTask = await Application.Current.Dispatcher.InvokeAsync(async () =>
+                {
+                    return await this.browserWrapper.WebBrowser.ExecuteScriptAsync(Scripts.GetHrefFromSkillPage);
+                });
+                var response = await responseTask;
+                logger.LogInformation("Parsing response");
+                var iconPayload = JsonConvert.DeserializeObject<IconPayload>(response);
+                if (iconPayload is null)
+                {
+                    logger.LogInformation("Bad response");
+                    await Task.Delay(1000);
+                    continue;
+                }
+
+                if (iconPayload.SkillUrl != skillIconUrl.Replace("\"", "%22"))
+                {
+                    logger.LogInformation("Retrieved icon doesn't match");
+                    await Task.Delay(1000);
+                    continue;
+                }
+
+                var potentialBase64 = iconPayload.SkillImage.Split(',').Skip(1).FirstOrDefault();
+                if (potentialBase64 == FaultyBase64 ||
+                    potentialBase64 == LargeFaultyBase64)
+                {
+                    logger.LogInformation("Faulty base64 retrieved");
+                    await Task.Delay(1000);
+                    continue;
+                }
+
+                byte[] bytes;
+                try
+                {
+                    bytes = Convert.FromBase64String(potentialBase64);
+                }
+                catch
+                {
+                    logger.LogError("Failed to parse base64");
+                    await Task.Delay(1000);
+                    continue;
+                }
+
+                await SaveIconLocally(request.Skill, bytes);
+                request.IconBase64 = potentialBase64;
+                request.Finished = true;
+                break;
+            }
+
+            logger.LogError($"Failed to retrieve icon");
+            request.Finished = true;
+        }
+
+        private static async Task<string> SaveIconLocally(Skill skill, byte[] data)
+        {
+            var curedSkillName = skill.Name
+                .Replace(" ", "_")
+                .Replace("\"", "");
+            await File.WriteAllBytesAsync(IconsLocation.Replace(NamePlaceholder, curedSkillName), data);
+            return curedSkillName;
+        }
+    }
+}

Daybreak/Services/IconRetrieve/IconCache.cs

@@ -0,0 +1,56 @@
+using Daybreak.Models.Builds;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Core.Extensions;
+using System.Extensions;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace Daybreak.Services.IconRetrieve
+{
+    public sealed class IconCache : IIconCache
+    {
+        private const string NamePlaceholder = "[SKILLNAME]";
+        private const string IconsDirectoryName = "Icons";
+        private const string IconsLocation = $"{IconsDirectoryName}/{NamePlaceholder}.jpg";
+
+        private readonly ILogger<IconCache> logger;
+
+        public IconCache(
+            ILogger<IconCache> logger)
+        {
+            this.logger = logger.ThrowIfNull();
+            if (Directory.Exists(IconsDirectoryName) is false)
+            {
+                Directory.CreateDirectory(IconsDirectoryName);
+            }
+        }
+
+        public Task<Optional<Uri>> GetIconUri(Skill skill)
+        {
+            var maybeIconUri = this.GetLocalIcon(skill);
+            if (maybeIconUri.ExtractValue() is Uri uri)
+            {
+                return Task.FromResult(Optional.FromValue(uri));
+            }
+
+            return Task.FromResult(Optional.None<Uri>());
+        }
+
+        private Optional<Uri> GetLocalIcon(Skill skill)
+        {
+            var curedSkillName = skill.Name
+                .Replace(" ", "_")
+                .Replace("\"", "");
+            this.logger.LogInformation("Checking local icon cache");
+            if (File.Exists(IconsLocation.Replace(NamePlaceholder, curedSkillName)))
+            {
+                this.logger.LogInformation("Local icon cache found. Retrieving icon");
+                return new Uri(AppDomain.CurrentDomain.BaseDirectory + "/" + IconsLocation.Replace(NamePlaceholder, curedSkillName), UriKind.Absolute);
+            }
+
+            this.logger.LogWarning("No local icon cache found");
+            return Optional.None<Uri>();
+        }
+    }
+}

Daybreak/Services/IconRetrieve/IconDownloader.cs

@@ -0,0 +1,239 @@
+using Daybreak.Configuration;
+using Daybreak.Controls;
+using Daybreak.Models;
+using Daybreak.Models.Builds;
+using Daybreak.Models.Progress;
+using Daybreak.Services.Configuration;
+using Microsoft.Extensions.Logging;
+using Microsoft.Web.WebView2.Core;
+using Microsoft.Web.WebView2.Wpf;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Core.Extensions;
+using System.Extensions;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Extensions.Services;
+
+namespace Daybreak.Services.IconRetrieve
+{
+    public sealed class IconDownloader : IIconDownloader, IApplicationLifetimeService
+    {
+        private readonly IIconBrowser iconBrowser;
+        private readonly IIconCache iconCache;
+        private readonly IConfigurationManager configurationManager;
+        private readonly ILogger<IconDownloader> logger;
+        private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
+        private readonly ILogger<ChromiumBrowserWrapper> browserLogger;
+        private ChromiumBrowserWrapper browserWrapper;
+        private CancellationTokenSource cancellationTokenSource;
+        private IconDownloadStatus iconDownloadStatus;
+
+        public bool DownloadComplete { get; private set; }
+        public bool Downloading => this.cancellationTokenSource is not null;
+
+        public IconDownloader(
+            IIconBrowser iconBrowser,
+            IIconCache iconCache,
+            IConfigurationManager configurationManager,
+            ILogger<IconDownloader> logger,
+            ILiveOptions<ApplicationConfiguration> liveOptions,
+            ILogger<ChromiumBrowserWrapper> browserLogger)
+        {
+            this.iconBrowser = iconBrowser.ThrowIfNull();
+            this.iconCache = iconCache.ThrowIfNull();
+            this.configurationManager = configurationManager.ThrowIfNull();
+            this.logger = logger.ThrowIfNull();
+            this.liveOptions = liveOptions.ThrowIfNull();
+            this.browserLogger = browserLogger.ThrowIfNull();
+            this.HookIntoConfigurationChanges();
+        }
+
+        public void SetBrowser(ChromiumBrowserWrapper chromiumBrowserWrapper)
+        {
+            if (this.browserWrapper is not null)
+            {
+                throw new InvalidOperationException("Browser is already set");
+            }
+
+            this.browserWrapper = chromiumBrowserWrapper;
+        }
+
+        public async Task<IconDownloadStatus> StartIconDownload()
+        {
+            while(this.browserWrapper is null)
+            {
+                await Task.Delay(100);
+            }
+
+            this.logger.LogInformation("Starting download");
+            if (this.Downloading)
+            {
+                this.logger.LogInformation("Download already running");
+                return this.iconDownloadStatus;
+            }
+
+            this.cancellationTokenSource = new();
+            this.iconDownloadStatus = new IconDownloadStatus();
+            _ = Task.Run(this.DownloadIcons);
+            return this.iconDownloadStatus;
+        }
+
+        public void CancelIconDownload()
+        {
+            this.cancellationTokenSource?.Cancel();
+            this.cancellationTokenSource?.Dispose();
+            this.cancellationTokenSource = null;
+        }
+
+        private async Task DownloadIcons()
+        {
+            this.logger.LogInformation("Beginning icon download");
+            if (await TestBrowserSupported() is false)
+            {
+                this.logger.LogError("Browser not supported. Icon downloading stopped");
+                this.iconDownloadStatus.CurrentStep = IconDownloadStatus.BrowserNotSupported;
+                return;
+            }
+
+            var progressIncrement = 100d / Skill.Skills.Count();
+            var progressValue = 0d;
+            var skillsToDownload = new List<Skill>();
+            foreach(var skill in Skill.Skills.OrderBy(s => s.Name))
+            {
+                if (skill == Skill.NoSkill)
+                {
+                    continue;
+                }
+
+                var logger = this.logger.CreateScopedLogger(nameof(this.DownloadIcons), skill.Name);
+                logger.LogInformation("Verifying if icon exists");
+                this.iconDownloadStatus.CurrentStep = IconDownloadStatus.Checking(skill.Name, progressValue);
+                if ((await this.iconCache.GetIconUri(skill)).ExtractValue() is not null)
+                {
+                    progressValue += progressIncrement;
+                    await Task.Delay(1);
+                    continue;
+                }
+
+                skillsToDownload.Add(skill);
+            }
+
+            if (skillsToDownload.Count == 0)
+            {
+                this.logger.LogInformation("No icons missing. Stopping download");
+                this.iconDownloadStatus.CurrentStep = IconDownloadStatus.Finished;
+                return;
+            }
+
+            this.iconBrowser.InitializeWebView(this.browserWrapper, this.cancellationTokenSource.Token);
+            
+            var incomplete = false;
+            foreach (var skill in skillsToDownload)
+            {
+                if (this.cancellationTokenSource?.IsCancellationRequested is null or true)
+                {
+                    this.iconDownloadStatus.CurrentStep = IconDownloadStatus.Stopped(progressValue);
+                    return;
+                }
+
+                if (skill == Skill.NoSkill)
+                {
+                    progressValue += progressIncrement;
+                    continue;
+                }
+
+                this.logger.LogInformation("Downloading icon");
+                this.iconDownloadStatus.CurrentStep = IconDownloadStatus.Downloading(skill.Name, progressValue);
+                var request = new IconRequest { Skill = skill };
+                this.iconBrowser.QueueIconRequest(request);
+
+                while (request.Finished is false)
+                {
+                    await Task.Delay(1000);
+                }
+
+                if (request.IconBase64.IsNullOrWhiteSpace())
+                {
+                    this.logger.LogWarning("Failed to download icon");
+                    incomplete = true;
+                }
+                else
+                {
+                    this.logger.LogInformation("Downloaded icon");
+                }
+
+                progressValue += progressIncrement;
+            }
+
+            if (incomplete)
+            {
+                this.logger.LogError("Failed to download all icons. Retrying");
+                await this.DownloadIcons();
+            }
+            else
+            {
+                Application.Current.Dispatcher.Invoke(() =>
+                {
+                    this.browserWrapper.IsEnabled = false;
+                    this.browserWrapper.WebBrowser.Dispose();
+                });
+                this.iconDownloadStatus.CurrentStep = IconDownloadStatus.Finished;
+                this.DownloadComplete = true;
+            }
+        }
+
+        private static async Task<bool> TestBrowserSupported()
+        {
+            CoreWebView2Environment coreWebView2Environment;
+            try
+            {
+                var task = await Application.Current.Dispatcher.InvokeAsync(async () =>
+                {
+                    return await CoreWebView2Environment.CreateAsync().ConfigureAwait(true);
+                });
+
+                coreWebView2Environment = await task;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+
+            return coreWebView2Environment is not null;
+        }
+
+        private void HookIntoConfigurationChanges()
+        {
+            this.configurationManager.ConfigurationChanged += async (_, _) =>
+            {
+                var configuration = this.configurationManager.GetConfiguration();
+                if (configuration.ExperimentalFeatures.DownloadIcons)
+                {
+                    await this.StartIconDownload();
+                }
+                else
+                {
+                    this.CancelIconDownload();
+                }
+            };
+        }
+
+        public async void OnStartup()
+        {
+            var configuration = this.configurationManager.GetConfiguration();
+            if (configuration.ExperimentalFeatures.DownloadIcons)
+            {
+                await this.StartIconDownload();
+            }
+        }
+
+        public void OnClosing()
+        {
+            this.cancellationTokenSource?.Cancel();
+        }
+    }
+}

Daybreak/Services/IconRetrieve/IconRetriever.cs

@@ -1,140 +0,0 @@
-using Daybreak.Configuration;
-using Daybreak.Models.Builds;
-using HtmlAgilityPack;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Configuration;
-using System.Extensions;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-
-namespace Daybreak.Services.IconRetrieve
-{
-    public sealed class IconRetriever : IIconRetriever
-    {
-        private const string NamePlaceholder = "[SKILLNAME]";
-        private const string BaseUrl = "https://wiki.guildwars.com";
-        private const string QueryUrl = $"wiki/File:{NamePlaceholder}.jpg";
-        private const string IconsDirectoryName = "Icons";
-        private const string IconsLocation = $"{IconsDirectoryName}/{NamePlaceholder}.jpg";
-
-        private readonly IHttpClient<IconRetriever> httpClient;
-        private readonly ILogger<IconRetriever> logger;
-        private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
-
-        public IconRetriever(
-            ILogger<IconRetriever> logger,
-            IHttpClient<IconRetriever> httpClient,
-            ILiveOptions<ApplicationConfiguration> liveOptions)
-        {
-            this.logger = logger.ThrowIfNull(nameof(logger));
-            this.httpClient = httpClient.ThrowIfNull(nameof(httpClient));
-            this.liveOptions = liveOptions.ThrowIfNull(nameof(liveOptions));
-            this.httpClient.BaseAddress = new Uri(BaseUrl);
-            if (Directory.Exists(IconsDirectoryName) is false)
-            {
-                Directory.CreateDirectory(IconsDirectoryName);
-            }
-        }
-
-        public async Task<Optional<Stream>> GetIcon(Skill skill)
-        {
-            if (this.liveOptions.Value.KeepLocalIconCache)
-            {
-                this.logger.LogInformation($"{nameof(IconRetriever)} configured to look first in cache before downloading icons");
-                var maybeIcon = await this.GetLocalIcon(skill);
-                if (maybeIcon.ExtractValue() is Stream stream)
-                {
-                    return stream;
-                }
-            }
-            else
-            {
-                this.logger.LogInformation($"{nameof(IconRetriever)} configured to skip local cache. Downloading icon");
-            }
-
-            return await this.DownloadIcon(skill);
-        }
-
-        private async Task<Optional<Stream>> DownloadIcon(Skill skill)
-        {
-            var curedSkillName = skill.Name
-                .Replace(" ", "_");
-            var skillIconUrl = QueryUrl.Replace(NamePlaceholder, curedSkillName);
-            this.logger.LogInformation($"Looking up icon for skill '{skill.Name}' at url {skillIconUrl}");
-            using var response = await this.httpClient.GetAsync(skillIconUrl).ConfigureAwait(false);
-            if (response.IsSuccessStatusCode is false)
-            {
-                this.logger.LogError($"Client returned status code {response.StatusCode}");
-                return Optional.None<Stream>();
-            }
-
-            this.logger.LogInformation("Crawling through response for href to latest icon url");
-            var doc = new HtmlDocument();
-            doc.LoadHtml(await response.Content.ReadAsStringAsync());
-            var url = GetHref(doc);
-            if (url is null)
-            {
-                this.logger.LogError("Failed to find latest icon url");
-                return Optional.None<Stream>();
-            }
-
-            this.logger.LogInformation($"Found latest icon url at {BaseUrl + "/" + url}. Requesting stream");
-            using var iconResponse = await this.httpClient.GetAsync(url);
-            if (response.IsSuccessStatusCode)
-            {
-                this.logger.LogInformation("Retrieved latest icon stream");
-                var iconData = await iconResponse.Content.ReadAsByteArrayAsync();
-                if (this.liveOptions.Value.KeepLocalIconCache)
-                {
-                    await SaveIconLocally(skill, iconData);
-                }
-
-                return new MemoryStream(iconData);
-            }
-
-            this.logger.LogError($"Failed to retrieve icon from {BaseUrl + "/" + url}");
-            return Optional.None<Stream>();
-        }
-
-        private async Task<Optional<Stream>> GetLocalIcon(Skill skill)
-        {
-            var curedSkillName = skill.Name
-                .Replace(" ", "_")
-                .Replace("\"", "");
-            this.logger.LogInformation("Checking local icon cache");
-            if (File.Exists(IconsLocation.Replace(NamePlaceholder, curedSkillName)))
-            {
-                this.logger.LogInformation("Local icon cache found. Retrieving icon");
-                return new MemoryStream(await File.ReadAllBytesAsync(IconsLocation.Replace(NamePlaceholder, curedSkillName)));
-            }
-
-            this.logger.LogWarning("No local icon cache found");
-            return Optional.None<Stream>();
-        }
-
-        private static async Task SaveIconLocally(Skill skill, byte[] data)
-        {
-            var curedSkillName = skill.Name
-                .Replace(" ", "_")
-                .Replace("\"", "");
-            await File.WriteAllBytesAsync(IconsLocation.Replace(NamePlaceholder, curedSkillName), data);
-        }
-
-        private static string GetHref(HtmlDocument doc)
-        {
-            foreach (var child in doc.DocumentNode.Descendants("a"))
-            {
-                var targetAttribute = child.Attributes.Where(a => a.Name == "href" && a.Value.Contains("images")).FirstOrDefault();
-                if (targetAttribute is not null)
-                {
-                    return targetAttribute.Value;
-                }
-            }
-
-            return null;
-        }
-    }
-}

Daybreak/Services/KeyboardHook/KeyboardHookService.cs

@@ -86,7 +86,7 @@ namespace Daybreak.Services.KeyboardHook
                     }
 
                     this.windowsHookHandle = IntPtr.Zero;
-                    this.hookProc -= LowLevelKeyboardProc;
+                    this.hookProc -= this.LowLevelKeyboardProc;
                 }
             }
 
@@ -104,12 +104,12 @@ namespace Daybreak.Services.KeyboardHook
 
         ~KeyboardHookService()
         {
-            Dispose(false);
+            this.Dispose(false);
         }
 
         public void Dispose()
         {
-            Dispose(true);
+            this.Dispose(true);
             GC.SuppressFinalize(this);
         }
     }

Daybreak/Services/Logging/CompositeLogsWritter.cs

@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using System.Logging;
+
+namespace Daybreak.Services.Logging
+{
+    public sealed class CompositeLogsWriter : ILogsWriter
+    {
+        private readonly IEnumerable<ILogsWriter> logsWriters;
+
+        public CompositeLogsWriter(params ILogsWriter[] innerLogsWriters)
+        {
+            this.logsWriters = innerLogsWriters;
+        }
+
+        public void WriteLog(Log log)
+        {
+            foreach (var logWriter in this.logsWriters)
+            {
+                logWriter.WriteLog(log);
+            }
+        }
+    }
+}

Daybreak/Services/Logging/DebugLogsWriter.cs

@@ -0,0 +1,13 @@
+using System.Diagnostics;
+using System.Logging;
+
+namespace Daybreak.Services.Logging
+{
+    public sealed class DebugLogsWriter : IDebugLogsWriter
+    {
+        public void WriteLog(Log log)
+        {
+            Debug.WriteLine($"[{log.LogTime}]\t[{log.LogLevel}]\t[{log.Category}]\n{log.Message}");
+        }
+    }
+}

Daybreak/Services/Logging/IDebugLogsWriter.cs

@@ -0,0 +1,8 @@
+using System.Logging;
+
+namespace Daybreak.Services.Logging
+{
+    public interface IDebugLogsWriter : ILogsWriter
+    {
+    }
+}

Daybreak/Services/Updater/ApplicationUpdater.cs

@@ -1,18 +1,18 @@
 using Daybreak.Configuration;
 using Daybreak.Exceptions;
-using Daybreak.Models;
 using Daybreak.Models.Github;
+using Daybreak.Models.Progress;
+using Daybreak.Services.Updater.PostUpdate;
 using Daybreak.Services.ViewManagement;
-using Daybreak.Utils;
 using Daybreak.Views;
 using Microsoft.Extensions.Logging;
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
+using System.Core.Extensions;
 using System.Diagnostics;
 using System.Extensions;
-using System.Http;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -26,55 +26,41 @@ namespace Daybreak.Services.Updater
 {
     public sealed class ApplicationUpdater : IApplicationUpdater
     {
-        private const string LaunchActionName = "Launch_Daybreak";
-        private const string ExecutionPolicyKey = "ExecutionPolicy";
+        private const string TemporaryInstallerFileName = "Daybreak.Installer.Temp.exe";
+        private const string InstallerFileName = "Daybreak.Installer.exe";
         private const string UpdatedKey = "Updating";
         private const string RegistryKey = "Daybreak";
-        private const string ExtractAndRunPs1 = "ExtractAndRun.ps1";
         private const string TempFile = "tempfile.zip";
         private const string VersionTag = "{VERSION}";
-        private const string InputFileTag = "{INPUTFILE}";
-        private const string OutputPathTag = "{OUTPUTPATH}";
-        private const string ExecutionPolicyTag = "{EXECUTIONPOLICY}";
-        private const string ProcessIdTag = "{PROCESSID}";
-        private const string ExecutableNameTag = "{EXECUTABLE}";
-        private const string WorkingDirectoryTag = "{WORKINGDIRECTORY}";
         private const string RefTagPrefix = "/refs/tags";
         private const string VersionListUrl = "https://api.github.com/repos/AlexMacocian/Daybreak/git/refs/tags";
         private const string Url = "https://github.com/AlexMacocian/Daybreak/releases/latest";
         private const string DownloadUrl = $"https://github.com/AlexMacocian/Daybreak/releases/download/{VersionTag}/Daybreak{VersionTag}.zip";
-        private const string GetExecutionPolicyCommand = "Get-ExecutionPolicy -Scope CurrentUser";
-        private const string SetExecutionPolicyCommand = $"Set-ExecutionPolicy {ExecutionPolicyTag} -Scope CurrentUser -Force";
-        private const string WaitCommand = $"Wait-Process -Id {ProcessIdTag}";
-        private const string ExtractCommandTemplate = $"Expand-Archive -Path '{InputFileTag}' -DestinationPath '{OutputPathTag}' -Force";
-        private const string PrepareScheduledAction = $"$action = New-ScheduledTaskAction -Execute {ExecutableNameTag} -WorkingDirectory {WorkingDirectoryTag}";
-        private const string PrepareTriggerForAction = $"$trigger = New-ScheduledTaskTrigger -Once -At (Get-Date)";
-        private const string RegisterScheduledAction = $"Register-ScheduledTask -Action $action -Trigger $trigger -TaskName {LaunchActionName} | Out-Null";
-        private const string LaunchScheduledAction = $"Start-ScheduledTask -TaskName {LaunchActionName}";
-        private const string SleepOneSecond = $"Start-Sleep -s 1";
-        private const string UnregisterScheduledAction = $"Unregister-ScheduledTask -TaskName {LaunchActionName} -Confirm:$false";
-        private const string RemoveTempFile = $"Remove-item {TempFile}";
-        private const string RemovePs1 = $"Remove-item {ExtractAndRunPs1}";
 
         private readonly CancellationTokenSource updateCancellationTokenSource = new();
-        private readonly ILogger<ApplicationUpdater> logger;
         private readonly IViewManager viewManager;
+        private readonly IPostUpdateActionProvider postUpdateActionProvider;
         private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
         private readonly IHttpClient<ApplicationUpdater> httpClient;
+        private readonly ILogger<ApplicationUpdater> logger;
 
         public Version CurrentVersion { get; }
 
         public ApplicationUpdater(
-            ILogger<ApplicationUpdater> logger,
-            ILiveOptions<ApplicationConfiguration> liveOptions,
             IViewManager viewManager,
-            IHttpClient<ApplicationUpdater> httpClient)
+            IPostUpdateActionProvider postUpdateActionProvider,
+            ILiveOptions<ApplicationConfiguration> liveOptions,
+            IHttpClient<ApplicationUpdater> httpClient,
+            ILogger<ApplicationUpdater> logger)
         {
-            this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
-            this.liveOptions = liveOptions.ThrowIfNull(nameof(liveOptions));
-            this.logger = logger.ThrowIfNull(nameof(logger));
-            this.httpClient = httpClient.ThrowIfNull(nameof(httpClient));
+            this.viewManager = viewManager.ThrowIfNull();
+            this.postUpdateActionProvider = postUpdateActionProvider.ThrowIfNull();
+            this.liveOptions = liveOptions.ThrowIfNull();
+            this.httpClient = httpClient.ThrowIfNull();
+            this.logger = logger.ThrowIfNull();
+
             this.httpClient.DefaultRequestHeaders.Add("user-agent", "Daybreak Client");
+
             if (Version.TryParse(Assembly.GetExecutingAssembly().GetName().Version.ToString(), out var currentVersion))
             {
                 if (currentVersion.HasPrefix is false)
@@ -191,23 +177,7 @@ namespace Daybreak.Services.Updater
 
         public void FinalizeUpdate()
         {
-            var maybeExecutionPolicy = this.RetrieveExecutionPolicy();
-            maybeExecutionPolicy.DoAny(
-                onNone: () =>
-                {
-                    throw new InvalidOperationException("Failed to retrieve execution policy");
-                });
-
-            var executionPolicy = maybeExecutionPolicy.ExtractValue();
-            if (executionPolicy is not ExecutionPolicies.Bypass ||
-                executionPolicy is not ExecutionPolicies.Unrestricted)
-            {
-                this.logger.LogInformation($"Execution policy is set to {executionPolicy}. Setting to {ExecutionPolicies.Bypass}");
-            }
-
-            SaveExecutionPolicyValueToRegistry(executionPolicy);
             MarkUpdateInRegistry();
-            this.SetExecutionPolicy(ExecutionPolicies.Bypass);
             this.LaunchExtractor();
         }
 
@@ -216,16 +186,7 @@ namespace Daybreak.Services.Updater
             if (UpdateMarkedInRegistry())
             {
                 UnmarkUpdateInRegistry();
-                var maybeExecutionPolicy = LoadExecutionPolicyValueFromRegistry();
-                maybeExecutionPolicy.Do(
-                    onSome: policy =>
-                    {
-                        SetExecutionPolicy(policy);
-                    },
-                    onNone: () =>
-                    {
-                        throw new InvalidOperationException("Found update marked in registry but no execution policy");
-                    });
+                this.ExecutePostUpdateActions();
             }
         }
 
@@ -245,92 +206,31 @@ namespace Daybreak.Services.Updater
             return Optional.None<string>();
         }
 
-        private Optional<ExecutionPolicies> RetrieveExecutionPolicy()
-        {
-            var process = new Process()
-            {
-                StartInfo = new ProcessStartInfo
-                {
-                    FileName = "powershell",
-                    Arguments = GetExecutionPolicyCommand,
-                    UseShellExecute = false,
-                    RedirectStandardError = true,
-                    RedirectStandardInput = true,
-                    RedirectStandardOutput = true
-                }
-            };
-            process.Start();
-            this.logger.LogInformation("Checking current execution policy");
-            var output = process.StandardOutput.ReadToEnd();
-            if (!Enum.TryParse(typeof(ExecutionPolicies), output, out var executionPolicy))
-            {
-                var error = process.StandardError.ReadToEnd();
-                this.logger.LogError($"Failed to retrieve current user execution policy. Stdout: {output}. Stderr: {error}");
-                return Optional.None<ExecutionPolicies>();
-            }
-
-            return executionPolicy.Cast<ExecutionPolicies>();
-        }
-
-        private void SetExecutionPolicy(ExecutionPolicies executionPolicy)
-        {
-            var process = new Process()
-            {
-                StartInfo = new ProcessStartInfo
-                {
-                    FileName = "powershell",
-                    Arguments = SetExecutionPolicyCommand.Replace(ExecutionPolicyTag, executionPolicy.ToString()),
-                    UseShellExecute = false,
-                    RedirectStandardError = true,
-                    RedirectStandardInput = true,
-                    RedirectStandardOutput = true
-                }
-            };
-            process.Start();
-            this.logger.LogInformation($"Setting execution policy to {executionPolicy}");
-            var output = process.StandardOutput.ReadToEnd();
-            if (!string.IsNullOrWhiteSpace(output))
-            {
-                var error = process.StandardError.ReadToEnd();
-                throw new InvalidOperationException($"Failed to set execution policy to {executionPolicy}. Stdout: {output}. Stderr: {error}");
-            }
-        }
-
         private void LaunchExtractor()
         {
-            File.WriteAllLines(ExtractAndRunPs1, new List<string>()
-            {
-                WaitCommand.Replace(ProcessIdTag, Environment.ProcessId.ToString()),
-                ExtractCommandTemplate
-                    .Replace(InputFileTag, Path.GetFullPath(TempFile))
-                    .Replace(OutputPathTag, Directory.GetCurrentDirectory()),
-                RemoveTempFile,
-                PrepareScheduledAction
-                    .Replace(ExecutableNameTag, Process.GetCurrentProcess()?.MainModule?.FileName)
-                    .Replace(WorkingDirectoryTag, Directory.GetCurrentDirectory()),
-                PrepareTriggerForAction,
-                RegisterScheduledAction,
-                LaunchScheduledAction,
-                SleepOneSecond,
-                UnregisterScheduledAction,
-                RemovePs1,
-            });
             var process = new Process()
             {
                 StartInfo = new ProcessStartInfo
                 {
-                    FileName = "powershell.exe",
-                    Arguments = $@"{Directory.GetCurrentDirectory()}\{ExtractAndRunPs1}",
-                    UseShellExecute = true,
-                    WindowStyle = ProcessWindowStyle.Maximized,
-                    WorkingDirectory = Directory.GetCurrentDirectory(),
-                    Verb = "runas"
-                },
+                    FileName = InstallerFileName
+                }
             };
-            this.logger.LogInformation("Created extractor script. Attempting to launch powershell");
+            this.logger.LogInformation("Launching installer");
             if (process.Start() is false)
             {
-                throw new InvalidOperationException("Failed to create and start powershell script");
+                throw new InvalidOperationException("Failed to launch installer");
+            }
+        }
+
+        private async void ExecutePostUpdateActions()
+        {
+            this.logger.LogInformation("Executing post-update actions");
+            foreach(var action in this.postUpdateActionProvider.GetPostUpdateActions())
+            {
+                this.logger.LogInformation($"Starting [{action.GetType().Name}]");
+                action.DoPostUpdateAction();
+                await action.DoPostUpdateActionAsync();
+                this.logger.LogInformation($"Finished [{action.GetType().Name}]");
             }
         }
 
@@ -368,40 +268,6 @@ namespace Daybreak.Services.Updater
             return false;
         }
 
-        private static void SaveExecutionPolicyValueToRegistry(ExecutionPolicies executionPolicy)
-        {
-            var homeRegistryKey = GetOrCreateHomeKey();
-            homeRegistryKey.SetValue(ExecutionPolicyKey, executionPolicy.ToString());
-            homeRegistryKey.Close();
-        }
-
-        private static Optional<ExecutionPolicies> LoadExecutionPolicyValueFromRegistry()
-        {
-            var homeRegistryKey = GetOrCreateHomeKey();
-            var executionPolicy = homeRegistryKey.GetValue(ExecutionPolicyKey);
-            homeRegistryKey.Close();
-            
-            if (executionPolicy is null)
-            {
-                return Optional.None<ExecutionPolicies>();
-            }
-            else if (executionPolicy is string executionPolicyString)
-            {
-                if (Enum.TryParse<ExecutionPolicies>(executionPolicyString, out var executionPolicyValue))
-                {
-                    return executionPolicyValue;
-                }
-                else
-                {
-                    throw new InvalidOperationException($"Found execution policy with value {executionPolicy}");
-                }
-            }
-            else
-            {
-                throw new InvalidOperationException($"Found execution policy of type {executionPolicy.GetType()}.");
-            }
-        }
-
         private static RegistryKey GetOrCreateHomeKey()
         {
             var homeRegistryKey = Registry.CurrentUser.OpenSubKey("Software", true).OpenSubKey(RegistryKey, true);

Daybreak/Services/Updater/IApplicationUpdater.cs

@@ -1,4 +1,4 @@
-using Daybreak.Models;
+using Daybreak.Models.Progress;
 using Daybreak.Models.Versioning;
 using System.Collections.Generic;
 using System.Threading.Tasks;

Daybreak/Services/Updater/PostUpdate/Actions/RenameInstallerAction.cs

@@ -0,0 +1,32 @@
+using Microsoft.Extensions.Logging;
+using System.Core.Extensions;
+using System.IO;
+
+namespace Daybreak.Services.Updater.PostUpdate.Actions
+{
+    public sealed class RenameInstallerAction : PostUpdateActionBase
+    {
+        private const string TemporaryInstallerFileName = "Daybreak.Installer.Temp.exe";
+        private const string InstallerFileName = "Daybreak.Installer.exe";
+
+        private readonly ILogger<RenameInstallerAction> logger;
+
+        public RenameInstallerAction(
+            ILogger<RenameInstallerAction> logger)
+        {
+            this.logger = logger.ThrowIfNull();
+        }
+
+        public override void DoPostUpdateAction()
+        {
+            if (File.Exists(TemporaryInstallerFileName))
+            {
+                this.logger.LogInformation("Detected new installer version. Overwriting old installer with new one");
+                File.Copy(TemporaryInstallerFileName, InstallerFileName, true);
+
+                this.logger.LogInformation("Deleting new installer temporary file");
+                File.Delete(TemporaryInstallerFileName);
+            }
+        }
+    }
+}

Daybreak/Services/Updater/PostUpdate/IPostUpdateActionManager.cs

@@ -0,0 +1,6 @@
+namespace Daybreak.Services.Updater.PostUpdate
+{
+    public interface IPostUpdateActionManager : IPostUpdateActionProducer, IPostUpdateActionProvider
+    {
+    }
+}

Daybreak/Services/Updater/PostUpdate/IPostUpdateActionProducer.cs

@@ -0,0 +1,8 @@
+namespace Daybreak.Services.Updater.PostUpdate
+{
+    public interface IPostUpdateActionProducer
+    {
+        void AddPostUpdateAction<T>()
+            where T : PostUpdateActionBase;
+    }
+}

Daybreak/Services/Updater/PostUpdate/IPostUpdateActionProvider.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Daybreak.Services.Updater.PostUpdate
+{
+    public interface IPostUpdateActionProvider
+    {
+        IEnumerable<PostUpdateActionBase> GetPostUpdateActions();
+    }
+}