From 60aa29f70b6923775d614eba7968481a873e3c7f Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Tue, 11 Jul 2023 23:23:14 +0200
Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=8C=8E=20Add=20Localization?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Initial languages: English, German
---
 GoAwayEdge/App.xaml                           |  2 +
 GoAwayEdge/App.xaml.cs                        | 38 ++++++++--------
 GoAwayEdge/Common/Updater.cs                  | 35 +++++++--------
 GoAwayEdge/GoAwayEdge.csproj                  | 12 +++++-
 GoAwayEdge/GoAwayEdge.csproj.user             |  6 +++
 GoAwayEdge/Installer.xaml                     | 37 ++++++----------
 GoAwayEdge/Installer.xaml.cs                  | 43 ++++++++++---------
 .../ResourceDictionary.de-DE.xaml             | 31 +++++++++++++
 .../Localization/ResourceDictionary.xaml      | 31 +++++++++++++
 GoAwayEdge/Pages/Installation.xaml            |  4 +-
 GoAwayEdge/Pages/Installation.xaml.cs         |  2 +-
 GoAwayEdge/Pages/InstallationSuccess.xaml     |  6 +--
 GoAwayEdge/Pages/License.xaml                 | 12 +++---
 GoAwayEdge/Pages/License.xaml.cs              |  9 ++--
 GoAwayEdge/Pages/Settings.xaml                | 15 +++----
 GoAwayEdge/Pages/Settings.xaml.cs             |  6 +--
 16 files changed, 177 insertions(+), 112 deletions(-)
 create mode 100644 GoAwayEdge/Localization/ResourceDictionary.de-DE.xaml
 create mode 100644 GoAwayEdge/Localization/ResourceDictionary.xaml

diff --git a/GoAwayEdge/App.xaml b/GoAwayEdge/App.xaml
index f1580f8..b3f84da 100644
--- a/GoAwayEdge/App.xaml
+++ b/GoAwayEdge/App.xaml
@@ -9,6 +9,8 @@
             <ResourceDictionary.MergedDictionaries>
                 <ui:ThemesDictionary Theme="Dark" />
                 <ui:ControlsDictionary />
+                <ResourceDictionary Source="/GoAwayEdge;component/Localization/ResourceDictionary.xaml"/>
+                <ResourceDictionary Source="/GoAwayEdge;component/Localization/ResourceDictionary.de-DE.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/GoAwayEdge/App.xaml.cs b/GoAwayEdge/App.xaml.cs
index 7b3948f..240d584 100644
--- a/GoAwayEdge/App.xaml.cs
+++ b/GoAwayEdge/App.xaml.cs
@@ -22,7 +22,7 @@ namespace GoAwayEdge
     /// <summary>
     /// Interaktionslogik für App.xaml
     /// </summary>
-    public partial class App : Application
+    public partial class App
     {
         private static string? _url;
         private static SearchEngine _engine = SearchEngine.Google; // Fallback
@@ -34,7 +34,7 @@ public void Application_Startup(object sender, StartupEventArgs e)
                 if (IsAdministrator() == false)
                 {
                     // Restart program and run as admin
-                    var exeName = System.Diagnostics.Process.GetCurrentProcess().MainModule?.FileName;
+                    var exeName = Process.GetCurrentProcess().MainModule?.FileName;
                     if (exeName != null)
                     {
                         var startInfo = new ProcessStartInfo(exeName)
@@ -42,7 +42,7 @@ public void Application_Startup(object sender, StartupEventArgs e)
                             Verb = "runas",
                             UseShellExecute = true
                         };
-                        System.Diagnostics.Process.Start(startInfo);
+                        Process.Start(startInfo);
                     }
                     Application.Current.Shutdown();
                     return;
@@ -60,7 +60,7 @@ public void Application_Startup(object sender, StartupEventArgs e)
             
 #if DEBUG
             Clipboard.SetText(argumentJoin);
-            MessageBox.Show("The following args was redirected (copied to clipboard):\n\n" + argumentJoin, "GoAwayEdge", MessageBoxButton.OK, MessageBoxImage.Information);
+            MessageBox.Show("The following args are redirected (copied to the clipboard):\n\n" + argumentJoin, "GoAwayEdge", MessageBoxButton.OK, MessageBoxImage.Information);
 #endif
             Output.WriteLine("Command line args:\n\n" + argumentJoin + "\n", ConsoleColor.Gray);
 
@@ -74,11 +74,11 @@ public void Application_Startup(object sender, StartupEventArgs e)
                 }
                 if (arg.Contains("--update"))
                 {
-                    var statusEnv = Common.Updater.InitEnv();
+                    var statusEnv = Updater.InitEnv();
                     if (statusEnv == false) Environment.Exit(1);
 
                     // Validate IFEO bínary
-                    var binaryStatus = Common.Updater.ValidateIfeoBinary();
+                    var binaryStatus = Updater.ValidateIfeoBinary();
                     switch (binaryStatus)
                     {
                         case 0: // validated
@@ -90,7 +90,7 @@ public void Application_Startup(object sender, StartupEventArgs e)
                                 if (result == MessageBoxResult.Yes)
                                 {
                                     // Restart program and run as admin
-                                    var exeName = System.Diagnostics.Process.GetCurrentProcess().MainModule?.FileName;
+                                    var exeName = Process.GetCurrentProcess().MainModule?.FileName;
                                     if (exeName != null)
                                     {
                                         var startInfo = new ProcessStartInfo(exeName)
@@ -99,7 +99,7 @@ public void Application_Startup(object sender, StartupEventArgs e)
                                             UseShellExecute = true,
                                             Arguments = "--update"
                                         };
-                                        System.Diagnostics.Process.Start(startInfo);
+                                        Process.Start(startInfo);
                                     }
                                     Application.Current.Shutdown();
                                     return;
@@ -115,7 +115,7 @@ public void Application_Startup(object sender, StartupEventArgs e)
                                 if (result == MessageBoxResult.Yes)
                                 {
                                     // Restart program and run as admin
-                                    var exeName = System.Diagnostics.Process.GetCurrentProcess().MainModule?.FileName;
+                                    var exeName = Process.GetCurrentProcess().MainModule?.FileName;
                                     if (exeName != null)
                                     {
                                         var startInfo = new ProcessStartInfo(exeName)
@@ -124,7 +124,7 @@ public void Application_Startup(object sender, StartupEventArgs e)
                                             UseShellExecute = true,
                                             Arguments = "--update"
                                         };
-                                        System.Diagnostics.Process.Start(startInfo);
+                                        Process.Start(startInfo);
                                     }
                                     Application.Current.Shutdown();
                                     return;
@@ -171,7 +171,7 @@ public void Application_Startup(object sender, StartupEventArgs e)
             // Open URL in default browser
             if (_url != null)
             {
-                var parsed = ParsingUrl(_url);
+                var parsed = ParseUrl(_url);
                 Output.WriteLine("Opening URL in default browser:\n\n" + parsed + "\n", ConsoleColor.Gray);
 
                 var p = new Process();
@@ -185,7 +185,7 @@ public void Application_Startup(object sender, StartupEventArgs e)
             Environment.Exit(0);
         }
 
-        private static string ParsingUrl(string encodedUrl)
+        private static string ParseUrl(string encodedUrl)
         {
             // Remove URI handler with url argument prefix
             encodedUrl = encodedUrl[encodedUrl.IndexOf("http", StringComparison.Ordinal)..];
@@ -207,7 +207,7 @@ private static string ParsingUrl(string encodedUrl)
             // Replace Search Engine
             encodedUrl = encodedUrl.Replace("https://www.bing.com/search?q=", DefineEngine(_engine));
 
-            Uri uri = new(encodedUrl.ToString());
+            var uri = new Uri(encodedUrl);
             return uri.ToString();
         }
 
@@ -236,9 +236,6 @@ private static string DecodeUrlString(string url)
 
         private static string DotSlash(string url)
         {
-            //url = url.Replace("%3A", ":");
-            //url = url.Replace("%2F", "/");
-
             string newUrl;
             while ((newUrl = Uri.UnescapeDataString(url)) != url)
                 url = newUrl;
@@ -247,13 +244,16 @@ private static string DotSlash(string url)
             {
                 var uri = new Uri(url);
                 var query = HttpUtility.ParseQueryString(uri.Query).Get("url");
-                var decoded = Encoding.UTF8.GetString(Convert.FromBase64String(query));
-                if (decoded != null)
+                if (query != null)
                 {
+                    var decoded = Encoding.UTF8.GetString(Convert.FromBase64String(query));
                     return decoded;
                 }
             }
-            catch {;}
+            catch
+            {
+                // ignored
+            }
 
             return url;
         }
diff --git a/GoAwayEdge/Common/Updater.cs b/GoAwayEdge/Common/Updater.cs
index e94c4cc..69479cf 100644
--- a/GoAwayEdge/Common/Updater.cs
+++ b/GoAwayEdge/Common/Updater.cs
@@ -1,9 +1,8 @@
-using Microsoft.Win32;
-using System;
+using Microsoft.Toolkit.Uwp.Notifications;
+using Microsoft.Win32;
 using System.IO;
-using System.Windows;
-using Microsoft.Toolkit.Uwp.Notifications;
 using System.Security.Cryptography;
+using System.Windows;
 
 namespace GoAwayEdge.Common
 {
@@ -65,20 +64,20 @@ public static int ValidateIfeoBinary()
                 return 2;
             }
 
-            var IfeoBinaryPath = (string)key.GetValue("FilterFullPath");
-            if (IfeoBinaryPath == null)
+            var ifeoBinaryPath = (string)key.GetValue("FilterFullPath");
+            if (ifeoBinaryPath == null)
             {
                 Console.WriteLine("FilterFullPath value not found.");
                 return 2;
             }
 
-            if (File.Exists(IfeoBinaryPath))
+            if (File.Exists(ifeoBinaryPath))
             {
-                var EdgeBinaryPath = Path.GetDirectoryName(IfeoBinaryPath) + "\\msedge.exe";
-                IfeoBinaryPath = Path.GetDirectoryName(IfeoBinaryPath) + "\\msedge_ifeo.exe";
+                var edgeBinaryPath = Path.GetDirectoryName(ifeoBinaryPath) + "\\msedge.exe";
+                ifeoBinaryPath = Path.GetDirectoryName(ifeoBinaryPath) + "\\msedge_ifeo.exe";
 
-                var edgeHash = CalculateMD5(EdgeBinaryPath);
-                var ifeoHash = CalculateMD5(IfeoBinaryPath);
+                var edgeHash = CalculateMD5(edgeBinaryPath);
+                var ifeoHash = CalculateMD5(ifeoBinaryPath);
 #if DEBUG
                 if (edgeHash != ifeoHash)
                     MessageBox.Show($"The Edge Hash ({edgeHash}) and Ifeo Hash ({ifeoHash}) are not identical. Validation failed!", "GoAwayEdge", MessageBoxButton.OK, MessageBoxImage.Warning);
@@ -88,7 +87,7 @@ public static int ValidateIfeoBinary()
             }
             else
             {
-                Console.WriteLine($"FilterFullPath does not exist: {IfeoBinaryPath}");
+                Console.WriteLine($"FilterFullPath does not exist: {ifeoBinaryPath}");
                 return 2;
             }
         }
@@ -123,14 +122,10 @@ public static void ModifyIfeoBinary(ModifyAction action)
 
         private static string CalculateMD5(string filename)
         {
-            using (var md5 = MD5.Create())
-            {
-                using (var stream = File.OpenRead(filename))
-                {
-                    var hash = md5.ComputeHash(stream);
-                    return BitConverter.ToString(hash).Replace("-", "").ToLowerInvariant();
-                }
-            }
+            using var md5 = MD5.Create();
+            using var stream = File.OpenRead(filename);
+            var hash = md5.ComputeHash(stream);
+            return BitConverter.ToString(hash).Replace("-", "").ToLowerInvariant();
         }
     }
 }
