From 5f630f3bc1046b4f567a96f1074300ee3e1e2b01 Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Sat, 18 Mar 2023 18:15:23 +0100
Subject: [PATCH 01/17] =?UTF-8?q?=F0=9F=97=91=EF=B8=8F=20Ignore=20file=20o?=
 =?UTF-8?q?utput?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 768fdec..bccfd0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -384,4 +384,5 @@ Temporary Items
 
 ### macOS Patch ###
 # iCloud generated files
-*.icloud
\ No newline at end of file
+*.icloud
+CheckIP.Windows/Setup/Output/

From b98bd9c12b13069668fadff12648e36e91269937 Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Sat, 18 Mar 2023 18:23:09 +0100
Subject: [PATCH 02/17] =?UTF-8?q?=20=C2=A9=EF=B8=8F=20Update=20copyright?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ffc41a0..e7823fc 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,8 @@
 </p>
 </br>
 
+<img src="https://raw.githubusercontent.com/valnoxy/valnoxy/main/assets/bar.gif">
+
 ## About CheckIP
 CheckIP is a GUI based application which can provide much information about an IP address.
 
@@ -50,9 +52,19 @@ GNU General Public License for more details.
 
 ---
 
+<h6>
+
 ```Google Play and the Google Play logo are trademarks of Google LLC.```
 
 ```Apple, the Apple logo, Apple Pay, Apple Pencil, Apple TV, Apple Watch, iPad, iPhone, iPod, iPod touch, iTunes, the iTunes logo, Mac, iMac, MacBook, MacBook Pro, MacBook Air, macOS, QuickTime, Siri, watchOS, and 3D Touch are trademarks of Apple Inc., registered in the U.S. and other countries.```
 
+</h6>
+
 ---
-```Copyright (c) 2018 - 2022 valnoxy. By Jonas G. <jonas@exploitox.de>```
+
+<h6 align="center">© 2018 - 2023 valnoxy. All Rights Reserved. 
+<br>
+By Jonas Günner &lt;jonas@exploitox.de&gt;</h6>
+<p align="center">
+	<a href="https://github.com/valnoxy/checkip/blob/main/LICENSE"><img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=GNU%20GENERAL%20PUBLIC%20%20LICENSE&logoColor=d9e0ee&colorA=363a4f&colorB=b7bdf8"/></a>
+</p

From b393cd88e9fc71e1ee19563740226ecf18939e06 Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Sat, 18 Mar 2023 20:26:03 +0100
Subject: [PATCH 03/17] =?UTF-8?q?=F0=9F=8C=8E=20Localization=20functionali?=
 =?UTF-8?q?ty?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See issue #5
---
 CheckIP.Windows/CheckIP/CheckIP.csproj        |  8 +-
 .../CheckIP/Common/LocalizationManager.cs     | 32 ++++++++
 .../Localization/ResourceDictionary.xaml      | 39 ++++++++++
 CheckIP.Windows/CheckIP/Pages/About.xaml      | 23 +++---
 CheckIP.Windows/CheckIP/Pages/App.xaml        |  3 +-
 CheckIP.Windows/CheckIP/Pages/FetchIP.xaml    | 64 ++++++++-------
 CheckIP.Windows/CheckIP/Pages/FetchIP.xaml.cs | 72 +++++++++--------
 CheckIP.Windows/CheckIP/Pages/Main.xaml       |  9 +--
 CheckIP.Windows/CheckIP/Pages/Main.xaml.cs    | 26 +++++--
 CheckIP.Windows/CheckIP/Pages/MyIP.xaml       | 48 ++++++------
 CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs    | 77 ++++++++++---------
 README.md                                     | 32 +++++++-
 12 files changed, 272 insertions(+), 161 deletions(-)
 create mode 100644 CheckIP.Windows/CheckIP/Common/LocalizationManager.cs
 create mode 100644 CheckIP.Windows/CheckIP/Localization/ResourceDictionary.xaml

diff --git a/CheckIP.Windows/CheckIP/CheckIP.csproj b/CheckIP.Windows/CheckIP/CheckIP.csproj
index eb0cc57..04ec1ca 100644
--- a/CheckIP.Windows/CheckIP/CheckIP.csproj
+++ b/CheckIP.Windows/CheckIP/CheckIP.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
@@ -10,7 +10,7 @@
 		<Description>Get more information about an IP address.</Description>
 		<Copyright>Copyright © 2018 - 2023 Exploitox. All rights reserved.</Copyright>
 		<RepositoryUrl>https://github.com/valnoxy/checkip</RepositoryUrl>
-		<Version>2.2.0</Version>
+		<Version>2.2.1</Version>
 		<Platforms>AnyCPU;ARM32;ARM64;x64;x86</Platforms>
 	</PropertyGroup>
 
@@ -286,6 +286,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<Page Remove="Localization\ResourceDictionary.xaml" />
 		<Page Remove="Pages\App.xaml" />
 		<Page Remove="W11App.xaml" />
 	</ItemGroup>
@@ -576,6 +577,9 @@
 		<Resource Include="Assets\zm.ico" />
 		<Resource Include="Assets\zw.ico" />
 		<Resource Include="icon.png" />
+		<Resource Include="Localization\ResourceDictionary.xaml">
+		  <Generator>MSBuild:Compile</Generator>
+		</Resource>
 	</ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/CheckIP.Windows/CheckIP/Common/LocalizationManager.cs b/CheckIP.Windows/CheckIP/Common/LocalizationManager.cs
new file mode 100644
index 0000000..640f6b8
--- /dev/null
+++ b/CheckIP.Windows/CheckIP/Common/LocalizationManager.cs
@@ -0,0 +1,32 @@
+using System.Windows;
+
+namespace CheckIP.Common
+{
+    public class LocalizationManager
+    {    
+        public static string LocalizeError(string errorMessage)
+        {
+            switch (errorMessage)
+            {
+                case "Reserved range":
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        errorMessage = (string)Application.Current.MainWindow.FindResource("ErrorReservedRange");
+                    });
+                    if (string.IsNullOrEmpty(errorMessage))
+                        errorMessage = "Error: Reserved range";
+                    break;
+                case "invalid query":
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        errorMessage = (string)Application.Current.MainWindow.FindResource("ErrorInvalidQuery");
+                    });
+                    if (string.IsNullOrEmpty(errorMessage))
+                        errorMessage = "Error: Invalid query";
+                    break;
+            }
+            return errorMessage;
+
+        }
+    }
+}
diff --git a/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.xaml b/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.xaml
new file mode 100644
index 0000000..9e01954
--- /dev/null
+++ b/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.xaml
@@ -0,0 +1,39 @@
+<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="IPAddress">IP Address</system:String>
+    <system:String x:Key="Fetch">Fetch</system:String>
+    <system:String x:Key="Information">Information</system:String>
+    <system:String x:Key="CityAndCountry">City / Country</system:String>
+    <system:String x:Key="Postal">Postal</system:String>
+    <system:String x:Key="Timezone">Timezone</system:String>
+    <system:String x:Key="Latitude">Latitude</system:String>
+    <system:String x:Key="Longitude">Longitude</system:String>
+    <system:String x:Key="ISPOrOrganization">ISP or Organization</system:String>
+    <system:String x:Key="ASN">ASN</system:String>
+    <system:String x:Key="IsMobile">Is Mobile</system:String>
+    <system:String x:Key="IsProxy">Is Proxy</system:String>
+    <system:String x:Key="IsHosting">Is Hosting</system:String>
+    <system:String x:Key="ExportInfo">Export Information</system:String>
+    <system:String x:Key="Unknown">Unknown</system:String>
+    <system:String x:Key="MyIP">My IP</system:String>
+
+    <!-- About -->
+    <system:String x:Key="About">About</system:String>
+    <system:String x:Key="AboutThisApp">About this App</system:String>
+    <system:String x:Key="License">This program is free software: you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation, either version 3 of the License, or
+        (at your option) any later version.</system:String>
+    <system:String x:Key="ThirdPartyLibraries">Third Party Libraries</system:String>
+    <system:String x:Key="ThirdPartyLibrariesDescription">List of all used open-source libraries and images.</system:String>
+    <system:String x:Key="SourceCodeBtn">Source Code on GitHub</system:String>
+    <system:String x:Key="HomepageBtn">Homepage</system:String>
+    <system:String x:Key="LicenseBtn">License</system:String>
+
+    <!-- Error's -->
+    <system:String x:Key="ErrorReservedRange">Error: Reserved range</system:String>
+    <system:String x:Key="ErrorInvalidIP">Error: This is not a valid IP address</system:String>
+    <system:String x:Key="ErrorNoConnection">Error: No connection to server</system:String>
+    <system:String x:Key="ErrorInvalidQuery">Error: Invalid query</system:String>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/CheckIP.Windows/CheckIP/Pages/About.xaml b/CheckIP.Windows/CheckIP/Pages/About.xaml
index 0245a8a..1e02a82 100644
--- a/CheckIP.Windows/CheckIP/Pages/About.xaml
+++ b/CheckIP.Windows/CheckIP/Pages/About.xaml
@@ -38,7 +38,7 @@
 
         <StackPanel>
             <Label x:Name="LabelTitle"
-                   Content="About this App" 
+                   Content="{DynamicResource AboutThisApp}" 
                    FontSize="15" 
                    Margin="-6,0,0,0"
                    Foreground="{DynamicResource TextFillColorPrimaryBrush}" 
@@ -60,17 +60,12 @@
                    VerticalAlignment="Top" 
                    HorizontalAlignment="Left"/>
 
-            <TextBlock x:Name="LicenseText" VerticalAlignment="Top" Foreground="{DynamicResource TextFillColorPrimaryBrush}" FontSize="15" TextWrapping="WrapWithOverflow" Height="100">
-                This program is free software: you can redistribute it and/or modify
-                it under the terms of the GNU General Public License as published by
-                the Free Software Foundation, either version 3 of the License, or
-                (at your option) any later version.
-            </TextBlock>
+            <TextBlock x:Name="LicenseText" VerticalAlignment="Top" Foreground="{DynamicResource TextFillColorPrimaryBrush}" FontSize="15" TextWrapping="WrapWithOverflow" Text="{DynamicResource License}"/>
 
         </StackPanel>
 
 
-        <Grid Grid.Row="3" Margin="0,0,0,12">
+        <Grid Margin="0,12,0,12">
             <StackPanel>
                 <ui:CardExpander
                     Margin="0,0,0,10"
@@ -85,11 +80,11 @@
                                 <TextBlock
                                     FontSize="13"
                                     FontWeight="Medium"
-                                    Text="Third Party Libraries" />
+                                    Text="{DynamicResource ThirdPartyLibraries}" />
                                 <TextBlock
                                     FontSize="12"
                                     Foreground="{DynamicResource TextFillColorTertiaryBrush}"
-                                    Text="List of all used open-source libraries." />
+                                    Text="{DynamicResource ThirdPartyLibrariesDescription}" />
                             </StackPanel>
                         </Grid>
                     </ui:CardExpander.Header>
@@ -109,19 +104,19 @@
                     </StackPanel>
                 </ui:CardExpander>
                 <ui:Hyperlink
-                    Content="Source Code on GitHub"
+                    Content="{DynamicResource SourceCodeBtn}"
                     Icon="Link48"
                     NavigateUri="https://github.com/valnoxy/checkip" 
                     FontSize="15" />
                 <ui:Hyperlink
-                    Content="Homepage"
+                    Content="{DynamicResource HomepageBtn}"
                     Icon="Link48"
                     NavigateUri="https://exploitox.de" 
                     FontSize="15" />
                 <ui:Hyperlink
-                    Content="GNU General Public License"
+                    Content="{DynamicResource LicenseBtn}"
                     Icon="Link48"
-                    NavigateUri="https://exploitox.de/license/checkip" 
+                    NavigateUri="https://github.com/valnoxy/checkip/blob/main/LICENSE" 
                     FontSize="15" />
             </StackPanel>
         </Grid>
diff --git a/CheckIP.Windows/CheckIP/Pages/App.xaml b/CheckIP.Windows/CheckIP/Pages/App.xaml
index 00cc787..03acf15 100644
--- a/CheckIP.Windows/CheckIP/Pages/App.xaml
+++ b/CheckIP.Windows/CheckIP/Pages/App.xaml
@@ -1,4 +1,4 @@
-<Application
+<Application
     x:Class="CheckIP.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -10,6 +10,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <ui:ThemesDictionary Theme="Dark" />
                 <ui:ControlsDictionary />
+                <ResourceDictionary Source="/CheckIP;component/Localization/ResourceDictionary.xaml"/>
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="{x:Type Label}">
                 <Setter Property="FontFamily" Value="Segoe UI Variable Display"/>
diff --git a/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml b/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml
index e4000aa..4f49458 100644
--- a/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml
+++ b/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml
@@ -12,7 +12,7 @@
     <StackPanel Margin="20,55,18,0">
 
         <StackPanel>
-            <Label Content="IP Address" HorizontalAlignment="Left" Margin="-6,0,0,0" VerticalAlignment="Top" Foreground="{DynamicResource TextFillColorPrimaryBrush}" FontSize="15"/>
+            <Label Content="{DynamicResource IPAddress}" HorizontalAlignment="Left" Margin="-6,0,0,0" VerticalAlignment="Top" Foreground="{DynamicResource TextFillColorPrimaryBrush}" FontSize="15"/>
 
             <Grid>
                 <Grid.ColumnDefinitions>
@@ -21,12 +21,19 @@
                 </Grid.ColumnDefinitions>
 
                 <ui:TextBox x:Name="IpAddress" Margin="0,0,5,0" Grid.Column="0" TextWrapping="Wrap" VerticalAlignment="Top" Foreground="{DynamicResource TextFillColorPrimaryBrush}" KeyDown="OnKeyDownHandler" Icon="Search24"/>
-                <Button Grid.Column="1" Content="Fetch" HorizontalAlignment="Right" VerticalAlignment="Top" Height="34" Foreground="{DynamicResource TextFillColorPrimaryBrush}" Click="FetchIP_Click" Cursor="Hand"/>
+                <ui:Button Grid.Column="1" Icon="Search24"  HorizontalAlignment="Right" VerticalAlignment="Top" Height="34" Click="FetchIP_Click"/>
             </Grid>
         </StackPanel>
 
         <StackPanel>
-            <Label Content="Information" 
+            <Label x:Name="ErrorLabel"
+                   Content="" 
+                   HorizontalAlignment="Right" 
+                   HorizontalContentAlignment="Right"
+                   Margin="0,12,0,-45"
+                   Foreground="Red"
+                   FontSize="15"/>
+            <Label Content="{DynamicResource Information}" 
                    HorizontalAlignment="Left" 
                    VerticalAlignment="Top" 
                    FontSize="24" 
@@ -44,8 +51,8 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="City / Country" />
-                <ui:TextBox x:Name="valueCityCountry" Grid.Column="1" Icon="City24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource CityAndCountry}" />
+                <ui:TextBox x:Name="ValueCityCountry" Grid.Column="1" Icon="City24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
 
             <Grid Margin="0,5,0,0">
@@ -58,8 +65,8 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="Postal" />
-                <ui:TextBox x:Name="valuePostal" Grid.Column="1" Icon="Mail24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource Postal}" />
+                <ui:TextBox x:Name="ValuePostal" Grid.Column="1" Icon="Mail24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -71,8 +78,8 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="Timezone" />
-                <ui:TextBox x:Name="valueTimezone" Grid.Column="1" Icon="Clock24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource Timezone}" />
+                <ui:TextBox x:Name="ValueTimezone" Grid.Column="1" Icon="Clock24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -84,8 +91,8 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="Latitude" />
-                <ui:TextBox x:Name="valueLatitude" Grid.Column="1" Icon="GlobeLocation24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource Latitude}" />
+                <ui:TextBox x:Name="ValueLatitude" Grid.Column="1" Icon="GlobeLocation24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -97,8 +104,8 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="Longitude" />
-                <ui:TextBox x:Name="valueLongitude" Grid.Column="1" Icon="GlobeLocation24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource Longitude}" />
+                <ui:TextBox x:Name="ValueLongitude" Grid.Column="1" Icon="GlobeLocation24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -110,8 +117,8 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="ISP or Organization" />
-                <ui:TextBox x:Name="valueISP" Grid.Column="1" Icon="Building24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource ISPOrOrganization}" />
+                <ui:TextBox x:Name="ValueIsp" Grid.Column="1" Icon="Building24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -123,8 +130,8 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="ASN" />
-                <ui:TextBox x:Name="valueASN" Grid.Column="1" Icon="Router24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource ASN}" />
+                <ui:TextBox x:Name="ValueAsn" Grid.Column="1" Icon="Router24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -136,8 +143,8 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="Is Mobile" />
-                <ui:TextBox x:Name="valueMobile" Grid.Column="1" Icon="Phone24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource IsMobile}" />
+                <ui:TextBox x:Name="ValueMobile" Grid.Column="1" Icon="Phone24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -149,8 +156,8 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="Is Proxy" />
-                <ui:TextBox x:Name="valueProxy" Grid.Column="1" Icon="Globe24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource IsProxy}" />
+                <ui:TextBox x:Name="ValueProxy" Grid.Column="1" Icon="Globe24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -162,22 +169,13 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="Is Hosting" />
-                <ui:TextBox x:Name="valueHosting" Grid.Column="1" Icon="Server24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource IsHosting}" />
+                <ui:TextBox x:Name="ValueHosting" Grid.Column="1" Icon="Server24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
             <Button Margin="0,10,0,0"
-                    Content="Export information"
+                    Content="{DynamicResource ExportInfo}"
                     Click="ExportBtn_OnClick"
                     HorizontalAlignment="Stretch"/>
         </StackPanel>
-
-        <Label x:Name="errorLabel"
-               Content="" 
-               HorizontalAlignment="Right" 
-               HorizontalContentAlignment="Right"
-               Margin="0,0,-6,-33"
-               VerticalAlignment="Bottom" 
-               Foreground="Red"
-               FontSize="15"/>
     </StackPanel>
 </Page>
diff --git a/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml.cs b/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml.cs
index 93b1e6c..3c6f576 100644
--- a/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml.cs
+++ b/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml.cs
@@ -46,14 +46,15 @@ private void ParseIpAddress()
             {
                 Dispatcher.Invoke(() =>
                 {
-                    errorLabel.Content = "Error: This is not a valid IP address";
+                    var error = (string)Application.Current.MainWindow.FindResource("ErrorInvalidIP");
+                    ErrorLabel.Content = !string.IsNullOrEmpty(error) ? error : "Error: This is not a valid IP address.";
                 });
                 return;
             }
 
             Dispatcher.Invoke(() =>
             {
-                errorLabel.Content = string.Empty;
+                ErrorLabel.Content = string.Empty;
             });
 
             var dataJson = string.Empty;
@@ -69,7 +70,8 @@ private void ParseIpAddress()
             {
                 this.Dispatcher.Invoke(() =>
                 {
-                    errorLabel.Content = "Error: No connection to server";
+                    var error = (string)Application.Current.MainWindow.FindResource("ErrorInvalidIP");
+                    ErrorLabel.Content = !string.IsNullOrEmpty(error) ? error : "Error: No connection to server";
                 });
             }
             dynamic data = JObject.Parse(dataJson);
@@ -93,19 +95,21 @@ private void ParseIpAddress()
             // Check status
             if (status != "success")
             {
+                var localizeError = Common.LocalizationManager.LocalizeError(message);
+
                 Dispatcher.Invoke(() =>
                 {
-                    errorLabel.Content = "Error: " + message;
-                    valueCityCountry.Text = "Unknown";
-                    valuePostal.Text = "Unknown";
-                    valueTimezone.Text = "Unknown";
-                    valueLatitude.Text = "Unknown";
-                    valueLongitude.Text = "Unknown";
-                    valueISP.Text = "Unknown";
-                    valueASN.Text = "Unknown";
-                    valueMobile.Text = "Unknown";
-                    valueProxy.Text = "Unknown";
-                    valueHosting.Text = "Unknown";
+                    ErrorLabel.Content = localizeError;
+                    ValueCityCountry.Text = "Unknown";
+                    ValuePostal.Text = "Unknown";
+                    ValueTimezone.Text = "Unknown";
+                    ValueLatitude.Text = "Unknown";
+                    ValueLongitude.Text = "Unknown";
+                    ValueIsp.Text = "Unknown";
+                    ValueAsn.Text = "Unknown";
+                    ValueMobile.Text = "Unknown";
+                    ValueProxy.Text = "Unknown";
+                    ValueHosting.Text = "Unknown";
                 });
                 return;
             }
@@ -113,16 +117,16 @@ private void ParseIpAddress()
             // Set Variable labels
             Dispatcher.Invoke(() =>
             {
-                valueCityCountry.Text = city + " / " + country + " (" + countryCode + ")";
-                valuePostal.Text = postal;
-                valueTimezone.Text = timezone;
-                valueLatitude.Text = latitude;
-                valueLongitude.Text = longitude;
-                valueISP.Text = isp;
-                valueASN.Text = asn;
-                valueMobile.Text = mobile;
-                valueProxy.Text = proxy;
-                valueHosting.Text = hosting;
+                ValueCityCountry.Text = city + " / " + country + " (" + countryCode + ")";
+                ValuePostal.Text = postal;
+                ValueTimezone.Text = timezone;
+                ValueLatitude.Text = latitude;
+                ValueLongitude.Text = longitude;
+                ValueIsp.Text = isp;
+                ValueAsn.Text = asn;
+                ValueMobile.Text = mobile;
+                ValueProxy.Text = proxy;
+                ValueHosting.Text = hosting;
             });
         }
 
@@ -131,16 +135,16 @@ private void ExportBtn_OnClick(object sender, RoutedEventArgs e)
             // Build export string
             var exportString = $@"Report created at {DateTime.Now} for IP {IpAddress.Text}
 
-City / Country: {valueCityCountry.Text}
-Postal: {valuePostal.Text}
-Timezone: {valueTimezone.Text}
-Latitude: {valueLatitude.Text}
-Longitude: {valueLongitude.Text}
-ISP or Organization: {valueISP.Text}
-ASN: {valueASN.Text}
-Is Mobile: {valueMobile.Text}
-Is Proxy: {valueProxy.Text}
-Is Hosting: {valueHosting.Text}
+City / Country: {ValueCityCountry.Text}
+Postal: {ValuePostal.Text}
+Timezone: {ValueTimezone.Text}
+Latitude: {ValueLatitude.Text}
+Longitude: {ValueLongitude.Text}
+ISP or Organization: {ValueIsp.Text}
+ASN: {ValueAsn.Text}
+Is Mobile: {ValueMobile.Text}
+Is Proxy: {ValueProxy.Text}
+Is Hosting: {ValueHosting.Text}
 ";
 
             var saveFileDialog = new SaveFileDialog
diff --git a/CheckIP.Windows/CheckIP/Pages/Main.xaml b/CheckIP.Windows/CheckIP/Pages/Main.xaml
index 9896aaa..2d4ec8d 100644
--- a/CheckIP.Windows/CheckIP/Pages/Main.xaml
+++ b/CheckIP.Windows/CheckIP/Pages/Main.xaml
@@ -6,7 +6,6 @@
         MinHeight="669" MinWidth="512"
         xmlns:pages="clr-namespace:CheckIP"
         xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
-        xmlns:tb="http://www.hardcodet.net/taskbar"
         WindowStartupLocation="CenterScreen"
         Style="{StaticResource UiWindow}"
         ExtendsContentIntoTitleBar="True"
@@ -33,19 +32,19 @@
                 Loaded="RootNavigation_OnLoaded">
                 <ui:NavigationStore.Items>
                     <ui:NavigationItem
-                        Content="Fetch"
+                        Content="{DynamicResource Fetch}"
                         Icon="Search24"
                         PageTag="dashboard"
                         PageType="{x:Type pages:FetchIP}" />
                     <ui:NavigationItem
-                        Content="My IP"
+                        Content="{DynamicResource MyIP}"
                         Icon="MyLocation24"
                         PageTag="forms"
                         PageType="{x:Type pages:MyIP}" />
                 </ui:NavigationStore.Items>
                 <ui:NavigationStore.Footer>
                     <ui:NavigationItem
-                        Content="About"
+                        Content="{DynamicResource About}"
                         Icon="QuestionCircle24"
                         PageTag="help"
                         PageType="{x:Type pages:About}" />
@@ -68,7 +67,7 @@
             </Border>
         </Grid>
 
-        <Label x:Name="debugLabel" 
+        <Label x:Name="DebugLabel"
                Grid.Row="0" 
                Content=""
                HorizontalContentAlignment="Right"
diff --git a/CheckIP.Windows/CheckIP/Pages/Main.xaml.cs b/CheckIP.Windows/CheckIP/Pages/Main.xaml.cs
index 53d6db5..0ae4016 100644
--- a/CheckIP.Windows/CheckIP/Pages/Main.xaml.cs
+++ b/CheckIP.Windows/CheckIP/Pages/Main.xaml.cs
@@ -2,11 +2,13 @@
 using System.Drawing;
 using System.IO;
 using System.Net.NetworkInformation;
+using System.Threading;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using CheckIP.Common;
 using Hardcodet.Wpf.TaskbarNotification;
+using Windows.Globalization;
 
 namespace CheckIP
 {
@@ -15,8 +17,6 @@ namespace CheckIP
     /// </summary>
     public partial class Main : Wpf.Ui.Controls.UiWindow
     {
-        public static Main? ContentMain;
-
         public Main()
         {
             InitializeComponent();
@@ -30,8 +30,23 @@ public Main()
                 );
             };
 
+            // Set current language model
+            var language = Thread.CurrentThread.CurrentCulture.ToString();
+            var dict = new ResourceDictionary();
+            switch (language)
+            {
+                default:
+                case "en-US":
+                    dict.Source = new Uri(@"/CheckIP;component/Localization/ResourceDictionary.xaml", UriKind.Relative);
+                    break;
+                case "de-DE":
+                    dict.Source = new Uri(@"/CheckIP;component/Localization/ResourceDictionary.de-DE.xaml", UriKind.Relative);
+                    break;
+            }
+            Application.Current.Resources.MergedDictionaries.Add(dict);
+
 #if DEBUG
-            debugLabel.Content = "Debug build - This is not a production ready build.";
+            DebugLabel.Content = "Debug build - This is not a production ready build.";
 #endif
         }
 
@@ -41,10 +56,5 @@ private void RootNavigation_OnLoaded(object sender, RoutedEventArgs e)
 
             TaskBar.Initialize();
         }
-
-        private void CloseMenuItem_Click(object sender, RoutedEventArgs e)
-        {
-            Environment.Exit(0);
-        }
     }
 }
diff --git a/CheckIP.Windows/CheckIP/Pages/MyIP.xaml b/CheckIP.Windows/CheckIP/Pages/MyIP.xaml
index f01c0d7..98c8e70 100644
--- a/CheckIP.Windows/CheckIP/Pages/MyIP.xaml
+++ b/CheckIP.Windows/CheckIP/Pages/MyIP.xaml
@@ -18,15 +18,15 @@
                    VerticalAlignment="Top"
                    Margin="-6,0,0,0"/>
             <Label x:Name="IpAddress"
-                   Content="Unknown"
+                   Content="{DynamicResource Unknown}"
                    HorizontalAlignment="Center"
                    VerticalAlignment="Top"
                    FontSize="25"
                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
         </StackPanel>
 
-        <StackPanel Grid.Row="2">
-            <Label Content="Information" 
+        <StackPanel>
+            <Label Content="{DynamicResource Information}" 
                    HorizontalAlignment="Left" 
                    VerticalAlignment="Top" 
                    FontSize="24" 
@@ -44,8 +44,8 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="City / Country" />
-                <ui:TextBox x:Name="valueCityCountry" Grid.Column="1" Icon="City24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource CityAndCountry}" />
+                <ui:TextBox x:Name="ValueCityCountry" Grid.Column="1" Icon="City24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
 
             <Grid Margin="0,5,0,0">