diff --git a/GoAwayEdge/GoAwayEdge.csproj b/GoAwayEdge/GoAwayEdge.csproj
index de2a8f3..e4469fe 100644
--- a/GoAwayEdge/GoAwayEdge.csproj
+++ b/GoAwayEdge/GoAwayEdge.csproj
@@ -13,7 +13,7 @@
 		<AssemblyName>GoAwayEdge</AssemblyName>
 		<Company>Exploitox</Company>
 		<Authors>valnoxy</Authors>
-		<Version>1.0.2.26</Version>
+		<Version>1.1.0.31</Version>
 		<Copyright>Copyright (c) 2018 - 2023 Exploitox. All rights reserved.</Copyright>
 		<PackageProjectUrl>https://github.com/valnoxy/GoAwayEdge</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/valnoxy/GoAwayEdge</RepositoryUrl>
@@ -21,10 +21,20 @@
 		<ApplicationIcon>GoAwayEdge.ico</ApplicationIcon>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <Page Remove="Localization\ResourceDictionary.de-DE.xaml" />
+	  <Page Remove="Localization\ResourceDictionary.xaml" />
+	</ItemGroup>
+
 	<ItemGroup>
 	  <Content Include="GoAwayEdge.ico" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Resource Include="Localization\ResourceDictionary.de-DE.xaml" />
+	  <Resource Include="Localization\ResourceDictionary.xaml" />
+	</ItemGroup>
+
 	<ItemGroup>
 	  <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
 	  <PackageReference Include="TaskScheduler" Version="2.10.1" />
diff --git a/GoAwayEdge/GoAwayEdge.csproj.user b/GoAwayEdge/GoAwayEdge.csproj.user
index 4b8db3e..c7adc9c 100644
--- a/GoAwayEdge/GoAwayEdge.csproj.user
+++ b/GoAwayEdge/GoAwayEdge.csproj.user
@@ -27,6 +27,12 @@
     <Page Update="App.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Resource Update="Localization\ResourceDictionary.de-DE.xaml">
+      <SubType>Designer</SubType>
+    </Resource>
+    <Resource Update="Localization\ResourceDictionary.xaml">
+      <SubType>Designer</SubType>
+    </Resource>
     <Page Update="Pages\Installation.xaml">
       <SubType>Designer</SubType>
     </Page>
diff --git a/GoAwayEdge/Installer.xaml b/GoAwayEdge/Installer.xaml
index 0849e68..0d07ecd 100644
--- a/GoAwayEdge/Installer.xaml
+++ b/GoAwayEdge/Installer.xaml
@@ -6,13 +6,14 @@
         xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
         xmlns:local="clr-namespace:GoAwayEdge"
         mc:Ignorable="d"
-        Title="GoAwayEdge Installer" MaxHeight="500" MaxWidth="800" 
+        Title="{StaticResource Title}" MaxHeight="500" MaxWidth="800" 
         MinHeight="500" MinWidth="800" Height="500" Width="800"
         WindowStartupLocation="CenterScreen"
         ExtendsContentIntoTitleBar="True"
         WindowBackdropType="Mica"
         WindowCornerPreference="Round"
         ResizeMode="NoResize">
+
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="50"/>
@@ -20,31 +21,21 @@
             <RowDefinition Height="60"/>
         </Grid.RowDefinitions>
 
-        <!--  We display our pages inside this element.  -->
-        <Border
-            Grid.Row="1"
-            CornerRadius="8,0,0,0">
+        <Border Grid.Row="1"
+                CornerRadius="8,0,0,0">
             <Frame Margin="15,10,15,10" x:Name="FrameWindow" />
         </Border>
 
-        <Grid Grid.Row="2" Margin="25,0,10,10">
-            <Grid HorizontalAlignment="Right">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
-                <Button Grid.Column="0" Content="Back" Margin="0,0,5,0" Click="Back_Click" x:Name="BackBtn" IsEnabled="false"/>
-                <Button Grid.Column="1" Content="Next" Margin="0,0,5,0" Click="ButtonBase_OnClick" x:Name="NextBtn" IsEnabled="false"/>
-            </Grid>
-        </Grid>
+        <DockPanel Grid.Row="2" Margin="15,0,10,0">
+            <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
+                <Label Content="Version 1.2.0" VerticalContentAlignment="Bottom" x:Name="VersionLbl"/>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button Content="{StaticResource Back}" Margin="0,0,5,0" Click="Back_Click" x:Name="BackBtn" IsEnabled="false"/>
+                <Button Content="{StaticResource Next}" Margin="0,0,5,0" Click="ButtonBase_OnClick" x:Name="NextBtn" IsEnabled="false"/>
+            </StackPanel>
+        </DockPanel>
 
-        <ui:TitleBar x:Name="Bar" Title="GoAwayEdge Installer" Grid.Row="0" ShowMaximize="false"/>
-        <Grid Grid.Row="0">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="140"/>
-                <ColumnDefinition Width="40"/>
-            </Grid.ColumnDefinitions>
-        </Grid>
+        <ui:TitleBar x:Name="Bar" Title="{StaticResource Title}" Grid.Row="0" ShowMaximize="false"/>
     </Grid>
 </ui:UiWindow>