@@ -58,8 +58,8 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="Postal" />
-                <ui:TextBox x:Name="valuePostal" Grid.Column="1" Icon="Mail24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource Postal}" />
+                <ui:TextBox x:Name="ValuePostal" Grid.Column="1" Icon="Mail24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -71,8 +71,8 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="Timezone" />
-                <ui:TextBox x:Name="valueTimezone" Grid.Column="1" Icon="Clock24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource Timezone}" />
+                <ui:TextBox x:Name="ValueTimezone" Grid.Column="1" Icon="Clock24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -84,8 +84,8 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="Latitude" />
-                <ui:TextBox x:Name="valueLatitude" Grid.Column="1" Icon="GlobeLocation24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource Latitude}" />
+                <ui:TextBox x:Name="ValueLatitude" Grid.Column="1" Icon="GlobeLocation24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -97,8 +97,8 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="Longitude" />
-                <ui:TextBox x:Name="valueLongitude" Grid.Column="1" Icon="GlobeLocation24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource Longitude}" />
+                <ui:TextBox x:Name="ValueLongitude" Grid.Column="1" Icon="GlobeLocation24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -110,8 +110,8 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="ISP or Organization" />
-                <ui:TextBox x:Name="valueISP" Grid.Column="1" Icon="Building24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource ISPOrOrganization}" />
+                <ui:TextBox x:Name="ValueIsp" Grid.Column="1" Icon="Building24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -123,8 +123,8 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="ASN" />
-                <ui:TextBox x:Name="valueASN" Grid.Column="1" Icon="Router24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource ASN}" />
+                <ui:TextBox x:Name="ValueAsn" Grid.Column="1" Icon="Router24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -136,8 +136,8 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="Is Mobile" />
-                <ui:TextBox x:Name="valueMobile" Grid.Column="1" Icon="Phone24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource IsMobile}" />
+                <ui:TextBox x:Name="ValueMobile" Grid.Column="1" Icon="Phone24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -149,8 +149,8 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="Is Proxy" />
-                <ui:TextBox x:Name="valueProxy" Grid.Column="1" Icon="Globe24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource IsProxy}" />
+                <ui:TextBox x:Name="ValueProxy" Grid.Column="1" Icon="Globe24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
             <Grid Margin="0,5,0,0">
                 <Grid.ColumnDefinitions>
@@ -162,11 +162,11 @@
                     FontSize="14"
                     Margin="0,6,0,0"
                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="Is Hosting" />
-                <ui:TextBox x:Name="valueHosting" Grid.Column="1" Icon="Server24" PlaceholderText="Unknown" IsEnabled="false" />
+                    Text="{DynamicResource IsHosting}" />
+                <ui:TextBox x:Name="ValueHosting" Grid.Column="1" Icon="Server24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
             </Grid>
             <Button Margin="0,10,0,0"
-                    Content="Export information"
+                    Content="{DynamicResource ExportInfo}"
                     Click="ExportBtn_OnClick"
                     HorizontalAlignment="Stretch"/>
         </StackPanel>
diff --git a/CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs b/CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs
index 7fee13a..2104410 100644
--- a/CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs
+++ b/CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs
@@ -31,8 +31,7 @@ public MyIP()
             Task.Run(ParseIpAddress);
 
             // Trigger NetworkChange
-            NetworkChange.NetworkAddressChanged +=
-                new NetworkAddressChangedEventHandler(NetworkChange_NetworkAvailabilityChanged);
+            NetworkChange.NetworkAddressChanged += NetworkChange_NetworkAvailabilityChanged;
         }
 
         [Obsolete("Will be replaced to a async version soon.")]
@@ -45,13 +44,13 @@ private static async Task<string> _GetIPAddress()
             }
             catch
             {
-                try
+                try // Alternative source
                 {
                     result = await Task.Run(() => new WebClient().DownloadString("https://api.ipify.org"));
                 }
                 catch
                 {
-                    
+                    // ignored
                 }
             }
 
@@ -66,7 +65,8 @@ private void ParseIpAddress()
             {
                 Dispatcher.Invoke(() =>
                 {
-                    ErrorLabel.Content = "Error: This is not a valid IP address";
+                    var error = (string)Application.Current.MainWindow.FindResource("ErrorInvalidIP");
+                    ErrorLabel.Content = !string.IsNullOrEmpty(error) ? error : "Error: This is not a valid IP address.";
                 });
                 return;
             }
@@ -89,7 +89,8 @@ private void ParseIpAddress()
             {
                 this.Dispatcher.Invoke(() =>
                 {
-                    ErrorLabel.Content = "Error: No connection to server";
+                    var error = (string)Application.Current.MainWindow.FindResource("ErrorInvalidIP");
+                    ErrorLabel.Content = !string.IsNullOrEmpty(error) ? error : "Error: No connection to server";
                 });
             }
             dynamic data = JObject.Parse(dataJson);
@@ -113,19 +114,21 @@ private void ParseIpAddress()
             // Check status
             if (status != "success")
             {
+                var localizeError = Common.LocalizationManager.LocalizeError(message);
+
                 this.Dispatcher.Invoke(() =>
                 {
-                    ErrorLabel.Content = "Error: " + message;
-                    valueCityCountry.Text = "Unknown";
-                    valuePostal.Text = "Unknown";
-                    valueTimezone.Text = "Unknown";
-                    valueLatitude.Text = "Unknown";
-                    valueLongitude.Text = "Unknown";
-                    valueISP.Text = "Unknown";
-                    valueASN.Text = "Unknown";
-                    valueMobile.Text = "Unknown";
-                    valueProxy.Text = "Unknown";
-                    valueHosting.Text = "Unknown";
+                    ErrorLabel.Content = localizeError;
+                    ValueCityCountry.Text = "Unknown";
+                    ValuePostal.Text = "Unknown";
+                    ValueTimezone.Text = "Unknown";
+                    ValueLatitude.Text = "Unknown";
+                    ValueLongitude.Text = "Unknown";
+                    ValueIsp.Text = "Unknown";
+                    ValueAsn.Text = "Unknown";
+                    ValueMobile.Text = "Unknown";
+                    ValueProxy.Text = "Unknown";
+                    ValueHosting.Text = "Unknown";
                 });
                 return;
             }
@@ -134,16 +137,16 @@ private void ParseIpAddress()
             Dispatcher.Invoke(() =>
             {
                 IpAddress.Content = _myIp;
-                valueCityCountry.Text = city + " / " + country + " (" + countryCode + ")";
-                valuePostal.Text = postal;
-                valueTimezone.Text = timezone;
-                valueLatitude.Text = latitude;
-                valueLongitude.Text = longitude;
-                valueISP.Text = isp;
-                valueASN.Text = asn;
-                valueMobile.Text = mobile;
-                valueProxy.Text = proxy;
-                valueHosting.Text = hosting;
+                ValueCityCountry.Text = city + " / " + country + " (" + countryCode + ")";
+                ValuePostal.Text = postal;
+                ValueTimezone.Text = timezone;
+                ValueLatitude.Text = latitude;
+                ValueLongitude.Text = longitude;
+                ValueIsp.Text = isp;
+                ValueAsn.Text = asn;
+                ValueMobile.Text = mobile;
+                ValueProxy.Text = proxy;
+                ValueHosting.Text = hosting;
             });
 
             // Update NotifyIcon
@@ -155,16 +158,16 @@ private void ExportBtn_OnClick(object sender, RoutedEventArgs e)
             // Build export string
             var exportString = $@"Report created at {DateTime.Now} for IP {IpAddress.Content}
 
-City / Country: {valueCityCountry.Text}
-Postal: {valuePostal.Text}
-Timezone: {valueTimezone.Text}
-Latitude: {valueLatitude.Text}
-Longitude: {valueLongitude.Text}
-ISP or Organization: {valueISP.Text}
-ASN: {valueASN.Text}
-Is Mobile: {valueMobile.Text}
-Is Proxy: {valueProxy.Text}
-Is Hosting: {valueHosting.Text}
+City / Country: {ValueCityCountry.Text}
+Postal: {ValuePostal.Text}
+Timezone: {ValueTimezone.Text}
+Latitude: {ValueLatitude.Text}
+Longitude: {ValueLongitude.Text}
+ISP or Organization: {ValueIsp.Text}
+ASN: {ValueAsn.Text}
+Is Mobile: {ValueMobile.Text}
+Is Proxy: {ValueProxy.Text}
+Is Hosting: {ValueHosting.Text}
 ";
 
             var saveFileDialog = new SaveFileDialog
diff --git a/README.md b/README.md
index e7823fc..f6ab3d3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # CheckIP - IP Informations
 
-<img align="right" src="https://dl.exploitox.de/checkip/checkip.png" alt="macOS Monterey running on the T440p" width="150">
+<img align="right" src="https://dl.exploitox.de/checkip/checkip.png" alt="CheckIP Logo" width="150">
 
 [![Android](https://img.shields.io/badge/Android-Xamarin-brightgreen.svg)](https://github.com/valnoxy/checkip/tree/main/CheckIP.Mobile)
 [![iOS](https://img.shields.io/badge/iOS-Xamarin-green)](https://github.com/valnoxy/checkip/tree/main/CheckIP.Mobile)
@@ -10,7 +10,7 @@
 <p align="center">
    <strong>Status: </strong>Maintained
    <br />
-   <strong>WPF Version: </strong>2.2.0
+   <strong>WPF Version: </strong>2.2.1
    <br />
    <strong>Xamarin Version: </strong>2.1.0-alpha2
    <br />
@@ -34,10 +34,36 @@ CheckIP is a GUI based application which can provide much information about an I
 [![AppStore](https://dl.exploitox.de/checkip/AppStoreBadge.png)](https://apps.apple.com/us/app/checkip-ip-informations/id1618841457)
 [![MicrosoftStore](https://dl.exploitox.de/checkip/MicrosoftStoreBadge.png)](https://www.microsoft.com/store/apps/9NFGS0SX9CP3)
 
-<a href="https://testflight.apple.com/join/auUvXWJJ">Join iOS Beta via TestFlight »</a>
+<a href="https://testflight.apple.com/join/auUvXWJJ">Join iOS Beta via TestFlight (currently closed) »</a>
 
 > Note: The mobile applications are currently in beta. The MAUI source base is outdated and and exists only for archival purposes. After MAUI is more stable, this project will move from Xamarin to MAUI.
 
+## Localization
+Want to add a new language or revise an existing one? Great! Follow these steps so you can translate CheckIP:
+
+1. Clone this Repository
+2. Copy ```Localization\ResourceDirectory.xaml``` and paste your country code into the new file name (e.g. ```ResourceDirectory.de-DE.xaml```).
+3. Open ```Pages\App.xaml``` and add a reference to the new file under ```MergedDictionaries```.
+   
+   ```<ResourceDictionary Source="/CheckIP;component/Localization/ResourceDictionary.de-DE.xaml"/>``` 
+
+4. Open ```Pages\Main.xaml.cs```, go to the function ```Main``` and add your country code in the switch/case function with reference to the new file.
+   ```c#
+    switch (language)
+    {
+      default:
+      case "en-US":
+          dict.Source = new Uri(@"/CheckIP;component/Localization/ResourceDictionary.xaml", UriKind.Relative);
+          break;
+      case "de-DE":
+          dict.Source = new Uri(@"/CheckIP;component/Localization/ResourceDictionary.de-DE.xaml", UriKind.Relative);
+          break;
+    }
+   ```
+
+5. Modify your new file as you wish by translating the value of each variable.
+6. When you are ready, you can open a pull request.
+
 ## License (GNU GPL)
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

From 8c085bc30935307e10cf8cbe4d895c355cb2ed07 Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Sat, 18 Mar 2023 20:26:29 +0100
Subject: [PATCH 04/17] =?UTF-8?q?=F0=9F=8C=8E=20Support=20German=20languag?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CheckIP.Windows/CheckIP/CheckIP.csproj        |  7 +++-
 .../ResourceDictionary.de-DE.xaml             | 36 +++++++++++++++++++
 CheckIP.Windows/CheckIP/Pages/App.xaml        |  3 +-
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 CheckIP.Windows/CheckIP/Localization/ResourceDictionary.de-DE.xaml

diff --git a/CheckIP.Windows/CheckIP/CheckIP.csproj b/CheckIP.Windows/CheckIP/CheckIP.csproj
index 04ec1ca..e4bed2b 100644
--- a/CheckIP.Windows/CheckIP/CheckIP.csproj
+++ b/CheckIP.Windows/CheckIP/CheckIP.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
@@ -286,6 +286,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<Page Remove="Localization\ResourceDictionary.de-DE.xaml" />
 		<Page Remove="Localization\ResourceDictionary.xaml" />
 		<Page Remove="Pages\App.xaml" />
 		<Page Remove="W11App.xaml" />
@@ -577,6 +578,10 @@
 		<Resource Include="Assets\zm.ico" />
 		<Resource Include="Assets\zw.ico" />
 		<Resource Include="icon.png" />
+		<Resource Include="Localization\ResourceDictionary.de-DE.xaml">
+		  <SubType>Component</SubType>
+		  <Generator>MSBuild:Compile</Generator>
+		</Resource>
 		<Resource Include="Localization\ResourceDictionary.xaml">
 		  <Generator>MSBuild:Compile</Generator>
 		</Resource>
diff --git a/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.de-DE.xaml b/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.de-DE.xaml
new file mode 100644
index 0000000..d859496
--- /dev/null
+++ b/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.de-DE.xaml
@@ -0,0 +1,36 @@
+<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="IPAddress">IP Adresse</system:String>
+    <system:String x:Key="Fetch">Abrufen</system:String>
+    <system:String x:Key="Information">Information</system:String>
+    <system:String x:Key="CityAndCountry">Stadt / Land</system:String>
+    <system:String x:Key="Postal">Postleitzahl</system:String>
+    <system:String x:Key="Timezone">Zeitzone</system:String>
+    <system:String x:Key="Latitude">Breitengrad</system:String>
+    <system:String x:Key="Longitude">Längengrad</system:String>
+    <system:String x:Key="ISPOrOrganization">ISP oder Firma</system:String>
+    <system:String x:Key="ASN">ASN</system:String>
+    <system:String x:Key="IsMobile">Mobiles Gerät</system:String>
+    <system:String x:Key="IsProxy">Proxy Server</system:String>
+    <system:String x:Key="IsHosting">Hosting</system:String>
+    <system:String x:Key="ExportInfo">Informationen exportieren</system:String>
+    <system:String x:Key="Unknown">Unbekannt</system:String>
+    <system:String x:Key="MyIP">Meine IP</system:String>
+
+    <!-- About -->
+    <system:String x:Key="About">Über</system:String>
+    <system:String x:Key="AboutThisApp">Über diese App</system:String>
+    <system:String x:Key="License">Dieses Programm ist freie Software: Sie können es unter den Bedingungen der GNU General Public License, wie sie von der Free Software Foundation veröffentlicht wurde, weitergeben und/oder modifizieren, entweder gemäß Version 3 der Lizenz oder (nach Ihrer Wahl) jeder späteren Version.</system:String>
+    <system:String x:Key="ThirdPartyLibraries">Drittanbieter Bibliotheken</system:String>
+    <system:String x:Key="ThirdPartyLibrariesDescription">Liste aller verwendeten Bibliotheken und Bilder.</system:String>
+    <system:String x:Key="SourceCodeBtn">Quellcode auf GitHub</system:String>
+    <system:String x:Key="HomepageBtn">Homepage</system:String>
+    <system:String x:Key="LicenseBtn">Lizenz</system:String>
+
+    <!-- Error's -->
+    <system:String x:Key="ErrorReservedRange">Fehler: Reservierter Bereich</system:String>
+    <system:String x:Key="ErrorInvalidIP">Fehler: Dies ist keine gültige IP Adresse</system:String>
+    <system:String x:Key="ErrorNoConnection">Fehler: Keine Verbindung zum Server</system:String>
+    <system:String x:Key="ErrorInvalidQuery">Fehler: Ungültige Abfrage</system:String>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/CheckIP.Windows/CheckIP/Pages/App.xaml b/CheckIP.Windows/CheckIP/Pages/App.xaml
index 03acf15..72958b3 100644
--- a/CheckIP.Windows/CheckIP/Pages/App.xaml
+++ b/CheckIP.Windows/CheckIP/Pages/App.xaml
@@ -1,4 +1,4 @@
-<Application
+<Application
     x:Class="CheckIP.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -11,6 +11,7 @@
                 <ui:ThemesDictionary Theme="Dark" />
                 <ui:ControlsDictionary />
                 <ResourceDictionary Source="/CheckIP;component/Localization/ResourceDictionary.xaml"/>
+                <ResourceDictionary Source="/CheckIP;component/Localization/ResourceDictionary.de-DE.xaml"/>
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="{x:Type Label}">
                 <Setter Property="FontFamily" Value="Segoe UI Variable Display"/>

From 7ae5048b5c44d7ef6505fd26c7503be93584c909 Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Sat, 18 Mar 2023 20:29:56 +0100
Subject: [PATCH 05/17] =?UTF-8?q?=E2=9A=92=EF=B8=8F=20Debug=20output=20cur?=
 =?UTF-8?q?rent=20language?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CheckIP.Windows/CheckIP/Pages/Main.xaml.cs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/CheckIP.Windows/CheckIP/Pages/Main.xaml.cs b/CheckIP.Windows/CheckIP/Pages/Main.xaml.cs
index 0ae4016..a2781f0 100644
--- a/CheckIP.Windows/CheckIP/Pages/Main.xaml.cs
+++ b/CheckIP.Windows/CheckIP/Pages/Main.xaml.cs
@@ -1,14 +1,9 @@
 using System;
-using System.Drawing;
-using System.IO;
-using System.Net.NetworkInformation;
+using System.Diagnostics;
 using System.Threading;
 using System.Windows;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
 using CheckIP.Common;
-using Hardcodet.Wpf.TaskbarNotification;
-using Windows.Globalization;
+
 
 namespace CheckIP
 {
@@ -33,6 +28,7 @@ public Main()
             // Set current language model
             var language = Thread.CurrentThread.CurrentCulture.ToString();
             var dict = new ResourceDictionary();
+            Debug.WriteLine("Trying to load language: " + language);
             switch (language)
             {
                 default:

From 89fdda30459468aea73fd8ea19818af9b0a5ab9c Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Sun, 19 Mar 2023 16:20:55 +0100
Subject: [PATCH 06/17] =?UTF-8?q?=F0=9F=8C=8E=20More=20strings=20localized?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See issue #7
---
 .../CheckIP/Common/LocalizationManager.cs     | 33 +++++++++++
 .../ResourceDictionary.de-DE.xaml             |  7 +++
 .../Localization/ResourceDictionary.xaml      |  7 +++
 CheckIP.Windows/CheckIP/Pages/About.xaml      | 15 +----
 CheckIP.Windows/CheckIP/Pages/About.xaml.cs   | 55 ++++++++++++++++++-
 CheckIP.Windows/CheckIP/Pages/FetchIP.xaml.cs | 45 ++++++++++-----
 CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs    | 47 +++++++++++-----
 7 files changed, 164 insertions(+), 45 deletions(-)

diff --git a/CheckIP.Windows/CheckIP/Common/LocalizationManager.cs b/CheckIP.Windows/CheckIP/Common/LocalizationManager.cs
index 640f6b8..0d15ba4 100644
--- a/CheckIP.Windows/CheckIP/Common/LocalizationManager.cs
+++ b/CheckIP.Windows/CheckIP/Common/LocalizationManager.cs
@@ -28,5 +28,38 @@ public static string LocalizeError(string errorMessage)
             return errorMessage;
 
         }
+
+        public static string LocalizeValue(string value)
+        {
+            var localizedValue = string.Empty;
+            switch (value)
+            {
+                case "True":
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        localizedValue = (string)Application.Current.MainWindow.FindResource("True");
+                    });
+                    break;
+                case "False":
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        localizedValue = (string)Application.Current.MainWindow.FindResource("False");
+                    });
+                    break;
+                case "All rights reserved.":
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        localizedValue = (string)Application.Current.MainWindow.FindResource("AllRightsReserved");
+                    });
+                    break;
+                case "by":
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        localizedValue = (string)Application.Current.MainWindow.FindResource("By");
+                    });
+                    break;
+            }
+            return string.IsNullOrEmpty(localizedValue) ? value : localizedValue;
+        }
     }
 }
diff --git a/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.de-DE.xaml b/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.de-DE.xaml
index d859496..afde582 100644
--- a/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.de-DE.xaml
+++ b/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.de-DE.xaml
@@ -17,17 +17,24 @@
     <system:String x:Key="ExportInfo">Informationen exportieren</system:String>
     <system:String x:Key="Unknown">Unbekannt</system:String>
     <system:String x:Key="MyIP">Meine IP</system:String>
+    <system:String x:Key="True">Wahr</system:String>
+    <system:String x:Key="False">Falsch</system:String>
 
     <!-- About -->
     <system:String x:Key="About">Über</system:String>
     <system:String x:Key="AboutThisApp">Über diese App</system:String>
+    <system:String x:Key="AllRightsReserved">Alle Rechte vorbehalten.</system:String>
     <system:String x:Key="License">Dieses Programm ist freie Software: Sie können es unter den Bedingungen der GNU General Public License, wie sie von der Free Software Foundation veröffentlicht wurde, weitergeben und/oder modifizieren, entweder gemäß Version 3 der Lizenz oder (nach Ihrer Wahl) jeder späteren Version.</system:String>
     <system:String x:Key="ThirdPartyLibraries">Drittanbieter Bibliotheken</system:String>
     <system:String x:Key="ThirdPartyLibrariesDescription">Liste aller verwendeten Bibliotheken und Bilder.</system:String>
+    <system:String x:Key="By">{0} von {1}</system:String>
     <system:String x:Key="SourceCodeBtn">Quellcode auf GitHub</system:String>
     <system:String x:Key="HomepageBtn">Homepage</system:String>
     <system:String x:Key="LicenseBtn">Lizenz</system:String>
 
+    <!-- Report -->
+    <system:String x:Key="ReportCreatedMessage">Bericht erstellt am {0} für IP-Adresse {1}</system:String>
+
     <!-- Error's -->
     <system:String x:Key="ErrorReservedRange">Fehler: Reservierter Bereich</system:String>
     <system:String x:Key="ErrorInvalidIP">Fehler: Dies ist keine gültige IP Adresse</system:String>
diff --git a/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.xaml b/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.xaml
index 9e01954..af4d7c2 100644
--- a/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.xaml
+++ b/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.xaml
@@ -17,20 +17,27 @@
     <system:String x:Key="ExportInfo">Export Information</system:String>
     <system:String x:Key="Unknown">Unknown</system:String>
     <system:String x:Key="MyIP">My IP</system:String>
+    <system:String x:Key="True">True</system:String>
+    <system:String x:Key="False">False</system:String>
 
     <!-- About -->
     <system:String x:Key="About">About</system:String>
     <system:String x:Key="AboutThisApp">About this App</system:String>
+    <system:String x:Key="AllRightsReserved">All rights reserved.</system:String>
     <system:String x:Key="License">This program is free software: you can redistribute it and/or modify
         it under the terms of the GNU General Public License as published by
         the Free Software Foundation, either version 3 of the License, or
         (at your option) any later version.</system:String>
     <system:String x:Key="ThirdPartyLibraries">Third Party Libraries</system:String>
     <system:String x:Key="ThirdPartyLibrariesDescription">List of all used open-source libraries and images.</system:String>
+    <system:String x:Key="By">{0} by {1}</system:String>
     <system:String x:Key="SourceCodeBtn">Source Code on GitHub</system:String>
     <system:String x:Key="HomepageBtn">Homepage</system:String>
     <system:String x:Key="LicenseBtn">License</system:String>
 
+    <!-- Report -->
+    <system:String x:Key="ReportCreatedMessage">Report created at {0} for IP address {1}</system:String>
+
     <!-- Error's -->
     <system:String x:Key="ErrorReservedRange">Error: Reserved range</system:String>
     <system:String x:Key="ErrorInvalidIP">Error: This is not a valid IP address</system:String>
diff --git a/CheckIP.Windows/CheckIP/Pages/About.xaml b/CheckIP.Windows/CheckIP/Pages/About.xaml
index 1e02a82..25c5a59 100644
--- a/CheckIP.Windows/CheckIP/Pages/About.xaml
+++ b/CheckIP.Windows/CheckIP/Pages/About.xaml
@@ -88,20 +88,7 @@
                             </StackPanel>
                         </Grid>
                     </ui:CardExpander.Header>
-                    <StackPanel>
-                        <TextBlock
-                            Text="• WPFUI by Lepoco"
-                            TextWrapping="Wrap" />
-                        <TextBlock
-                            Text="• Hardcodet.NotifyIcon.Wpf by Hardcodet"
-                            TextWrapping="Wrap" />
-                        <TextBlock
-                            Text="• Flag Icons by Icons8"
-                            TextWrapping="Wrap" />
-                        <TextBlock
-                            Text="• Newtonsoft.Json by James Newton-King"
-                            TextWrapping="Wrap" />
-                    </StackPanel>
+                    <StackPanel x:Name="ThirdPartyList"/>
                 </ui:CardExpander>
                 <ui:Hyperlink
                     Content="{DynamicResource SourceCodeBtn}"
diff --git a/CheckIP.Windows/CheckIP/Pages/About.xaml.cs b/CheckIP.Windows/CheckIP/Pages/About.xaml.cs
index 776a787..dd9ec18 100644
--- a/CheckIP.Windows/CheckIP/Pages/About.xaml.cs
+++ b/CheckIP.Windows/CheckIP/Pages/About.xaml.cs
@@ -1,7 +1,11 @@
-using System.Collections.ObjectModel;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics;
+using System.Net;
 using System.Reflection;
+using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Documents;
 
 namespace CheckIP
 {
@@ -10,13 +14,60 @@ namespace CheckIP
     /// </summary>
     public partial class About : Page
     {
+        private class ThirdParty
+        {
+            internal string Author { get; set; }
+            internal string Product { get; set; }
+        }
+
         public About()
         {
             InitializeComponent();
 
             var versionInfo = FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location);
             ValueVersion.Content = $"{versionInfo.ProductName} V. {versionInfo.ProductVersion}";
-            ValueCopyright.Content = versionInfo.LegalCopyright;
+
+            var legalCopyright = versionInfo.LegalCopyright;
+            var localizedAllRightsReserved = Common.LocalizationManager.LocalizeValue("All rights reserved.");
+            var localizedCopyright = legalCopyright!.Replace("All rights reserved.", localizedAllRightsReserved);
+            ValueCopyright.Content = localizedCopyright;
+            
+            var thirdPartyList = new List<ThirdParty>
+            {
+                new ThirdParty
+                {
+                    Author = "Lecopo",
+                    Product = "WPF-UI"
+                },
+                new ThirdParty
+                {
+                    Author = "Hardcodet",
+                    Product = "Hardcodet.NotifyIcon.Wpf"
+                },
+                new ThirdParty
+                {
+                    Author = "Icons8",
+                    Product = "Flag Icons"
+                },
+                new ThirdParty
+                {
+                    Author = "James Newton-King",
+                    Product = "Newtonsoft.Json"
+                }
+            };
+
+            foreach (var thirdParty in thirdPartyList)
+            {
+                var localizedBy = Common.LocalizationManager.LocalizeValue("by");
+                var formattedMessage = string.Format(localizedBy, thirdParty.Product, thirdParty.Author);
+
+                var tb = new TextBlock
+                {
+                    Text = $"• {formattedMessage}",
+                    TextWrapping = TextWrapping.Wrap
+                };
+                ThirdPartyList.Children.Add(tb);
+            }
         }
     }
 }
diff --git a/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml.cs b/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml.cs
index 3c6f576..e6a2997 100644
--- a/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml.cs
+++ b/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml.cs
@@ -115,6 +115,9 @@ private void ParseIpAddress()
             }
 
             // Set Variable labels
+            var localizeMobile = Common.LocalizationManager.LocalizeValue(mobile);
+            var localizeProxy = Common.LocalizationManager.LocalizeValue(proxy);
+            var localizeHosting = Common.LocalizationManager.LocalizeValue(hosting);
             Dispatcher.Invoke(() =>
             {
                 ValueCityCountry.Text = city + " / " + country + " (" + countryCode + ")";
@@ -124,27 +127,41 @@ private void ParseIpAddress()
                 ValueLongitude.Text = longitude;
                 ValueIsp.Text = isp;
                 ValueAsn.Text = asn;
-                ValueMobile.Text = mobile;
-                ValueProxy.Text = proxy;
-                ValueHosting.Text = hosting;
+                ValueMobile.Text = localizeMobile;
+                ValueProxy.Text = localizeProxy;
+                ValueHosting.Text = localizeHosting;
             });
         }
 
         private void ExportBtn_OnClick(object sender, RoutedEventArgs e)
         {
             // Build export string
-            var exportString = $@"Report created at {DateTime.Now} for IP {IpAddress.Text}
+            var reportCreatedMessage = (string)Application.Current.MainWindow.FindResource("ReportCreatedMessage");
+            var formattedMessage = string.Format(reportCreatedMessage, DateTime.Now, IpAddress.Text);
 
-City / Country: {ValueCityCountry.Text}
-Postal: {ValuePostal.Text}
-Timezone: {ValueTimezone.Text}
-Latitude: {ValueLatitude.Text}
-Longitude: {ValueLongitude.Text}
-ISP or Organization: {ValueIsp.Text}
-ASN: {ValueAsn.Text}
-Is Mobile: {ValueMobile.Text}
-Is Proxy: {ValueProxy.Text}
-Is Hosting: {ValueHosting.Text}
+            var cityAndCountry = (string)Application.Current.MainWindow.FindResource("CityAndCountry");
+            var postal = (string)Application.Current.MainWindow.FindResource("Postal");
+            var timezone = (string)Application.Current.MainWindow.FindResource("Timezone");
+            var latitude = (string)Application.Current.MainWindow.FindResource("Latitude");
+            var longitude = (string)Application.Current.MainWindow.FindResource("Longitude");
+            var isp = (string)Application.Current.MainWindow.FindResource("ISPOrOrganization");
+            var asn = (string)Application.Current.MainWindow.FindResource("ASN");
+            var mobile = (string)Application.Current.MainWindow.FindResource("IsMobile");
+            var proxy = (string)Application.Current.MainWindow.FindResource("IsProxy");
+            var hosting = (string)Application.Current.MainWindow.FindResource("IsHosting");
+
+            var exportString = $@"{formattedMessage}
+
+{cityAndCountry}: {ValueCityCountry.Text}
+{postal}: {ValuePostal.Text}
+{timezone}: {ValueTimezone.Text}
+{latitude}: {ValueLatitude.Text}
+{longitude}: {ValueLongitude.Text}
+{isp}: {ValueIsp.Text}
+{asn}: {ValueAsn.Text}
+{mobile}: {ValueMobile.Text}
+{proxy}: {ValueProxy.Text}
+{hosting}: {ValueHosting.Text}
 ";
 
             var saveFileDialog = new SaveFileDialog
diff --git a/CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs b/CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs
index 2104410..ea44acb 100644
--- a/CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs
+++ b/CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs
@@ -134,6 +134,9 @@ private void ParseIpAddress()
             }
 
             // Set Variable labels
+            var localizeMobile = Common.LocalizationManager.LocalizeValue(mobile);
+            var localizeProxy = Common.LocalizationManager.LocalizeValue(proxy);
+            var localizeHosting = Common.LocalizationManager.LocalizeValue(hosting);
             Dispatcher.Invoke(() =>
             {
                 IpAddress.Content = _myIp;
@@ -144,9 +147,9 @@ private void ParseIpAddress()
                 ValueLongitude.Text = longitude;
                 ValueIsp.Text = isp;
                 ValueAsn.Text = asn;
-                ValueMobile.Text = mobile;
-                ValueProxy.Text = proxy;
-                ValueHosting.Text = hosting;
+                ValueMobile.Text = localizeMobile;
+                ValueProxy.Text = localizeProxy;
+                ValueHosting.Text = localizeHosting;
             });
 
             // Update NotifyIcon