\ No newline at end of file
diff --git a/GoAwayEdge/Installer.xaml.cs b/GoAwayEdge/Installer.xaml.cs
index 8570b87..d167922 100644
--- a/GoAwayEdge/Installer.xaml.cs
+++ b/GoAwayEdge/Installer.xaml.cs
@@ -1,30 +1,37 @@
-using System.Windows;
+using System.Diagnostics;
+using System.Reflection;
+using System.Windows;
+using GoAwayEdge.Pages;
 
 namespace GoAwayEdge
 {
     /// <summary>
     /// Interaktionslogik für Installer.xaml
     /// </summary>
-    public partial class Installer : Wpf.Ui.Controls.UiWindow
+    public partial class Installer
     {
         internal static Installer? ContentWindow;
-        private static Pages.License _licensePage;
-        private static Pages.Settings _settingPage;
+        private static License? _licensePage;
+        private static Settings? _settingPage;
         
         public Installer()
         {
             InitializeComponent();
 
-            Loaded += (sender, args) =>
+            // Set current language model
+            var language = Thread.CurrentThread.CurrentCulture.ToString();
+            var dict = new ResourceDictionary();
+            Debug.WriteLine("Trying to load language: " + language);
+            dict.Source = language switch
             {
-                Wpf.Ui.Appearance.Watcher.Watch(
-                    this,
-                    Wpf.Ui.Appearance.BackgroundType.Mica,
-                    true
-                );
+                "en-US" => new Uri(@"/GoAwayEdge;component/Localization/ResourceDictionary.xaml", UriKind.Relative),
+                "de-DE" => new Uri(@"/GoAwayEdge;component/Localization/ResourceDictionary.de-DE.xaml", UriKind.Relative),
+                _ => new Uri(@"/GoAwayEdge;component/Localization/ResourceDictionary.xaml", UriKind.Relative)
             };
+            Application.Current.Resources.MergedDictionaries.Add(dict);
+            VersionLbl.Content = $"Version {Assembly.GetExecutingAssembly().GetName().Version!}";
 
-            _licensePage = new Pages.License();
+            _licensePage = new License();
             FrameWindow.Content = _licensePage;
             ContentWindow = this;
         }
@@ -33,19 +40,17 @@ internal void ButtonBase_OnClick(object sender, RoutedEventArgs e)
         {
             switch (FrameWindow.Content)
             {
-                case Pages.Settings:
+                case Settings:
                     NextBtn.IsEnabled = false;
                     BackBtn.IsEnabled = false;
-                    FrameWindow.Content = new Pages.Installation();
+                    FrameWindow.Content = new Installation();
                     break;
-                case Pages.License:
+                case License:
                     NextBtn.IsEnabled = true;
                     BackBtn.IsEnabled = true;
-                    _settingPage = new Pages.Settings();
+                    _settingPage = new Settings();
                     FrameWindow.Content = _settingPage;
                     break;
-                default:
-                    break;
             }
         }
 
@@ -53,13 +58,11 @@ private void Back_Click(object sender, RoutedEventArgs e)
         {
             switch (FrameWindow.Content)
             {
-                case Pages.Settings:
+                case Settings:
                     NextBtn.IsEnabled = true;
                     BackBtn.IsEnabled = false;
                     FrameWindow.Content = _licensePage;
                     break;
-                default:
-                    break;
             }
         }
     }
diff --git a/GoAwayEdge/Localization/ResourceDictionary.de-DE.xaml b/GoAwayEdge/Localization/ResourceDictionary.de-DE.xaml
new file mode 100644
index 0000000..8b16698
--- /dev/null
+++ b/GoAwayEdge/Localization/ResourceDictionary.de-DE.xaml
@@ -0,0 +1,31 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+    <system:String x:Key="Title">GoAwayEdge-Installationsprogramm</system:String>
+    <system:String x:Key="Next">Weiter</system:String>
+    <system:String x:Key="Back">Zurück</system:String>
+
+    <!-- License -->
+    <system:String x:Key="LicenseNote">Bitte lesen Sie die folgende Lizenz. Sie müssen die Lizenzbedingungen akzeptieren, bevor Sie mit der Installation fortfahren können.</system:String>
+    <system:String x:Key="LicenseAccept">Ich akzeptiere diese Lizenz.</system:String>
+    <system:String x:Key="LicenseDecline">Ich lehne diese Lizenz ab.</system:String>
+
+    <!-- Settings -->
+    <system:String x:Key="SettingsTitle">Einstellungen</system:String>
+    <system:String x:Key="SettingsEdgeChannelTitle">Edge Channel</system:String>
+    <system:String x:Key="SettingsEdgeChannelDescription">Wählen Sie den installierten Microsoft Edge Channel aus.</system:String>
+    <system:String x:Key="SettingsSearchEngineTitle">Suchmaschine</system:String>
+    <system:String x:Key="SettingsSearchEngineDescription">Wählen Sie Ihre bevorzugte Suchmaschine.</system:String>
+    <system:String x:Key="SettingsUninstallTitle">Deinstallieren</system:String>
+    <system:String x:Key="SettingsUninstallDescription">Deinstalliere GoAwayEdge und wiederherstelle die Edge-Funktionalität.</system:String>
+
+    <!-- Setup in progress -->
+    <system:String x:Key="SetupProgressTitle">Installation läuft ...</system:String>
+    <system:String x:Key="SetupProgressDescription">Bitte warten Sie, bis die Installation abgeschlossen ist.</system:String>
+
+    <!-- Setup finished -->
+    <system:String x:Key="SetupFinishedTitle">Installation abgeschlossen!</system:String>
+    <system:String x:Key="SetupFinishedDescription">Öffnen Sie das Installationsprogramm, wenn Sie GoAwayEdge erneut anpassen möchten.</system:String>
+    <system:String x:Key="DonateButton">Über PayPal spenden</system:String>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/GoAwayEdge/Localization/ResourceDictionary.xaml b/GoAwayEdge/Localization/ResourceDictionary.xaml
new file mode 100644
index 0000000..bd00513
--- /dev/null
+++ b/GoAwayEdge/Localization/ResourceDictionary.xaml
@@ -0,0 +1,31 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+    <system:String x:Key="Title">GoAwayEdge Installer</system:String>
+    <system:String x:Key="Next">Next</system:String>
+    <system:String x:Key="Back">Back</system:String>
+
+    <!-- License -->
+    <system:String x:Key="LicenseNote">Please read the following License. You must accept the terms of the license before continuing with the installation.</system:String>
+    <system:String x:Key="LicenseAccept">I accept this license.</system:String>
+    <system:String x:Key="LicenseDecline">I decline this license.</system:String>
+
+    <!-- Settings -->
+    <system:String x:Key="SettingsTitle">Settings</system:String>
+    <system:String x:Key="SettingsEdgeChannelTitle">Edge Channel</system:String>
+    <system:String x:Key="SettingsEdgeChannelDescription">Select the installed Microsoft Edge Channel.</system:String>
+    <system:String x:Key="SettingsSearchEngineTitle">Search Engine</system:String>
+    <system:String x:Key="SettingsSearchEngineDescription">Select your favorite Search Engine.</system:String>
+    <system:String x:Key="SettingsUninstallTitle">Uninstall</system:String>
+    <system:String x:Key="SettingsUninstallDescription">Uninstall GoAwayEdge and restore Edge functionality.</system:String>
+
+    <!-- Setup in progress -->
+    <system:String x:Key="SetupProgressTitle">Installation in progress ...</system:String>
+    <system:String x:Key="SetupProgressDescription">Please wait until the installation completes.</system:String>
+
+    <!-- Setup finished -->
+    <system:String x:Key="SetupFinishedTitle">Installation completed!</system:String>
+    <system:String x:Key="SetupFinishedDescription">Simply open this Installer, if you want to customize GoAwayEdge again.</system:String>
+    <system:String x:Key="DonateButton">Donate via PayPal</system:String>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/GoAwayEdge/Pages/Installation.xaml b/GoAwayEdge/Pages/Installation.xaml
index 3a6e84f..9440245 100644
--- a/GoAwayEdge/Pages/Installation.xaml
+++ b/GoAwayEdge/Pages/Installation.xaml
@@ -9,11 +9,11 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <StackPanel>
         <ui:SymbolIcon Symbol="Apps24" FontSize="80" />
-        <Label Content="Installation in progress ..." 
+        <Label Content="{StaticResource SetupProgressTitle}" 
                HorizontalAlignment="Center" 
                FontSize="30" 
                Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
-        <Label Content="Please wait until the installation completes." 
+        <Label Content="{StaticResource SetupProgressDescription}" 
                Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                Margin="0,15,0,0"
                FontSize="14"
diff --git a/GoAwayEdge/Pages/Installation.xaml.cs b/GoAwayEdge/Pages/Installation.xaml.cs
index f71d1ed..003c37b 100644
--- a/GoAwayEdge/Pages/Installation.xaml.cs
+++ b/GoAwayEdge/Pages/Installation.xaml.cs
@@ -199,7 +199,7 @@ private static void ApplyBackgroundWorker_ProgressChanged(object? sender, Progre
         public static bool CopyItself(string pathTo, bool overwrite = false)
         {
             var fileName = string.Concat(Process.GetCurrentProcess().ProcessName, ".exe");
-            var filePath = Path.Combine(Environment.CurrentDirectory, fileName);
+            var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, fileName);
             try
             {
                 if (overwrite) System.IO.File.Copy(filePath, pathTo, true);
diff --git a/GoAwayEdge/Pages/InstallationSuccess.xaml b/GoAwayEdge/Pages/InstallationSuccess.xaml
index 6399762..a4a7939 100644
--- a/GoAwayEdge/Pages/InstallationSuccess.xaml
+++ b/GoAwayEdge/Pages/InstallationSuccess.xaml
@@ -9,15 +9,15 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <StackPanel>
         <ui:SymbolIcon Symbol="CheckmarkCircle24" FontSize="80" />
-        <Label Content="Installation completed!" 
+        <Label Content="{StaticResource SetupFinishedTitle}"
                HorizontalAlignment="Center" 
                FontSize="30" 
                Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
-        <Label Content="Simply open this Installer, if you want to customize GoAwayEdge again." 
+        <Label Content="{StaticResource SetupFinishedDescription}" 
                Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                Margin="0,15,0,0"
                FontSize="14"
                HorizontalAlignment="Center"/>
-        <ui:Hyperlink HorizontalAlignment="Center" NavigateUri="https://paypal.me/valnoxy" Content="Donate via PayPal"/>
+        <ui:Hyperlink HorizontalAlignment="Center" NavigateUri="https://paypal.me/valnoxy" Content="{StaticResource DonateButton}"/>
     </StackPanel>
 </UserControl>
diff --git a/GoAwayEdge/Pages/License.xaml b/GoAwayEdge/Pages/License.xaml
index 42a693e..bf10e5f 100644
--- a/GoAwayEdge/Pages/License.xaml
+++ b/GoAwayEdge/Pages/License.xaml
@@ -9,18 +9,16 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
         <StackPanel>
-            <TextBlock Foreground="{DynamicResource TextFillColorPrimaryBrush}">
-                Please read the following License. You must accept the terms of the license before continuing with the installation.
-            </TextBlock>
+            <TextBlock Foreground="{DynamicResource TextFillColorPrimaryBrush}" Text="{StaticResource LicenseNote}"/>
 
-            <ui:Card Margin="0,10,0,0">
-                <ScrollViewer Height="240">
+            <ui:Card Margin="0,10,0,10">
+                <ScrollViewer Height="240" Margin="0,-5,-10,0">
                     <TextBlock x:Name="LicenseBlock" />
                 </ScrollViewer>
             </ui:Card>
 
-            <RadioButton Content="I accept this license." Margin="0,5,0,5" Click="AcceptLicenseRb_Click"/>
-            <RadioButton Content="I decline this license." IsChecked="true" Click="DeclineLicenseRb_Click"/>
+            <RadioButton Content="{StaticResource LicenseAccept}" Click="AcceptLicenseRb_Click"/>
+            <RadioButton Content="{StaticResource LicenseDecline}" IsChecked="true" Click="DeclineLicenseRb_Click"/>
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/GoAwayEdge/Pages/License.xaml.cs b/GoAwayEdge/Pages/License.xaml.cs
index 5bf70ef..10d984b 100644
--- a/GoAwayEdge/Pages/License.xaml.cs
+++ b/GoAwayEdge/Pages/License.xaml.cs
@@ -1,18 +1,17 @@
 using System.Windows;
-using System.Windows.Controls;
 
 namespace GoAwayEdge.Pages
 {
     /// <summary>
     /// Interaktionslogik für License.xaml
     /// </summary>
-    public partial class License : UserControl
+    public partial class License
     {
         public License()
         {
             InitializeComponent();
 
-            string license = @"MIT License
+            const string license = @"MIT License
 
 Copyright (c) 2023 valnoxy
 
@@ -40,11 +39,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
         private void AcceptLicenseRb_Click(object sender, RoutedEventArgs e)
         {
-            Installer.ContentWindow.NextBtn.IsEnabled = true;
+            Installer.ContentWindow!.NextBtn.IsEnabled = true;
         }
         private void DeclineLicenseRb_Click(object sender, RoutedEventArgs e)
         {
-            Installer.ContentWindow.NextBtn.IsEnabled = false;
+            Installer.ContentWindow!.NextBtn.IsEnabled = false;
         }
     }
 }
diff --git a/GoAwayEdge/Pages/Settings.xaml b/GoAwayEdge/Pages/Settings.xaml
index fe760c8..3347d6e 100644
--- a/GoAwayEdge/Pages/Settings.xaml
+++ b/GoAwayEdge/Pages/Settings.xaml
@@ -8,7 +8,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <StackPanel>
-        <Label FontSize="20" Content="Settings" Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
+        <Label FontSize="20" Content="{StaticResource SettingsTitle}" Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
         <StackPanel Margin="0,5,0,0">
             <ui:CardControl Icon="Channel24">
                 <ui:CardControl.Header>
@@ -21,11 +21,11 @@
                             <TextBlock
                                 FontSize="13"
                                 FontWeight="Medium"
-                                Text="Edge Channel" />
+                                Text="{StaticResource SettingsEdgeChannelTitle}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{DynamicResource TextFillColorTertiaryBrush}"
-                                Text="Select the installed Microsoft Edge Channel." />
+                                Text="{StaticResource SettingsEdgeChannelDescription}" />
                         </StackPanel>
                         <ComboBox Grid.Column="1" Margin="0,0,16,0" x:Name="EdgeChannelBox" Width="140" SelectionChanged="EdgeChannelBox_OnSelectionChanged"/>
                     </Grid>
@@ -45,17 +45,16 @@
                             <TextBlock
                                 FontSize="13"
                                 FontWeight="Medium"
-                                Text="Search Engine" />
+                                Text="{StaticResource SettingsSearchEngineTitle}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{DynamicResource TextFillColorTertiaryBrush}"
-                                Text="Select your favorite Search Engine." />
+                                Text="{StaticResource SettingsSearchEngineDescription}" />
                         </StackPanel>
                         <ComboBox Grid.Column="1" Margin="0,0,16,0" x:Name="SearchEngineBox" Width="140" SelectionChanged="SearchEngineBox_OnSelectionChanged"/>
                     </Grid>
                 </ui:CardControl.Header>
             </ui:CardControl>
-            <!--<ui:InfoBar Margin="0,10,0,0" Title="Note" Message="Currently only search terms will be redirected to your selected search engine." Severity="Informational" IsClosable="false" IsOpen="true"/>-->
         </StackPanel>
 
         <StackPanel Margin="0,10,0,0">
@@ -70,11 +69,11 @@
                             <TextBlock
                                 FontSize="13"
                                 FontWeight="Medium"
-                                Text="Uninstall" />
+                                Text="{StaticResource SettingsUninstallTitle}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{DynamicResource TextFillColorTertiaryBrush}"
-                                Text="Uninstall GoAwayEdge and restore Edge functionality." 
+                                Text="{StaticResource SettingsUninstallDescription}" 
                                 x:Name="EdgeUninstallNote"/>
                         </StackPanel>
                         <ui:ToggleSwitch Grid.Column="1" Margin="0,0,16,0" x:Name="UninstallSwitch" Click="UninstallSwitch_OnClick"/>
diff --git a/GoAwayEdge/Pages/Settings.xaml.cs b/GoAwayEdge/Pages/Settings.xaml.cs
index 1f8ce94..a2dd9d7 100644
--- a/GoAwayEdge/Pages/Settings.xaml.cs
+++ b/GoAwayEdge/Pages/Settings.xaml.cs
@@ -7,7 +7,7 @@ namespace GoAwayEdge.Pages
     /// <summary>
     /// Interaktionslogik für Settings.xaml
     /// </summary>
-    public partial class Settings : UserControl
+    public partial class Settings
     {
         public Settings()
         {
@@ -32,11 +32,11 @@ public Settings()
 
             Common.Configuration.Uninstall = false;
 
-            var InstDir = Path.Combine(
+            var instDir = Path.Combine(
                 Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles),
                 "valnoxy",
                 "GoAwayEdge");
-            if (Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName) == InstDir)
+            if (Path.GetDirectoryName(Environment.ProcessPath) == instDir)
             {
                 UninstallSwitch.IsEnabled = false;
                 EdgeUninstallNote.Text = "Please use the Installer in order to uninstall GoAwayEdge.";

From 7d04992e1f6c4f5e855cc90ad38a918a4d2294d2 Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Tue, 11 Jul 2023 23:25:18 +0200
Subject: [PATCH 2/3] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2264999..1946b92 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 <p align="center">
     Redirect all Edge calls to your favorite browser! 
     <br />
-    <strong>Version: </strong>1.0.2
+    <strong>Version: </strong>1.1.0
     <br />
     <br />
     <a href="https://github.com/valnoxy/GoAwayEdge/releases"><strong>Download now »</strong></a>
@@ -61,4 +61,4 @@ This project uses the following libraries:
 By Jonas Günner &lt;jonas@exploitox.de&gt;</h6>
 <p align="center">
 	<a href="https://github.com/valnoxy/GoAwayEdge/blob/main/LICENSE"><img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&logoColor=d9e0ee&colorA=363a4f&colorB=b7bdf8"/></a>
-</p
\ No newline at end of file
+</p

From cf2e13acf5a183750f9f31ada84e3ab4e66bcad1 Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Wed, 12 Jul 2023 01:52:17 +0200
Subject: [PATCH 3/3] Added two new search engine options

- Added Qwant search engine
- Added custom search engine
---
 GoAwayEdge/App.xaml.cs                        | 52 +++++++++--
 GoAwayEdge/Common/Configuration.cs            |  5 +-
 GoAwayEdge/GoAwayEdge.csproj                  |  2 +-
 GoAwayEdge/Installer.xaml                     |  4 +-
 GoAwayEdge/Installer.xaml.cs                  |  4 +-
 .../ResourceDictionary.de-DE.xaml             |  4 +
 .../Localization/ResourceDictionary.xaml      |  4 +
 GoAwayEdge/Pages/Installation.xaml.cs         | 33 +++----
 GoAwayEdge/Pages/Settings.xaml                | 30 ++++++-
 GoAwayEdge/Pages/Settings.xaml.cs             | 90 +++++++++++++------
 10 files changed, 169 insertions(+), 59 deletions(-)

diff --git a/GoAwayEdge/App.xaml.cs b/GoAwayEdge/App.xaml.cs
index 240d584..28ac072 100644
--- a/GoAwayEdge/App.xaml.cs
+++ b/GoAwayEdge/App.xaml.cs
@@ -16,6 +16,7 @@
 using System.Text;
 using System.Web;
 using System.Windows;
+using Microsoft.Win32;
 
 namespace GoAwayEdge
 {
@@ -153,15 +154,22 @@ public void Application_Startup(object sender, StartupEventArgs e)
                         "Yandex" => SearchEngine.Yandex,
                         "Ecosia" => SearchEngine.Ecosia,
                         "Ask" => SearchEngine.Ask,
+                        "Qwant" => SearchEngine.Qwant,
+                        "Custom" => SearchEngine.Custom,
                         _ => SearchEngine.Google // Fallback search engine
                     };
                 }
 
-                if (e.Args.Length != 2 || !arg.Contains("msedge.exe")) continue; // Opens Edge normally
-                
+                if (!args.Contains("--profile-directory") && !ContainsParsedData(args) && args.Length != 2) continue; // Start Edge (default browser on this system)
+
+#if DEBUG
+                MessageBox.Show("Microsoft Edge will now start normally via IFEO application.", "GoAwayEdge", MessageBoxButton.OK, MessageBoxImage.Information);
+#endif
+
+                var parsedArgs = args.Skip(2);
                 var p = new Process();
-                p.StartInfo.FileName = "msedge_ifeo.exe";
-                p.StartInfo.Arguments = "";
+                p.StartInfo.FileName = "C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge_ifeo.exe";
+                p.StartInfo.Arguments = string.Join(" ", parsedArgs);
                 p.StartInfo.UseShellExecute = true;
                 p.StartInfo.RedirectStandardOutput = false;
                 p.Start();
@@ -173,7 +181,9 @@ public void Application_Startup(object sender, StartupEventArgs e)
             {
                 var parsed = ParseUrl(_url);
                 Output.WriteLine("Opening URL in default browser:\n\n" + parsed + "\n", ConsoleColor.Gray);
-
+#if DEBUG
+                MessageBox.Show("Opening URL in default browser:\n\n" + parsed + "\n", "GoAwayEdge", MessageBoxButton.OK, MessageBoxImage.Information);
+#endif
                 var p = new Process();
                 p.StartInfo.FileName = parsed;
                 p.StartInfo.Arguments = "";
@@ -185,6 +195,19 @@ public void Application_Startup(object sender, StartupEventArgs e)
             Environment.Exit(0);
         }
 
+        private static bool ContainsParsedData(IEnumerable<string> args)
+        {
+            var contains = false;
+            var engineUrl = DefineEngine(_engine);
+
+            foreach (var arg in args)
+            {
+                if (arg.Contains(engineUrl))
+                    contains = true;
+            }
+            return contains;
+        }
+
         private static string ParseUrl(string encodedUrl)
         {
             // Remove URI handler with url argument prefix
@@ -207,21 +230,38 @@ private static string ParseUrl(string encodedUrl)
             // Replace Search Engine
             encodedUrl = encodedUrl.Replace("https://www.bing.com/search?q=", DefineEngine(_engine));
 
+#if DEBUG
+            MessageBox.Show("New Uri: " + encodedUrl, "GoAwayEdge", MessageBoxButton.OK, MessageBoxImage.Information);
+#endif
             var uri = new Uri(encodedUrl);
             return uri.ToString();
         }
 
         private static string DefineEngine(SearchEngine engine)
         {
+            string customQueryUrl = null!;
+            try
+            {
+                var key = Registry.LocalMachine.OpenSubKey(
+                    @"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\msedge.exe\0", false);
+                customQueryUrl = (string)key?.GetValue("CustomQueryUrl")!;
+            }
+            catch
+            {
+                // ignored
+            }
+
             return engine switch
             {
                 SearchEngine.Google => "https://www.google.com/search?q=",
                 SearchEngine.Bing => "https://www.bing.com/search?q=",
-                SearchEngine.DuckDuckGo => "https://duckduckgo.com/?q=",
+                SearchEngine.DuckDuckGo => "https://duckduckgo.com/?q=}",
                 SearchEngine.Yahoo => "https://search.yahoo.com/search?p=",
                 SearchEngine.Yandex => "https://yandex.com/search/?text=",
                 SearchEngine.Ecosia => "https://www.ecosia.org/search?q=",
                 SearchEngine.Ask => "https://www.ask.com/web?q=",
+                SearchEngine.Qwant => "https://qwant.com/?q=",
+                SearchEngine.Custom => customQueryUrl,
                 _ => "https://www.google.com/search?q="
             };
         }
diff --git a/GoAwayEdge/Common/Configuration.cs b/GoAwayEdge/Common/Configuration.cs
index 330a45b..6d63953 100644
--- a/GoAwayEdge/Common/Configuration.cs
+++ b/GoAwayEdge/Common/Configuration.cs
@@ -8,7 +8,9 @@ internal enum SearchEngine
         Yahoo,
         Yandex,
         Ecosia,
-        Ask
+        Ask,
+        Qwant,
+        Custom
     }
 
     internal enum EdgeChannel
@@ -24,6 +26,7 @@ internal class Configuration
         public static EdgeChannel Channel { get; set; }
         public static SearchEngine Search { get; set; }
         public static bool Uninstall { get; set; }
+        public static string CustomQueryUrl { get; set; }
     }
 
     internal enum ModifyAction
diff --git a/GoAwayEdge/GoAwayEdge.csproj b/GoAwayEdge/GoAwayEdge.csproj
index e4469fe..1869eee 100644
--- a/GoAwayEdge/GoAwayEdge.csproj
+++ b/GoAwayEdge/GoAwayEdge.csproj
@@ -13,7 +13,7 @@
 		<AssemblyName>GoAwayEdge</AssemblyName>
 		<Company>Exploitox</Company>
 		<Authors>valnoxy</Authors>
-		<Version>1.1.0.31</Version>
+		<Version>1.1.0.38</Version>
 		<Copyright>Copyright (c) 2018 - 2023 Exploitox. All rights reserved.</Copyright>
 		<PackageProjectUrl>https://github.com/valnoxy/GoAwayEdge</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/valnoxy/GoAwayEdge</RepositoryUrl>
diff --git a/GoAwayEdge/Installer.xaml b/GoAwayEdge/Installer.xaml
index 0d07ecd..d07b664 100644
--- a/GoAwayEdge/Installer.xaml
+++ b/GoAwayEdge/Installer.xaml
@@ -31,8 +31,8 @@
                 <Label Content="Version 1.2.0" VerticalContentAlignment="Bottom" x:Name="VersionLbl"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                <Button Content="{StaticResource Back}" Margin="0,0,5,0" Click="Back_Click" x:Name="BackBtn" IsEnabled="false"/>
-                <Button Content="{StaticResource Next}" Margin="0,0,5,0" Click="ButtonBase_OnClick" x:Name="NextBtn" IsEnabled="false"/>
+                <Button Content="{StaticResource Back}" Margin="0,0,5,0" Click="BackBtn_OnClick" x:Name="BackBtn" IsEnabled="false"/>
+                <Button Content="{StaticResource Next}" Margin="0,0,5,0" Click="NextBtn_OnClick" x:Name="NextBtn" IsEnabled="false"/>
             </StackPanel>
         </DockPanel>
 
diff --git a/GoAwayEdge/Installer.xaml.cs b/GoAwayEdge/Installer.xaml.cs
index d167922..78221e1 100644
--- a/GoAwayEdge/Installer.xaml.cs
+++ b/GoAwayEdge/Installer.xaml.cs
@@ -36,7 +36,7 @@ public Installer()
             ContentWindow = this;
         }
 
-        internal void ButtonBase_OnClick(object sender, RoutedEventArgs e)
+        internal void NextBtn_OnClick(object sender, RoutedEventArgs e)
         {
             switch (FrameWindow.Content)
             {
@@ -54,7 +54,7 @@ internal void ButtonBase_OnClick(object sender, RoutedEventArgs e)
             }
         }
 
-        private void Back_Click(object sender, RoutedEventArgs e)
+        private void BackBtn_OnClick(object sender, RoutedEventArgs e)
         {
             switch (FrameWindow.Content)
             {
diff --git a/GoAwayEdge/Localization/ResourceDictionary.de-DE.xaml b/GoAwayEdge/Localization/ResourceDictionary.de-DE.xaml
index 8b16698..724234a 100644
--- a/GoAwayEdge/Localization/ResourceDictionary.de-DE.xaml
+++ b/GoAwayEdge/Localization/ResourceDictionary.de-DE.xaml
@@ -16,8 +16,12 @@
     <system:String x:Key="SettingsEdgeChannelDescription">Wählen Sie den installierten Microsoft Edge Channel aus.</system:String>
     <system:String x:Key="SettingsSearchEngineTitle">Suchmaschine</system:String>
     <system:String x:Key="SettingsSearchEngineDescription">Wählen Sie Ihre bevorzugte Suchmaschine.</system:String>
+    <system:String x:Key="SettingsSearchEngineCustomItem">Benutzerdefiniert</system:String>
+    <system:String x:Key="SettingsCustomSearchEngineTitle">Benutzerdefinierte Suchmaschine</system:String>
+    <system:String x:Key="SettingsCustomSearchEngineDescription">Bitte geben Sie die Anfrage-URL der Suchmaschine ein.</system:String>
     <system:String x:Key="SettingsUninstallTitle">Deinstallieren</system:String>
     <system:String x:Key="SettingsUninstallDescription">Deinstalliere GoAwayEdge und wiederherstelle die Edge-Funktionalität.</system:String>
+    <system:String x:Key="SettingsUninstallUseInstaller">Bitte verwenden Sie den Installer, um GoAwayEdge zu deinstallieren.</system:String>
 
     <!-- Setup in progress -->
     <system:String x:Key="SetupProgressTitle">Installation läuft ...</system:String>
diff --git a/GoAwayEdge/Localization/ResourceDictionary.xaml b/GoAwayEdge/Localization/ResourceDictionary.xaml
index bd00513..c03a840 100644
--- a/GoAwayEdge/Localization/ResourceDictionary.xaml
+++ b/GoAwayEdge/Localization/ResourceDictionary.xaml
@@ -16,8 +16,12 @@
     <system:String x:Key="SettingsEdgeChannelDescription">Select the installed Microsoft Edge Channel.</system:String>
     <system:String x:Key="SettingsSearchEngineTitle">Search Engine</system:String>
     <system:String x:Key="SettingsSearchEngineDescription">Select your favorite Search Engine.</system:String>
+    <system:String x:Key="SettingsSearchEngineCustomItem">Custom</system:String>
+    <system:String x:Key="SettingsCustomSearchEngineTitle">Custom Search Engine</system:String>
+    <system:String x:Key="SettingsCustomSearchEngineDescription">Please enter the query URL from the search engine.</system:String>
     <system:String x:Key="SettingsUninstallTitle">Uninstall</system:String>
     <system:String x:Key="SettingsUninstallDescription">Uninstall GoAwayEdge and restore Edge functionality.</system:String>
+    <system:String x:Key="SettingsUninstallUseInstaller">Please use the Installer in order to uninstall GoAwayEdge.</system:String>
 
     <!-- Setup in progress -->
     <system:String x:Key="SetupProgressTitle">Installation in progress ...</system:String>
diff --git a/GoAwayEdge/Pages/Installation.xaml.cs b/GoAwayEdge/Pages/Installation.xaml.cs
index 003c37b..c7adfaa 100644
--- a/GoAwayEdge/Pages/Installation.xaml.cs
+++ b/GoAwayEdge/Pages/Installation.xaml.cs
@@ -56,7 +56,6 @@ private static void Install(object? sender, DoWorkEventArgs e)
 
             // Apply IFEO registry key
             var msEdge = "";
-            var engine = "";
             msEdge = Common.Configuration.Channel switch
             {
                 EdgeChannel.Stable => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86),
@@ -70,21 +69,9 @@ private static void Install(object? sender, DoWorkEventArgs e)
                 _ => msEdge
             };
 
-            engine = Common.Configuration.Search switch
-            {
-                SearchEngine.Ask => "Ask",
-                SearchEngine.Bing => "Bing",
-                SearchEngine.DuckDuckGo => "DuckDuckGo",
-                SearchEngine.Ecosia => "Ecisua",
-                SearchEngine.Google => "Google",
-                SearchEngine.Yahoo => "Yahoo",
-                SearchEngine.Yandex => "Yandex",
-                _ => engine
-            };
-
             try
             {
-                var key = Microsoft.Win32.Registry.LocalMachine.OpenSubKey(
+                var key = Registry.LocalMachine.OpenSubKey(
                     @"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options", true);
                 key?.CreateSubKey("msedge.exe");
                 key = key?.OpenSubKey("msedge.exe", true);
@@ -92,9 +79,25 @@ private static void Install(object? sender, DoWorkEventArgs e)
 
                 key?.CreateSubKey("0");
                 key = key?.OpenSubKey("0", true);
-                key?.SetValue("Debugger", Path.Combine(instDir, $"GoAwayEdge.exe -se{engine}"));
+                key?.SetValue("Debugger", Path.Combine(instDir, $"GoAwayEdge.exe -se{Configuration.Search}"));
                 key?.SetValue("FilterFullPath", msEdge);
 
+                if (Configuration.Search == SearchEngine.Custom)
+                {
+                    key?.SetValue("CustomQueryUrl", Configuration.CustomQueryUrl);
+                }
+                else
+                {
+                    try
+                    {
+                        key?.DeleteValue("CustomQueryUrl");
+                    }
+                    catch
+                    {
+                        // ignore: never used custom search engine
+                    }
+                }
+
                 key?.Close();
             }
             catch (Exception ex)
diff --git a/GoAwayEdge/Pages/Settings.xaml b/GoAwayEdge/Pages/Settings.xaml
index 3347d6e..2c8bcf4 100644
--- a/GoAwayEdge/Pages/Settings.xaml
+++ b/GoAwayEdge/Pages/Settings.xaml
@@ -27,7 +27,7 @@
                                 Foreground="{DynamicResource TextFillColorTertiaryBrush}"
                                 Text="{StaticResource SettingsEdgeChannelDescription}" />
                         </StackPanel>
-                        <ComboBox Grid.Column="1" Margin="0,0,16,0" x:Name="EdgeChannelBox" Width="140" SelectionChanged="EdgeChannelBox_OnSelectionChanged"/>
+                        <ComboBox Grid.Column="1" x:Name="EdgeChannelBox" Width="180" SelectionChanged="EdgeChannelBox_OnSelectionChanged"/>
                     </Grid>
                 </ui:CardControl.Header>
             </ui:CardControl>
@@ -51,7 +51,31 @@
                                 Foreground="{DynamicResource TextFillColorTertiaryBrush}"
                                 Text="{StaticResource SettingsSearchEngineDescription}" />
                         </StackPanel>
-                        <ComboBox Grid.Column="1" Margin="0,0,16,0" x:Name="SearchEngineBox" Width="140" SelectionChanged="SearchEngineBox_OnSelectionChanged"/>
+                        <ComboBox Grid.Column="1" x:Name="SearchEngineBox" Width="180" SelectionChanged="SearchEngineBox_OnSelectionChanged"/>
+                    </Grid>
+                </ui:CardControl.Header>
+            </ui:CardControl>
+        </StackPanel>
+
+        <StackPanel Margin="0,10,0,0" x:Name="CustomSearchPanel" Visibility="Collapsed">
+            <ui:CardControl Icon="SearchSettings20">
+                <ui:CardControl.Header>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <StackPanel Grid.Column="0" VerticalAlignment="Center">
+                            <TextBlock
+                                FontSize="13"
+                                FontWeight="Medium"
+                                Text="{StaticResource SettingsCustomSearchEngineTitle}" />
+                            <TextBlock
+                                FontSize="12"
+                                Foreground="{DynamicResource TextFillColorTertiaryBrush}"
+                                Text="{StaticResource SettingsCustomSearchEngineDescription}"/>
+                        </StackPanel>
+                        <ui:TextBox Grid.Column="1" Width="300" x:Name="QueryUrlTextBox" TextChanged="QueryUrlTextBox_OnTextChanged" PlaceholderText="https://www.google.com/search?q="/>
                     </Grid>
                 </ui:CardControl.Header>
             </ui:CardControl>
@@ -76,7 +100,7 @@
                                 Text="{StaticResource SettingsUninstallDescription}" 
                                 x:Name="EdgeUninstallNote"/>
                         </StackPanel>
-                        <ui:ToggleSwitch Grid.Column="1" Margin="0,0,16,0" x:Name="UninstallSwitch" Click="UninstallSwitch_OnClick"/>
+                        <ui:ToggleSwitch Grid.Column="1" x:Name="UninstallSwitch" Click="UninstallSwitch_OnClick"/>
                     </Grid>
                 </ui:CardControl.Header>
             </ui:CardControl>
diff --git a/GoAwayEdge/Pages/Settings.xaml.cs b/GoAwayEdge/Pages/Settings.xaml.cs
index a2dd9d7..8cc7443 100644
--- a/GoAwayEdge/Pages/Settings.xaml.cs
+++ b/GoAwayEdge/Pages/Settings.xaml.cs
@@ -1,5 +1,6 @@
 using System.Windows;
 using System.Windows.Controls;
+using GoAwayEdge.Common;
 using Path = System.IO.Path;
 
 namespace GoAwayEdge.Pages
@@ -18,7 +19,7 @@ public Settings()
             EdgeChannelBox.Items.Add("Edge Dev");
             EdgeChannelBox.Items.Add("Edge Canary");
             EdgeChannelBox.SelectedIndex = 0;
-            Common.Configuration.Channel = Common.EdgeChannel.Stable;
+            Configuration.Channel = EdgeChannel.Stable;
 
             SearchEngineBox.Items.Add("Google");
             SearchEngineBox.Items.Add("Bing");
@@ -27,39 +28,50 @@ public Settings()
             SearchEngineBox.Items.Add("Yandex");
             SearchEngineBox.Items.Add("Ecosia");
             SearchEngineBox.Items.Add("Ask");
+            SearchEngineBox.Items.Add("Qwant");
+
+            try
+            {
+                Dispatcher.Invoke(() =>
+                {
+                    var resourceValue = (string)Application.Current.MainWindow!.FindResource("SettingsSearchEngineCustomItem");
+                    SearchEngineBox.Items.Add(!string.IsNullOrEmpty(resourceValue) ? resourceValue : "Custom");
+                });
+            }
+            catch
+            {
+                SearchEngineBox.Items.Add("Custom");
+            }
+
             SearchEngineBox.SelectedIndex = 0;
-            Common.Configuration.Search = Common.SearchEngine.Google;
+            Configuration.Search = SearchEngine.Google;
 
-            Common.Configuration.Uninstall = false;
+            Configuration.Uninstall = false;
 
             var instDir = Path.Combine(
                 Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles),
                 "valnoxy",
                 "GoAwayEdge");
-            if (Path.GetDirectoryName(Environment.ProcessPath) == instDir)
+            
+            if (Path.GetDirectoryName(Environment.ProcessPath) != instDir) return;
+            UninstallSwitch.IsEnabled = false;
+            Dispatcher.Invoke(() =>
             {
-                UninstallSwitch.IsEnabled = false;
-                EdgeUninstallNote.Text = "Please use the Installer in order to uninstall GoAwayEdge.";
-            }
+                var resourceValue = (string)Application.Current.MainWindow.FindResource("SettingsUninstallUseInstaller");
+                EdgeUninstallNote.Text = !string.IsNullOrEmpty(resourceValue) ? resourceValue : "Please use the Installer in order to uninstall GoAwayEdge.";
+            });
         }
 
         private void EdgeChannelBox_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            switch (EdgeChannelBox.SelectedIndex)
+            Configuration.Channel = EdgeChannelBox.SelectedIndex switch
             {
-                case 0:
-                    Common.Configuration.Channel = Common.EdgeChannel.Stable;
-                    break;
-                case 1:
-                    Common.Configuration.Channel = Common.EdgeChannel.Beta;
-                    break;
-                case 2:
-                    Common.Configuration.Channel = Common.EdgeChannel.Dev;
-                    break;
-                case 3:
-                    Common.Configuration.Channel = Common.EdgeChannel.Canary;
-                    break;
-            }
+                0 => EdgeChannel.Stable,
+                1 => EdgeChannel.Beta,
+                2 => EdgeChannel.Dev,
+                3 => EdgeChannel.Canary,
+                _ => EdgeChannel.Stable
+            };
         }
 
         private void SearchEngineBox_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -67,32 +79,47 @@ private void SearchEngineBox_OnSelectionChanged(object sender, SelectionChangedE
             switch (SearchEngineBox.SelectedIndex)
             {
                 case 0:
-                    Common.Configuration.Search = Common.SearchEngine.Google;
+                    Configuration.Search = SearchEngine.Google;
+                    CustomSearchPanel.Visibility = Visibility.Collapsed;
                     break;
                 case 1:
-                    Common.Configuration.Search = Common.SearchEngine.Bing;
+                    Configuration.Search = SearchEngine.Bing;
+                    CustomSearchPanel.Visibility = Visibility.Collapsed;
                     break;
                 case 2:
-                    Common.Configuration.Search = Common.SearchEngine.DuckDuckGo;
+                    Configuration.Search = SearchEngine.DuckDuckGo;
+                    CustomSearchPanel.Visibility = Visibility.Collapsed;
                     break;
                 case 3:
-                    Common.Configuration.Search = Common.SearchEngine.Yahoo;
+                    Configuration.Search = SearchEngine.Yahoo;
+                    CustomSearchPanel.Visibility = Visibility.Collapsed;
                     break;
                 case 4:
-                    Common.Configuration.Search = Common.SearchEngine.Yandex;
+                    Configuration.Search = SearchEngine.Yandex;
+                    CustomSearchPanel.Visibility = Visibility.Collapsed;
                     break;
                 case 5:
-                    Common.Configuration.Search = Common.SearchEngine.Ecosia;
+                    Configuration.Search = SearchEngine.Ecosia;
+                    CustomSearchPanel.Visibility = Visibility.Collapsed;
                     break;
                 case 6:
-                    Common.Configuration.Search = Common.SearchEngine.Ask;
+                    Configuration.Search = SearchEngine.Ask;
+                    CustomSearchPanel.Visibility = Visibility.Collapsed;
+                    break;
+                case 7:
+                    Configuration.Search = SearchEngine.Qwant;
+                    CustomSearchPanel.Visibility = Visibility.Collapsed;
+                    break;
+                case 8:
+                    Configuration.Search = SearchEngine.Custom;
+                    CustomSearchPanel.Visibility = Visibility.Visible;
                     break;
             }
         }
 
         private void UninstallSwitch_OnClick(object sender, RoutedEventArgs e)
         {
-            Common.Configuration.Uninstall = UninstallSwitch.IsChecked.Value;
+            Configuration.Uninstall = UninstallSwitch.IsChecked!.Value;
             if (UninstallSwitch.IsChecked.Value)
             {
                 SearchEngineBox.IsEnabled = false;
@@ -104,5 +131,10 @@ private void UninstallSwitch_OnClick(object sender, RoutedEventArgs e)
                 EdgeChannelBox.IsEnabled = true;
             }
         }
+
+        private void QueryUrlTextBox_OnTextChanged(object sender, TextChangedEventArgs e)
+        {
+            Configuration.CustomQueryUrl = QueryUrlTextBox.Text;
+        }
     }
 }