@@ -156,18 +159,32 @@ private void ParseIpAddress()
         private void ExportBtn_OnClick(object sender, RoutedEventArgs e)
         {
             // Build export string
-            var exportString = $@"Report created at {DateTime.Now} for IP {IpAddress.Content}
-
-City / Country: {ValueCityCountry.Text}
-Postal: {ValuePostal.Text}
-Timezone: {ValueTimezone.Text}
-Latitude: {ValueLatitude.Text}
-Longitude: {ValueLongitude.Text}
-ISP or Organization: {ValueIsp.Text}
-ASN: {ValueAsn.Text}
-Is Mobile: {ValueMobile.Text}
-Is Proxy: {ValueProxy.Text}
-Is Hosting: {ValueHosting.Text}
+            var reportCreatedMessage = (string)Application.Current.MainWindow.FindResource("ReportCreatedMessage");
+            var formattedMessage = string.Format(reportCreatedMessage, DateTime.Now, IpAddress.Content);
+
+            var cityAndCountry = (string)Application.Current.MainWindow.FindResource("CityAndCountry");
+            var postal = (string)Application.Current.MainWindow.FindResource("Postal");
+            var timezone = (string)Application.Current.MainWindow.FindResource("Timezone");
+            var latitude = (string)Application.Current.MainWindow.FindResource("Latitude");
+            var longitude = (string)Application.Current.MainWindow.FindResource("Longitude");
+            var isp = (string)Application.Current.MainWindow.FindResource("ISPOrOrganization");
+            var asn = (string)Application.Current.MainWindow.FindResource("ASN");
+            var mobile = (string)Application.Current.MainWindow.FindResource("IsMobile");
+            var proxy = (string)Application.Current.MainWindow.FindResource("IsProxy");
+            var hosting = (string)Application.Current.MainWindow.FindResource("IsHosting");
+
+            var exportString = $@"{formattedMessage}
+
+{cityAndCountry}: {ValueCityCountry.Text}
+{postal}: {ValuePostal.Text}
+{timezone}: {ValueTimezone.Text}
+{latitude}: {ValueLatitude.Text}
+{longitude}: {ValueLongitude.Text}
+{isp}: {ValueIsp.Text}
+{asn}: {ValueAsn.Text}
+{mobile}: {ValueMobile.Text}
+{proxy}: {ValueProxy.Text}
+{hosting}: {ValueHosting.Text}
 ";
 
             var saveFileDialog = new SaveFileDialog

From 9bfb9a487d117d20ec2dde2f7587af98750f5fe6 Mon Sep 17 00:00:00 2001
From: bovirus <1262554+bovirus@users.noreply.github.com>
Date: Tue, 21 Mar 2023 09:32:05 -0700
Subject: [PATCH 07/17] Add italian language (#8)

* Localization italian language

* Add italian/italian language to the installer
---
 .../ResourceDictionary.it-IT.xaml             | 46 +++++++++++++++++++
 CheckIP.Windows/CheckIP/Pages/App.xaml        |  1 +
 CheckIP.Windows/CheckIP/Pages/Main.xaml.cs    |  3 ++
 CheckIP.Windows/Setup/ISS/x64.iss             | 43 ++++++++++++-----
 CheckIP.Windows/Setup/ISS/x86.iss             | 42 ++++++++++++-----
 5 files changed, 113 insertions(+), 22 deletions(-)
 create mode 100644 CheckIP.Windows/CheckIP/Localization/ResourceDictionary.it-IT.xaml

diff --git a/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.it-IT.xaml b/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.it-IT.xaml
new file mode 100644
index 0000000..443b156
--- /dev/null
+++ b/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.it-IT.xaml
@@ -0,0 +1,46 @@
+<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="IPAddress">Indirizzo IP</system:String>
+    <system:String x:Key="Fetch">Verifica</system:String>
+    <system:String x:Key="Information">Informazioni</system:String>
+    <system:String x:Key="CityAndCountry">Città/nazione</system:String>
+    <system:String x:Key="Postal">CAP</system:String>
+    <system:String x:Key="Timezone">Fuso orario</system:String>
+    <system:String x:Key="Latitude">Latitudine</system:String>
+    <system:String x:Key="Longitude">Longitudine</system:String>
+    <system:String x:Key="ISPOrOrganization">ISP/organizzazione</system:String>
+    <system:String x:Key="ASN">ASN</system:String>
+    <system:String x:Key="IsMobile">Mobile</system:String>
+    <system:String x:Key="IsProxy">Proxy</system:String>
+    <system:String x:Key="IsHosting">Hosting</system:String>
+    <system:String x:Key="ExportInfo">Esporta informazioni</system:String>
+    <system:String x:Key="Unknown">Sconosciuto/a</system:String>
+    <system:String x:Key="MyIP">IP attuale</system:String>
+    <system:String x:Key="True">ON</system:String>
+    <system:String x:Key="False">OFF</system:String>
+
+    <!-- About -->
+    <system:String x:Key="About">Info</system:String>
+    <system:String x:Key="AboutThisApp">Info su questa app</system:String>
+    <system:String x:Key="AllRightsReserved">Tutti i diritti riservati.</system:String>
+    <system:String x:Key="License">Questo programma è un software gratuito: puoi ridistribuirlo e/o
+        modificarlo sotto i termini della licenza GNU General Public License 
+        pubblicata dalla Free Software Foundation, versione 3 della Licenza, 
+        o (a tua scelta) qualsiasi versione successiva.</system:String>
+    <system:String x:Key="ThirdPartyLibraries">Librerie di terze parti</system:String>
+    <system:String x:Key="ThirdPartyLibrariesDescription">Elenco di tutte le librerie immagini open source usate.</system:String>
+    <system:String x:Key="By">{0} di {1}</system:String>
+    <system:String x:Key="SourceCodeBtn">Codice sorgente su GitHub</system:String>
+    <system:String x:Key="HomepageBtn">Pagina home</system:String>
+    <system:String x:Key="LicenseBtn">Licenza</system:String>
+
+    <!-- Report -->
+    <system:String x:Key="ReportCreatedMessage">Rapporto creato il {0} per {1} indirizzi IP</system:String>
+
+    <!-- Error's -->
+    <system:String x:Key="ErrorReservedRange">Errore: intervallo riservato</system:String>
+    <system:String x:Key="ErrorInvalidIP">Errore: questo non è un indirizzo IP valido</system:String>
+    <system:String x:Key="ErrorNoConnection">Errore: nessuna connessione al server</system:String>
+    <system:String x:Key="ErrorInvalidQuery">Errore: richiesta non valida</system:String>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/CheckIP.Windows/CheckIP/Pages/App.xaml b/CheckIP.Windows/CheckIP/Pages/App.xaml
index 72958b3..8f2d8f4 100644
--- a/CheckIP.Windows/CheckIP/Pages/App.xaml
+++ b/CheckIP.Windows/CheckIP/Pages/App.xaml
@@ -12,6 +12,7 @@
                 <ui:ControlsDictionary />
                 <ResourceDictionary Source="/CheckIP;component/Localization/ResourceDictionary.xaml"/>
                 <ResourceDictionary Source="/CheckIP;component/Localization/ResourceDictionary.de-DE.xaml"/>
+                <ResourceDictionary Source="/CheckIP;component/Localization/ResourceDictionary.it-IT.xaml"/>
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="{x:Type Label}">
                 <Setter Property="FontFamily" Value="Segoe UI Variable Display"/>
diff --git a/CheckIP.Windows/CheckIP/Pages/Main.xaml.cs b/CheckIP.Windows/CheckIP/Pages/Main.xaml.cs
index a2781f0..0a78bcc 100644
--- a/CheckIP.Windows/CheckIP/Pages/Main.xaml.cs
+++ b/CheckIP.Windows/CheckIP/Pages/Main.xaml.cs
@@ -38,6 +38,9 @@ public Main()
                 case "de-DE":
                     dict.Source = new Uri(@"/CheckIP;component/Localization/ResourceDictionary.de-DE.xaml", UriKind.Relative);
                     break;
+                case "it-IT":
+                    dict.Source = new Uri(@"/CheckIP;component/Localization/ResourceDictionary.it-IT.xaml", UriKind.Relative);
+                    break;
             }
             Application.Current.Resources.MergedDictionaries.Add(dict);
 
diff --git a/CheckIP.Windows/Setup/ISS/x64.iss b/CheckIP.Windows/Setup/ISS/x64.iss
index 11791a1..a8feddb 100644
--- a/CheckIP.Windows/Setup/ISS/x64.iss
+++ b/CheckIP.Windows/Setup/ISS/x64.iss
@@ -1,38 +1,59 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#define MyAppName "CheckIP"
-#define MyAppVersion "2.2.0"
-#define MyAppPublisher "Exploitox"
-#define MyAppURL "https://github.com/valnoxy/checkip"
-#define MyAppExeName "CheckIP.exe"
-
+#define MyAppName          "CheckIP"
+#define MyAppVersion       GetFileVersion('..\..\CheckIP\bin\Release\net7.0-windows10.0.19041.0\publish\win-x64\CheckIP.exe.exe')
+#define MyAppPlatform      "64bit"
+#define MyAppPublisher     "Exploitox"
+#define MyAppURL           "https://github.com/valnoxy/checkip"
+#define MyAppExeName       "CheckIP.exe"
+#define MyAppStartingYear  "2018"
+#define MyAppEndingYear    GetDateTimeString('yyyy','','')
+              
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{47128A10-4D16-4AE3-AE08-F311BDB04571}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
+AppVerName={#MyAppName} {#MyAppVersion} ({#MyAppPlaform})
+
+VersionInfoDescription={#MyAppName} installer
+VersionInfoVersion={#MyAppVersion}
+VersionInfoProductName={#MyAppName}
+VersionInfoProductVersion={#MyAppVersion}
+AppCopyright={#MyAppPublisher} {#MyAppStartingYear}-{#MyAppEndingYear}
+
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
+
+UninstallDisplayIcon={app}\CheckIP.exe
+UninstallDisplayName={#MyAppName}
+AppPublisher={#MyAppPublisher}
+
+WizardStyle=modern
+ShowLanguageDialog=yes
+UsePreviousLanguage=no
+
+ArchitecturesInstallIn64BitMode=x64
+
 DefaultDirName={commonpf64}\{#MyAppPublisher}\{#MyAppName}
+UsePreviousAppDir=yes
 DisableProgramGroupPage=yes
 LicenseFile=..\..\..\LICENSE
 ; Uncomment the following line to run in non administrative install mode (install for current user only.)
 ;PrivilegesRequired=lowest
 PrivilegesRequiredOverridesAllowed=commandline
 OutputDir=..\Output
-OutputBaseFilename=CheckIP
+OutputBaseFilename=CheckIP-x64
 Compression=lzma
 SolidCompression=yes
-WizardStyle=modern
-ArchitecturesInstallIn64BitMode=x64
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
+Name: "german";  MessagesFile: "compiler:Languages\German.isl"
+Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
diff --git a/CheckIP.Windows/Setup/ISS/x86.iss b/CheckIP.Windows/Setup/ISS/x86.iss
index 5f9a157..0f452d9 100644
--- a/CheckIP.Windows/Setup/ISS/x86.iss
+++ b/CheckIP.Windows/Setup/ISS/x86.iss
@@ -1,43 +1,63 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#define MyAppName "CheckIP"
-#define MyAppVersion "2.2.0"
-#define MyAppPublisher "Exploitox"
-#define MyAppURL "https://github.com/valnoxy/checkip"
-#define MyAppExeName "CheckIP.exe"
-
+#define MyAppName          "CheckIP"
+#define MyAppVersion       GetFileVersion('..\..\CheckIP\bin\Release\net7.0-windows10.0.19041.0\publish\win-x64\CheckIP.exe.exe')
+#define MyAppPlatform      "32bit"
+#define MyAppPublisher     "Exploitox"
+#define MyAppURL           "https://github.com/valnoxy/checkip"
+#define MyAppExeName       "CheckIP.exe"
+#define MyAppStartingYear  "2018"
+#define MyAppEndingYear    GetDateTimeString('yyyy','','')
+              
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{47128A10-4D16-4AE3-AE08-F311BDB04571}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
+AppVerName={#MyAppName} {#MyAppVersion} ({#MyAppPlaform})
+
+VersionInfoDescription={#MyAppName} installer
+VersionInfoVersion={#MyAppVersion}
+VersionInfoProductName={#MyAppName}
+VersionInfoProductVersion={#MyAppVersion}
+AppCopyright={#MyAppPublisher} {#MyAppStartingYear}-{#MyAppEndingYear}
+
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
+
+UninstallDisplayIcon={app}\CheckIP.exe
+UninstallDisplayName={#MyAppName}
+AppPublisher={#MyAppPublisher}
+
+WizardStyle=modern
+ShowLanguageDialog=yes
+UsePreviousLanguage=no
+
 DefaultDirName={commonpf32}\{#MyAppPublisher}\{#MyAppName}
+UsePreviousAppDir=yes
 DisableProgramGroupPage=yes
 LicenseFile=..\..\..\LICENSE
 ; Uncomment the following line to run in non administrative install mode (install for current user only.)
 ;PrivilegesRequired=lowest
 PrivilegesRequiredOverridesAllowed=commandline
 OutputDir=..\Output
-OutputBaseFilename=CheckIP
+OutputBaseFilename=CheckIP-x86
 Compression=lzma
 SolidCompression=yes
-WizardStyle=modern
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
+Name: "german";  MessagesFile: "compiler:Languages\German.isl"
+Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "..\..\CheckIP\bin\Release\net7.0-windows10.0.19041.0\publish\win-x86\*"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\CheckIP\bin\Release\net7.0-windows10.0.19041.0\publish\win-x64\*"; DestDir: "{app}"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

From d385f5fdfb8679787bb97d43f97cf6b33481bbba Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Tue, 21 Mar 2023 17:56:42 +0100
Subject: [PATCH 08/17] =?UTF-8?q?=F0=9F=8C=8E=20Update=20Inno=20Setup=20fi?=
 =?UTF-8?q?les?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CheckIP.Windows/CheckIP/CheckIP.csproj |  7 ++++---
 CheckIP.Windows/Setup/ISS/x64.iss      | 12 ++++++------
 CheckIP.Windows/Setup/ISS/x86.iss      | 12 ++++++------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/CheckIP.Windows/CheckIP/CheckIP.csproj b/CheckIP.Windows/CheckIP/CheckIP.csproj
index e4bed2b..b70f69b 100644
--- a/CheckIP.Windows/CheckIP/CheckIP.csproj
+++ b/CheckIP.Windows/CheckIP/CheckIP.csproj
@@ -12,6 +12,7 @@
 		<RepositoryUrl>https://github.com/valnoxy/checkip</RepositoryUrl>
 		<Version>2.2.1</Version>
 		<Platforms>AnyCPU;ARM32;ARM64;x64;x86</Platforms>
+		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -286,8 +287,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<Page Remove="Localization\ResourceDictionary.de-DE.xaml" />
-		<Page Remove="Localization\ResourceDictionary.xaml" />
 		<Page Remove="Pages\App.xaml" />
 		<Page Remove="W11App.xaml" />
 	</ItemGroup>
@@ -579,12 +578,14 @@
 		<Resource Include="Assets\zw.ico" />
 		<Resource Include="icon.png" />
 		<Resource Include="Localization\ResourceDictionary.de-DE.xaml">
-		  <SubType>Component</SubType>
 		  <Generator>MSBuild:Compile</Generator>
 		</Resource>
 		<Resource Include="Localization\ResourceDictionary.xaml">
 		  <Generator>MSBuild:Compile</Generator>
 		</Resource>
+		<Resource Include="Localization\ResourceDictionary.it-IT.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Resource>
 	</ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/CheckIP.Windows/Setup/ISS/x64.iss b/CheckIP.Windows/Setup/ISS/x64.iss
index a8feddb..608161f 100644
--- a/CheckIP.Windows/Setup/ISS/x64.iss
+++ b/CheckIP.Windows/Setup/ISS/x64.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName          "CheckIP"
-#define MyAppVersion       GetFileVersion('..\..\CheckIP\bin\Release\net7.0-windows10.0.19041.0\publish\win-x64\CheckIP.exe.exe')
+#define MyAppVersion       GetFileVersion('..\..\CheckIP\bin\x64\Release\CheckIP.exe')
 #define MyAppPlatform      "64bit"
 #define MyAppPublisher     "Exploitox"
 #define MyAppURL           "https://github.com/valnoxy/checkip"
@@ -16,13 +16,13 @@
 AppId={{47128A10-4D16-4AE3-AE08-F311BDB04571}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
-AppVerName={#MyAppName} {#MyAppVersion} ({#MyAppPlaform})
+AppVerName={#MyAppName} {#MyAppVersion} ({#MyAppPlatform})
 
-VersionInfoDescription={#MyAppName} installer
+VersionInfoDescription={#MyAppName} Installer
 VersionInfoVersion={#MyAppVersion}
 VersionInfoProductName={#MyAppName}
 VersionInfoProductVersion={#MyAppVersion}
-AppCopyright={#MyAppPublisher} {#MyAppStartingYear}-{#MyAppEndingYear}
+AppCopyright=Copyright � {#MyAppStartingYear} - {#MyAppEndingYear} {#MyAppPublisher}. All rights reserved.       
 
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
@@ -46,7 +46,7 @@ LicenseFile=..\..\..\LICENSE
 ;PrivilegesRequired=lowest
 PrivilegesRequiredOverridesAllowed=commandline
 OutputDir=..\Output
-OutputBaseFilename=CheckIP-x64
+OutputBaseFilename=CheckIP_{#MyAppVersion}_x64
 Compression=lzma
 SolidCompression=yes
 
@@ -59,7 +59,7 @@ Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "..\..\CheckIP\bin\Release\net7.0-windows10.0.19041.0\publish\win-x64\*"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\CheckIP\bin\x64\Release\*"; DestDir: "{app}"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
diff --git a/CheckIP.Windows/Setup/ISS/x86.iss b/CheckIP.Windows/Setup/ISS/x86.iss
index 0f452d9..129fd6e 100644
--- a/CheckIP.Windows/Setup/ISS/x86.iss
+++ b/CheckIP.Windows/Setup/ISS/x86.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName          "CheckIP"
-#define MyAppVersion       GetFileVersion('..\..\CheckIP\bin\Release\net7.0-windows10.0.19041.0\publish\win-x64\CheckIP.exe.exe')
+#define MyAppVersion       GetFileVersion('..\..\CheckIP\bin\x86\Release\CheckIP.exe')
 #define MyAppPlatform      "32bit"
 #define MyAppPublisher     "Exploitox"
 #define MyAppURL           "https://github.com/valnoxy/checkip"
@@ -16,13 +16,13 @@
 AppId={{47128A10-4D16-4AE3-AE08-F311BDB04571}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
-AppVerName={#MyAppName} {#MyAppVersion} ({#MyAppPlaform})
+AppVerName={#MyAppName} {#MyAppVersion} ({#MyAppPlatform})
 
-VersionInfoDescription={#MyAppName} installer
+VersionInfoDescription={#MyAppName} Installer
 VersionInfoVersion={#MyAppVersion}
 VersionInfoProductName={#MyAppName}
 VersionInfoProductVersion={#MyAppVersion}
-AppCopyright={#MyAppPublisher} {#MyAppStartingYear}-{#MyAppEndingYear}
+AppCopyright=Copyright � {#MyAppStartingYear} - {#MyAppEndingYear} {#MyAppPublisher}. All rights reserved.
 
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
@@ -44,7 +44,7 @@ LicenseFile=..\..\..\LICENSE
 ;PrivilegesRequired=lowest
 PrivilegesRequiredOverridesAllowed=commandline
 OutputDir=..\Output
-OutputBaseFilename=CheckIP-x86
+OutputBaseFilename=CheckIP_{#MyAppVersion}_x86
 Compression=lzma
 SolidCompression=yes
 
@@ -57,7 +57,7 @@ Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "..\..\CheckIP\bin\Release\net7.0-windows10.0.19041.0\publish\win-x64\*"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\CheckIP\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

From 6205f37972645434246a1654a855e482493efcef Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Tue, 21 Mar 2023 18:15:06 +0100
Subject: [PATCH 09/17] =?UTF-8?q?=E2=9A=92=EF=B8=8F=20Added=20GitHub=20Act?=
 =?UTF-8?q?ion=20Workflow=20for=20Windows=20GUI=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/Windows-GUI.yml | 53 +++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 .github/workflows/Windows-GUI.yml

diff --git a/.github/workflows/Windows-GUI.yml b/.github/workflows/Windows-GUI.yml
new file mode 100644
index 0000000..62923c5
--- /dev/null
+++ b/.github/workflows/Windows-GUI.yml
@@ -0,0 +1,53 @@
+name: Windows GUI
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    
+    - name: Setup .NET 7.0.x
+      uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: 7.0.x
+        
+    - name: Setup MSBuild
+      uses: microsoft/setup-msbuild@v1.1
+
+    - name: Setup NuGet
+      uses: NuGet/setup-nuget@v1.0.6
+        
+    - name: Restore dependencies
+      run: nuget restore CheckIP.Windows\CheckIP.sln
+      
+    - name: Build (x86)
+      run: msbuild.exe CheckIP.Windows\CheckIP.sln /p:platform="x86" /p:configuration="Release"
+      
+    - name: Build (x64)
+      run: msbuild.exe CheckIP.Windows\CheckIP.sln /p:platform="x64" /p:configuration="Release"
+    
+    - name: Create Setup file (x86)
+      run: |
+        "%programfiles(x86)%\\Inno Setup 6\\iscc.exe" "CheckIP.Windows\Setup\ISS\x86.iss"
+      shell: cmd
+
+    - name: Create Setup file (x64)
+      run: |
+        "%programfiles(x86)%\\Inno Setup 6\\iscc.exe" "CheckIP.Windows\Setup\ISS\x64.iss"
+      shell: cmd
+
+    - name: Upload setup artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: CheckIP binaries
+        path: CheckIP.Windows\Setup\*
\ No newline at end of file

From aeca7471598ec80c2fee97945ba2c11b86496802 Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Wed, 12 Jul 2023 13:36:12 +0200
Subject: [PATCH 10/17] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f6ab3d3..e7308e7 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 [![iOS](https://img.shields.io/badge/iOS-Xamarin-green)](https://github.com/valnoxy/checkip/tree/main/CheckIP.Mobile)
 [![Windows](https://img.shields.io/badge/Windows-WPF-blue)](https://github.com/valnoxy/checkip/tree/main/CheckIP.Windows)
 [![License](https://img.shields.io/badge/license-GNU%20General%20Public%20License-purple)](/LICENSE)
-
+[![Downloads](https://img.shields.io/github/downloads/valnoxy/checkip/total.svg)](https://github.com/valnoxy/checkip/releases)
 <p align="center">
    <strong>Status: </strong>Maintained
    <br />

From 6fffcf89a617ddd9f248a989b02b83cdbeec880d Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Sun, 24 Mar 2024 04:48:21 +0100
Subject: [PATCH 11/17] =?UTF-8?q?=F0=9F=94=84=EF=B8=8F=20New=20UI,=20IPMan?=
 =?UTF-8?q?ager,=20.NET=208.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/Windows-GUI.yml             |   4 +-
 CheckIP.Windows/CheckIP/{Pages => }/App.xaml  |   2 +-
 .../CheckIP/{Pages => }/App.xaml.cs           |   0
 CheckIP.Windows/CheckIP/CheckIP.csproj        |  28 +-
 CheckIP.Windows/CheckIP/Common/IPManager.cs   | 111 ++++++
 CheckIP.Windows/CheckIP/Common/TrayIcon.cs    |  16 +-
 .../ResourceDictionary.de-DE.xaml             |   3 +-
 .../ResourceDictionary.it-IT.xaml             |   4 +-
 .../Localization/ResourceDictionary.xaml      |   2 +-
 CheckIP.Windows/CheckIP/MainWindow.xaml       |  74 ++++
 .../Main.xaml.cs => MainWindow.xaml.cs}       |  31 +-
 CheckIP.Windows/CheckIP/Pages/About.xaml      | 152 ++++----
 CheckIP.Windows/CheckIP/Pages/About.xaml.cs   |  65 +++-
 CheckIP.Windows/CheckIP/Pages/FetchIP.xaml    | 341 +++++++++---------
 CheckIP.Windows/CheckIP/Pages/FetchIP.xaml.cs | 154 ++++----
 CheckIP.Windows/CheckIP/Pages/Main.xaml       |  84 -----
 CheckIP.Windows/CheckIP/Pages/MyIP.xaml       | 325 +++++++++--------
 CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs    | 208 +++++------
 18 files changed, 878 insertions(+), 726 deletions(-)
 rename CheckIP.Windows/CheckIP/{Pages => }/App.xaml (96%)
 rename CheckIP.Windows/CheckIP/{Pages => }/App.xaml.cs (100%)
 create mode 100644 CheckIP.Windows/CheckIP/Common/IPManager.cs
 create mode 100644 CheckIP.Windows/CheckIP/MainWindow.xaml
 rename CheckIP.Windows/CheckIP/{Pages/Main.xaml.cs => MainWindow.xaml.cs} (63%)
 delete mode 100644 CheckIP.Windows/CheckIP/Pages/Main.xaml

diff --git a/.github/workflows/Windows-GUI.yml b/.github/workflows/Windows-GUI.yml
index 62923c5..27ac552 100644
--- a/.github/workflows/Windows-GUI.yml
+++ b/.github/workflows/Windows-GUI.yml
@@ -16,10 +16,10 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     
-    - name: Setup .NET 7.0.x
+    - name: Setup .NET 8.0.x
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
         
     - name: Setup MSBuild
       uses: microsoft/setup-msbuild@v1.1
diff --git a/CheckIP.Windows/CheckIP/Pages/App.xaml b/CheckIP.Windows/CheckIP/App.xaml
similarity index 96%
rename from CheckIP.Windows/CheckIP/Pages/App.xaml
rename to CheckIP.Windows/CheckIP/App.xaml
index 8f2d8f4..eba419b 100644
--- a/CheckIP.Windows/CheckIP/Pages/App.xaml
+++ b/CheckIP.Windows/CheckIP/App.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:CheckIP"
     xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
-    StartupUri="Main.xaml">
+    StartupUri="/MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/CheckIP.Windows/CheckIP/Pages/App.xaml.cs b/CheckIP.Windows/CheckIP/App.xaml.cs
similarity index 100%
rename from CheckIP.Windows/CheckIP/Pages/App.xaml.cs
rename to CheckIP.Windows/CheckIP/App.xaml.cs
diff --git a/CheckIP.Windows/CheckIP/CheckIP.csproj b/CheckIP.Windows/CheckIP/CheckIP.csproj
index b70f69b..28b861d 100644
--- a/CheckIP.Windows/CheckIP/CheckIP.csproj
+++ b/CheckIP.Windows/CheckIP/CheckIP.csproj
@@ -2,17 +2,19 @@
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+		<Nullable>disable</Nullable>
+		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
 		<UseWPF>true</UseWPF>
 		<ApplicationIcon>Assets\CheckIP.ico</ApplicationIcon>
 		<Authors>valnoxy</Authors>
 		<Company>Exploitox</Company>
 		<Description>Get more information about an IP address.</Description>
-		<Copyright>Copyright © 2018 - 2023 Exploitox. All rights reserved.</Copyright>
+		<Copyright>Copyright © 2018 - 2024 Exploitox. All rights reserved.</Copyright>
 		<RepositoryUrl>https://github.com/valnoxy/checkip</RepositoryUrl>
-		<Version>2.2.1</Version>
+		<Version>2.3.0</Version>
 		<Platforms>AnyCPU;ARM32;ARM64;x64;x86</Platforms>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+		<StartupObject>CheckIP.App</StartupObject>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -287,15 +289,15 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<Page Remove="Pages\App.xaml" />
-		<Page Remove="W11App.xaml" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ApplicationDefinition Include="Pages\App.xaml">
+		<Page Update="Pages\About.xaml">
 			<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-			<Generator>MSBuild:Compile</Generator>
-		</ApplicationDefinition>
+		</Page>
+		<Page Update="Pages\FetchIP.xaml">
+			<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+		</Page>
+		<Page Update="Pages\MyIP.xaml">
+			<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+		</Page>
 	</ItemGroup>
 
 	<ItemGroup>
@@ -349,8 +351,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-		<PackageReference Include="WPF-UI" Version="2.0.3" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Include="WPF-UI" Version="3.0.2" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/CheckIP.Windows/CheckIP/Common/IPManager.cs b/CheckIP.Windows/CheckIP/Common/IPManager.cs
new file mode 100644
index 0000000..a011e5e
--- /dev/null
+++ b/CheckIP.Windows/CheckIP/Common/IPManager.cs
@@ -0,0 +1,111 @@
+using Newtonsoft.Json.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace CheckIP.Common
+{
+    public class IPManager
+    {
+        public class IP
+        {
+            public string City { get; set; }
+            public string Country { get; set; }
+            public string CountryCode { get; set; }
+            public string Postal { get; set; }
+            public string Timezone { get; set; }
+            public string Latitude { get; set; }
+            public string Longitude { get; set; }
+            public string Isp { get; set; }
+            public string Asn { get; set; }
+            public bool Mobile { get; set; }
+            public bool Proxy { get; set; }
+            public bool Hosting { get; set; }
+            public bool ParseSuccess { get; set; }
+            public string Status { get; set; }
+            public IPAddress IPAddress { get; set; }
+        }
+
+        public static IP Parse(string ip)
+        {
+            var ipData = new IP();
+
+            var validateIp = IPAddress.TryParse(ip, out var ipAddr);
+            if (!validateIp)
+            {
+                ipData.ParseSuccess = false;
+                Application.Current.Dispatcher.Invoke(() =>
+                {
+                    var error = (string)Application.Current.MainWindow!.FindResource("ErrorInvalidIP");
+                    ipData.Status = !string.IsNullOrEmpty(error) ? error : "Error: This is not a valid IP address.";
+                });
+                return ipData;
+            }
+
+            // Parse data
+            string dataJson;
+            var url = "http://ip-api.com/json/" + ip + "?fields=status,message,country,countryCode,city,zip,lat,lon,timezone,isp,as,mobile,proxy,hosting";
+            try
+            {
+                var client = new HttpClient();
+                using var response = client.GetAsync(url).Result;
+                using var content = response.Content;
+                dataJson = content.ReadAsStringAsync().Result;
+            }
+            catch
+            {
+                ipData.ParseSuccess = false;
+                Application.Current.Dispatcher.Invoke(() =>
+                {
+                    var error = (string)Application.Current.MainWindow!.FindResource("ErrorNoConnection");
+                    ipData.Status = !string.IsNullOrEmpty(error) ? error : "Error: No connection to server";
+                });
+                return ipData;
+            }
+            dynamic data = JObject.Parse(dataJson);
+
+            // Parse data
+            string status = data.status;
+            string message = data.message;
+            string country = data.country;
+            string countryCode = data.countryCode;
+            string city = data.city;
+            string postal = data.zip;
+            string timezone = data.timezone;
+            string latitude = data.lat;
+            string longitude = data.lon;
+            string isp = data.isp;
+            string asn = data.@as;
+            string mobile = data.mobile;
+            string proxy = data.proxy;
+            string hosting = data.hosting;
+
+            // Check status
+            if (status != "success")
+            {
+                var localizeError = Common.LocalizationManager.LocalizeError(message);
+                ipData.Status = localizeError;
+                ipData.ParseSuccess = false;
+                return ipData;
+            }
+
+            ipData.City = city;
+            ipData.Country = country;
+            ipData.CountryCode = countryCode;
+            ipData.Postal = postal;
+            ipData.Timezone = timezone;
+            ipData.Latitude = latitude;
+            ipData.Longitude = longitude;
+            ipData.Isp = isp;
+            ipData.Asn = asn; 
+            ipData.Mobile = mobile.Equals("true", System.StringComparison.CurrentCultureIgnoreCase);
+            ipData.Proxy = proxy.Equals("true", System.StringComparison.CurrentCultureIgnoreCase);
+            ipData.Hosting = hosting.Equals("true", System.StringComparison.CurrentCultureIgnoreCase);
+            ipData.IPAddress = ipAddr;
+            ipData.ParseSuccess = true;
+
+            return ipData;
+        }
+    }
+}
diff --git a/CheckIP.Windows/CheckIP/Common/TrayIcon.cs b/CheckIP.Windows/CheckIP/Common/TrayIcon.cs
index 8f8521e..945cf42 100644
--- a/CheckIP.Windows/CheckIP/Common/TrayIcon.cs
+++ b/CheckIP.Windows/CheckIP/Common/TrayIcon.cs
@@ -1,11 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Drawing;
-using System.Linq;
 using System.Net;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Media.Imaging;
 using Hardcodet.Wpf.TaskbarNotification;
 
@@ -40,6 +35,17 @@ public static void Update(string country, string city, IPAddress ip, string coun
                 Debug.WriteLine(ex);
             }
         }
+
+        public static BitmapImage Create(string path)
+        {
+            var img = new BitmapImage();
+            img.BeginInit();
+            img.CacheOption = BitmapCacheOption.OnLoad;
+            img.UriSource = new Uri(path, UriKind.RelativeOrAbsolute);
+            img.EndInit();
+            img.Freeze();
+            return img;
+        }
     }
 
 }
diff --git a/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.de-DE.xaml b/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.de-DE.xaml
index afde582..38a87da 100644
--- a/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.de-DE.xaml
+++ b/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.de-DE.xaml
@@ -28,9 +28,10 @@
     <system:String x:Key="ThirdPartyLibraries">Drittanbieter Bibliotheken</system:String>
     <system:String x:Key="ThirdPartyLibrariesDescription">Liste aller verwendeten Bibliotheken und Bilder.</system:String>
     <system:String x:Key="By">{0} von {1}</system:String>
-    <system:String x:Key="SourceCodeBtn">Quellcode auf GitHub</system:String>
+    <system:String x:Key="SourceCodeBtn">Quellcode</system:String>
     <system:String x:Key="HomepageBtn">Homepage</system:String>
     <system:String x:Key="LicenseBtn">Lizenz</system:String>
+    <system:String x:Key="DonateBtn">Spenden</system:String>
 
     <!-- Report -->
     <system:String x:Key="ReportCreatedMessage">Bericht erstellt am {0} für IP-Adresse {1}</system:String>
diff --git a/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.it-IT.xaml b/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.it-IT.xaml
index 443b156..ee45f40 100644
--- a/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.it-IT.xaml
+++ b/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.it-IT.xaml
@@ -31,9 +31,9 @@
     <system:String x:Key="ThirdPartyLibraries">Librerie di terze parti</system:String>
     <system:String x:Key="ThirdPartyLibrariesDescription">Elenco di tutte le librerie immagini open source usate.</system:String>
     <system:String x:Key="By">{0} di {1}</system:String>
-    <system:String x:Key="SourceCodeBtn">Codice sorgente su GitHub</system:String>
+    <system:String x:Key="SourceCodeBtn">Codice sorgente</system:String>
     <system:String x:Key="HomepageBtn">Pagina home</system:String>
-    <system:String x:Key="LicenseBtn">Licenza</system:String>
+    <system:String x:Key="DonateBtn">Donare</system:String>
 
     <!-- Report -->
     <system:String x:Key="ReportCreatedMessage">Rapporto creato il {0} per {1} indirizzi IP</system:String>
diff --git a/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.xaml b/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.xaml
index af4d7c2..b29e4f2 100644
--- a/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.xaml
+++ b/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.xaml
@@ -33,7 +33,7 @@
     <system:String x:Key="By">{0} by {1}</system:String>
     <system:String x:Key="SourceCodeBtn">Source Code on GitHub</system:String>
     <system:String x:Key="HomepageBtn">Homepage</system:String>
-    <system:String x:Key="LicenseBtn">License</system:String>
+    <system:String x:Key="DonateBtn">Donate</system:String>
 
     <!-- Report -->
     <system:String x:Key="ReportCreatedMessage">Report created at {0} for IP address {1}</system:String>
diff --git a/CheckIP.Windows/CheckIP/MainWindow.xaml b/CheckIP.Windows/CheckIP/MainWindow.xaml
new file mode 100644
index 0000000..e4438eb
--- /dev/null
+++ b/CheckIP.Windows/CheckIP/MainWindow.xaml
@@ -0,0 +1,74 @@
+<ui:FluentWindow x:Class="CheckIP.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="CheckIP" Height="669" Width="512"
+        MinHeight="669" MinWidth="512"
+        xmlns:pages="clr-namespace:CheckIP"
+        xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+        WindowStartupLocation="CenterScreen"
+        ExtendsContentIntoTitleBar="True"
+        WindowBackdropType="Mica"
+        WindowCornerPreference="Round"
+        ResizeMode="NoResize"
+        ContentRendered="MainWindow_OnContentRendered">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <Grid Grid.Row="1" Margin="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+
+            <ui:NavigationView x:Name="RootNavigation" PaneDisplayMode="Top" IsBackButtonVisible="Collapsed" Margin="6,0" Grid.Row="0">
+                <ui:NavigationView.MenuItems>
+                    <ui:NavigationViewItem Content="{DynamicResource Fetch}" NavigationCacheMode="Enabled" TargetPageType="{x:Type pages:FetchIP}">
+                        <ui:NavigationViewItem.Icon>
+                            <ui:SymbolIcon Symbol="Search24" />
+                        </ui:NavigationViewItem.Icon>
+                    </ui:NavigationViewItem>
+                    <ui:NavigationViewItem Content="{DynamicResource MyIP}" NavigationCacheMode="Enabled" TargetPageType="{x:Type pages:MyIP}">
+                        <ui:NavigationViewItem.Icon>
+                            <ui:SymbolIcon Symbol="MyLocation24" />
+                        </ui:NavigationViewItem.Icon>
+                    </ui:NavigationViewItem>
+                </ui:NavigationView.MenuItems>
+
+                <ui:NavigationView.FooterMenuItems>
+                    <ui:NavigationViewItem Click="ThemeSwitch_Click">
+                        <ui:NavigationViewItem.Icon>
+                            <ui:SymbolIcon Symbol="PaintBrush24"/>
+                        </ui:NavigationViewItem.Icon>
+                    </ui:NavigationViewItem>
+                    <ui:NavigationViewItem TargetPageType="{x:Type pages:About}" NavigationCacheMode="Enabled">
+                        <ui:NavigationViewItem.Icon>
+                            <ui:SymbolIcon Symbol="QuestionCircle24" />
+                        </ui:NavigationViewItem.Icon>
+                    </ui:NavigationViewItem>
+                </ui:NavigationView.FooterMenuItems>
+            </ui:NavigationView>
+        </Grid>
+
+        <ui:TitleBar
+            Title="CheckIP"
+            ShowMinimize="False"
+            ShowMaximize="False"
+            Grid.Row="0">
+            <ui:TitleBar.Icon>
+                <ui:ImageIcon Source="pack://application:,,,/Assets/CheckIP.ico" />
+            </ui:TitleBar.Icon>
+        </ui:TitleBar>
+
+        <Grid Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Grid.Column="1" x:Name="DebugString" Text="Debug" Margin="0,17,50,0" Foreground="Red" TextAlignment="Right" HorizontalAlignment="Right"/>
+        </Grid>
+    </Grid>
+</ui:FluentWindow>
\ No newline at end of file
diff --git a/CheckIP.Windows/CheckIP/Pages/Main.xaml.cs b/CheckIP.Windows/CheckIP/MainWindow.xaml.cs
similarity index 63%
rename from CheckIP.Windows/CheckIP/Pages/Main.xaml.cs
rename to CheckIP.Windows/CheckIP/MainWindow.xaml.cs
index 0a78bcc..129b3cc 100644
--- a/CheckIP.Windows/CheckIP/Pages/Main.xaml.cs
+++ b/CheckIP.Windows/CheckIP/MainWindow.xaml.cs
@@ -1,30 +1,21 @@
-using System;
+using CheckIP.Common;
+using System;
 using System.Diagnostics;
 using System.Threading;
 using System.Windows;
-using CheckIP.Common;
-
+using Wpf.Ui.Controls;
 
 namespace CheckIP
 {
     /// <summary>
     /// Interaktionslogik für Main.xaml
     /// </summary>
-    public partial class Main : Wpf.Ui.Controls.UiWindow
+    public partial class MainWindow
     {
-        public Main()
+        public MainWindow()
         {
             InitializeComponent();
 
-            Loaded += (sender, args) =>
-            {
-                Wpf.Ui.Appearance.Watcher.Watch(
-                  this,                                 // Window class
-                  Wpf.Ui.Appearance.BackgroundType.Mica, // Background type
-                  true                                  // Whether to change accents automatically
-                );
-            };
-
             // Set current language model
             var language = Thread.CurrentThread.CurrentCulture.ToString();
             var dict = new ResourceDictionary();
@@ -45,15 +36,19 @@ public Main()
             Application.Current.Resources.MergedDictionaries.Add(dict);
 
 #if DEBUG
-            DebugLabel.Content = "Debug build - This is not a production ready build.";
+            DebugString.Text = "Debug build";
 #endif
         }
 
-        private void RootNavigation_OnLoaded(object sender, RoutedEventArgs e)
+        private void MainWindow_OnContentRendered(object sender, EventArgs e)
         {
-            RootNavigation.Navigate("dashboard");
-
+            RootNavigation.Navigate(typeof(FetchIP));
             TaskBar.Initialize();
         }
+
+        private void ThemeSwitch_Click(object sender, RoutedEventArgs e)
+        {
+            WindowBackdropType = WindowBackdropType == WindowBackdropType.Mica ? WindowBackdropType.Tabbed : WindowBackdropType.Mica;
+        }
     }
 }
diff --git a/CheckIP.Windows/CheckIP/Pages/About.xaml b/CheckIP.Windows/CheckIP/Pages/About.xaml
index 25c5a59..62ed6b7 100644
--- a/CheckIP.Windows/CheckIP/Pages/About.xaml
+++ b/CheckIP.Windows/CheckIP/Pages/About.xaml
@@ -5,71 +5,98 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:CheckIP"
       mc:Ignorable="d"
-      Style="{StaticResource UiPageScrollable}"
       xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
       d:DesignHeight="516" d:DesignWidth="441"
       Title="About">
 
-    <VirtualizingStackPanel IsVirtualizing="True" VirtualizationMode="Recycling" Margin="20,55,18,0">
+    <VirtualizingStackPanel IsVirtualizing="True" VirtualizationMode="Recycling" Margin="8,0,8,0">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
 
-        <StackPanel>
-            <Viewbox Height="97" VerticalAlignment="Top">
-                <Canvas Height="1000.000000" Width="2745.000000">
-                    <Canvas.RenderTransform>
-                        <TransformGroup>
-                            <ScaleTransform ScaleX="0.100000" ScaleY="-0.100000" />
-                            <TranslateTransform X="0.000000" Y="1000.000000" />
-                        </TransformGroup>
-                    </Canvas.RenderTransform>
-                    <Path Data="M4680 6635 c-387 -71 -691 -352 -797 -740 l-28 -100 0 -780 c0 -608 3 -793 13 -840 88 -400 360 -685 757 -791 66 -18 118 -19 855 -19 l785 0 75 24 c98 30 141 52 223 115 153 114 256 312 257 489 l0 47 -1002 0 c-1152 0 -1079 -5 -1178 87 -76 70 -104 132 -104 233 0 57 5 87 22 126 29 63 101 136 167 166 49 22 60 23 440 28 l390 6 79 27 c116 41 203 96 282 179 108 114 173 260 174 391 l0 47 -637 0 c-740 0 -717 -3 -813 87 -76 70 -104 132 -104 233 0 57 5 87 22 126 29 63 101 136 167 166 l50 23 750 5 750 5 70 24 c95 32 138 54 218 115 153 114 256 312 257 489 l0 47 -1032 -1 c-827 -1 -1048 -4 -1108 -14z" Fill="#ec1a5a" Stroke="#00000000" />
-                    <Path Data="M17854 6458 c-59 -19 -127 -80 -159 -143 -26 -52 -30 -68 -29 -139 1 -97 17 -139 81 -207 112 -119 307 -119 424 2 138 142 95 384 -83 473 -43 22 -65 26 -127 25 -42 -1 -90 -6 -107 -11z" Fill="#ec1a5a" Stroke="#00000000" />
-                    <Path Data="M8180 4975 l0 -1455 960 0 960 0 -2 238 -3 237 -717 3 -718 2 0 365 0 365 660 0 660 0 0 240 0 240 -660 0 -660 0 0 370 0 370 720 0 720 0 0 240 0 240 -960 0 -960 0 0 -1455z" Fill="#ec1a5a" Stroke="#00000000" />
-                    <Path Data="M14620 5256 c0 -1303 -3 -1243 71 -1396 57 -115 171 -231 282 -284 99 -48 245 -84 368 -93 l99 -6 0 210 0 210 -37 7 c-21 3 -50 6 -65 6 -46 0 -138 40 -180 78 -22 20 -49 54 -61 76 l-22 41 -3 1158 -2 1157 -225 0 -225 0 0 -1164z" Fill="#ec1a5a" Stroke="#00000000" />
-                    <Path Data="M18642 5103 c3 -1046 3 -1048 25 -1126 35 -123 86 -212 172 -297 111 -110 230 -166 410 -191 90 -13 287 -7 302 8 5 5 8 92 7 199 l-3 189 -110 6 c-165 10 -247 42 -299 117 -60 86 -60 87 -64 680 l-3 542 205 0 206 0 0 210 0 210 -203 0 -204 0 -17 223 c-9 122 -19 234 -22 250 l-6 27 -199 0 -200 0 3 -1047z" Fill="#ec1a5a" Stroke="#00000000" />
-                    <Path Data="M13207 5679 c-197 -13 -394 -57 -573 -127 l-94 -36 0 -1343 0 -1343 225 0 225 0 0 361 c0 340 1 361 18 354 43 -17 142 -45 196 -54 133 -24 354 -8 491 36 238 76 421 248 488 458 22 69 22 81 22 590 0 581 1 574 -73 725 -47 95 -158 211 -255 265 -169 93 -401 133 -670 114z m233 -398 c102 -17 170 -50 232 -111 90 -90 89 -86 86 -606 l-3 -439 -25 -48 c-72 -142 -223 -204 -469 -195 -69 3 -159 13 -199 23 l-72 17 2 651 3 651 68 24 c114 38 263 52 377 33z" Fill="#ec1a5a" Stroke="#00000000" />
-                    <Path Data="M16405 5683 c-361 -33 -636 -223 -732 -506 l-28 -82 0 -505 c0 -558 0 -559 67 -695 130 -268 449 -429 812 -412 150 7 262 34 381 93 206 100 333 252 386 461 19 78 20 105 17 570 l-3 488 -27 80 c-94 276 -357 466 -701 504 -53 6 -104 10 -114 9 -10 -1 -36 -3 -58 -5z m265 -479 c80 -38 134 -83 163 -138 21 -40 22 -51 25 -460 3 -483 3 -482 -79 -567 -72 -74 -158 -110 -275 -117 -150 -8 -274 42 -353 142 -59 75 -62 100 -59 553 l3 408 27 46 c35 59 77 95 153 130 79 36 91 38 220 35 100 -1 116 -4 175 -32z" Fill="#ec1a5a" Stroke="#00000000" />
-                    <Path Data="M20550 5679 c-335 -39 -595 -216 -691 -468 -43 -113 -48 -183 -49 -606 0 -417 7 -527 41 -629 77 -231 295 -412 570 -472 115 -25 297 -29 404 -10 121 23 174 40 277 93 140 72 249 179 313 308 65 132 68 156 72 605 6 530 -4 626 -80 775 -82 162 -239 291 -430 354 -149 49 -295 66 -427 50z m249 -458 c120 -37 209 -119 228 -210 5 -20 8 -216 8 -436 0 -396 0 -400 -23 -450 -40 -87 -114 -149 -223 -185 -53 -19 -80 -21 -160 -18 -81 4 -107 10 -162 36 -84 39 -148 99 -178 165 l-24 52 0 420 c0 394 1 422 19 455 48 88 98 128 206 167 85 30 220 32 309 4z" Fill="#ec1a5a" Stroke="#00000000" />
-                    <Path Data="M10320 5640 c0 -5 157 -241 348 -523 192 -281 351 -517 356 -524 6 -11 -178 -287 -621 -935 l-94 -138 263 0 263 0 117 183 c64 100 165 268 224 374 60 106 111 192 114 192 3 1 50 -81 104 -182 55 -100 154 -269 220 -374 l121 -193 258 0 c141 0 257 3 257 6 0 3 -155 242 -345 531 l-344 525 33 52 c18 28 173 266 344 528 172 263 312 480 312 483 0 3 -115 4 -257 3 l-256 -3 -106 -171 c-58 -94 -158 -264 -221 -377 -63 -114 -117 -207 -120 -207 -3 0 -60 98 -127 218 -67 119 -169 289 -226 377 l-103 160 -257 3 c-170 1 -257 -1 -257 -8z" Fill="#ec1a5a" Stroke="#00000000" />
-                    <Path Data="M21620 5640 c0 -6 157 -241 348 -523 191 -282 351 -517 355 -524 6 -9 -465 -718 -695 -1045 l-19 -28 263 0 263 0 116 183 c64 100 166 268 225 374 60 106 111 192 114 192 3 0 55 -91 116 -203 62 -112 161 -280 220 -375 l109 -171 258 0 c141 0 257 2 257 5 0 3 -155 243 -345 532 l-345 526 17 26 c150 227 673 1033 673 1036 0 3 -116 4 -257 3 l-257 -3 -105 -171 c-58 -94 -158 -264 -221 -377 -63 -113 -117 -206 -120 -206 -3 0 -60 97 -128 217 -67 119 -169 289 -225 377 l-103 160 -257 3 c-174 1 -257 -1 -257 -8z" Fill="#ec1a5a" Stroke="#00000000" />
-                    <Path Data="M17710 4580 l0 -1060 235 0 235 0 0 1060 0 1060 -235 0 -235 0 0 -1060z" Fill="#ec1a5a" Stroke="#00000000" />
-                </Canvas>
-            </Viewbox>
-        </StackPanel>
-
-        <StackPanel>
-            <Label x:Name="LabelTitle"
-                   Content="{DynamicResource AboutThisApp}" 
-                   FontSize="15" 
-                   Margin="-6,0,0,0"
-                   Foreground="{DynamicResource TextFillColorPrimaryBrush}" 
-                   FontWeight="Bold"/>
-
-            <Label x:Name="ValueVersion" 
-                   Content="CheckIP" 
-                   Margin="-6,-8,0,0"
-                   Foreground="{DynamicResource TextFillColorPrimaryBrush}" 
-                   FontSize="15" 
-                   VerticalAlignment="Top" 
-                   HorizontalAlignment="Left"/>
-
-            <Label x:Name="ValueCopyright" 
-                   Content="Copyright © Exploitox. All rights reserved." 
-                   FontSize="15" 
-                   Margin="-6,-8,0,0"
-                   Foreground="{DynamicResource TextFillColorPrimaryBrush}" 
-                   VerticalAlignment="Top" 
-                   HorizontalAlignment="Left"/>
-
-            <TextBlock x:Name="LicenseText" VerticalAlignment="Top" Foreground="{DynamicResource TextFillColorPrimaryBrush}" FontSize="15" TextWrapping="WrapWithOverflow" Text="{DynamicResource License}"/>
-
-        </StackPanel>
+            <Grid Grid.Row="1">
+                <Frame x:Name="ContentFrame" NavigationUIVisibility="Hidden" Height="97" VerticalAlignment="Top"/>
+                <Viewbox Height="97" VerticalAlignment="Top">
+                    <Canvas Height="1000.000000" Width="2745.000000">
+                        <Canvas.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform ScaleX="0.100000" ScaleY="-0.100000" />
+                                <TranslateTransform X="0.000000" Y="1000.000000" />
+                            </TransformGroup>
+                        </Canvas.RenderTransform>
+                        <Path Data="M4680 6635 c-387 -71 -691 -352 -797 -740 l-28 -100 0 -780 c0 -608 3 -793 13 -840 88 -400 360 -685 757 -791 66 -18 118 -19 855 -19 l785 0 75 24 c98 30 141 52 223 115 153 114 256 312 257 489 l0 47 -1002 0 c-1152 0 -1079 -5 -1178 87 -76 70 -104 132 -104 233 0 57 5 87 22 126 29 63 101 136 167 166 49 22 60 23 440 28 l390 6 79 27 c116 41 203 96 282 179 108 114 173 260 174 391 l0 47 -637 0 c-740 0 -717 -3 -813 87 -76 70 -104 132 -104 233 0 57 5 87 22 126 29 63 101 136 167 166 l50 23 750 5 750 5 70 24 c95 32 138 54 218 115 153 114 256 312 257 489 l0 47 -1032 -1 c-827 -1 -1048 -4 -1108 -14z" Fill="#ec1a5a" Stroke="#00000000" />
+                        <Path Data="M17854 6458 c-59 -19 -127 -80 -159 -143 -26 -52 -30 -68 -29 -139 1 -97 17 -139 81 -207 112 -119 307 -119 424 2 138 142 95 384 -83 473 -43 22 -65 26 -127 25 -42 -1 -90 -6 -107 -11z" Fill="#ec1a5a" Stroke="#00000000" />
+                        <Path Data="M8180 4975 l0 -1455 960 0 960 0 -2 238 -3 237 -717 3 -718 2 0 365 0 365 660 0 660 0 0 240 0 240 -660 0 -660 0 0 370 0 370 720 0 720 0 0 240 0 240 -960 0 -960 0 0 -1455z" Fill="#ec1a5a" Stroke="#00000000" />
+                        <Path Data="M14620 5256 c0 -1303 -3 -1243 71 -1396 57 -115 171 -231 282 -284 99 -48 245 -84 368 -93 l99 -6 0 210 0 210 -37 7 c-21 3 -50 6 -65 6 -46 0 -138 40 -180 78 -22 20 -49 54 -61 76 l-22 41 -3 1158 -2 1157 -225 0 -225 0 0 -1164z" Fill="#ec1a5a" Stroke="#00000000" />
+                        <Path Data="M18642 5103 c3 -1046 3 -1048 25 -1126 35 -123 86 -212 172 -297 111 -110 230 -166 410 -191 90 -13 287 -7 302 8 5 5 8 92 7 199 l-3 189 -110 6 c-165 10 -247 42 -299 117 -60 86 -60 87 -64 680 l-3 542 205 0 206 0 0 210 0 210 -203 0 -204 0 -17 223 c-9 122 -19 234 -22 250 l-6 27 -199 0 -200 0 3 -1047z" Fill="#ec1a5a" Stroke="#00000000" />
+                        <Path Data="M13207 5679 c-197 -13 -394 -57 -573 -127 l-94 -36 0 -1343 0 -1343 225 0 225 0 0 361 c0 340 1 361 18 354 43 -17 142 -45 196 -54 133 -24 354 -8 491 36 238 76 421 248 488 458 22 69 22 81 22 590 0 581 1 574 -73 725 -47 95 -158 211 -255 265 -169 93 -401 133 -670 114z m233 -398 c102 -17 170 -50 232 -111 90 -90 89 -86 86 -606 l-3 -439 -25 -48 c-72 -142 -223 -204 -469 -195 -69 3 -159 13 -199 23 l-72 17 2 651 3 651 68 24 c114 38 263 52 377 33z" Fill="#ec1a5a" Stroke="#00000000" />
+                        <Path Data="M16405 5683 c-361 -33 -636 -223 -732 -506 l-28 -82 0 -505 c0 -558 0 -559 67 -695 130 -268 449 -429 812 -412 150 7 262 34 381 93 206 100 333 252 386 461 19 78 20 105 17 570 l-3 488 -27 80 c-94 276 -357 466 -701 504 -53 6 -104 10 -114 9 -10 -1 -36 -3 -58 -5z m265 -479 c80 -38 134 -83 163 -138 21 -40 22 -51 25 -460 3 -483 3 -482 -79 -567 -72 -74 -158 -110 -275 -117 -150 -8 -274 42 -353 142 -59 75 -62 100 -59 553 l3 408 27 46 c35 59 77 95 153 130 79 36 91 38 220 35 100 -1 116 -4 175 -32z" Fill="#ec1a5a" Stroke="#00000000" />
+                        <Path Data="M20550 5679 c-335 -39 -595 -216 -691 -468 -43 -113 -48 -183 -49 -606 0 -417 7 -527 41 -629 77 -231 295 -412 570 -472 115 -25 297 -29 404 -10 121 23 174 40 277 93 140 72 249 179 313 308 65 132 68 156 72 605 6 530 -4 626 -80 775 -82 162 -239 291 -430 354 -149 49 -295 66 -427 50z m249 -458 c120 -37 209 -119 228 -210 5 -20 8 -216 8 -436 0 -396 0 -400 -23 -450 -40 -87 -114 -149 -223 -185 -53 -19 -80 -21 -160 -18 -81 4 -107 10 -162 36 -84 39 -148 99 -178 165 l-24 52 0 420 c0 394 1 422 19 455 48 88 98 128 206 167 85 30 220 32 309 4z" Fill="#ec1a5a" Stroke="#00000000" />
+                        <Path Data="M10320 5640 c0 -5 157 -241 348 -523 192 -281 351 -517 356 -524 6 -11 -178 -287 -621 -935 l-94 -138 263 0 263 0 117 183 c64 100 165 268 224 374 60 106 111 192 114 192 3 1 50 -81 104 -182 55 -100 154 -269 220 -374 l121 -193 258 0 c141 0 257 3 257 6 0 3 -155 242 -345 531 l-344 525 33 52 c18 28 173 266 344 528 172 263 312 480 312 483 0 3 -115 4 -257 3 l-256 -3 -106 -171 c-58 -94 -158 -264 -221 -377 -63 -114 -117 -207 -120 -207 -3 0 -60 98 -127 218 -67 119 -169 289 -226 377 l-103 160 -257 3 c-170 1 -257 -1 -257 -8z" Fill="#ec1a5a" Stroke="#00000000" />
+                        <Path Data="M21620 5640 c0 -6 157 -241 348 -523 191 -282 351 -517 355 -524 6 -9 -465 -718 -695 -1045 l-19 -28 263 0 263 0 116 183 c64 100 166 268 225 374 60 106 111 192 114 192 3 0 55 -91 116 -203 62 -112 161 -280 220 -375 l109 -171 258 0 c141 0 257 2 257 5 0 3 -155 243 -345 532 l-345 526 17 26 c150 227 673 1033 673 1036 0 3 -116 4 -257 3 l-257 -3 -105 -171 c-58 -94 -158 -264 -221 -377 -63 -113 -117 -206 -120 -206 -3 0 -60 97 -128 217 -67 119 -169 289 -225 377 l-103 160 -257 3 c-174 1 -257 -1 -257 -8z" Fill="#ec1a5a" Stroke="#00000000" />
+                        <Path Data="M17710 4580 l0 -1060 235 0 235 0 0 1060 0 1060 -235 0 -235 0 0 -1060z" Fill="#ec1a5a" Stroke="#00000000" />
+                    </Canvas>
+                </Viewbox>
+            </Grid>
+            
+            <Grid Grid.Row="2" Margin="0,0,0,12">
+                <StackPanel>
+                    <ui:CardControl Icon="Info24" Margin="0,5,0,5">
+                        <ui:CardControl.Header>
+                            <StackPanel>
+                                <StackPanel VerticalAlignment="Center" HorizontalAlignment="Left" Orientation="Horizontal">
+                                        <ui:Image Source="pack://application:,,,/Assets/CheckIP.ico" Width="30" Margin="0,0,10,0"/>
+                                        <StackPanel>
+                                            <Label x:Name="ValueVersion" Foreground="{DynamicResource TextFillColorPrimaryBrush}" Content="CheckIP" Margin="0,0,0,-5"/>
+                                            <Label x:Name="ValueCopyright" Foreground="{DynamicResource TextFillColorPrimaryBrush}" Content="Copyright © Exploitox."/>
+                                        </StackPanel>
+                                </StackPanel>
+                                <StackPanel Margin="0,5,0,0">
+                                    <TextBlock x:Name="LicenseText" 
+                                               Foreground="{DynamicResource TextFillColorTertiaryBrush}" 
+                                               VerticalAlignment="Top" 
+                                               FontSize="15" 
+                                               TextWrapping="WrapWithOverflow" 
+                                               Text="{DynamicResource License}"/>
+                                </StackPanel>
+                                <Grid Margin="0,10,0,0" HorizontalAlignment="Center">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
 
+                                    <ui:Button Grid.Column="0"
+                                               Content="{DynamicResource HomepageBtn}"
+                                               Width="135"
+                                               Click="Homepage_OnClick"
+                                               Margin="3,0,3,0"/>
+                                    <ui:Button Grid.Column="1"
+                                               Content="{DynamicResource DonateBtn}"
+                                               Width="135"
+                                               Click="Donate_OnClick"
+                                               Margin="3,0,3,0"/>
+                                    <ui:Button Grid.Column="2" 
+                                               Content="{DynamicResource SourceCodeBtn}"
+                                               Width="135"
+                                               Click="SourceCode_OnClick"
+                                               Margin="3,0,3,0"/>
+                                </Grid>
+                            </StackPanel>
+                        </ui:CardControl.Header>
+                    </ui:CardControl>
+                </StackPanel>
+            </Grid>
+        </Grid>
 
-        <Grid Margin="0,12,0,12">
+        <Grid>
             <StackPanel>
                 <ui:CardExpander
                     Margin="0,0,0,10"
-                    Icon="Person24">
+                    Icon="{ui:SymbolIcon Person24}">
                     <ui:CardExpander.Header>
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -90,21 +117,6 @@
                     </ui:CardExpander.Header>
                     <StackPanel x:Name="ThirdPartyList"/>
                 </ui:CardExpander>
-                <ui:Hyperlink
-                    Content="{DynamicResource SourceCodeBtn}"
-                    Icon="Link48"
-                    NavigateUri="https://github.com/valnoxy/checkip" 
-                    FontSize="15" />
-                <ui:Hyperlink
-                    Content="{DynamicResource HomepageBtn}"
-                    Icon="Link48"
-                    NavigateUri="https://exploitox.de" 
-                    FontSize="15" />
-                <ui:Hyperlink
-                    Content="{DynamicResource LicenseBtn}"
-                    Icon="Link48"
-                    NavigateUri="https://github.com/valnoxy/checkip/blob/main/LICENSE" 
-                    FontSize="15" />
             </StackPanel>
         </Grid>
     </VirtualizingStackPanel>
diff --git a/CheckIP.Windows/CheckIP/Pages/About.xaml.cs b/CheckIP.Windows/CheckIP/Pages/About.xaml.cs
index dd9ec18..cb2b2a3 100644
--- a/CheckIP.Windows/CheckIP/Pages/About.xaml.cs
+++ b/CheckIP.Windows/CheckIP/Pages/About.xaml.cs
@@ -1,31 +1,29 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics;
-using System.Net;
 using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Documents;
 
 namespace CheckIP
 {
     /// <summary>
     /// Interaktionslogik für About.xaml
     /// </summary>
-    public partial class About : Page
+    public partial class About
     {
         private class ThirdParty
         {
-            internal string Author { get; set; }
-            internal string Product { get; set; }
+            internal string Author { get; init; }
+            internal string Product { get; init; }
         }
 
         public About()
         {
             InitializeComponent();
 
-            var versionInfo = FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location);
-            ValueVersion.Content = $"{versionInfo.ProductName} V. {versionInfo.ProductVersion}";
+            var versionInfo = FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly()!.Location);
+            ValueVersion.Content = $"{versionInfo.ProductName} v{versionInfo.ProductVersion}";
+            ValueCopyright.Content = versionInfo.LegalCopyright;
 
             var legalCopyright = versionInfo.LegalCopyright;
             var localizedAllRightsReserved = Common.LocalizationManager.LocalizeValue("All rights reserved.");
@@ -34,22 +32,22 @@ public About()
             
             var thirdPartyList = new List<ThirdParty>
             {
-                new ThirdParty
+                new()
                 {
                     Author = "Lecopo",
                     Product = "WPF-UI"
                 },
-                new ThirdParty
+                new()
                 {
                     Author = "Hardcodet",
                     Product = "Hardcodet.NotifyIcon.Wpf"
                 },
-                new ThirdParty
+                new()
                 {
                     Author = "Icons8",
                     Product = "Flag Icons"
                 },
-                new ThirdParty
+                new()
                 {
                     Author = "James Newton-King",
                     Product = "Newtonsoft.Json"
@@ -69,5 +67,46 @@ public About()
                 ThirdPartyList.Children.Add(tb);
             }
         }
+
+        private void Homepage_OnClick(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                Process.Start(new ProcessStartInfo() { FileName = "https://exploitox.de", UseShellExecute = true });
+            }
+            catch
+            {
+                // ignored
+            }
+        }
+
+        private void Donate_OnClick(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                Process.Start(new ProcessStartInfo() { FileName = "https://paypal.me/valnoxy", UseShellExecute = true });
+            }
+            catch
+            {
+                // ignored
+            }
+        }
+
+        private void SourceCode_OnClick(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                Process.Start(new ProcessStartInfo() { FileName = "https://github.com/valnoxy/checkip", UseShellExecute = true });
+            }
+            catch (System.ComponentModel.Win32Exception noBrowser)
+            {
+                if (noBrowser.ErrorCode == -2147467259)
+                    MessageBox.Show(noBrowser.Message);
+            }
+            catch (System.Exception other)
+            {
+                MessageBox.Show(other.Message);
+            }
+        }
     }
 }
diff --git a/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml b/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml
index 4f49458..f660140 100644
--- a/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml
+++ b/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml
@@ -3,179 +3,186 @@
       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:CheckIP"
       xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
       mc:Ignorable="d" 
       d:DesignHeight="625" d:DesignWidth="441"
       Title="FetchIP">
 
-    <StackPanel Margin="20,55,18,0">
-
-        <StackPanel>
-            <Label Content="{DynamicResource IPAddress}" HorizontalAlignment="Left" Margin="-6,0,0,0" VerticalAlignment="Top" Foreground="{DynamicResource TextFillColorPrimaryBrush}" FontSize="15"/>
-
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-
-                <ui:TextBox x:Name="IpAddress" Margin="0,0,5,0" Grid.Column="0" TextWrapping="Wrap" VerticalAlignment="Top" Foreground="{DynamicResource TextFillColorPrimaryBrush}" KeyDown="OnKeyDownHandler" Icon="Search24"/>
-                <ui:Button Grid.Column="1" Icon="Search24"  HorizontalAlignment="Right" VerticalAlignment="Top" Height="34" Click="FetchIP_Click"/>
-            </Grid>
-        </StackPanel>
-
-        <StackPanel>
-            <Label x:Name="ErrorLabel"
-                   Content="" 
-                   HorizontalAlignment="Right" 
-                   HorizontalContentAlignment="Right"
-                   Margin="0,12,0,-45"
-                   Foreground="Red"
-                   FontSize="15"/>
-            <Label Content="{DynamicResource Information}" 
-                   HorizontalAlignment="Left" 
-                   VerticalAlignment="Top" 
-                   FontSize="24" 
-                   Foreground="{DynamicResource TextFillColorPrimaryBrush}" 
-                   Margin="-6,5,0,0"
-                   FontWeight="SemiBold"/>
-
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource CityAndCountry}" />
-                <ui:TextBox x:Name="ValueCityCountry" Grid.Column="1" Icon="City24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-
-            <Grid Margin="0,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource Postal}" />
-                <ui:TextBox x:Name="ValuePostal" Grid.Column="1" Icon="Mail24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-            <Grid Margin="0,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource Timezone}" />
-                <ui:TextBox x:Name="ValueTimezone" Grid.Column="1" Icon="Clock24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-            <Grid Margin="0,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource Latitude}" />
-                <ui:TextBox x:Name="ValueLatitude" Grid.Column="1" Icon="GlobeLocation24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-            <Grid Margin="0,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource Longitude}" />
-                <ui:TextBox x:Name="ValueLongitude" Grid.Column="1" Icon="GlobeLocation24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-            <Grid Margin="0,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource ISPOrOrganization}" />
-                <ui:TextBox x:Name="ValueIsp" Grid.Column="1" Icon="Building24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-            <Grid Margin="0,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource ASN}" />
-                <ui:TextBox x:Name="ValueAsn" Grid.Column="1" Icon="Router24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-            <Grid Margin="0,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource IsMobile}" />
-                <ui:TextBox x:Name="ValueMobile" Grid.Column="1" Icon="Phone24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-            <Grid Margin="0,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource IsProxy}" />
-                <ui:TextBox x:Name="ValueProxy" Grid.Column="1" Icon="Globe24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-            <Grid Margin="0,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource IsHosting}" />
-                <ui:TextBox x:Name="ValueHosting" Grid.Column="1" Icon="Server24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-            <Button Margin="0,10,0,0"
-                    Content="{DynamicResource ExportInfo}"
+    <StackPanel Margin="8,15,8,0">
+        <ui:Card>
+            <StackPanel>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <ui:TextBlock Text="{DynamicResource IPAddress}"
+                                  Grid.Column="0"
+                                  Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                                  FontTypography="BodyStrong" 
+                                  Margin="0,-5,0,5"/>
+
+                    <ui:TextBlock x:Name="ErrorLabel"
+                                  Grid.Column="1"
+                                  HorizontalAlignment="Right"
+                                  TextAlignment="Right"
+                                  Foreground="Red"/>
+                </Grid>
+                
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+
+                    <ui:TextBox x:Name="IpAddress" 
+                                Margin="0,0,5,0" 
+                                Grid.Column="0" 
+                                TextWrapping="Wrap" 
+                                VerticalAlignment="Top" 
+                                Foreground="{DynamicResource TextFillColorPrimaryBrush}" 
+                                KeyDown="OnKeyDownHandler" 
+                                Icon="{ui:SymbolIcon Search24}"/>
+                    <ui:Button Grid.Column="1"
+                               x:Name="FetchBtn"
+                               Icon="{ui:SymbolIcon Search24}" 
+                               HorizontalAlignment="Right" 
+                               VerticalAlignment="Top" 
+                               Height="36" 
+                               Click="FetchIP_Click"/>
+                </Grid>
+            </StackPanel>
+        </ui:Card>
+
+        <ui:Card Margin="0,5,0,0">
+            <StackPanel>
+                <Grid x:Name="BusyPanel" Height="336" Visibility="Collapsed">
+                    <ui:ProgressRing IsIndeterminate="True"/>
+                </Grid>
+                <StackPanel x:Name="InfoPanel">
+                    <ui:TextBlock Text="{DynamicResource Information}"
+                                  Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                                  FontTypography="BodyStrong" 
+                                  Margin="0,-5,0,5"/>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="135"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0"
+                                   FontSize="14"
+                                   Margin="0,6,0,0"
+                                   Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                                   Text="{DynamicResource CityAndCountry}" />
+                        <ui:TextBox x:Name="ValueCityCountry" Grid.Column="1" Icon="{ui:SymbolIcon City24}" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
+                    </Grid>
+
+                    <Grid Margin="0,5,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="135"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0"
+                                   FontSize="14"
+                                   Margin="0,6,0,0"
+                                   Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                                   Text="{DynamicResource Postal}" />
+                        <ui:TextBox x:Name="ValuePostal" Grid.Column="1" Icon="{ui:SymbolIcon Mail24}" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
+                    </Grid>
+
+                    <Grid Margin="0,5,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="135"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0"
+                                   FontSize="14"
+                                   Margin="0,6,0,0"
+                                   Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                                   Text="{DynamicResource Timezone}" />
+                        <ui:TextBox x:Name="ValueTimezone" Grid.Column="1" Icon="{ui:SymbolIcon Clock24}" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
+                    </Grid>
+
+                    <Grid Margin="0,5,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="135"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0"
+                                   FontSize="14"
+                                   Margin="0,6,0,0"
+                                   Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                                   Text="{DynamicResource Latitude}" />
+                        <ui:TextBox x:Name="ValueLatitude" Grid.Column="1" Icon="{ui:SymbolIcon GlobeLocation24}" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
+                    </Grid>
+
+                    <Grid Margin="0,5,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="135"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0"
+                                   FontSize="14"
+                                   Margin="0,6,0,0"
+                                   Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                                   Text="{DynamicResource Longitude}" />
+                        <ui:TextBox x:Name="ValueLongitude" Grid.Column="1" Icon="{ui:SymbolIcon GlobeLocation24}" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
+                    </Grid>
+
+                    <Grid Margin="0,5,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="135"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0"
+                                   FontSize="14"
+                                   Margin="0,6,0,0"
+                                   Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                                   Text="{DynamicResource ISPOrOrganization}" />
+                        <ui:TextBox x:Name="ValueIsp" Grid.Column="1" Icon="{ui:SymbolIcon Building24}" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
+                    </Grid>
+
+                    <Grid Margin="0,5,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="135"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0"
+                                   FontSize="14"
+                                   Margin="0,6,0,0"
+                                   Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                                   Text="{DynamicResource ASN}" />
+                        <ui:TextBox x:Name="ValueAsn" Grid.Column="1" Icon="{ui:SymbolIcon Router24}" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
+                    </Grid>
+
+                    <Grid Margin="0,5,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <CheckBox x:Name="ValueMobile" Grid.Column="0" Content="{DynamicResource IsMobile}" IsEnabled="False"/>
+                        <CheckBox x:Name="ValueProxy" Grid.Column="1" Content="{DynamicResource IsProxy}" IsEnabled="False"/>
+                        <CheckBox x:Name="ValueHosting" Grid.Column="2" Content="{DynamicResource IsHosting}" IsEnabled="False"/>
+                    </Grid>
+                </StackPanel>
+            </StackPanel>
+        </ui:Card>
+
+        <ui:Card Margin="0,10,0,0">
+            <Button Content="{DynamicResource ExportInfo}"
                     Click="ExportBtn_OnClick"
                     HorizontalAlignment="Stretch"/>
-        </StackPanel>
+        </ui:Card>
+
     </StackPanel>
 </Page>
diff --git a/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml.cs b/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml.cs
index e6a2997..b1f7d0b 100644
--- a/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml.cs
+++ b/CheckIP.Windows/CheckIP/Pages/FetchIP.xaml.cs
@@ -1,105 +1,83 @@
 using Microsoft.Win32;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
-using System.Collections;
 using System.IO;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Threading;
+using CheckIP.Common;
+using System.ComponentModel;
 
 namespace CheckIP
 {
     /// <summary>
     /// Interaktionslogik für FetchIP.xaml
     /// </summary>
-    public partial class FetchIP : Page
+    public partial class FetchIP
     {
         private static string _myIp;
+        private static BackgroundWorker _worker;
         
         public FetchIP()
         {
             InitializeComponent();
+            _worker = new BackgroundWorker();
+            _worker.DoWork += FetchAndParse;
+            _worker.RunWorkerCompleted += NotBusy;
+        }
+
+        private void NotBusy(object sender, RunWorkerCompletedEventArgs e)
+        {
+            Dispatcher.Invoke(() =>
+            {
+                InfoPanel.Visibility = Visibility.Visible;
+                BusyPanel.Visibility = Visibility.Collapsed;
+                FetchBtn.IsEnabled = true;
+            });
+        }
+
+        private void FetchAndParse(object sender, DoWorkEventArgs e)
+        {
+            Dispatcher.Invoke(() =>
+            {
+                InfoPanel.Visibility = Visibility.Collapsed;
+                BusyPanel.Visibility = Visibility.Visible;
+                FetchBtn.IsEnabled = false;
+            });
+
+            Task.Run(ParseIpAddress).Wait();
         }
 
         private void FetchIP_Click(object sender, RoutedEventArgs e)
         {
             _myIp = IpAddress.Text;
-            Task.Run(ParseIpAddress);
+            _worker.RunWorkerAsync();
         }
 
         private void OnKeyDownHandler(object sender, KeyEventArgs e)
         {
             if (e.Key != Key.Return) return;
             _myIp = IpAddress.Text;
-            Task.Run(ParseIpAddress);
+            _worker.RunWorkerAsync();
         }
 
         private void ParseIpAddress()
         {
-            // Validate IP
-            var validateIp = IPAddress.TryParse(_myIp, out var ip);
-            if (!validateIp)
-            {
-                Dispatcher.Invoke(() =>
-                {
-                    var error = (string)Application.Current.MainWindow.FindResource("ErrorInvalidIP");
-                    ErrorLabel.Content = !string.IsNullOrEmpty(error) ? error : "Error: This is not a valid IP address.";
-                });
-                return;
-            }
+            var data = IPManager.Parse(_myIp);
 
             Dispatcher.Invoke(() =>
             {
-                ErrorLabel.Content = string.Empty;
+                ErrorLabel.Text = string.Empty;
             });
-
-            var dataJson = string.Empty;
-            var url = "http://ip-api.com/json/" + _myIp + "?fields=status,message,country,countryCode,city,zip,lat,lon,timezone,isp,as,mobile,proxy,hosting";
-            try
-            {
-                var client = new HttpClient();
-                using var response = client.GetAsync(url).Result;
-                using var content = response.Content;
-                dataJson = content.ReadAsStringAsync().Result;
-            }
-            catch
+            
+            if (!data.ParseSuccess)
             {
-                this.Dispatcher.Invoke(() =>
-                {
-                    var error = (string)Application.Current.MainWindow.FindResource("ErrorInvalidIP");
-                    ErrorLabel.Content = !string.IsNullOrEmpty(error) ? error : "Error: No connection to server";
-                });
-            }
-            dynamic data = JObject.Parse(dataJson);
-
-            // Parse data
-            string status = data.status;
-            string message = data.message;
-            string country = data.country;
-            string countryCode = data.countryCode;
-            string city = data.city;
-            string postal = data.zip;
-            string timezone = data.timezone;
-            string latitude = data.lat;
-            string longitude = data.lon;
-            string isp = data.isp;
-            string asn = data.@as;
-            string mobile = data.mobile;
-            string proxy = data.proxy;
-            string hosting = data.hosting;
-
-            // Check status
-            if (status != "success")
-            {
-                var localizeError = Common.LocalizationManager.LocalizeError(message);
-
                 Dispatcher.Invoke(() =>
                 {
-                    ErrorLabel.Content = localizeError;
+                    ErrorLabel.Text = data.Status;
                     ValueCityCountry.Text = "Unknown";
                     ValuePostal.Text = "Unknown";
                     ValueTimezone.Text = "Unknown";
@@ -107,36 +85,32 @@ private void ParseIpAddress()
                     ValueLongitude.Text = "Unknown";
                     ValueIsp.Text = "Unknown";
                     ValueAsn.Text = "Unknown";
-                    ValueMobile.Text = "Unknown";
-                    ValueProxy.Text = "Unknown";
-                    ValueHosting.Text = "Unknown";
+                    ValueMobile.IsChecked = false;
+                    ValueProxy.IsChecked = false;
+                    ValueHosting.IsChecked = false;
                 });
                 return;
             }
 
-            // Set Variable labels
-            var localizeMobile = Common.LocalizationManager.LocalizeValue(mobile);
-            var localizeProxy = Common.LocalizationManager.LocalizeValue(proxy);
-            var localizeHosting = Common.LocalizationManager.LocalizeValue(hosting);
             Dispatcher.Invoke(() =>
             {
-                ValueCityCountry.Text = city + " / " + country + " (" + countryCode + ")";
-                ValuePostal.Text = postal;
-                ValueTimezone.Text = timezone;
-                ValueLatitude.Text = latitude;
-                ValueLongitude.Text = longitude;
-                ValueIsp.Text = isp;
-                ValueAsn.Text = asn;
-                ValueMobile.Text = localizeMobile;
-                ValueProxy.Text = localizeProxy;
-                ValueHosting.Text = localizeHosting;
+                ValueCityCountry.Text = data.City + " / " + data.Country + " (" + data.CountryCode + ")";
+                ValuePostal.Text = data.Postal;
+                ValueTimezone.Text = data.Timezone;
+                ValueLatitude.Text = data.Latitude;
+                ValueLongitude.Text = data.Longitude;
+                ValueIsp.Text = data.Isp;
+                ValueAsn.Text = data.Asn;
+                ValueMobile.IsChecked = data.Mobile;
+                ValueProxy.IsChecked = data.Proxy;
+                ValueHosting.IsChecked = data.Hosting;
             });
         }
 
         private void ExportBtn_OnClick(object sender, RoutedEventArgs e)
         {
             // Build export string
-            var reportCreatedMessage = (string)Application.Current.MainWindow.FindResource("ReportCreatedMessage");
+            var reportCreatedMessage = (string)Application.Current.MainWindow!.FindResource("ReportCreatedMessage");
             var formattedMessage = string.Format(reportCreatedMessage, DateTime.Now, IpAddress.Text);
 
             var cityAndCountry = (string)Application.Current.MainWindow.FindResource("CityAndCountry");
@@ -150,19 +124,21 @@ private void ExportBtn_OnClick(object sender, RoutedEventArgs e)
             var proxy = (string)Application.Current.MainWindow.FindResource("IsProxy");
             var hosting = (string)Application.Current.MainWindow.FindResource("IsHosting");
 
-            var exportString = $@"{formattedMessage}
+            var exportString = $"""
+                                {formattedMessage}
+
+                                {cityAndCountry}: {ValueCityCountry.Text}
+                                {postal}: {ValuePostal.Text}
+                                {timezone}: {ValueTimezone.Text}
+                                {latitude}: {ValueLatitude.Text}
+                                {longitude}: {ValueLongitude.Text}
+                                {isp}: {ValueIsp.Text}
+                                {asn}: {ValueAsn.Text}
+                                {mobile}: {ValueMobile.IsChecked}
+                                {proxy}: {ValueProxy.IsChecked}
+                                {hosting}: {ValueHosting.IsChecked}
 
-{cityAndCountry}: {ValueCityCountry.Text}
-{postal}: {ValuePostal.Text}
-{timezone}: {ValueTimezone.Text}
-{latitude}: {ValueLatitude.Text}
-{longitude}: {ValueLongitude.Text}
-{isp}: {ValueIsp.Text}
-{asn}: {ValueAsn.Text}
-{mobile}: {ValueMobile.Text}
-{proxy}: {ValueProxy.Text}
-{hosting}: {ValueHosting.Text}
-";
+                                """;
 
             var saveFileDialog = new SaveFileDialog
             {
diff --git a/CheckIP.Windows/CheckIP/Pages/Main.xaml b/CheckIP.Windows/CheckIP/Pages/Main.xaml
deleted file mode 100644
index 2d4ec8d..0000000
--- a/CheckIP.Windows/CheckIP/Pages/Main.xaml
+++ /dev/null
@@ -1,84 +0,0 @@
-<ui:UiWindow x:Class="CheckIP.Main"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        Title="CheckIP" Height="669" Width="512"
-        MinHeight="669" MinWidth="512"
-        xmlns:pages="clr-namespace:CheckIP"
-        xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
-        WindowStartupLocation="CenterScreen"
-        Style="{StaticResource UiWindow}"
-        ExtendsContentIntoTitleBar="True"
-        WindowBackdropType="Mica"
-        WindowCornerPreference="Round"
-        ResizeMode="NoResize">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-
-        <Grid Grid.Row="1" Margin="0">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-           <ui:NavigationStore
-                x:Name="RootNavigation"
-                Grid.Column="0"
-                Margin="6,0,6,0"
-                Frame="{Binding ElementName=RootFrame}"
-                Loaded="RootNavigation_OnLoaded">
-                <ui:NavigationStore.Items>
-                    <ui:NavigationItem
-                        Content="{DynamicResource Fetch}"
-                        Icon="Search24"
-                        PageTag="dashboard"
-                        PageType="{x:Type pages:FetchIP}" />
-                    <ui:NavigationItem
-                        Content="{DynamicResource MyIP}"
-                        Icon="MyLocation24"
-                        PageTag="forms"
-                        PageType="{x:Type pages:MyIP}" />
-                </ui:NavigationStore.Items>
-                <ui:NavigationStore.Footer>
-                    <ui:NavigationItem
-                        Content="{DynamicResource About}"
-                        Icon="QuestionCircle24"
-                        PageTag="help"
-                        PageType="{x:Type pages:About}" />
-                </ui:NavigationStore.Footer>
-            </ui:NavigationStore> 
-            
-            <Border
-                Grid.Column="1"
-                Background="{DynamicResource ControlFillColorDefaultBrush}"
-                CornerRadius="8,0,0,0">
-                <Grid>
-                    <Frame x:Name="RootFrame" />
-                    <ui:Breadcrumb
-                        Margin="18,18,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        FontSize="24"
-                        Navigation="{Binding ElementName=RootNavigation}" />
-                </Grid>
-            </Border>
-        </Grid>
-
-        <Label x:Name="DebugLabel"
-               Grid.Row="0" 
-               Content=""
-               HorizontalContentAlignment="Right"
-               HorizontalAlignment="Right"
-               Margin="0,12,40,0"
-               Foreground="Red"
-               FontSize="13"/>
-        <ui:TitleBar Grid.Row="0" 
-                     ShowMaximize="False" 
-                     ShowMinimize="False" 
-                     Title="CheckIP" 
-                     Icon="pack://application:,,,/icon.png"/>
-    </Grid>
-</ui:UiWindow>
\ No newline at end of file
diff --git a/CheckIP.Windows/CheckIP/Pages/MyIP.xaml b/CheckIP.Windows/CheckIP/Pages/MyIP.xaml
index 98c8e70..322d262 100644
--- a/CheckIP.Windows/CheckIP/Pages/MyIP.xaml
+++ b/CheckIP.Windows/CheckIP/Pages/MyIP.xaml
@@ -9,166 +9,173 @@
       d:DesignHeight="625" d:DesignWidth="441"
       Title="MyIP">
 
-    <StackPanel Margin="20,55,18,0">
-
-        <StackPanel>
-            <Label HorizontalAlignment="Right"
-                   x:Name="ErrorLabel"
-                   Foreground="Red"
-                   VerticalAlignment="Top"
-                   Margin="-6,0,0,0"/>
-            <Label x:Name="IpAddress"
-                   Content="{DynamicResource Unknown}"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Top"
-                   FontSize="25"
-                   Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
-        </StackPanel>
-
-        <StackPanel>
-            <Label Content="{DynamicResource Information}" 
-                   HorizontalAlignment="Left" 
-                   VerticalAlignment="Top" 
-                   FontSize="24" 
-                   Foreground="{DynamicResource TextFillColorPrimaryBrush}" 
-                   Margin="-6,0,0,0"
-                   FontWeight="SemiBold"/>
-
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource CityAndCountry}" />
-                <ui:TextBox x:Name="ValueCityCountry" Grid.Column="1" Icon="City24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-
-            <Grid Margin="0,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource Postal}" />
-                <ui:TextBox x:Name="ValuePostal" Grid.Column="1" Icon="Mail24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-            <Grid Margin="0,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource Timezone}" />
-                <ui:TextBox x:Name="ValueTimezone" Grid.Column="1" Icon="Clock24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-            <Grid Margin="0,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource Latitude}" />
-                <ui:TextBox x:Name="ValueLatitude" Grid.Column="1" Icon="GlobeLocation24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-            <Grid Margin="0,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource Longitude}" />
-                <ui:TextBox x:Name="ValueLongitude" Grid.Column="1" Icon="GlobeLocation24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-            <Grid Margin="0,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource ISPOrOrganization}" />
-                <ui:TextBox x:Name="ValueIsp" Grid.Column="1" Icon="Building24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-            <Grid Margin="0,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource ASN}" />
-                <ui:TextBox x:Name="ValueAsn" Grid.Column="1" Icon="Router24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-            <Grid Margin="0,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource IsMobile}" />
-                <ui:TextBox x:Name="ValueMobile" Grid.Column="1" Icon="Phone24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-            <Grid Margin="0,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource IsProxy}" />
-                <ui:TextBox x:Name="ValueProxy" Grid.Column="1" Icon="Globe24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-            <Grid Margin="0,5,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock
-                    FontSize="14"
-                    Margin="0,6,0,0"
-                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                    Text="{DynamicResource IsHosting}" />
-                <ui:TextBox x:Name="ValueHosting" Grid.Column="1" Icon="Server24" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
-            </Grid>
-            <Button Margin="0,10,0,0"
-                    Content="{DynamicResource ExportInfo}"
+    <StackPanel Margin="8,15,8,0">
+        <ui:Card>
+            <StackPanel>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <ui:TextBlock Text="{DynamicResource IPAddress}"
+                                  Grid.Column="0"
+                                  Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                                  FontTypography="BodyStrong" 
+                                  Margin="0,-5,0,5"/>
+
+                    <ui:TextBlock x:Name="ErrorLabel"
+                                  Grid.Column="1"
+                                  HorizontalAlignment="Right"
+                                  TextAlignment="Right"
+                                  Foreground="Red"/>
+                </Grid>
+
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock Grid.Column="0"
+                               x:Name="IpAddress"
+                               Text="{DynamicResource Unknown}"
+                               HorizontalAlignment="Center"
+                               VerticalAlignment="Top"
+                               FontSize="25"
+                               Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
+                </Grid>
+            </StackPanel>
+        </ui:Card>
+
+        <ui:Card Margin="0,5,0,0">
+            <StackPanel>
+                <Grid x:Name="BusyPanel" Height="336" Visibility="Collapsed">
+                    <ui:ProgressRing IsIndeterminate="True"/>
+                </Grid>
+                <StackPanel x:Name="InfoPanel">
+                    <ui:TextBlock Text="{DynamicResource Information}"
+                          Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                          FontTypography="BodyStrong" 
+                          Margin="0,-5,0,5"/>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="135"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0"
+                           FontSize="14"
+                           Margin="0,6,0,0"
+                           Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                           Text="{DynamicResource CityAndCountry}" />
+                        <ui:TextBox x:Name="ValueCityCountry" Grid.Column="1" Icon="{ui:SymbolIcon City24}" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
+                    </Grid>
+
+                    <Grid Margin="0,5,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="135"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0"
+                           FontSize="14"
+                           Margin="0,6,0,0"
+                           Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                           Text="{DynamicResource Postal}" />
+                        <ui:TextBox x:Name="ValuePostal" Grid.Column="1" Icon="{ui:SymbolIcon Mail24}" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
+                    </Grid>
+
+                    <Grid Margin="0,5,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="135"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0"
+                           FontSize="14"
+                           Margin="0,6,0,0"
+                           Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                           Text="{DynamicResource Timezone}" />
+                        <ui:TextBox x:Name="ValueTimezone" Grid.Column="1" Icon="{ui:SymbolIcon Clock24}" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
+                    </Grid>
+
+                    <Grid Margin="0,5,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="135"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0"
+                           FontSize="14"
+                           Margin="0,6,0,0"
+                           Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                           Text="{DynamicResource Latitude}" />
+                        <ui:TextBox x:Name="ValueLatitude" Grid.Column="1" Icon="{ui:SymbolIcon GlobeLocation24}" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
+                    </Grid>
+
+                    <Grid Margin="0,5,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="135"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0"
+                           FontSize="14"
+                           Margin="0,6,0,0"
+                           Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                           Text="{DynamicResource Longitude}" />
+                        <ui:TextBox x:Name="ValueLongitude" Grid.Column="1" Icon="{ui:SymbolIcon GlobeLocation24}" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
+                    </Grid>
+
+                    <Grid Margin="0,5,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="135"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0"
+                           FontSize="14"
+                           Margin="0,6,0,0"
+                           Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                           Text="{DynamicResource ISPOrOrganization}" />
+                        <ui:TextBox x:Name="ValueIsp" Grid.Column="1" Icon="{ui:SymbolIcon Building24}" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
+                    </Grid>
+
+                    <Grid Margin="0,5,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="135"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0"
+                           FontSize="14"
+                           Margin="0,6,0,0"
+                           Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                           Text="{DynamicResource ASN}" />
+                        <ui:TextBox x:Name="ValueAsn" Grid.Column="1" Icon="{ui:SymbolIcon Router24}" PlaceholderText="{DynamicResource Unknown}" IsEnabled="false" />
+                    </Grid>
+
+                    <Grid Margin="0,5,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <CheckBox x:Name="ValueMobile" Grid.Column="0" Content="{DynamicResource IsMobile}" IsEnabled="False"/>
+                        <CheckBox x:Name="ValueProxy" Grid.Column="1" Content="{DynamicResource IsProxy}" IsEnabled="False"/>
+                        <CheckBox x:Name="ValueHosting" Grid.Column="2" Content="{DynamicResource IsHosting}" IsEnabled="False"/>
+                    </Grid>
+                </StackPanel>
+            </StackPanel>
+        </ui:Card>
+
+        <ui:Card Margin="0,10,0,0">
+            <Button Content="{DynamicResource ExportInfo}"
                     Click="ExportBtn_OnClick"
                     HorizontalAlignment="Stretch"/>
-        </StackPanel>
+        </ui:Card>
+
     </StackPanel>
 </Page>
diff --git a/CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs b/CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs
index ea44acb..30f64db 100644
--- a/CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs
+++ b/CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs
@@ -1,37 +1,55 @@
 using Microsoft.Win32;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System;
-using System.Collections;
 using System.IO;
 using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media.Imaging;
-using System.Windows.Threading;
-using CheckIP.Common;
 using System.Net.NetworkInformation;
+using System.ComponentModel;
+using CheckIP.Common;
+using System.Collections.Generic;
 
 namespace CheckIP
 {
     /// <summary>
     /// Interaktionslogik für MyIP.xaml
     /// </summary>
-    public partial class MyIP : Page
+    public partial class MyIP
     {
         private static string _myIp;
+        private readonly Queue<Action> workQueue = new Queue<Action>();
+        private readonly object queueLock = new object();
+        private readonly BackgroundWorker worker = new BackgroundWorker();
 
         public MyIP()
         {
             InitializeComponent();
 
             _myIp = Task.Run(_GetIPAddress).GetAwaiter().GetResult();
-            Task.Run(ParseIpAddress);
+            worker.DoWork += Worker_DoWork;
+            worker.RunWorkerCompleted += Worker_RunWorkerCompleted;
 
             // Trigger NetworkChange
             NetworkChange.NetworkAddressChanged += NetworkChange_NetworkAvailabilityChanged;
+
+            EnqueueWork(FetchAndParse);
+        }
+
+        private void FetchAndParse()
+        {
+            Dispatcher.Invoke(() =>
+            {
+                InfoPanel.Visibility = Visibility.Collapsed;
+                BusyPanel.Visibility = Visibility.Visible;
+            });
+
+            Task.Run(ParseIpAddress).Wait();
+
+            Dispatcher.Invoke(() =>
+            {
+                InfoPanel.Visibility = Visibility.Visible;
+                BusyPanel.Visibility = Visibility.Collapsed;
+            });
         }
 
         [Obsolete("Will be replaced to a async version soon.")]
@@ -59,66 +77,18 @@ private static async Task<string> _GetIPAddress()
 
         private void ParseIpAddress()
         {
-            // Validate IP
-            var validateIp = IPAddress.TryParse(_myIp, out var ip);
-            if (!validateIp)
-            {
-                Dispatcher.Invoke(() =>
-                {
-                    var error = (string)Application.Current.MainWindow.FindResource("ErrorInvalidIP");
-                    ErrorLabel.Content = !string.IsNullOrEmpty(error) ? error : "Error: This is not a valid IP address.";
-                });
-                return;
-            }
+            var data = IPManager.Parse(_myIp);
 
             Dispatcher.Invoke(() =>
             {
-                ErrorLabel.Content = string.Empty;
+                ErrorLabel.Text = string.Empty;
             });
 
-            var dataJson = string.Empty;
-            var url = "http://ip-api.com/json/" + _myIp + "?fields=status,message,country,countryCode,city,zip,lat,lon,timezone,isp,as,mobile,proxy,hosting";
-            try
-            {
-                var client = new HttpClient();
-                using var response = client.GetAsync(url).Result;
-                using var content = response.Content;
-                dataJson = content.ReadAsStringAsync().Result;
-            }
-            catch
+            if (!data.ParseSuccess)
             {
-                this.Dispatcher.Invoke(() =>
-                {
-                    var error = (string)Application.Current.MainWindow.FindResource("ErrorInvalidIP");
-                    ErrorLabel.Content = !string.IsNullOrEmpty(error) ? error : "Error: No connection to server";
-                });
-            }
-            dynamic data = JObject.Parse(dataJson);
-
-            // Parse data
-            string status = data.status;
-            string message = data.message;
-            string country = data.country;
-            string countryCode = data.countryCode;
-            string city = data.city;
-            string postal = data.zip;
-            string timezone = data.timezone;
-            string latitude = data.lat;
-            string longitude = data.lon;
-            string isp = data.isp;
-            string asn = data.@as;
-            string mobile = data.mobile;
-            string proxy = data.proxy;
-            string hosting = data.hosting;
-
-            // Check status
-            if (status != "success")
-            {
-                var localizeError = Common.LocalizationManager.LocalizeError(message);
-
-                this.Dispatcher.Invoke(() =>
+                Dispatcher.Invoke(() =>
                 {
-                    ErrorLabel.Content = localizeError;
+                    ErrorLabel.Text = data.Status;
                     ValueCityCountry.Text = "Unknown";
                     ValuePostal.Text = "Unknown";
                     ValueTimezone.Text = "Unknown";
@@ -126,41 +96,35 @@ private void ParseIpAddress()
                     ValueLongitude.Text = "Unknown";
                     ValueIsp.Text = "Unknown";
                     ValueAsn.Text = "Unknown";
-                    ValueMobile.Text = "Unknown";
-                    ValueProxy.Text = "Unknown";
-                    ValueHosting.Text = "Unknown";
+                    ValueMobile.IsChecked = false;
+                    ValueProxy.IsChecked = false;
+                    ValueHosting.IsChecked = false;
                 });
                 return;
             }
 
-            // Set Variable labels
-            var localizeMobile = Common.LocalizationManager.LocalizeValue(mobile);
-            var localizeProxy = Common.LocalizationManager.LocalizeValue(proxy);
-            var localizeHosting = Common.LocalizationManager.LocalizeValue(hosting);
             Dispatcher.Invoke(() =>
             {
-                IpAddress.Content = _myIp;
-                ValueCityCountry.Text = city + " / " + country + " (" + countryCode + ")";
-                ValuePostal.Text = postal;
-                ValueTimezone.Text = timezone;
-                ValueLatitude.Text = latitude;
-                ValueLongitude.Text = longitude;
-                ValueIsp.Text = isp;
-                ValueAsn.Text = asn;
-                ValueMobile.Text = localizeMobile;
-                ValueProxy.Text = localizeProxy;
-                ValueHosting.Text = localizeHosting;
+                IpAddress.Text = _myIp;
+                ValueCityCountry.Text = data.City + " / " + data.Country + " (" + data.CountryCode + ")";
+                ValuePostal.Text = data.Postal;
+                ValueTimezone.Text = data.Timezone;
+                ValueLatitude.Text = data.Latitude;
+                ValueLongitude.Text = data.Longitude;
+                ValueIsp.Text = data.Isp;
+                ValueAsn.Text = data.Asn;
+                ValueMobile.IsChecked = data.Mobile;
+                ValueProxy.IsChecked = data.Proxy;
+                ValueHosting.IsChecked = data.Hosting;
+                TaskBar.Update(data.Country, data.City, data.IPAddress, data.CountryCode);
             });
-
-            // Update NotifyIcon
-            Dispatcher.Invoke(() => TaskBar.Update(country, city, ip, countryCode));
         }
-        
+
         private void ExportBtn_OnClick(object sender, RoutedEventArgs e)
         {
             // Build export string
-            var reportCreatedMessage = (string)Application.Current.MainWindow.FindResource("ReportCreatedMessage");
-            var formattedMessage = string.Format(reportCreatedMessage, DateTime.Now, IpAddress.Content);
+            var reportCreatedMessage = (string)Application.Current.MainWindow!.FindResource("ReportCreatedMessage");
+            var formattedMessage = string.Format(reportCreatedMessage, DateTime.Now, IpAddress.Text);
 
             var cityAndCountry = (string)Application.Current.MainWindow.FindResource("CityAndCountry");
             var postal = (string)Application.Current.MainWindow.FindResource("Postal");
@@ -173,19 +137,21 @@ private void ExportBtn_OnClick(object sender, RoutedEventArgs e)
             var proxy = (string)Application.Current.MainWindow.FindResource("IsProxy");
             var hosting = (string)Application.Current.MainWindow.FindResource("IsHosting");
 
-            var exportString = $@"{formattedMessage}
+            var exportString = $"""
+                                {formattedMessage}
+
+                                {cityAndCountry}: {ValueCityCountry.Text}
+                                {postal}: {ValuePostal.Text}
+                                {timezone}: {ValueTimezone.Text}
+                                {latitude}: {ValueLatitude.Text}
+                                {longitude}: {ValueLongitude.Text}
+                                {isp}: {ValueIsp.Text}
+                                {asn}: {ValueAsn.Text}
+                                {mobile}: {ValueMobile.IsChecked}
+                                {proxy}: {ValueProxy.IsChecked}
+                                {hosting}: {ValueHosting.IsChecked}
 
-{cityAndCountry}: {ValueCityCountry.Text}
-{postal}: {ValuePostal.Text}
-{timezone}: {ValueTimezone.Text}
-{latitude}: {ValueLatitude.Text}
-{longitude}: {ValueLongitude.Text}
-{isp}: {ValueIsp.Text}
-{asn}: {ValueAsn.Text}
-{mobile}: {ValueMobile.Text}
-{proxy}: {ValueProxy.Text}
-{hosting}: {ValueHosting.Text}
-";
+                                """;
 
             var saveFileDialog = new SaveFileDialog
             {
@@ -196,10 +162,50 @@ private void ExportBtn_OnClick(object sender, RoutedEventArgs e)
                 File.WriteAllText(saveFileDialog.FileName, exportString);
         }
 
+        private void EnqueueWork(Action work)
+        {
+            lock (queueLock)
+            {
+                workQueue.Enqueue(work);
+                if (!worker.IsBusy)
+                {
+                    worker.RunWorkerAsync();
+                }
+            }
+        }
+
+        private void Worker_DoWork(object sender, DoWorkEventArgs e)
+        {
+            Action work = null;
+            lock (queueLock)
+            {
+                if (workQueue.Count > 0)
+                {
+                    work = workQueue.Dequeue();
+                }
+            }
+
+            work?.Invoke();
+        }
+
+        private void Worker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
+        {
+            lock (queueLock)
+            {
+                if (workQueue.Count > 0)
+                {
+                    worker.RunWorkerAsync();
+                }
+            }
+        }
+
         private void NetworkChange_NetworkAvailabilityChanged(object sender, EventArgs e)
         {
-            _myIp = Task.Run(_GetIPAddress).GetAwaiter().GetResult();
-            Task.Run(ParseIpAddress);
+            EnqueueWork(() =>
+            {
+                _myIp = Task.Run(() => _GetIPAddress()).GetAwaiter().GetResult();
+                FetchAndParse();
+            });
         }
     }
 }

From 42c4ecceb9e6389525b4f0ff8f8947728122dc9b Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Sun, 24 Mar 2024 04:56:08 +0100
Subject: [PATCH 12/17] Update pipeline

---
 .github/workflows/Windows-GUI.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/Windows-GUI.yml b/.github/workflows/Windows-GUI.yml
index 27ac552..cdc39c1 100644
--- a/.github/workflows/Windows-GUI.yml
+++ b/.github/workflows/Windows-GUI.yml
@@ -17,15 +17,15 @@ jobs:
     - uses: actions/checkout@v3
     
     - name: Setup .NET 8.0.x
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 8.0.x
         
     - name: Setup MSBuild
-      uses: microsoft/setup-msbuild@v1.1
+      uses: microsoft/setup-msbuild@v2
 
     - name: Setup NuGet
-      uses: NuGet/setup-nuget@v1.0.6
+      uses: NuGet/setup-nuget@v2.0.0
         
     - name: Restore dependencies
       run: nuget restore CheckIP.Windows\CheckIP.sln

From 28e2323af5ea90b167ed0f73d40cddc70cadcd40 Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Sun, 24 Mar 2024 05:02:43 +0100
Subject: [PATCH 13/17] Add RuntimeIdentifiers

---
 CheckIP.Windows/CheckIP/CheckIP.csproj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CheckIP.Windows/CheckIP/CheckIP.csproj b/CheckIP.Windows/CheckIP/CheckIP.csproj
index 28b861d..3b2b372 100644
--- a/CheckIP.Windows/CheckIP/CheckIP.csproj
+++ b/CheckIP.Windows/CheckIP/CheckIP.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
@@ -13,6 +13,7 @@
 		<RepositoryUrl>https://github.com/valnoxy/checkip</RepositoryUrl>
 		<Version>2.3.0</Version>
 		<Platforms>AnyCPU;ARM32;ARM64;x64;x86</Platforms>
+		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<StartupObject>CheckIP.App</StartupObject>
 	</PropertyGroup>

From cfbef3a2691ab4f8e33d449bcdb5c510af614635 Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Sun, 24 Mar 2024 19:33:17 +0100
Subject: [PATCH 14/17] Update Readme & Code cleanup

---
 CHANGELOG.md                               |  28 ----
 CheckIP.CLI/CheckIP.CLI.sln                |  25 ----
 CheckIP.CLI/CheckIP.CLI/CheckIP.CLI.csproj |  14 --
 CheckIP.CLI/CheckIP.CLI/Program.cs         |  32 -----
 CheckIP.Windows/CheckIP/MainWindow.xaml    |   2 +-
 CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs |  40 +++---
 README.md                                  | 159 ++++++++++++---------
 7 files changed, 113 insertions(+), 187 deletions(-)
 delete mode 100644 CHANGELOG.md
 delete mode 100644 CheckIP.CLI/CheckIP.CLI.sln
 delete mode 100644 CheckIP.CLI/CheckIP.CLI/CheckIP.CLI.csproj
 delete mode 100644 CheckIP.CLI/CheckIP.CLI/Program.cs

diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 001eee0..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,28 +0,0 @@
-<h3 align="center">CheckIP</h3>
-<p align="center">Get more information about an IP address</p>
-<p align="center">
-    <br />
-    <a href="https://github.com/valnoxy/checkip/issues">Report Bug</a>
-    ·
-    <a href="https://github.com/valnoxy/checkip/blob/main/CHANGELOG.md">View Changelog</a>
-  </p>
-</p>
-
-![-----------------------------------------------------](https://dl.exploitox.de/t440p-oc/rainbow.png)
-
-## Changelog
-
-### Version 2.1.0
-- Add mobile source code (iOS & Android)
-- Add Windows 11 UI for Windows 10 users
-- Update libraries
-- Add CLI project (WIP)
-
-### Version 2.0.0
-- New UI for Windows 11 users
-
-### Version 1.0.1
-- Add feature to parse IP by pressing ENTER.
-
-### Version 1.0.0
-- Initial release
\ No newline at end of file
diff --git a/CheckIP.CLI/CheckIP.CLI.sln b/CheckIP.CLI/CheckIP.CLI.sln
deleted file mode 100644
index 7f7cfe5..0000000
--- a/CheckIP.CLI/CheckIP.CLI.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.2.32408.312
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CheckIP.CLI", "CheckIP.CLI\CheckIP.CLI.csproj", "{4BA51A99-A14B-4A93-ACA1-FD8C27CE8525}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4BA51A99-A14B-4A93-ACA1-FD8C27CE8525}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4BA51A99-A14B-4A93-ACA1-FD8C27CE8525}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4BA51A99-A14B-4A93-ACA1-FD8C27CE8525}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4BA51A99-A14B-4A93-ACA1-FD8C27CE8525}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {3BBC0C94-AF69-4273-8ACB-FBFCCF878B67}
-	EndGlobalSection
-EndGlobal
diff --git a/CheckIP.CLI/CheckIP.CLI/CheckIP.CLI.csproj b/CheckIP.CLI/CheckIP.CLI/CheckIP.CLI.csproj
deleted file mode 100644
index 313a173..0000000
--- a/CheckIP.CLI/CheckIP.CLI/CheckIP.CLI.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.8.0" />
-  </ItemGroup>
-
-</Project>
diff --git a/CheckIP.CLI/CheckIP.CLI/Program.cs b/CheckIP.CLI/CheckIP.CLI/Program.cs
deleted file mode 100644
index cb7c789..0000000
--- a/CheckIP.CLI/CheckIP.CLI/Program.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using CommandLine;
-using CommandLine.Text;
-using System;
-
-namespace CheckIP.CLI
-{
-    internal class Program
-    {
-        public class Options
-        {
-            [Usage(ApplicationAlias = "CheckIP")]
-
-            [Value(index: 0, Required = true, HelpText = "Image file Path to analyze.")]
-            public string Path { get; set; }
-            
-            [Option(shortName: 'c', longName: "confidence", Required = false, HelpText = "Minimum confidence.", Default = 0.9f)]
-            public float Confidence { get; set; }
-        }
-
-        static void Main(string[] args)
-        {
-            CommandLine.Parser.Default.ParseArguments<Options>(args)
-                .WithParsed<Options>(o => {
-                // parsing successful; go ahead and run the app
-                })
-                .WithNotParsed<Options>(e => {
-                // parsing unsuccessful; deal with parsing errors
-                });
-            Console.WriteLine("Hello World.");
-        }
-    }
-}
\ No newline at end of file
diff --git a/CheckIP.Windows/CheckIP/MainWindow.xaml b/CheckIP.Windows/CheckIP/MainWindow.xaml
index e4438eb..2cb33ee 100644
--- a/CheckIP.Windows/CheckIP/MainWindow.xaml
+++ b/CheckIP.Windows/CheckIP/MainWindow.xaml
@@ -68,7 +68,7 @@
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
 
-            <TextBlock Grid.Column="1" x:Name="DebugString" Text="Debug" Margin="0,17,50,0" Foreground="Red" TextAlignment="Right" HorizontalAlignment="Right"/>
+            <TextBlock Grid.Column="1" x:Name="DebugString" Margin="0,17,50,0" Foreground="Red" TextAlignment="Right" HorizontalAlignment="Right"/>
         </Grid>
     </Grid>
 </ui:FluentWindow>
\ No newline at end of file
diff --git a/CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs b/CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs
index 30f64db..4728947 100644
--- a/CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs
+++ b/CheckIP.Windows/CheckIP/Pages/MyIP.xaml.cs
@@ -1,13 +1,13 @@
 using Microsoft.Win32;
 using System;
 using System.IO;
-using System.Net;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Net.NetworkInformation;
 using System.ComponentModel;
 using CheckIP.Common;
 using System.Collections.Generic;
+using System.Net.Http;
 
 namespace CheckIP
 {
@@ -17,17 +17,17 @@ namespace CheckIP
     public partial class MyIP
     {
         private static string _myIp;
-        private readonly Queue<Action> workQueue = new Queue<Action>();
-        private readonly object queueLock = new object();
-        private readonly BackgroundWorker worker = new BackgroundWorker();
+        private readonly Queue<Action> _workQueue = new Queue<Action>();
+        private readonly object _queueLock = new object();
+        private readonly BackgroundWorker _worker = new BackgroundWorker();
 
         public MyIP()
         {
             InitializeComponent();
 
             _myIp = Task.Run(_GetIPAddress).GetAwaiter().GetResult();
-            worker.DoWork += Worker_DoWork;
-            worker.RunWorkerCompleted += Worker_RunWorkerCompleted;
+            _worker.DoWork += Worker_DoWork;
+            _worker.RunWorkerCompleted += Worker_RunWorkerCompleted;
 
             // Trigger NetworkChange
             NetworkChange.NetworkAddressChanged += NetworkChange_NetworkAvailabilityChanged;
@@ -52,19 +52,19 @@ private void FetchAndParse()
             });
         }
 
-        [Obsolete("Will be replaced to a async version soon.")]
         private static async Task<string> _GetIPAddress()
         {
             string result = null;
+            using var client = new HttpClient();
             try
             {
-                result = await Task.Run(() => new WebClient().DownloadString("https://ifconfig.me/ip"));
+                result = await client.GetStringAsync("https://ifconfig.me/ip");
             }
             catch
             {
                 try // Alternative source
                 {
-                    result = await Task.Run(() => new WebClient().DownloadString("https://api.ipify.org"));
+                    result = await client.GetStringAsync("https://api.ipify.org");
                 }
                 catch
                 {
@@ -164,12 +164,12 @@ private void ExportBtn_OnClick(object sender, RoutedEventArgs e)
 
         private void EnqueueWork(Action work)
         {
-            lock (queueLock)
+            lock (_queueLock)
             {
-                workQueue.Enqueue(work);
-                if (!worker.IsBusy)
+                _workQueue.Enqueue(work);
+                if (!_worker.IsBusy)
                 {
-                    worker.RunWorkerAsync();
+                    _worker.RunWorkerAsync();
                 }
             }
         }
@@ -177,11 +177,11 @@ private void EnqueueWork(Action work)
         private void Worker_DoWork(object sender, DoWorkEventArgs e)
         {
             Action work = null;
-            lock (queueLock)
+            lock (_queueLock)
             {
-                if (workQueue.Count > 0)
+                if (_workQueue.Count > 0)
                 {
-                    work = workQueue.Dequeue();
+                    work = _workQueue.Dequeue();
                 }
             }
 
@@ -190,11 +190,11 @@ private void Worker_DoWork(object sender, DoWorkEventArgs e)
 
         private void Worker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
-            lock (queueLock)
+            lock (_queueLock)
             {
-                if (workQueue.Count > 0)
+                if (_workQueue.Count > 0)
                 {
-                    worker.RunWorkerAsync();
+                    _worker.RunWorkerAsync();
                 }
             }
         }
@@ -203,7 +203,7 @@ private void NetworkChange_NetworkAvailabilityChanged(object sender, EventArgs e
         {
             EnqueueWork(() =>
             {
-                _myIp = Task.Run(() => _GetIPAddress()).GetAwaiter().GetResult();
+                _myIp = Task.Run(_GetIPAddress).GetAwaiter().GetResult();
                 FetchAndParse();
             });
         }
diff --git a/README.md b/README.md
index e7308e7..1629476 100644
--- a/README.md
+++ b/README.md
@@ -1,76 +1,101 @@
-# CheckIP - IP Informations
-
-<img align="right" src="https://dl.exploitox.de/checkip/checkip.png" alt="CheckIP Logo" width="150">
-
-[![Android](https://img.shields.io/badge/Android-Xamarin-brightgreen.svg)](https://github.com/valnoxy/checkip/tree/main/CheckIP.Mobile)
-[![iOS](https://img.shields.io/badge/iOS-Xamarin-green)](https://github.com/valnoxy/checkip/tree/main/CheckIP.Mobile)
-[![Windows](https://img.shields.io/badge/Windows-WPF-blue)](https://github.com/valnoxy/checkip/tree/main/CheckIP.Windows)
-[![License](https://img.shields.io/badge/license-GNU%20General%20Public%20License-purple)](/LICENSE)
-[![Downloads](https://img.shields.io/github/downloads/valnoxy/checkip/total.svg)](https://github.com/valnoxy/checkip/releases)
-<p align="center">
-   <strong>Status: </strong>Maintained
-   <br />
-   <strong>WPF Version: </strong>2.2.1
-   <br />
-   <strong>Xamarin Version: </strong>2.1.0-alpha2
-   <br />
-   <a href="https://github.com/valnoxy/checkip/issues">Report Bug</a>
-   ·
-   <a href="https://github.com/valnoxy/checkip/releases">Download</a>
+<div align="center">
+
+  <!-- PROJECT LOGO -->
+  <br />
+    <a href="https://github.com/valnoxy/checkip/">
+      <img src="https://dl.exploitox.de/checkip/gh-banner-checkip.png" alt="CheckIP Banner">
+    </a>
+  <br />
+
+  [![Version][version-shield]][version-url]
+  [![Download Counter][downloads-shield]][downloads-url]
+  [![License][license-shield]][license-url]
+</div>
+
+[version-shield]: https://img.shields.io/github/v/release/valnoxy/checkip?color=9565F6
+[version-url]: https://github.com/valnoxy/checkip/releases
+
+[downloads-shield]: https://img.shields.io/github/downloads/valnoxy/checkip/total.svg?color=431D93
+[downloads-url]: https://github.com/valnoxy/checkip/releases
+
+[license-shield]: https://img.shields.io/github/license/valnoxy/checkip?color=9565F6
+[license-url]: https://img.shields.io/github/license/valnoxy/checkip
+
+<div align="center">
+  <h3 align="center">CheckIP</h3>
+  <p align="center">
+    <p>Discover the World Behind Every Address!</p>
+    </div>
+    <br />
+    <a href="https://github.com/valnoxy/checkip/issues">Report Bug</a>
+    ·
+    <a href="https://github.com/valnoxy/checkip/discussions/">Discussions</a>
+    <br />
+    <br />
+    🎉 Version 2.3.0 for Windows is out. Check out the release notes
+    <a href="https://github.com/valnoxy/checkip/releases">here</a>.
+    <br />
+    <br />
   </p>
-</p>
-</br>
-
-<img src="https://raw.githubusercontent.com/valnoxy/valnoxy/main/assets/bar.gif">
-
-## About CheckIP
-CheckIP is a GUI based application which can provide much information about an IP address.
-
-## Screenshots
-<img src="https://dl.exploitox.de/checkip/v2.2.0/CheckIP_FetchIP.png" width="350"> <img src="https://dl.exploitox.de/checkip/v2.2.0/CheckIP_MyIP.png" width="350">
-
-## Download
-[![GooglePlay](https://dl.exploitox.de/checkip/PlayStoreBadge.png)](https://play.google.com/store/apps/details?id=dev.valnoxy.checkip)
-[![AppStore](https://dl.exploitox.de/checkip/AppStoreBadge.png)](https://apps.apple.com/us/app/checkip-ip-informations/id1618841457)
-[![MicrosoftStore](https://dl.exploitox.de/checkip/MicrosoftStoreBadge.png)](https://www.microsoft.com/store/apps/9NFGS0SX9CP3)
+</div>
 
-<a href="https://testflight.apple.com/join/auUvXWJJ">Join iOS Beta via TestFlight (currently closed) »</a>
-
-> Note: The mobile applications are currently in beta. The MAUI source base is outdated and and exists only for archival purposes. After MAUI is more stable, this project will move from Xamarin to MAUI.
-
-## Localization
-Want to add a new language or revise an existing one? Great! Follow these steps so you can translate CheckIP:
-
-1. Clone this Repository
-2. Copy ```Localization\ResourceDirectory.xaml``` and paste your country code into the new file name (e.g. ```ResourceDirectory.de-DE.xaml```).
-3. Open ```Pages\App.xaml``` and add a reference to the new file under ```MergedDictionaries```.
-   
-   ```<ResourceDictionary Source="/CheckIP;component/Localization/ResourceDictionary.de-DE.xaml"/>``` 
-
-4. Open ```Pages\Main.xaml.cs```, go to the function ```Main``` and add your country code in the switch/case function with reference to the new file.
-   ```c#
-    switch (language)
-    {
-      default:
-      case "en-US":
-          dict.Source = new Uri(@"/CheckIP;component/Localization/ResourceDictionary.xaml", UriKind.Relative);
-          break;
-      case "de-DE":
-          dict.Source = new Uri(@"/CheckIP;component/Localization/ResourceDictionary.de-DE.xaml", UriKind.Relative);
-          break;
-    }
-   ```
-
-5. Modify your new file as you wish by translating the value of each variable.
-6. When you are ready, you can open a pull request.
+---
 
-## License (GNU GPL)
+<!-- TABLE OF CONTENTS -->
+<details>
+  <summary>🏁 Table of Contents</summary>
+  <ol>
+    <li><a href="#-introduction">Introduction</a></li>
+    <li>
+      <a href="#-installation-methods">Installation methods</a>
+      <ul>
+        <li><a href="##-1-install-via-microsoft-store">Install via Microsoft Store</a></li>
+        <li><a href="##-2-install-via-setup">Install via Setup</a></li>
+      </ul>
+    </li>
+    <li><a href="#-screenshot">Screenshot</a></li>
+    <li><a href="#-libraries">Libraries</a></li>
+    <li><a href="#-license">License</a></li>
+  </ol>
+</details>
+
+<br />
+
+# 🚀Introduction
+CheckIP is a GUI-based application that provides comprehensive information about an IP address. Whether you’re curious about the geographical location, network details, or other relevant data related to an IP, CheckIP has you covered.
+
+# 🤸 Installation methods
+
+> [!NOTE]
+> The Linux/Mac/Mobile version of CheckIP will be released at a later date.
+
+## 🛍️ 1. Install via Microsoft Store
+CheckIP is available in the Microsoft Store for free.
+
+<a href="https://apps.microsoft.com/detail/CheckIP/9nfgs0sx9cp3?launch=true
+	&mode=mini">
+	<img src="https://get.microsoft.com/images/en-us%20dark.svg" width="200"/>
+</a>
+
+## 💿 2. Install via Setup
+You can find the setup files here on GitHub. Simply download and run the setup assistant to install CheckIP
+
+# 🖼️ Screenshot
+<img src="https://dl.exploitox.de/checkip/v2.3.0/CheckIP_FetchIP.png" width="350"> <img src="https://dl.exploitox.de/checkip/v2.3.0/CheckIP_MyIP.png" width="350">
+
+# 🙏 Libraries
+This project uses the following libraries:
+- [Flag Icons](https://icons8.com)
+- [Hardcodet.NotifyIcon.Wpf](https://github.com/hardcodet/wpf-notifyicon)
+- [Newtonsoft.Json](https://www.newtonsoft.com/json)
+- [WPF-UI](https://github.com/lepoco/wpfui)
+
+# 🧾 License
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -88,9 +113,9 @@ GNU General Public License for more details.
 
 ---
 
-<h6 align="center">© 2018 - 2023 valnoxy. All Rights Reserved. 
+<h6 align="center">© 2018 - 2024 valnoxy. All Rights Reserved. 
 <br>
 By Jonas Günner &lt;jonas@exploitox.de&gt;</h6>
 <p align="center">
-	<a href="https://github.com/valnoxy/checkip/blob/main/LICENSE"><img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=GNU%20GENERAL%20PUBLIC%20%20LICENSE&logoColor=d9e0ee&colorA=363a4f&colorB=b7bdf8"/></a>
+	<a href="https://github.com/valnoxy/checkip/blob/main/LICENSE"><img src="https://img.shields.io/github/license/valnoxy/checkip?color=9565F6"/></a>
 </p

From 98c527c341093af5711720e00c0ea94fe2780a41 Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Sun, 24 Mar 2024 19:45:32 +0100
Subject: [PATCH 15/17] Fix layout

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1629476..f1130bd 100644
--- a/README.md
+++ b/README.md
@@ -25,11 +25,11 @@
   <h3 align="center">CheckIP</h3>
   <p align="center">
     <p>Discover the World Behind Every Address!</p>
-    </div>
-    <br />
     <a href="https://github.com/valnoxy/checkip/issues">Report Bug</a>
     ·
     <a href="https://github.com/valnoxy/checkip/discussions/">Discussions</a>
+    ·
+    <a href="https://crowdin.com/project/checkip">Help me translate</a>
     <br />
     <br />
     🎉 Version 2.3.0 for Windows is out. Check out the release notes
@@ -78,7 +78,7 @@ CheckIP is available in the Microsoft Store for free.
 </a>
 
 ## 💿 2. Install via Setup
-You can find the setup files here on GitHub. Simply download and run the setup assistant to install CheckIP
+You can find the setup files [here](https://github.com/valnoxy/checkip/releases) on GitHub. Simply download and run the setup assistant to install CheckIP.
 
 # 🖼️ Screenshot
 <img src="https://dl.exploitox.de/checkip/v2.3.0/CheckIP_FetchIP.png" width="350"> <img src="https://dl.exploitox.de/checkip/v2.3.0/CheckIP_MyIP.png" width="350">

From 3572169c313e14d372c3bd0e118153579e811480 Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Sun, 24 Mar 2024 19:54:36 +0100
Subject: [PATCH 16/17] Removed Action - will be implemented later

---
 .github/workflows/Windows-GUI.yml | 53 -------------------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 .github/workflows/Windows-GUI.yml

diff --git a/.github/workflows/Windows-GUI.yml b/.github/workflows/Windows-GUI.yml
deleted file mode 100644
index cdc39c1..0000000
--- a/.github/workflows/Windows-GUI.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-name: Windows GUI
-
-on:
-  push:
-    branches:
-      - '*'
-  pull_request:
-    branches:
-      - '*'
-
-jobs:
-  build:
-
-    runs-on: windows-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Setup .NET 8.0.x
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: 8.0.x
-        
-    - name: Setup MSBuild
-      uses: microsoft/setup-msbuild@v2
-
-    - name: Setup NuGet
-      uses: NuGet/setup-nuget@v2.0.0
-        
-    - name: Restore dependencies
-      run: nuget restore CheckIP.Windows\CheckIP.sln
-      
-    - name: Build (x86)
-      run: msbuild.exe CheckIP.Windows\CheckIP.sln /p:platform="x86" /p:configuration="Release"
-      
-    - name: Build (x64)
-      run: msbuild.exe CheckIP.Windows\CheckIP.sln /p:platform="x64" /p:configuration="Release"
-    
-    - name: Create Setup file (x86)
-      run: |
-        "%programfiles(x86)%\\Inno Setup 6\\iscc.exe" "CheckIP.Windows\Setup\ISS\x86.iss"
-      shell: cmd
-
-    - name: Create Setup file (x64)
-      run: |
-        "%programfiles(x86)%\\Inno Setup 6\\iscc.exe" "CheckIP.Windows\Setup\ISS\x64.iss"
-      shell: cmd
-
-    - name: Upload setup artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: CheckIP binaries
-        path: CheckIP.Windows\Setup\*
\ No newline at end of file

From 8e074f56d1725b3a190e3148d58e9812a288c489 Mon Sep 17 00:00:00 2001
From: valnoxy <jonas@exploitox.de>
Date: Sun, 24 Mar 2024 23:00:34 +0100
Subject: [PATCH 17/17] Finalized Setup files

---
 .gitignore                                    |   6 +-
 .../CheckIP.Packaging.wapproj                 |  23 +-
 .../Package.StoreAssociation.xml              | 373 ++++++++++++++++++
 .../CheckIP.Packaging/Package.appxmanifest    |   2 +-
 CheckIP.Windows/CheckIP.sln                   |  36 +-
 CheckIP.Windows/CheckIP/CheckIP.csproj        |   6 +-
 .../Localization/ResourceDictionary.xaml      |   2 +-
 .../Properties/PublishProfiles/ARM64.pubxml   |  19 +
 .../Properties/PublishProfiles/x64.pubxml     |  19 +
 .../Properties/PublishProfiles/x86.pubxml     |  19 +
 CheckIP.Windows/Setup/ISS/ARM64.iss           |  71 ++++
 CheckIP.Windows/Setup/ISS/x64.iss             |   6 +-
 CheckIP.Windows/Setup/ISS/x86.iss             |   6 +-
 13 files changed, 528 insertions(+), 60 deletions(-)
 create mode 100644 CheckIP.Windows/CheckIP.Packaging/Package.StoreAssociation.xml
 create mode 100644 CheckIP.Windows/CheckIP/Properties/PublishProfiles/ARM64.pubxml
 create mode 100644 CheckIP.Windows/CheckIP/Properties/PublishProfiles/x64.pubxml
 create mode 100644 CheckIP.Windows/CheckIP/Properties/PublishProfiles/x86.pubxml
 create mode 100644 CheckIP.Windows/Setup/ISS/ARM64.iss

diff --git a/.gitignore b/.gitignore
index bccfd0e..7346cb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -174,8 +174,8 @@ publish/
 *.azurePubxml
 # Note: Comment the next line if you want to checkin your web deploy settings,
 # but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
+#*.pubxml
+#*.publishproj
 
 # Microsoft Azure Web App publish settings. Comment the next line if you want to
 # checkin your Azure Web App publish settings, but sensitive information contained
@@ -207,7 +207,7 @@ rcf/
 # Windows Store app package directories and files
 AppPackages/
 BundleArtifacts/
-Package.StoreAssociation.xml
+# Package.StoreAssociation.xml
 _pkginfo.txt
 *.appx
 *.appxbundle
diff --git a/CheckIP.Windows/CheckIP.Packaging/CheckIP.Packaging.wapproj b/CheckIP.Windows/CheckIP.Packaging/CheckIP.Packaging.wapproj
index 9a999bb..630a3a3 100644
--- a/CheckIP.Windows/CheckIP.Packaging/CheckIP.Packaging.wapproj
+++ b/CheckIP.Windows/CheckIP.Packaging/CheckIP.Packaging.wapproj
@@ -20,14 +20,6 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
       <Platform>ARM64</Platform>
@@ -54,15 +46,18 @@
     <TargetPlatformVersion>10.0.22000.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <DefaultLanguage>de-DE</DefaultLanguage>
-    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
     <NoWarn>$(NoWarn);NU1702</NoWarn>
     <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
-    <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
+    <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <EntryPointProjectUniqueName>..\CheckIP\CheckIP.csproj</EntryPointProjectUniqueName>
+    <PackageCertificateThumbprint>A80FD11EC378D1985237EE2B346FC5D63304C50D</PackageCertificateThumbprint>
+    <AppxPackageSigningTimestampServerUrl>http://time.certum.pl</AppxPackageSigningTimestampServerUrl>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
     <DefaultLanguage>en-US</DefaultLanguage>
@@ -72,10 +67,6 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefaultLanguage>en-US</DefaultLanguage>
     <AppxBundle>Always</AppxBundle>
@@ -96,10 +87,6 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DefaultLanguage>en-US</DefaultLanguage>
     <AppxBundle>Always</AppxBundle>
diff --git a/CheckIP.Windows/CheckIP.Packaging/Package.StoreAssociation.xml b/CheckIP.Windows/CheckIP.Packaging/Package.StoreAssociation.xml
new file mode 100644
index 0000000..0cc162f
--- /dev/null
+++ b/CheckIP.Windows/CheckIP.Packaging/Package.StoreAssociation.xml
@@ -0,0 +1,373 @@
+<?xml version="1.0" encoding="utf-8"?>
+<StoreAssociation xmlns="http://schemas.microsoft.com/appx/2010/storeassociation">
+  <Publisher>CN=31057B9D-4921-4747-A145-1C1FDFD7E821</Publisher>
+  <PublisherDisplayName>valnoxy</PublisherDisplayName>
+  <DeveloperAccountType>MSA</DeveloperAccountType>
+  <GeneratePackageHash>http://www.w3.org/2001/04/xmlenc#sha256</GeneratePackageHash>
+  <SupportedLocales>
+    <Language Code="af" InMinimumRequirementSet="true" />
+    <Language Code="af-za" InMinimumRequirementSet="true" />
+    <Language Code="am" InMinimumRequirementSet="true" />
+    <Language Code="am-et" InMinimumRequirementSet="true" />
+    <Language Code="ar" InMinimumRequirementSet="true" />
+    <Language Code="ar-ae" InMinimumRequirementSet="true" />
+    <Language Code="ar-bh" InMinimumRequirementSet="true" />
+    <Language Code="ar-dz" InMinimumRequirementSet="true" />
+    <Language Code="ar-eg" InMinimumRequirementSet="true" />
+    <Language Code="ar-iq" InMinimumRequirementSet="true" />
+    <Language Code="ar-jo" InMinimumRequirementSet="true" />
+    <Language Code="ar-kw" InMinimumRequirementSet="true" />
+    <Language Code="ar-lb" InMinimumRequirementSet="true" />
+    <Language Code="ar-ly" InMinimumRequirementSet="true" />
+    <Language Code="ar-ma" InMinimumRequirementSet="true" />
+    <Language Code="ar-om" InMinimumRequirementSet="true" />
+    <Language Code="ar-qa" InMinimumRequirementSet="true" />
+    <Language Code="ar-sa" InMinimumRequirementSet="true" />
+    <Language Code="ar-sy" InMinimumRequirementSet="true" />
+    <Language Code="ar-tn" InMinimumRequirementSet="true" />
+    <Language Code="ar-ye" InMinimumRequirementSet="true" />
+    <Language Code="as" InMinimumRequirementSet="true" />
+    <Language Code="as-in" InMinimumRequirementSet="true" />
+    <Language Code="az" InMinimumRequirementSet="true" />
+    <Language Code="az-arab" InMinimumRequirementSet="true" />
+    <Language Code="az-arab-az" InMinimumRequirementSet="true" />
+    <Language Code="az-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="az-cyrl-az" InMinimumRequirementSet="true" />
+    <Language Code="az-latn" InMinimumRequirementSet="true" />
+    <Language Code="az-latn-az" InMinimumRequirementSet="true" />
+    <Language Code="be" InMinimumRequirementSet="true" />
+    <Language Code="be-by" InMinimumRequirementSet="true" />
+    <Language Code="bg" InMinimumRequirementSet="true" />
+    <Language Code="bg-bg" InMinimumRequirementSet="true" />
+    <Language Code="bn" InMinimumRequirementSet="true" />
+    <Language Code="bn-bd" InMinimumRequirementSet="true" />
+    <Language Code="bn-in" InMinimumRequirementSet="true" />
+    <Language Code="bs" InMinimumRequirementSet="true" />
+    <Language Code="bs-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="bs-cyrl-ba" InMinimumRequirementSet="true" />
+    <Language Code="bs-latn" InMinimumRequirementSet="true" />
+    <Language Code="bs-latn-ba" InMinimumRequirementSet="true" />
+    <Language Code="ca" InMinimumRequirementSet="true" />
+    <Language Code="ca-es" InMinimumRequirementSet="true" />
+    <Language Code="ca-es-valencia" InMinimumRequirementSet="true" />
+    <Language Code="chr-cher" InMinimumRequirementSet="true" />
+    <Language Code="chr-cher-us" InMinimumRequirementSet="true" />
+    <Language Code="chr-latn" InMinimumRequirementSet="true" />
+    <Language Code="cs" InMinimumRequirementSet="true" />
+    <Language Code="cs-cz" InMinimumRequirementSet="true" />
+    <Language Code="cy" InMinimumRequirementSet="true" />
+    <Language Code="cy-gb" InMinimumRequirementSet="true" />
+    <Language Code="da" InMinimumRequirementSet="true" />
+    <Language Code="da-dk" InMinimumRequirementSet="true" />
+    <Language Code="de" InMinimumRequirementSet="true" />
+    <Language Code="de-at" InMinimumRequirementSet="true" />
+    <Language Code="de-ch" InMinimumRequirementSet="true" />
+    <Language Code="de-de" InMinimumRequirementSet="true" />
+    <Language Code="de-li" InMinimumRequirementSet="true" />
+    <Language Code="de-lu" InMinimumRequirementSet="true" />
+    <Language Code="el" InMinimumRequirementSet="true" />
+    <Language Code="el-gr" InMinimumRequirementSet="true" />
+    <Language Code="en" InMinimumRequirementSet="true" />
+    <Language Code="en-011" InMinimumRequirementSet="true" />
+    <Language Code="en-014" InMinimumRequirementSet="true" />
+    <Language Code="en-018" InMinimumRequirementSet="true" />
+    <Language Code="en-021" InMinimumRequirementSet="true" />
+    <Language Code="en-029" InMinimumRequirementSet="true" />
+    <Language Code="en-053" InMinimumRequirementSet="true" />
+    <Language Code="en-au" InMinimumRequirementSet="true" />
+    <Language Code="en-bz" InMinimumRequirementSet="true" />
+    <Language Code="en-ca" InMinimumRequirementSet="true" />
+    <Language Code="en-gb" InMinimumRequirementSet="true" />
+    <Language Code="en-hk" InMinimumRequirementSet="true" />
+    <Language Code="en-id" InMinimumRequirementSet="true" />
+    <Language Code="en-ie" InMinimumRequirementSet="true" />
+    <Language Code="en-in" InMinimumRequirementSet="true" />
+    <Language Code="en-jm" InMinimumRequirementSet="true" />
+    <Language Code="en-kz" InMinimumRequirementSet="true" />
+    <Language Code="en-mt" InMinimumRequirementSet="true" />
+    <Language Code="en-my" InMinimumRequirementSet="true" />
+    <Language Code="en-nz" InMinimumRequirementSet="true" />
+    <Language Code="en-ph" InMinimumRequirementSet="true" />
+    <Language Code="en-pk" InMinimumRequirementSet="true" />
+    <Language Code="en-sg" InMinimumRequirementSet="true" />
+    <Language Code="en-tt" InMinimumRequirementSet="true" />
+    <Language Code="en-us" InMinimumRequirementSet="true" />
+    <Language Code="en-vn" InMinimumRequirementSet="true" />
+    <Language Code="en-za" InMinimumRequirementSet="true" />
+    <Language Code="en-zw" InMinimumRequirementSet="true" />
+    <Language Code="es" InMinimumRequirementSet="true" />
+    <Language Code="es-019" InMinimumRequirementSet="true" />
+    <Language Code="es-419" InMinimumRequirementSet="true" />
+    <Language Code="es-ar" InMinimumRequirementSet="true" />
+    <Language Code="es-bo" InMinimumRequirementSet="true" />
+    <Language Code="es-cl" InMinimumRequirementSet="true" />
+    <Language Code="es-co" InMinimumRequirementSet="true" />
+    <Language Code="es-cr" InMinimumRequirementSet="true" />
+    <Language Code="es-do" InMinimumRequirementSet="true" />
+    <Language Code="es-ec" InMinimumRequirementSet="true" />
+    <Language Code="es-es" InMinimumRequirementSet="true" />
+    <Language Code="es-gt" InMinimumRequirementSet="true" />
+    <Language Code="es-hn" InMinimumRequirementSet="true" />
+    <Language Code="es-mx" InMinimumRequirementSet="true" />
+    <Language Code="es-ni" InMinimumRequirementSet="true" />
+    <Language Code="es-pa" InMinimumRequirementSet="true" />
+    <Language Code="es-pe" InMinimumRequirementSet="true" />
+    <Language Code="es-pr" InMinimumRequirementSet="true" />
+    <Language Code="es-py" InMinimumRequirementSet="true" />
+    <Language Code="es-sv" InMinimumRequirementSet="true" />
+    <Language Code="es-us" InMinimumRequirementSet="true" />
+    <Language Code="es-uy" InMinimumRequirementSet="true" />
+    <Language Code="es-ve" InMinimumRequirementSet="true" />
+    <Language Code="et" InMinimumRequirementSet="true" />
+    <Language Code="et-ee" InMinimumRequirementSet="true" />
+    <Language Code="eu" InMinimumRequirementSet="true" />
+    <Language Code="eu-es" InMinimumRequirementSet="true" />
+    <Language Code="fa" InMinimumRequirementSet="true" />
+    <Language Code="fa-ir" InMinimumRequirementSet="true" />
+    <Language Code="fi" InMinimumRequirementSet="true" />
+    <Language Code="fi-fi" InMinimumRequirementSet="true" />
+    <Language Code="fil" InMinimumRequirementSet="true" />
+    <Language Code="fil-latn" InMinimumRequirementSet="true" />
+    <Language Code="fil-ph" InMinimumRequirementSet="true" />
+    <Language Code="fr" InMinimumRequirementSet="true" />
+    <Language Code="fr-011" InMinimumRequirementSet="true" />
+    <Language Code="fr-015" InMinimumRequirementSet="true" />
+    <Language Code="fr-021" InMinimumRequirementSet="true" />
+    <Language Code="fr-029" InMinimumRequirementSet="true" />
+    <Language Code="fr-155" InMinimumRequirementSet="true" />
+    <Language Code="fr-be" InMinimumRequirementSet="true" />
+    <Language Code="fr-ca" InMinimumRequirementSet="true" />
+    <Language Code="fr-cd" InMinimumRequirementSet="true" />
+    <Language Code="fr-ch" InMinimumRequirementSet="true" />
+    <Language Code="fr-ci" InMinimumRequirementSet="true" />
+    <Language Code="fr-cm" InMinimumRequirementSet="true" />
+    <Language Code="fr-fr" InMinimumRequirementSet="true" />
+    <Language Code="fr-ht" InMinimumRequirementSet="true" />
+    <Language Code="fr-lu" InMinimumRequirementSet="true" />
+    <Language Code="fr-ma" InMinimumRequirementSet="true" />
+    <Language Code="fr-mc" InMinimumRequirementSet="true" />
+    <Language Code="fr-ml" InMinimumRequirementSet="true" />
+    <Language Code="fr-re" InMinimumRequirementSet="true" />
+    <Language Code="frc-latn" InMinimumRequirementSet="true" />
+    <Language Code="frp-latn" InMinimumRequirementSet="true" />
+    <Language Code="ga" InMinimumRequirementSet="true" />
+    <Language Code="ga-ie" InMinimumRequirementSet="true" />
+    <Language Code="gd-gb" InMinimumRequirementSet="true" />
+    <Language Code="gd-latn" InMinimumRequirementSet="true" />
+    <Language Code="gl" InMinimumRequirementSet="true" />
+    <Language Code="gl-es" InMinimumRequirementSet="true" />
+    <Language Code="gu" InMinimumRequirementSet="true" />
+    <Language Code="gu-in" InMinimumRequirementSet="true" />
+    <Language Code="ha" InMinimumRequirementSet="true" />
+    <Language Code="ha-latn" InMinimumRequirementSet="true" />
+    <Language Code="ha-latn-ng" InMinimumRequirementSet="true" />
+    <Language Code="he" InMinimumRequirementSet="true" />
+    <Language Code="he-il" InMinimumRequirementSet="true" />
+    <Language Code="hi" InMinimumRequirementSet="true" />
+    <Language Code="hi-in" InMinimumRequirementSet="true" />
+    <Language Code="hr" InMinimumRequirementSet="true" />
+    <Language Code="hr-ba" InMinimumRequirementSet="true" />
+    <Language Code="hr-hr" InMinimumRequirementSet="true" />
+    <Language Code="hu" InMinimumRequirementSet="true" />
+    <Language Code="hu-hu" InMinimumRequirementSet="true" />
+    <Language Code="hy" InMinimumRequirementSet="true" />
+    <Language Code="hy-am" InMinimumRequirementSet="true" />
+    <Language Code="id" InMinimumRequirementSet="true" />
+    <Language Code="id-id" InMinimumRequirementSet="true" />
+    <Language Code="ig-latn" InMinimumRequirementSet="true" />
+    <Language Code="ig-ng" InMinimumRequirementSet="true" />
+    <Language Code="is" InMinimumRequirementSet="true" />
+    <Language Code="is-is" InMinimumRequirementSet="true" />
+    <Language Code="it" InMinimumRequirementSet="true" />
+    <Language Code="it-ch" InMinimumRequirementSet="true" />
+    <Language Code="it-it" InMinimumRequirementSet="true" />
+    <Language Code="iu-cans" InMinimumRequirementSet="true" />
+    <Language Code="iu-latn" InMinimumRequirementSet="true" />
+    <Language Code="iu-latn-ca" InMinimumRequirementSet="true" />
+    <Language Code="ja" InMinimumRequirementSet="true" />
+    <Language Code="ja-jp" InMinimumRequirementSet="true" />
+    <Language Code="ka" InMinimumRequirementSet="true" />
+    <Language Code="ka-ge" InMinimumRequirementSet="true" />
+    <Language Code="kk" InMinimumRequirementSet="true" />
+    <Language Code="kk-kz" InMinimumRequirementSet="true" />
+    <Language Code="km" InMinimumRequirementSet="true" />
+    <Language Code="km-kh" InMinimumRequirementSet="true" />
+    <Language Code="kn" InMinimumRequirementSet="true" />
+    <Language Code="kn-in" InMinimumRequirementSet="true" />
+    <Language Code="ko" InMinimumRequirementSet="true" />
+    <Language Code="ko-kr" InMinimumRequirementSet="true" />
+    <Language Code="kok" InMinimumRequirementSet="true" />
+    <Language Code="kok-in" InMinimumRequirementSet="true" />
+    <Language Code="ku-arab" InMinimumRequirementSet="true" />
+    <Language Code="ku-arab-iq" InMinimumRequirementSet="true" />
+    <Language Code="ky-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="ky-kg" InMinimumRequirementSet="true" />
+    <Language Code="lb" InMinimumRequirementSet="true" />
+    <Language Code="lb-lu" InMinimumRequirementSet="true" />
+    <Language Code="lo" InMinimumRequirementSet="true" />
+    <Language Code="lo-la" InMinimumRequirementSet="true" />
+    <Language Code="lt" InMinimumRequirementSet="true" />
+    <Language Code="lt-lt" InMinimumRequirementSet="true" />
+    <Language Code="lv" InMinimumRequirementSet="true" />
+    <Language Code="lv-lv" InMinimumRequirementSet="true" />
+    <Language Code="mi" InMinimumRequirementSet="true" />
+    <Language Code="mi-latn" InMinimumRequirementSet="true" />
+    <Language Code="mi-nz" InMinimumRequirementSet="true" />
+    <Language Code="mk" InMinimumRequirementSet="true" />
+    <Language Code="mk-mk" InMinimumRequirementSet="true" />
+    <Language Code="ml" InMinimumRequirementSet="true" />
+    <Language Code="ml-in" InMinimumRequirementSet="true" />
+    <Language Code="mn-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="mn-mn" InMinimumRequirementSet="true" />
+    <Language Code="mn-mong" InMinimumRequirementSet="true" />
+    <Language Code="mn-phag" InMinimumRequirementSet="true" />
+    <Language Code="mr" InMinimumRequirementSet="true" />
+    <Language Code="mr-in" InMinimumRequirementSet="true" />
+    <Language Code="ms" InMinimumRequirementSet="true" />
+    <Language Code="ms-bn" InMinimumRequirementSet="true" />
+    <Language Code="ms-my" InMinimumRequirementSet="true" />
+    <Language Code="mt" InMinimumRequirementSet="true" />
+    <Language Code="mt-mt" InMinimumRequirementSet="true" />
+    <Language Code="nb" InMinimumRequirementSet="true" />
+    <Language Code="nb-no" InMinimumRequirementSet="true" />
+    <Language Code="ne" InMinimumRequirementSet="true" />
+    <Language Code="ne-np" InMinimumRequirementSet="true" />
+    <Language Code="nl" InMinimumRequirementSet="true" />
+    <Language Code="nl-be" InMinimumRequirementSet="true" />
+    <Language Code="nl-nl" InMinimumRequirementSet="true" />
+    <Language Code="nn" InMinimumRequirementSet="true" />
+    <Language Code="nn-no" InMinimumRequirementSet="true" />
+    <Language Code="no" InMinimumRequirementSet="true" />
+    <Language Code="no-no" InMinimumRequirementSet="true" />
+    <Language Code="nso" InMinimumRequirementSet="true" />
+    <Language Code="nso-za" InMinimumRequirementSet="true" />
+    <Language Code="om" InMinimumRequirementSet="false" />
+    <Language Code="om-et" InMinimumRequirementSet="false" />
+    <Language Code="or" InMinimumRequirementSet="true" />
+    <Language Code="or-in" InMinimumRequirementSet="true" />
+    <Language Code="pa" InMinimumRequirementSet="true" />
+    <Language Code="pa-arab" InMinimumRequirementSet="true" />
+    <Language Code="pa-arab-pk" InMinimumRequirementSet="true" />
+    <Language Code="pa-deva" InMinimumRequirementSet="true" />
+    <Language Code="pa-in" InMinimumRequirementSet="true" />
+    <Language Code="pl" InMinimumRequirementSet="true" />
+    <Language Code="pl-pl" InMinimumRequirementSet="true" />
+    <Language Code="prs" InMinimumRequirementSet="true" />
+    <Language Code="prs-af" InMinimumRequirementSet="true" />
+    <Language Code="prs-arab" InMinimumRequirementSet="true" />
+    <Language Code="pt" InMinimumRequirementSet="true" />
+    <Language Code="pt-br" InMinimumRequirementSet="true" />
+    <Language Code="pt-pt" InMinimumRequirementSet="true" />
+    <Language Code="quc-latn" InMinimumRequirementSet="true" />
+    <Language Code="qut-gt" InMinimumRequirementSet="true" />
+    <Language Code="qut-latn" InMinimumRequirementSet="true" />
+    <Language Code="quz" InMinimumRequirementSet="true" />
+    <Language Code="quz-bo" InMinimumRequirementSet="true" />
+    <Language Code="quz-ec" InMinimumRequirementSet="true" />
+    <Language Code="quz-pe" InMinimumRequirementSet="true" />
+    <Language Code="ro" InMinimumRequirementSet="true" />
+    <Language Code="ro-ro" InMinimumRequirementSet="true" />
+    <Language Code="ru" InMinimumRequirementSet="true" />
+    <Language Code="ru-ru" InMinimumRequirementSet="true" />
+    <Language Code="rw" InMinimumRequirementSet="true" />
+    <Language Code="rw-rw" InMinimumRequirementSet="true" />
+    <Language Code="sd-arab" InMinimumRequirementSet="true" />
+    <Language Code="sd-arab-pk" InMinimumRequirementSet="true" />
+    <Language Code="sd-deva" InMinimumRequirementSet="true" />
+    <Language Code="si" InMinimumRequirementSet="true" />
+    <Language Code="si-lk" InMinimumRequirementSet="true" />
+    <Language Code="sk" InMinimumRequirementSet="true" />
+    <Language Code="sk-sk" InMinimumRequirementSet="true" />
+    <Language Code="sl" InMinimumRequirementSet="true" />
+    <Language Code="sl-si" InMinimumRequirementSet="true" />
+    <Language Code="sq" InMinimumRequirementSet="true" />
+    <Language Code="sq-al" InMinimumRequirementSet="true" />
+    <Language Code="sr" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl-ba" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl-cs" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl-me" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl-rs" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn-ba" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn-cs" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn-me" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn-rs" InMinimumRequirementSet="true" />
+    <Language Code="sv" InMinimumRequirementSet="true" />
+    <Language Code="sv-fi" InMinimumRequirementSet="true" />
+    <Language Code="sv-se" InMinimumRequirementSet="true" />
+    <Language Code="sw" InMinimumRequirementSet="true" />
+    <Language Code="sw-ke" InMinimumRequirementSet="true" />
+    <Language Code="ta" InMinimumRequirementSet="true" />
+    <Language Code="ta-in" InMinimumRequirementSet="true" />
+    <Language Code="te" InMinimumRequirementSet="true" />
+    <Language Code="te-in" InMinimumRequirementSet="true" />
+    <Language Code="tg-arab" InMinimumRequirementSet="true" />
+    <Language Code="tg-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="tg-cyrl-tj" InMinimumRequirementSet="true" />
+    <Language Code="tg-latn" InMinimumRequirementSet="true" />
+    <Language Code="th" InMinimumRequirementSet="true" />
+    <Language Code="th-th" InMinimumRequirementSet="true" />
+    <Language Code="ti" InMinimumRequirementSet="true" />
+    <Language Code="ti-et" InMinimumRequirementSet="true" />
+    <Language Code="tk-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="tk-cyrl-tr" InMinimumRequirementSet="true" />
+    <Language Code="tk-latn" InMinimumRequirementSet="true" />
+    <Language Code="tk-latn-tr" InMinimumRequirementSet="true" />
+    <Language Code="tk-tm" InMinimumRequirementSet="true" />
+    <Language Code="tn" InMinimumRequirementSet="true" />
+    <Language Code="tn-bw" InMinimumRequirementSet="true" />
+    <Language Code="tn-za" InMinimumRequirementSet="true" />
+    <Language Code="tr" InMinimumRequirementSet="true" />
+    <Language Code="tr-tr" InMinimumRequirementSet="true" />
+    <Language Code="tt-arab" InMinimumRequirementSet="true" />
+    <Language Code="tt-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="tt-latn" InMinimumRequirementSet="true" />
+    <Language Code="tt-ru" InMinimumRequirementSet="true" />
+    <Language Code="ug-arab" InMinimumRequirementSet="true" />
+    <Language Code="ug-cn" InMinimumRequirementSet="true" />
+    <Language Code="ug-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="ug-latn" InMinimumRequirementSet="true" />
+    <Language Code="uk" InMinimumRequirementSet="true" />
+    <Language Code="uk-ua" InMinimumRequirementSet="true" />
+    <Language Code="ur" InMinimumRequirementSet="true" />
+    <Language Code="ur-pk" InMinimumRequirementSet="true" />
+    <Language Code="uz" InMinimumRequirementSet="true" />
+    <Language Code="uz-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="uz-latn" InMinimumRequirementSet="true" />
+    <Language Code="uz-latn-uz" InMinimumRequirementSet="true" />
+    <Language Code="vi" InMinimumRequirementSet="true" />
+    <Language Code="vi-vn" InMinimumRequirementSet="true" />
+    <Language Code="wo" InMinimumRequirementSet="true" />
+    <Language Code="wo-sn" InMinimumRequirementSet="true" />
+    <Language Code="xh" InMinimumRequirementSet="true" />
+    <Language Code="xh-za" InMinimumRequirementSet="true" />
+    <Language Code="yo-latn" InMinimumRequirementSet="true" />
+    <Language Code="yo-ng" InMinimumRequirementSet="true" />
+    <Language Code="zh" InMinimumRequirementSet="true" />
+    <Language Code="zh-cn" InMinimumRequirementSet="true" />
+    <Language Code="zh-hans" InMinimumRequirementSet="true" />
+    <Language Code="zh-hans-cn" InMinimumRequirementSet="true" />
+    <Language Code="zh-hans-sg" InMinimumRequirementSet="true" />
+    <Language Code="zh-hant" InMinimumRequirementSet="true" />
+    <Language Code="zh-hant-hk" InMinimumRequirementSet="true" />
+    <Language Code="zh-hant-mo" InMinimumRequirementSet="true" />
+    <Language Code="zh-hant-tw" InMinimumRequirementSet="true" />
+    <Language Code="zh-hk" InMinimumRequirementSet="true" />
+    <Language Code="zh-mo" InMinimumRequirementSet="true" />
+    <Language Code="zh-sg" InMinimumRequirementSet="true" />
+    <Language Code="zh-tw" InMinimumRequirementSet="true" />
+    <Language Code="zu" InMinimumRequirementSet="true" />
+    <Language Code="zu-za" InMinimumRequirementSet="true" />
+  </SupportedLocales>
+  <ProductReservedInfo>
+    <MainPackageIdentityName>1689valnoxy.CheckIP</MainPackageIdentityName>
+    <ReservedNames>
+      <ReservedName>CheckIP</ReservedName>
+    </ReservedNames>
+  </ProductReservedInfo>
+  <AccountPackageIdentityNames>
+    <MainPackageIdentityName>1689valnoxy.CheckIP</MainPackageIdentityName>
+  </AccountPackageIdentityNames>
+  <PackageInfoList LandingUrl="https://developer.microsoft.com/dashboard/Application?appId=9NFGS0SX9CP3" />
+</StoreAssociation>
\ No newline at end of file
diff --git a/CheckIP.Windows/CheckIP.Packaging/Package.appxmanifest b/CheckIP.Windows/CheckIP.Packaging/Package.appxmanifest
index 7116eeb..b385cb4 100644
--- a/CheckIP.Windows/CheckIP.Packaging/Package.appxmanifest
+++ b/CheckIP.Windows/CheckIP.Packaging/Package.appxmanifest
@@ -9,7 +9,7 @@
   <Identity
     Name="1689valnoxy.CheckIP"
     Publisher="CN=31057B9D-4921-4747-A145-1C1FDFD7E821"
-    Version="2.2.0.0" />
+    Version="2.3.0.0" />
 
   <Properties>
     <DisplayName>CheckIP</DisplayName>
diff --git a/CheckIP.Windows/CheckIP.sln b/CheckIP.Windows/CheckIP.sln
index af761c4..36f94ab 100644
--- a/CheckIP.Windows/CheckIP.sln
+++ b/CheckIP.Windows/CheckIP.sln
@@ -10,14 +10,10 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
-		Debug|ARM32 = Debug|ARM32
 		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
-		Release|ARM32 = Release|ARM32
 		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
@@ -25,22 +21,14 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Debug|ARM.Build.0 = Debug|Any CPU
-		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Debug|ARM32.ActiveCfg = Debug|ARM32
-		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Debug|ARM32.Build.0 = Debug|ARM32
-		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Debug|x64.Build.0 = Debug|Any CPU
-		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Debug|x86.Build.0 = Debug|Any CPU
+		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Debug|ARM64.Build.0 = Debug|ARM64
+		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Debug|x64.ActiveCfg = Debug|x64
+		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Debug|x64.Build.0 = Debug|x64
+		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Debug|x86.ActiveCfg = Debug|x86
+		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Debug|x86.Build.0 = Debug|x86
 		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Release|ARM.ActiveCfg = Release|ARM32
-		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Release|ARM.Build.0 = Release|ARM32
-		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Release|ARM32.ActiveCfg = Release|ARM32
-		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Release|ARM32.Build.0 = Release|ARM32
 		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Release|ARM64.ActiveCfg = Release|ARM64
 		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Release|ARM64.Build.0 = Release|ARM64
 		{2CFE2279-B648-45C5-BE54-88968977BBCE}.Release|x64.ActiveCfg = Release|x64
@@ -50,12 +38,6 @@ Global
 		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Debug|ARM.ActiveCfg = Debug|ARM
-		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Debug|ARM.Build.0 = Debug|ARM
-		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Debug|ARM.Deploy.0 = Debug|ARM
-		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Debug|ARM32.ActiveCfg = Debug|Any CPU
-		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Debug|ARM32.Build.0 = Debug|Any CPU
-		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Debug|ARM32.Deploy.0 = Debug|Any CPU
 		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Debug|ARM64.Build.0 = Debug|ARM64
 		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Debug|ARM64.Deploy.0 = Debug|ARM64
@@ -68,12 +50,6 @@ Global
 		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Release|ARM.ActiveCfg = Release|ARM
-		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Release|ARM.Build.0 = Release|ARM
-		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Release|ARM.Deploy.0 = Release|ARM
-		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Release|ARM32.ActiveCfg = Release|ARM
-		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Release|ARM32.Build.0 = Release|ARM
-		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Release|ARM32.Deploy.0 = Release|ARM
 		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Release|ARM64.ActiveCfg = Release|ARM64
 		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Release|ARM64.Build.0 = Release|ARM64
 		{F22735B2-E433-4D3A-957E-D8377B7D1ABF}.Release|ARM64.Deploy.0 = Release|ARM64
diff --git a/CheckIP.Windows/CheckIP/CheckIP.csproj b/CheckIP.Windows/CheckIP/CheckIP.csproj
index 3b2b372..1e57bfb 100644
--- a/CheckIP.Windows/CheckIP/CheckIP.csproj
+++ b/CheckIP.Windows/CheckIP/CheckIP.csproj
@@ -12,10 +12,14 @@
 		<Copyright>Copyright © 2018 - 2024 Exploitox. All rights reserved.</Copyright>
 		<RepositoryUrl>https://github.com/valnoxy/checkip</RepositoryUrl>
 		<Version>2.3.0</Version>
-		<Platforms>AnyCPU;ARM32;ARM64;x64;x86</Platforms>
+		<Platforms>ARM64;x64;x86;AnyCPU</Platforms>
 		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<StartupObject>CheckIP.App</StartupObject>
+		<AssemblyVersion>$(Version)</AssemblyVersion>
+		<FileVersion>$(Version)</FileVersion>
+		<AssemblyInformationalVersion>$(Version)</AssemblyInformationalVersion>
+		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.xaml b/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.xaml
index b29e4f2..655a6f3 100644
--- a/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.xaml
+++ b/CheckIP.Windows/CheckIP/Localization/ResourceDictionary.xaml
@@ -31,7 +31,7 @@
     <system:String x:Key="ThirdPartyLibraries">Third Party Libraries</system:String>
     <system:String x:Key="ThirdPartyLibrariesDescription">List of all used open-source libraries and images.</system:String>
     <system:String x:Key="By">{0} by {1}</system:String>
-    <system:String x:Key="SourceCodeBtn">Source Code on GitHub</system:String>
+    <system:String x:Key="SourceCodeBtn">Source Code</system:String>
     <system:String x:Key="HomepageBtn">Homepage</system:String>
     <system:String x:Key="DonateBtn">Donate</system:String>
 
diff --git a/CheckIP.Windows/CheckIP/Properties/PublishProfiles/ARM64.pubxml b/CheckIP.Windows/CheckIP/Properties/PublishProfiles/ARM64.pubxml
new file mode 100644
index 0000000..91fe94b
--- /dev/null
+++ b/CheckIP.Windows/CheckIP/Properties/PublishProfiles/ARM64.pubxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>ARM64</Platform>
+    <PublishDir>bin\Release\publish\win-arm64\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <RuntimeIdentifier>win-arm64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishReadyToRun>false</PublishReadyToRun>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/CheckIP.Windows/CheckIP/Properties/PublishProfiles/x64.pubxml b/CheckIP.Windows/CheckIP/Properties/PublishProfiles/x64.pubxml
new file mode 100644
index 0000000..6bfe805
--- /dev/null
+++ b/CheckIP.Windows/CheckIP/Properties/PublishProfiles/x64.pubxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>x64</Platform>
+    <PublishDir>bin\Release\publish\win-x64</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishReadyToRun>false</PublishReadyToRun>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/CheckIP.Windows/CheckIP/Properties/PublishProfiles/x86.pubxml b/CheckIP.Windows/CheckIP/Properties/PublishProfiles/x86.pubxml
new file mode 100644
index 0000000..cbc1fe4
--- /dev/null
+++ b/CheckIP.Windows/CheckIP/Properties/PublishProfiles/x86.pubxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>x86</Platform>
+    <PublishDir>bin\Release\publish\win-x86</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishReadyToRun>false</PublishReadyToRun>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/CheckIP.Windows/Setup/ISS/ARM64.iss b/CheckIP.Windows/Setup/ISS/ARM64.iss
new file mode 100644
index 0000000..396d2fa
--- /dev/null
+++ b/CheckIP.Windows/Setup/ISS/ARM64.iss
@@ -0,0 +1,71 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName          "CheckIP"
+#define MyAppVersion       GetFileVersion('..\..\CheckIP\bin\Release\publish\win-arm64\CheckIP.exe')
+#define MyAppPlatform      "arm64"
+#define MyAppPublisher     "Exploitox"
+#define MyAppURL           "https://github.com/valnoxy/checkip"
+#define MyAppExeName       "CheckIP.exe"
+#define MyAppStartingYear  "2018"
+#define MyAppEndingYear    GetDateTimeString('yyyy','','')
+              
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{47128A10-4D16-4AE3-AE08-F311BDB04571}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+AppVerName={#MyAppName} {#MyAppVersion} ({#MyAppPlatform})
+
+VersionInfoDescription={#MyAppName} Installer
+VersionInfoVersion={#MyAppVersion}
+VersionInfoProductName={#MyAppName}
+VersionInfoProductVersion={#MyAppVersion}
+AppCopyright=Copyright © {#MyAppStartingYear} - {#MyAppEndingYear} {#MyAppPublisher}. All rights reserved.       
+
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+
+UninstallDisplayIcon={app}\CheckIP.exe
+UninstallDisplayName={#MyAppName}
+AppPublisher={#MyAppPublisher}
+
+WizardStyle=modern
+ShowLanguageDialog=yes
+UsePreviousLanguage=no
+
+ArchitecturesInstallIn64BitMode=arm64
+
+DefaultDirName={commonpf64}\{#MyAppPublisher}\{#MyAppName}
+UsePreviousAppDir=yes
+DisableProgramGroupPage=yes
+LicenseFile=..\..\..\LICENSE
+; Uncomment the following line to run in non administrative install mode (install for current user only.)
+;PrivilegesRequired=lowest
+PrivilegesRequiredOverridesAllowed=commandline
+OutputDir=..\Output
+OutputBaseFilename=CheckIP_{#MyAppVersion}_arm64
+Compression=lzma
+SolidCompression=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+Name: "german";  MessagesFile: "compiler:Languages\German.isl"
+Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "..\..\CheckIP\bin\Release\publish\win-arm64\*"; DestDir: "{app}"; Flags: ignoreversion
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+
diff --git a/CheckIP.Windows/Setup/ISS/x64.iss b/CheckIP.Windows/Setup/ISS/x64.iss
index 608161f..c1f2537 100644
--- a/CheckIP.Windows/Setup/ISS/x64.iss
+++ b/CheckIP.Windows/Setup/ISS/x64.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName          "CheckIP"
-#define MyAppVersion       GetFileVersion('..\..\CheckIP\bin\x64\Release\CheckIP.exe')
+#define MyAppVersion       GetFileVersion('..\..\CheckIP\bin\Release\publish\win-x64\CheckIP.exe')
 #define MyAppPlatform      "64bit"
 #define MyAppPublisher     "Exploitox"
 #define MyAppURL           "https://github.com/valnoxy/checkip"
@@ -22,7 +22,7 @@ VersionInfoDescription={#MyAppName} Installer
 VersionInfoVersion={#MyAppVersion}
 VersionInfoProductName={#MyAppName}
 VersionInfoProductVersion={#MyAppVersion}
-AppCopyright=Copyright � {#MyAppStartingYear} - {#MyAppEndingYear} {#MyAppPublisher}. All rights reserved.       
+AppCopyright=Copyright © {#MyAppStartingYear} - {#MyAppEndingYear} {#MyAppPublisher}. All rights reserved.       
 
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
@@ -59,7 +59,7 @@ Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "..\..\CheckIP\bin\x64\Release\*"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\CheckIP\bin\Release\publish\win-x64\*"; DestDir: "{app}"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
diff --git a/CheckIP.Windows/Setup/ISS/x86.iss b/CheckIP.Windows/Setup/ISS/x86.iss
index 129fd6e..281fa6b 100644
--- a/CheckIP.Windows/Setup/ISS/x86.iss
+++ b/CheckIP.Windows/Setup/ISS/x86.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName          "CheckIP"
-#define MyAppVersion       GetFileVersion('..\..\CheckIP\bin\x86\Release\CheckIP.exe')
+#define MyAppVersion       GetFileVersion('..\..\CheckIP\bin\Release\publish\win-x86\CheckIP.exe')
 #define MyAppPlatform      "32bit"
 #define MyAppPublisher     "Exploitox"
 #define MyAppURL           "https://github.com/valnoxy/checkip"
@@ -22,7 +22,7 @@ VersionInfoDescription={#MyAppName} Installer
 VersionInfoVersion={#MyAppVersion}
 VersionInfoProductName={#MyAppName}
 VersionInfoProductVersion={#MyAppVersion}
-AppCopyright=Copyright � {#MyAppStartingYear} - {#MyAppEndingYear} {#MyAppPublisher}. All rights reserved.
+AppCopyright=Copyright © {#MyAppStartingYear} - {#MyAppEndingYear} {#MyAppPublisher}. All rights reserved.
 
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
@@ -57,7 +57,7 @@ Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "..\..\CheckIP\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\CheckIP\bin\Release\publish\win-x86\*"; DestDir: "{app}"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]