diff --git a/InternetTest.Setup/Setup.iss b/InternetTest.Setup/Setup.iss
index a7dc3028..f7aadca7 100644
--- a/InternetTest.Setup/Setup.iss
+++ b/InternetTest.Setup/Setup.iss
@@ -2,8 +2,8 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "InternetTest Pro"
-#define MyAppVersion "7.1.0.2209"
-#define MyAppFullVersion "7.1.0.2209"
+#define MyAppVersion "7.2.0.2211"
+#define MyAppFullVersion "7.2.0.2211"
 #define MyAppPublisher "L�o Corporation"
 #define MyAppURL "https://leocorporation.dev/"
 #define MyAppExeName "InternetTest.exe"
diff --git a/InternetTest/InternetTest/Classes/Global.cs b/InternetTest/InternetTest/Classes/Global.cs
index 1863a79e..d3977ee5 100644
--- a/InternetTest/InternetTest/Classes/Global.cs
+++ b/InternetTest/InternetTest/Classes/Global.cs
@@ -23,9 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 */
 using InternetTest.Enums;
 using InternetTest.Pages;
-using LeoCorpLibrary;
-using LeoCorpLibrary.Enums;
 using Microsoft.Win32;
+using PeyrSharp.Enums;
+using PeyrSharp.Env;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -35,13 +35,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Media;
 
 namespace InternetTest.Classes;
 public static class Global
 {
-	public static string Version => "7.1.0.2209";
+	public static string Version => "7.2.0.2211";
 	public static string LastVersionLink => "https://raw.githubusercontent.com/Leo-Corporation/LeoCorp-Docs/master/Liens/Update%20System/InternetTest/7.0/Version.txt";
 	public static bool IsConfidentialModeEnabled { get; set; } = false;
 	public static Settings Settings { get; set; } = SettingsManager.Load();
@@ -59,7 +58,7 @@ public static class Global
 	public static IpConfigPage? IpConfigPage { get; set; }
 	public static WiFiPasswordsPage? WiFiPasswordsPage { get; set; }
 
-	internal static string SynethiaPath => $@"{Env.AppDataPath}\Léo Corporation\InternetTest Pro\SynethiaConfig.json";
+	internal static string SynethiaPath => $@"{FileSys.AppDataPath}\Léo Corporation\InternetTest Pro\SynethiaConfig.json";
 
 	public static string GetHiSentence
 	{
@@ -263,7 +262,7 @@ public static void ChangeTheme()
 
 	public static bool IsSystemThemeDark()
 	{
-		if (Env.WindowsVersion != WindowsVersion.Windows10 && Env.WindowsVersion != WindowsVersion.Windows11)
+		if (Sys.CurrentWindowsVersion != WindowsVersion.Windows10 && Sys.CurrentWindowsVersion != WindowsVersion.Windows11)
 		{
 			return false; // Avoid errors on older OSs
 		}
diff --git a/InternetTest/InternetTest/Classes/HistoryManager.cs b/InternetTest/InternetTest/Classes/HistoryManager.cs
index 90f578d5..78c3d164 100644
--- a/InternetTest/InternetTest/Classes/HistoryManager.cs
+++ b/InternetTest/InternetTest/Classes/HistoryManager.cs
@@ -21,7 +21,7 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE. 
 */
-using LeoCorpLibrary;
+using PeyrSharp.Env;
 using System.IO;
 using System.Text.Json;
 
@@ -29,12 +29,12 @@ namespace InternetTest.Classes
 {
 	public static class HistoryManager
 	{
-		internal static string HistoryPath = $@"{Env.AppDataPath}\Léo Corporation\InternetTest Pro\History.json";
+		internal static string HistoryPath = $@"{FileSys.AppDataPath}\Léo Corporation\InternetTest Pro\History.json";
 		public static History Load()
 		{
-			if (!Directory.Exists($@"{Env.AppDataPath}\Léo Corporation\InternetTest Pro\"))
+			if (!Directory.Exists($@"{FileSys.AppDataPath}\Léo Corporation\InternetTest Pro\"))
 			{
-				Directory.CreateDirectory($@"{Env.AppDataPath}\Léo Corporation\InternetTest Pro\");
+				Directory.CreateDirectory($@"{FileSys.AppDataPath}\Léo Corporation\InternetTest Pro\");
 			}
 
 			if (!File.Exists(HistoryPath))
@@ -47,7 +47,7 @@ public static History Load()
 
 			// If History exists
 			// Deserialize the file to History (using JSON)
-			return JsonSerializer.Deserialize<History>(File.ReadAllText(HistoryPath));
+			return JsonSerializer.Deserialize<History>(File.ReadAllText(HistoryPath)) ?? new();
 		}
 
 		public static void Save(History history)
diff --git a/InternetTest/InternetTest/Classes/Settings.cs b/InternetTest/InternetTest/Classes/Settings.cs
index a81a96c2..d66a8aaf 100644
--- a/InternetTest/InternetTest/Classes/Settings.cs
+++ b/InternetTest/InternetTest/Classes/Settings.cs
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE. 
 */
 using InternetTest.Enums;
-using LeoCorpLibrary;
+using PeyrSharp.Env;
 using System;
 using System.Diagnostics;
 using System.IO;
@@ -64,12 +64,12 @@ public Settings()
 
 public static class SettingsManager
 {
-	private static string SettingsPath => $@"{Env.AppDataPath}\Léo Corporation\InternetTest Pro\Settings.xml";
+	private static string SettingsPath => $@"{FileSys.AppDataPath}\Léo Corporation\InternetTest Pro\Settings.xml";
 	public static Settings Load()
 	{
-		if (!Directory.Exists($@"{Env.AppDataPath}\Léo Corporation\InternetTest Pro\"))
+		if (!Directory.Exists($@"{FileSys.AppDataPath}\Léo Corporation\InternetTest Pro\"))
 		{
-			Directory.CreateDirectory($@"{Env.AppDataPath}\Léo Corporation\InternetTest Pro\");
+			Directory.CreateDirectory($@"{FileSys.AppDataPath}\Léo Corporation\InternetTest Pro\");
 		}
 
 		if (!File.Exists(SettingsPath))
@@ -89,7 +89,7 @@ public static Settings Load()
 		XmlSerializer xmlDeserializer = new(typeof(Settings));
 
 		StreamReader streamReader = new(SettingsPath);
-		var settings = (Settings)xmlDeserializer.Deserialize(streamReader) ?? new();
+		var settings = (Settings?)xmlDeserializer.Deserialize(streamReader) ?? new();
 
 		// Upgrade the settings file if it comes from an older version
 		settings.IsMaximized ??= false; // Set the default value if none is specified.
diff --git a/InternetTest/InternetTest/Classes/SynethiaManager.cs b/InternetTest/InternetTest/Classes/SynethiaManager.cs
index e8bf2e1e..4771b203 100644
--- a/InternetTest/InternetTest/Classes/SynethiaManager.cs
+++ b/InternetTest/InternetTest/Classes/SynethiaManager.cs
@@ -21,7 +21,7 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE. 
 */
-using LeoCorpLibrary;
+using PeyrSharp.Env;
 using System.IO;
 using System.Text.Json;
 
@@ -31,9 +31,9 @@ public static class SynethiaManager
 	public static SynethiaConfig Load()
 	{
 		if (!Global.Settings.UseSynethia) return new();
-		if (!Directory.Exists($@"{Env.AppDataPath}\Léo Corporation\InternetTest Pro\"))
+		if (!Directory.Exists($@"{FileSys.AppDataPath}\Léo Corporation\InternetTest Pro\"))
 		{
-			Directory.CreateDirectory($@"{Env.AppDataPath}\Léo Corporation\InternetTest Pro\");
+			Directory.CreateDirectory($@"{FileSys.AppDataPath}\Léo Corporation\InternetTest Pro\");
 		}
 
 		if (!File.Exists(Global.SynethiaPath)) // If no Synethia config exists
@@ -46,7 +46,7 @@ public static SynethiaConfig Load()
 
 		// If Synethia config exists
 		// Deserialize the file to Synethia config (using JSON)
-		return JsonSerializer.Deserialize<SynethiaConfig>(File.ReadAllText(Global.SynethiaPath));
+		return JsonSerializer.Deserialize<SynethiaConfig>(File.ReadAllText(Global.SynethiaPath)) ?? new();
 	}
 
 	public static void Save(SynethiaConfig synethiaConfig)
diff --git a/InternetTest/InternetTest/InternetTest.csproj b/InternetTest/InternetTest/InternetTest.csproj
index f33de376..d6500bc1 100644
--- a/InternetTest/InternetTest/InternetTest.csproj
+++ b/InternetTest/InternetTest/InternetTest.csproj
@@ -6,7 +6,7 @@
 		<Nullable>enable</Nullable>
 		<UseWPF>true</UseWPF>
 		<UseWindowsForms>True</UseWindowsForms>
-		<Version>7.1.0.2209</Version>
+		<Version>7.2.0.2211</Version>
 		<Copyright>© 2022</Copyright>
 		<Company>Léo Corporation</Company>
 		<Description>Taking you to another level. InternetTest can locate IP addresses, send ping request, recover your WiFi passwords and more!</Description>
@@ -34,7 +34,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="LeoCorpLibrary" Version="4.9.0.2208" />
+	  <PackageReference Include="PeyrSharp.Core" Version="1.0.0.2211" />
+	  <PackageReference Include="PeyrSharp.Env" Version="1.0.0.2211" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/InternetTest/InternetTest/MainWindow.xaml b/InternetTest/InternetTest/MainWindow.xaml
index 2a8059cd..d9d1c500 100644
--- a/InternetTest/InternetTest/MainWindow.xaml
+++ b/InternetTest/InternetTest/MainWindow.xaml
@@ -102,17 +102,19 @@
 						<ColumnDefinition Width="Auto"/>
 						<ColumnDefinition Width="Auto"/>
 						<ColumnDefinition Width="Auto"/>
+						<ColumnDefinition Width="Auto"/>
 					</Grid.ColumnDefinitions>
+					<Button Grid.Column="1" FontSize="14" Content="&#xF602;" FontFamily="/Fonts/#FluentSystemIcons-Regular" x:Name="PinBtn" Click="PinBtn_Click" RenderOptions.EdgeMode="Aliased" Style="{StaticResource TitleBarButtonStyle}" Background="Transparent" Width="46" Height="32" Foreground="{Binding Source={StaticResource Foreground1}}"/>
 
-					<Button Grid.Column="1" FontSize="14" x:Name="ConfidentialModeBtn" Click="ConfidentialModeBtn_Click"  RenderOptions.EdgeMode="Aliased" Style="{StaticResource TitleBarButtonStyle}" Background="Transparent" Width="46" Height="32" Foreground="{Binding Source={StaticResource Foreground1}}">
+					<Button Grid.Column="2" FontSize="14" x:Name="ConfidentialModeBtn" Click="ConfidentialModeBtn_Click"  RenderOptions.EdgeMode="Aliased" Style="{StaticResource TitleBarButtonStyle}" Background="Transparent" Width="46" Height="32" Foreground="{Binding Source={StaticResource Foreground1}}">
 						<Grid>
 							<TextBlock x:Name="RegularLockTxt" Text="&#xFC25;" FontFamily="/Fonts/#FluentSystemIcons-Regular"/>
 							<TextBlock x:Name="FilledLockTxt" Text="&#xFC2C;" FontFamily="/Fonts/#FluentSystemIcons-Filled" Visibility="Collapsed"/>
 						</Grid>
 					</Button>
-					<Button Grid.Column="2" FontSize="14" Content="&#xFC75;" FontFamily="/Fonts/#FluentSystemIcons-Regular" x:Name="MinimizeBtn" Click="MinimizeBtn_Click"  RenderOptions.EdgeMode="Aliased" Style="{StaticResource TitleBarButtonStyle}" Background="Transparent" Width="46" Height="32" Foreground="{Binding Source={StaticResource Foreground1}}"/>
-					<Button Grid.Column="3" FontSize="14" Content="&#xFA40;" FontFamily="/Fonts/#FluentSystemIcons-Regular" x:Name="MaximizeRestoreBtn" Click="MaximizeRestoreBtn_Click"  RenderOptions.EdgeMode="Aliased" Style="{StaticResource TitleBarButtonStyle}" Background="Transparent" Width="46" Height="32" Foreground="{Binding Source={StaticResource Foreground1}}"/>
-					<Button Grid.Column="4" FontSize="14" Content="&#xF36B;" FontFamily="/Fonts/#FluentSystemIcons-Regular" x:Name="CloseBtn" Click="CloseBtn_Click" RenderOptions.EdgeMode="Aliased" Style="{StaticResource TitleBarCloseButtonStyle}" Background="Transparent" Width="46" Height="32" Foreground="{Binding Source={StaticResource Foreground1}}"/>
+					<Button Grid.Column="3" FontSize="14" Content="&#xFC75;" FontFamily="/Fonts/#FluentSystemIcons-Regular" x:Name="MinimizeBtn" Click="MinimizeBtn_Click"  RenderOptions.EdgeMode="Aliased" Style="{StaticResource TitleBarButtonStyle}" Background="Transparent" Width="46" Height="32" Foreground="{Binding Source={StaticResource Foreground1}}"/>
+					<Button Grid.Column="4" FontSize="14" Content="&#xFA40;" FontFamily="/Fonts/#FluentSystemIcons-Regular" x:Name="MaximizeRestoreBtn" Click="MaximizeRestoreBtn_Click"  RenderOptions.EdgeMode="Aliased" Style="{StaticResource TitleBarButtonStyle}" Background="Transparent" Width="46" Height="32" Foreground="{Binding Source={StaticResource Foreground1}}"/>
+					<Button Grid.Column="5" FontSize="14" Content="&#xF36B;" FontFamily="/Fonts/#FluentSystemIcons-Regular" x:Name="CloseBtn" Click="CloseBtn_Click" RenderOptions.EdgeMode="Aliased" Style="{StaticResource TitleBarCloseButtonStyle}" Background="Transparent" Width="46" Height="32" Foreground="{Binding Source={StaticResource Foreground1}}"/>
 				</Grid>
 			</Border>
 
diff --git a/InternetTest/InternetTest/MainWindow.xaml.cs b/InternetTest/InternetTest/MainWindow.xaml.cs
index 2d92f3c6..31054da8 100644
--- a/InternetTest/InternetTest/MainWindow.xaml.cs
+++ b/InternetTest/InternetTest/MainWindow.xaml.cs
@@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using InternetTest.Enums;
 using InternetTest.Pages;
 using InternetTest.UserControls;
-using LeoCorpLibrary;
+using PeyrSharp.Env;
 using System;
 using System.Windows;
 using System.Windows.Controls;
@@ -87,43 +87,43 @@ private void InitUI()
 				break;
 			case AppPages.Status:
 				PageDisplayer.Content = Global.StatusPage;
-				Global.SynethiaConfig.StatusPageInfo.EnterUnixTime = Env.UnixTime;
+				Global.SynethiaConfig.StatusPageInfo.EnterUnixTime = Sys.UnixTime;
 				UnCheckAllButton();
 				CheckButton(StatusPageBtn);
 				break;
 			case AppPages.DownDetector:
 				PageDisplayer.Content = Global.DownDetectorPage;
-				Global.SynethiaConfig.DownDetectorPageInfo.EnterUnixTime = Env.UnixTime;
+				Global.SynethiaConfig.DownDetectorPageInfo.EnterUnixTime = Sys.UnixTime;
 				UnCheckAllButton();
 				CheckButton(DownDetectorPageBtn);
 				break;
 			case AppPages.MyIP:
 				PageDisplayer.Content = Global.MyIpPage;
-				Global.SynethiaConfig.MyIPPageInfo.EnterUnixTime = Env.UnixTime;
+				Global.SynethiaConfig.MyIPPageInfo.EnterUnixTime = Sys.UnixTime;
 				UnCheckAllButton();
 				CheckButton(MyIPPageBtn);
 				break;
 			case AppPages.LocateIP:
 				PageDisplayer.Content = Global.LocateIpPage;
-				Global.SynethiaConfig.LocateIPPageInfo.EnterUnixTime = Env.UnixTime;
+				Global.SynethiaConfig.LocateIPPageInfo.EnterUnixTime = Sys.UnixTime;
 				UnCheckAllButton();
 				CheckButton(LocateIPPageBtn);
 				break;
 			case AppPages.Ping:
 				PageDisplayer.Content = Global.PingPage;
-				Global.SynethiaConfig.PingPageInfo.EnterUnixTime = Env.UnixTime;
+				Global.SynethiaConfig.PingPageInfo.EnterUnixTime = Sys.UnixTime;
 				UnCheckAllButton();
 				CheckButton(PingPageBtn);
 				break;
 			case AppPages.IPConfig:
 				PageDisplayer.Content = Global.IpConfigPage;
-				Global.SynethiaConfig.IPConfigPageInfo.EnterUnixTime = Env.UnixTime;
+				Global.SynethiaConfig.IPConfigPageInfo.EnterUnixTime = Sys.UnixTime;
 				UnCheckAllButton();
 				CheckButton(IPConfigPageBtn);
 				break;
 			case AppPages.WiFiPasswords:
 				PageDisplayer.Content = Global.WiFiPasswordsPage;
-				Global.SynethiaConfig.WiFiPasswordsPageInfo.EnterUnixTime = Env.UnixTime;
+				Global.SynethiaConfig.WiFiPasswordsPageInfo.EnterUnixTime = Sys.UnixTime;
 				UnCheckAllButton();
 				CheckButton(WifiPasswordsPageBtn);
 				break;
@@ -145,43 +145,43 @@ private void PageCard_OnCardClick(object? sender, PageEventArgs e)
 		{
 			case AppPages.Status:
 				PageDisplayer.Content = Global.StatusPage;
-				Global.SynethiaConfig.StatusPageInfo.EnterUnixTime = Env.UnixTime;
+				Global.SynethiaConfig.StatusPageInfo.EnterUnixTime = Sys.UnixTime;
 				UnCheckAllButton();
 				CheckButton(StatusPageBtn);
 				break;
 			case AppPages.DownDetector:
 				PageDisplayer.Content = Global.DownDetectorPage;
-				Global.SynethiaConfig.DownDetectorPageInfo.EnterUnixTime = Env.UnixTime;
+				Global.SynethiaConfig.DownDetectorPageInfo.EnterUnixTime = Sys.UnixTime;
 				UnCheckAllButton();
 				CheckButton(DownDetectorPageBtn);
 				break;
 			case AppPages.MyIP:
 				PageDisplayer.Content = Global.MyIpPage;
-				Global.SynethiaConfig.MyIPPageInfo.EnterUnixTime = Env.UnixTime;
+				Global.SynethiaConfig.MyIPPageInfo.EnterUnixTime = Sys.UnixTime;
 				UnCheckAllButton();
 				CheckButton(MyIPPageBtn);
 				break;
 			case AppPages.LocateIP:
 				PageDisplayer.Content = Global.LocateIpPage;
-				Global.SynethiaConfig.LocateIPPageInfo.EnterUnixTime = Env.UnixTime;
+				Global.SynethiaConfig.LocateIPPageInfo.EnterUnixTime = Sys.UnixTime;
 				UnCheckAllButton();
 				CheckButton(LocateIPPageBtn);
 				break;
 			case AppPages.Ping:
 				PageDisplayer.Content = Global.PingPage;
-				Global.SynethiaConfig.PingPageInfo.EnterUnixTime = Env.UnixTime;
+				Global.SynethiaConfig.PingPageInfo.EnterUnixTime = Sys.UnixTime;
 				UnCheckAllButton();
 				CheckButton(PingPageBtn);
 				break;
 			case AppPages.IPConfig:
 				PageDisplayer.Content = Global.IpConfigPage;
-				Global.SynethiaConfig.IPConfigPageInfo.EnterUnixTime = Env.UnixTime;
+				Global.SynethiaConfig.IPConfigPageInfo.EnterUnixTime = Sys.UnixTime;
 				UnCheckAllButton();
 				CheckButton(IPConfigPageBtn);
 				break;
 			case AppPages.WiFiPasswords:
 				PageDisplayer.Content = Global.WiFiPasswordsPage;
-				Global.SynethiaConfig.WiFiPasswordsPageInfo.EnterUnixTime = Env.UnixTime;
+				Global.SynethiaConfig.WiFiPasswordsPageInfo.EnterUnixTime = Sys.UnixTime;
 				UnCheckAllButton();
 				CheckButton(WifiPasswordsPageBtn);
 				break;
@@ -341,7 +341,7 @@ private void StatusPageBtn_Click(object sender, RoutedEventArgs e)
 		CheckButton(StatusPageBtn);
 
 		PageDisplayer.Content = Global.StatusPage; // Display the status page
-		Global.SynethiaConfig.StatusPageInfo.EnterUnixTime = Env.UnixTime; // Update the last entered time
+		Global.SynethiaConfig.StatusPageInfo.EnterUnixTime = Sys.UnixTime; // Update the last entered time
 	}
 
 	private void DownDetectorPageBtn_Click(object sender, RoutedEventArgs e)
@@ -351,7 +351,7 @@ private void DownDetectorPageBtn_Click(object sender, RoutedEventArgs e)
 		CheckButton(DownDetectorPageBtn);
 
 		PageDisplayer.Content = Global.DownDetectorPage; // Display the down detector page
-		Global.SynethiaConfig.DownDetectorPageInfo.EnterUnixTime = Env.UnixTime; // Update the last entered time
+		Global.SynethiaConfig.DownDetectorPageInfo.EnterUnixTime = Sys.UnixTime; // Update the last entered time
 	}
 
 	private void MyIPPageBtn_Click(object sender, RoutedEventArgs e)
@@ -361,7 +361,7 @@ private void MyIPPageBtn_Click(object sender, RoutedEventArgs e)
 		CheckButton(MyIPPageBtn);
 
 		PageDisplayer.Content = Global.MyIpPage; // Display the my IP page
-		Global.SynethiaConfig.MyIPPageInfo.EnterUnixTime = Env.UnixTime; // Update the last entered time
+		Global.SynethiaConfig.MyIPPageInfo.EnterUnixTime = Sys.UnixTime; // Update the last entered time
 	}
 
 	private void LocateIPPageBtn_Click(object sender, RoutedEventArgs e)
@@ -371,7 +371,7 @@ private void LocateIPPageBtn_Click(object sender, RoutedEventArgs e)
 		CheckButton(LocateIPPageBtn);
 
 		PageDisplayer.Content = Global.LocateIpPage; // Display the locate IP page
-		Global.SynethiaConfig.LocateIPPageInfo.EnterUnixTime = Env.UnixTime; // Update the last entered time
+		Global.SynethiaConfig.LocateIPPageInfo.EnterUnixTime = Sys.UnixTime; // Update the last entered time
 	}
 
 	private void PingPageBtn_Click(object sender, RoutedEventArgs e)
@@ -381,7 +381,7 @@ private void PingPageBtn_Click(object sender, RoutedEventArgs e)
 		CheckButton(PingPageBtn);
 
 		PageDisplayer.Content = Global.PingPage; // Display the ping page
-		Global.SynethiaConfig.PingPageInfo.EnterUnixTime = Env.UnixTime; // Update the last entered time
+		Global.SynethiaConfig.PingPageInfo.EnterUnixTime = Sys.UnixTime; // Update the last entered time
 	}
 
 	private void IPConfigPageBtn_Click(object sender, RoutedEventArgs e)
@@ -391,7 +391,7 @@ private void IPConfigPageBtn_Click(object sender, RoutedEventArgs e)
 		CheckButton(IPConfigPageBtn);
 
 		PageDisplayer.Content = Global.IpConfigPage; // Display the IP config page
-		Global.SynethiaConfig.IPConfigPageInfo.EnterUnixTime = Env.UnixTime; // Update the last entered time
+		Global.SynethiaConfig.IPConfigPageInfo.EnterUnixTime = Sys.UnixTime; // Update the last entered time
 	}
 
 	private void WifiPasswordsPageBtn_Click(object sender, RoutedEventArgs e)
@@ -401,7 +401,7 @@ private void WifiPasswordsPageBtn_Click(object sender, RoutedEventArgs e)
 		CheckButton(WifiPasswordsPageBtn);
 
 		PageDisplayer.Content = Global.WiFiPasswordsPage; // Display the wifi passwords page
-		Global.SynethiaConfig.WiFiPasswordsPageInfo.EnterUnixTime = Env.UnixTime; // Update the last entered time
+		Global.SynethiaConfig.WiFiPasswordsPageInfo.EnterUnixTime = Sys.UnixTime; // Update the last entered time
 	}
 
 	private void HomePageBtn_Click(object sender, RoutedEventArgs e)
@@ -436,43 +436,43 @@ private void LeavePage()
 		if (!Global.Settings.UseSynethia) return;
 		if (PageDisplayer.Content is StatusPage)
 		{
-			Global.SynethiaConfig.StatusPageInfo.LeaveUnixTime = Env.UnixTime;
+			Global.SynethiaConfig.StatusPageInfo.LeaveUnixTime = Sys.UnixTime;
 			Global.SynethiaConfig.StatusPageInfo.TotalTimeSpent += Global.SynethiaConfig.StatusPageInfo.LeaveUnixTime - Global.SynethiaConfig.StatusPageInfo.EnterUnixTime;
 			Global.SynethiaConfig.StatusPageInfo.Score = Global.SynethiaConfig.StatusPageInfo.TotalTimeSpent * (Global.SynethiaConfig.StatusPageInfo.InteractionCount > 0 ? Global.SynethiaConfig.StatusPageInfo.InteractionCount / 2d : 1d); // Calculate the score
 		}
 		else if (PageDisplayer.Content is DownDetectorPage)
 		{
-			Global.SynethiaConfig.DownDetectorPageInfo.LeaveUnixTime = Env.UnixTime;
+			Global.SynethiaConfig.DownDetectorPageInfo.LeaveUnixTime = Sys.UnixTime;
 			Global.SynethiaConfig.DownDetectorPageInfo.TotalTimeSpent += Global.SynethiaConfig.DownDetectorPageInfo.LeaveUnixTime - Global.SynethiaConfig.DownDetectorPageInfo.EnterUnixTime;
 			Global.SynethiaConfig.DownDetectorPageInfo.Score = Global.SynethiaConfig.DownDetectorPageInfo.TotalTimeSpent * (Global.SynethiaConfig.DownDetectorPageInfo.InteractionCount > 0 ? Global.SynethiaConfig.DownDetectorPageInfo.InteractionCount / 2d : 1d); // Calculate the score
 		}
 		else if (PageDisplayer.Content is MyIpPage)
 		{
-			Global.SynethiaConfig.MyIPPageInfo.LeaveUnixTime = Env.UnixTime;
+			Global.SynethiaConfig.MyIPPageInfo.LeaveUnixTime = Sys.UnixTime;
 			Global.SynethiaConfig.MyIPPageInfo.TotalTimeSpent += Global.SynethiaConfig.MyIPPageInfo.LeaveUnixTime - Global.SynethiaConfig.MyIPPageInfo.EnterUnixTime;
 			Global.SynethiaConfig.MyIPPageInfo.Score = Global.SynethiaConfig.MyIPPageInfo.TotalTimeSpent * (Global.SynethiaConfig.MyIPPageInfo.InteractionCount > 0 ? Global.SynethiaConfig.MyIPPageInfo.InteractionCount / 2d : 1d); // Calculate the score
 		}
 		else if (PageDisplayer.Content is LocateIpPage)
 		{
-			Global.SynethiaConfig.LocateIPPageInfo.LeaveUnixTime = Env.UnixTime;
+			Global.SynethiaConfig.LocateIPPageInfo.LeaveUnixTime = Sys.UnixTime;
 			Global.SynethiaConfig.LocateIPPageInfo.TotalTimeSpent += Global.SynethiaConfig.LocateIPPageInfo.LeaveUnixTime - Global.SynethiaConfig.LocateIPPageInfo.EnterUnixTime;
 			Global.SynethiaConfig.LocateIPPageInfo.Score = Global.SynethiaConfig.LocateIPPageInfo.TotalTimeSpent * (Global.SynethiaConfig.LocateIPPageInfo.InteractionCount > 0 ? Global.SynethiaConfig.LocateIPPageInfo.InteractionCount / 2d : 1d); // Calculate the score
 		}
 		else if (PageDisplayer.Content is PingPage)
 		{
-			Global.SynethiaConfig.PingPageInfo.LeaveUnixTime = Env.UnixTime;
+			Global.SynethiaConfig.PingPageInfo.LeaveUnixTime = Sys.UnixTime;
 			Global.SynethiaConfig.PingPageInfo.TotalTimeSpent += Global.SynethiaConfig.PingPageInfo.LeaveUnixTime - Global.SynethiaConfig.PingPageInfo.EnterUnixTime;
 			Global.SynethiaConfig.PingPageInfo.Score = Global.SynethiaConfig.PingPageInfo.TotalTimeSpent * (Global.SynethiaConfig.PingPageInfo.InteractionCount > 0 ? Global.SynethiaConfig.PingPageInfo.InteractionCount / 2d : 1d); // Calculate the score
 		}
 		else if (PageDisplayer.Content is IpConfigPage)
 		{
-			Global.SynethiaConfig.IPConfigPageInfo.LeaveUnixTime = Env.UnixTime;
+			Global.SynethiaConfig.IPConfigPageInfo.LeaveUnixTime = Sys.UnixTime;
 			Global.SynethiaConfig.IPConfigPageInfo.TotalTimeSpent += Global.SynethiaConfig.IPConfigPageInfo.LeaveUnixTime - Global.SynethiaConfig.IPConfigPageInfo.EnterUnixTime;
 			Global.SynethiaConfig.IPConfigPageInfo.Score = Global.SynethiaConfig.IPConfigPageInfo.TotalTimeSpent * (Global.SynethiaConfig.IPConfigPageInfo.InteractionCount > 0 ? Global.SynethiaConfig.IPConfigPageInfo.InteractionCount / 2d : 1d); // Calculate the score
 		}
 		else if (PageDisplayer.Content is WiFiPasswordsPage)
 		{
-			Global.SynethiaConfig.WiFiPasswordsPageInfo.LeaveUnixTime = Env.UnixTime;
+			Global.SynethiaConfig.WiFiPasswordsPageInfo.LeaveUnixTime = Sys.UnixTime;
 			Global.SynethiaConfig.WiFiPasswordsPageInfo.TotalTimeSpent += Global.SynethiaConfig.WiFiPasswordsPageInfo.LeaveUnixTime - Global.SynethiaConfig.WiFiPasswordsPageInfo.EnterUnixTime;
 			Global.SynethiaConfig.WiFiPasswordsPageInfo.Score = Global.SynethiaConfig.WiFiPasswordsPageInfo.TotalTimeSpent * (Global.SynethiaConfig.WiFiPasswordsPageInfo.InteractionCount > 0 ? Global.SynethiaConfig.WiFiPasswordsPageInfo.InteractionCount / 2d : 1d); // Calculate the score
 		}
@@ -490,4 +490,10 @@ private void ConfidentialModeBtn_Click(object sender, RoutedEventArgs e)
 		Global.IpConfigPage?.ToggleConfidentialMode(Global.IsConfidentialModeEnabled);
 		Global.WiFiPasswordsPage?.ToggleConfidentialMode();
 	}
+
+	private void PinBtn_Click(object sender, RoutedEventArgs e)
+	{
+		Topmost = !Topmost; // Toggle
+		PinBtn.Content = Topmost ? "\uF604" : "\uF602"; // Set text
+	}
 }
diff --git a/InternetTest/InternetTest/Pages/DownDetectorPage.xaml.cs b/InternetTest/InternetTest/Pages/DownDetectorPage.xaml.cs
index c82b315c..ab57f485 100644
--- a/InternetTest/InternetTest/Pages/DownDetectorPage.xaml.cs
+++ b/InternetTest/InternetTest/Pages/DownDetectorPage.xaml.cs
@@ -23,8 +23,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 */
 using InternetTest.Classes;
 using InternetTest.UserControls;
-using LeoCorpLibrary;
+using PeyrSharp.Core;
+using PeyrSharp.Enums;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -109,6 +111,7 @@ private void InjectSynethiaCode()
 
 		internal async void TestBtn_Click(object sender, RoutedEventArgs e)
 		{
+			results.Clear();
 			// Check if the URL is valid
 			if (!WebsiteTxt.Text.StartsWith("http"))
 			{
@@ -133,10 +136,13 @@ internal async void TestBtn_Click(object sender, RoutedEventArgs e)
 				}
 			}
 
+			SetTestIconResult(results);
+
 			// Increment the interaction count of the ActionInfo in Global.SynethiaConfig
 			Global.SynethiaConfig.ActionInfos.First(a => a.Action == Enums.AppActions.DownDetectorRequest).UsageCount++;
 		}
 
+		readonly List<StatusCodes> results = new();
 		internal async Task<DownDetectorTestResult> LaunchTest(string url, bool isFirst = false)
 		{
 			try
@@ -153,20 +159,22 @@ internal async Task<DownDetectorTestResult> LaunchTest(string url, bool isFirst
 				StatusIconTxt.Foreground = new SolidColorBrush(Global.GetColorFromResource("Gray"));
 				StatusTxt.Text = Properties.Resources.TestInProgress;
 
-				int statusCode = await NetworkConnection.GetWebPageStatusCodeAsync(url);
+				int statusCode = await Internet.GetStatusCodeAsync(url);
 				if (statusCode < 400)
 				{
+					results.Add(StatusCodes.Success);
+
 					// Update icon and text
 					StatusIconTxt.Text = "\uF299"; // Update the icon
 					StatusIconTxt.Foreground = new SolidColorBrush(Global.GetColorFromResource("Green"));
+					StatusTxt.Text = Properties.Resources.WebsiteAvailable; // Update the text
+
 					if (isFirst)
 					{
 						IconTxt.Text = "\uF299"; // Update the icon
 						IconTxt.Foreground = new SolidColorBrush(Global.GetColorFromResource("Green"));
 					}
 
-					StatusTxt.Text = Properties.Resources.WebsiteAvailable; // Update the text
-
 					// Update details section
 					int time = 0;
 					DispatcherTimer dispatcherTimer = new() { Interval = TimeSpan.FromMilliseconds(1) };
@@ -177,7 +185,7 @@ internal async Task<DownDetectorTestResult> LaunchTest(string url, bool isFirst
 					dispatcherTimer.Stop();
 					DetailsStatusTxt.Text = statusCode.ToString();
 
-					string message = await NetworkConnection.GetWebPageStatusDescriptionAsync(url);
+					string message = await Internet.GetStatusDescriptionAsync(url);
 					DetailsMessageTxt.Text = message;
 
 					DetailsTimeTxt.Text = $"{time}ms"; // Update the time
@@ -188,17 +196,19 @@ internal async Task<DownDetectorTestResult> LaunchTest(string url, bool isFirst
 				}
 				else
 				{
+					results.Add(StatusCodes.ClientError);
+
 					// Update icon and text
 					StatusIconTxt.Text = "\uF36E"; // Update the icon
 					StatusIconTxt.Foreground = new SolidColorBrush(Global.GetColorFromResource("Red"));
+					StatusTxt.Text = Properties.Resources.WebsiteDown; // Update the text
+
 					if (isFirst)
 					{
 						IconTxt.Text = "\uF36E"; // Update the icon
 						IconTxt.Foreground = new SolidColorBrush(Global.GetColorFromResource("Red"));
 					}
 
-					StatusTxt.Text = Properties.Resources.WebsiteDown; // Update the text
-
 					// Update details section
 					// Update details section
 					int time = 0;
@@ -209,7 +219,7 @@ internal async Task<DownDetectorTestResult> LaunchTest(string url, bool isFirst
 					dispatcherTimer.Stop();
 					DetailsStatusTxt.Text = statusCode.ToString();
 
-					string message = await NetworkConnection.GetWebPageStatusDescriptionAsync(url);
+					string message = await Internet.GetStatusDescriptionAsync(url);
 					DetailsMessageTxt.Text = message;
 
 					DetailsTimeTxt.Text = $"{time}ms"; // Update the time
@@ -221,15 +231,18 @@ internal async Task<DownDetectorTestResult> LaunchTest(string url, bool isFirst
 			}
 			catch (Exception ex)
 			{
+				results.Add(StatusCodes.ClientError);
+
 				// Update icon and text
 				StatusIconTxt.Text = "\uF36E"; // Update the icon
 				StatusIconTxt.Foreground = new SolidColorBrush(Global.GetColorFromResource("Red"));
+				StatusTxt.Text = Properties.Resources.WebsiteDown; // Update the text
+
 				if (isFirst)
 				{
 					IconTxt.Text = "\uF36E"; // Update the icon
 					IconTxt.Foreground = new SolidColorBrush(Global.GetColorFromResource("Red"));
 				}
-				StatusTxt.Text = Properties.Resources.WebsiteDown; // Update the text
 
 				DetailsMessageTxt.Text = ex.Message;
 
@@ -238,11 +251,53 @@ internal async Task<DownDetectorTestResult> LaunchTest(string url, bool isFirst
 
 				Global.History.DownDetectorHistory.Add(new($"{DateTime.Now:g} - {url} - {Properties.Resources.Down} (Error)", StatusIconTxt.Text));
 
-				StatusTxt.Text = Properties.Resources.WebsiteDown; // Update the text
 				return new(0, 0, ex.Message);
 			}
 		}
 
+		private void SetTestIconResult(List<StatusCodes> StatusCodess)
+		{
+			// Init counters
+			int success = 0;
+			int failed = 0;
+
+			for (int i = 0; i < StatusCodess.Count; i++) // For each test result
+			{
+				switch (StatusCodess[i])
+				{
+					case StatusCodes.Success:
+						success++;
+						break;
+					default:
+						failed++;
+						break;
+				}
+			}
+
+			// If all tests were sucessful
+			if (success > 0 && failed == 0)
+			{
+				StatusIconTxt.Text = "\uF299"; // Update the icon
+				StatusIconTxt.Foreground = new SolidColorBrush(Global.GetColorFromResource("Green"));
+
+				StatusTxt.Text = Properties.Resources.AllSuccess; // Update the text
+			}
+			else if (success == 0 && failed > 0) // If all tests failed
+			{
+				StatusIconTxt.Text = "\uF36E"; // Update the icon
+				StatusIconTxt.Foreground = new SolidColorBrush(Global.GetColorFromResource("Red"));
+
+				StatusTxt.Text = Properties.Resources.AllFailed; // Update the text
+			}
+			else // If some tests passed and others failed
+			{
+				StatusIconTxt.Text = "\uF882"; // Update the icon
+				StatusIconTxt.Foreground = new SolidColorBrush(Global.GetColorFromResource("Orange"));
+
+				StatusTxt.Text = Properties.Resources.TestSucessAndFailed; // Update the text
+			}
+		}
+
 		private void BrowserBtn_Click(object sender, RoutedEventArgs e)
 		{
 			Process.Start("explorer.exe", WebsiteTxt.Text);
@@ -314,7 +369,8 @@ private void ScheduledTestLaunchBtn_Click(object sender, RoutedEventArgs e)
 					timeCounter++;
 					if (timeCounter == secondsRemainingFixed)
 					{
-						_ = LaunchTest(WebsiteTxt.Text);
+						results.Clear();
+						_ = await LaunchTest(WebsiteTxt.Text);
 						for (int i = 0; i < DownDetectorItemDisplayer.Children.Count; i++)
 						{
 							if (DownDetectorItemDisplayer.Children[i] is DownDetectorItem item)
@@ -324,6 +380,7 @@ private void ScheduledTestLaunchBtn_Click(object sender, RoutedEventArgs e)
 								item.WebsiteTxt.Foreground = new SolidColorBrush(Global.GetColorFromResource("DarkGray"));
 							}
 						}
+						SetTestIconResult(results);
 					}
 					if (secondsRemaining > 0)
 					{
@@ -335,7 +392,6 @@ private void ScheduledTestLaunchBtn_Click(object sender, RoutedEventArgs e)
 						timeCounter = 0;
 					}
 					TimeIntervalTxt.Text = string.Format(Properties.Resources.ScheduledTestInterval, secondsRemaining); // Set the time interval text
-
 				};
 				timer.Start();
 			}
diff --git a/InternetTest/InternetTest/Pages/FirstRun/JumpInPage.xaml.cs b/InternetTest/InternetTest/Pages/FirstRun/JumpInPage.xaml.cs
index 151d3994..d969b92e 100644
--- a/InternetTest/InternetTest/Pages/FirstRun/JumpInPage.xaml.cs
+++ b/InternetTest/InternetTest/Pages/FirstRun/JumpInPage.xaml.cs
@@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 */
 
 using InternetTest.Classes;
-using LeoCorpLibrary;
 using System.Diagnostics;
+using System.IO;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -45,7 +45,7 @@ private void NextBtn_Click(object sender, RoutedEventArgs e)
 		SettingsManager.Save();
 		SynethiaManager.Save(Global.SynethiaConfig);
 
-		Process.Start(Env.CurrentAppDirectory + @"\InternetTest.exe");
+		Process.Start(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) + @"\InternetTest.exe");
 		Application.Current.Shutdown(); // Quit the app
 	}
 }
diff --git a/InternetTest/InternetTest/Pages/FirstRun/WelcomePage.xaml.cs b/InternetTest/InternetTest/Pages/FirstRun/WelcomePage.xaml.cs
index 335f3bd1..844fce8d 100644
--- a/InternetTest/InternetTest/Pages/FirstRun/WelcomePage.xaml.cs
+++ b/InternetTest/InternetTest/Pages/FirstRun/WelcomePage.xaml.cs
@@ -25,8 +25,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using InternetTest.Classes;
 using InternetTest.Enums;
 using InternetTest.Windows;
-using LeoCorpLibrary;
 using System.Diagnostics;
+using System.IO;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -54,7 +54,7 @@ private void SkipBtn_Click(object sender, RoutedEventArgs e)
 		Global.Settings.IsFirstRun = false;
 		SettingsManager.Save();
 
-		Process.Start(Env.CurrentAppDirectory + @"\InternetTest.exe");
+		Process.Start(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) + @"\InternetTest.exe");
 		Application.Current.Shutdown();
 	}
 
diff --git a/InternetTest/InternetTest/Pages/HomePage.xaml b/InternetTest/InternetTest/Pages/HomePage.xaml
index a565dbaf..0ff6ebbd 100644
--- a/InternetTest/InternetTest/Pages/HomePage.xaml
+++ b/InternetTest/InternetTest/Pages/HomePage.xaml
@@ -17,32 +17,38 @@
 			<RowDefinition Height="Auto"/>
 			<RowDefinition Height="Auto"/>
 			<RowDefinition Height="Auto"/>
+			<RowDefinition Height="Auto"/>
 		</Grid.RowDefinitions>
 
-		<StackPanel Margin="10" Orientation="Horizontal">
+		<StackPanel Grid.Row="0" Margin="10" Orientation="Horizontal">
+			<TextBlock x:Name="StatusIconTxt" Text="&#xF484;" FontSize="16" FontFamily="../Fonts/#FluentSystemIcons-Filled" Foreground="{Binding Source={StaticResource AccentColor}}" VerticalAlignment="Center"/>
+			<TextBlock x:Name="StatusTxt" Text="{x:Static lang:Resources.Connected}" FontSize="14" VerticalAlignment="Center" FontWeight="ExtraBold" Margin="5,0,0,0"/>
+		</StackPanel>
+		
+		<StackPanel Margin="10" Orientation="Horizontal" Grid.Row="1">
 			<TextBlock Text="&#xF484;" FontSize="16" FontFamily="../Fonts/#FluentSystemIcons-Regular" Foreground="{Binding Source={StaticResource AccentColor}}" VerticalAlignment="Center"/>
 			<TextBlock Text="{x:Static lang:Resources.GetStarted}" FontSize="14" VerticalAlignment="Center" FontWeight="ExtraBold" Margin="5,0,0,0"/>
 		</StackPanel>
 
-		<WrapPanel Grid.Row="1" x:Name="GetStartedPanel" Orientation="Horizontal">
+		<WrapPanel Grid.Row="2" x:Name="GetStartedPanel" Orientation="Horizontal">
 
 		</WrapPanel>
 
-		<StackPanel Margin="10" Orientation="Horizontal" Grid.Row="2">
+		<StackPanel Margin="10" Orientation="Horizontal" Grid.Row="3">
 			<TextBlock Text="&#xF4DB;" FontSize="16" FontFamily="../Fonts/#FluentSystemIcons-Regular" Foreground="{Binding Source={StaticResource AccentColor}}" VerticalAlignment="Center"/>
 			<TextBlock Text="{x:Static lang:Resources.SuggestedActions}" FontSize="14" VerticalAlignment="Center" FontWeight="ExtraBold" Margin="5,0,0,0"/>
 		</StackPanel>
 
-		<WrapPanel Grid.Row="3" x:Name="SuggestedActionsPanel" Orientation="Horizontal">
+		<WrapPanel Grid.Row="4" x:Name="SuggestedActionsPanel" Orientation="Horizontal">
 
 		</WrapPanel>
 
-		<StackPanel Margin="10" Orientation="Horizontal" Grid.Row="4">
+		<StackPanel Margin="10" Orientation="Horizontal" Grid.Row="5">
 			<TextBlock Text="&#xF311;" FontSize="16" FontFamily="../Fonts/#FluentSystemIcons-Regular" Foreground="{Binding Source={StaticResource AccentColor}}" VerticalAlignment="Center"/>
 			<TextBlock Text="{x:Static lang:Resources.Discover}" FontSize="14" VerticalAlignment="Center" FontWeight="ExtraBold" Margin="5,0,0,0"/>
 		</StackPanel>
 
-		<WrapPanel Grid.Row="5" x:Name="DiscoverPanel" Orientation="Horizontal">
+		<WrapPanel Grid.Row="6" x:Name="DiscoverPanel" Orientation="Horizontal">
 
 		</WrapPanel>
 	</Grid>
diff --git a/InternetTest/InternetTest/Pages/HomePage.xaml.cs b/InternetTest/InternetTest/Pages/HomePage.xaml.cs
index 80986024..16a4214c 100644
--- a/InternetTest/InternetTest/Pages/HomePage.xaml.cs
+++ b/InternetTest/InternetTest/Pages/HomePage.xaml.cs
@@ -24,9 +24,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using InternetTest.Classes;
 using InternetTest.Enums;
 using InternetTest.UserControls;
+using PeyrSharp.Core;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Controls;
+using System.Windows.Media;
 
 namespace InternetTest.Pages;
 /// <summary>
@@ -40,7 +42,7 @@ public HomePage()
 		InitUI();
 	}
 
-	internal void InitUI()
+	internal async void InitUI()
 	{
 		// Load "Get started" section
 		List<AppPages> relevantPages = Enumerable.Empty<AppPages>().ToList();
@@ -73,5 +75,11 @@ internal void InitUI()
 		{
 			SuggestedActionsPanel.Children.Add(new ActionCard(relevantActions[i]));
 		}
+
+		// Load "Status" section
+		bool connected = await Internet.GetStatusCodeAsync(Global.Settings.TestSite) != 400; // Check if Internet is available
+		StatusTxt.Text = connected ? Properties.Resources.Connected : Properties.Resources.NotConnected; // Set text
+		StatusIconTxt.Text = connected ? "\uF299" : "\uF36E";
+		StatusIconTxt.Foreground = connected ? new SolidColorBrush(Global.GetColorFromResource("Green")) : new SolidColorBrush(Global.GetColorFromResource("Red"));
 	}
 }
diff --git a/InternetTest/InternetTest/Pages/LocateIpPage.xaml.cs b/InternetTest/InternetTest/Pages/LocateIpPage.xaml.cs
index 6df0201c..a1fe51c4 100644
--- a/InternetTest/InternetTest/Pages/LocateIpPage.xaml.cs
+++ b/InternetTest/InternetTest/Pages/LocateIpPage.xaml.cs
@@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 */
 using InternetTest.Classes;
 using InternetTest.Enums;
-using LeoCorpLibrary;
 using Microsoft.Win32;
+using PeyrSharp.Core;
 using System;
 using System.Diagnostics;
 using System.IO;
@@ -53,12 +53,12 @@ private async void InitUI()
 		TitleTxt.Text = $"{Properties.Resources.IPTools} > {Properties.Resources.LocateIP}";
 		try
 		{
-			if (await NetworkConnection.IsAvailableAsync())
+			if (await Internet.IsAvailableAsync())
 			{
 				LocateIP(""); // Get the current IP of the user
 			}
 		}
-		catch (Exception) {	} // Cancel if there is no internet connection
+		catch (Exception) { } // Cancel if there is no internet connection
 	}
 
 	private void InjectSynethiaCode()
@@ -203,7 +203,7 @@ private void SaveBtn_Click(object sender, RoutedEventArgs e)
 			DefaultExt = ".txt"
 		};
 
-		if (dialog.ShowDialog().Value)
+		if (dialog.ShowDialog() ?? false)
 		{
 			File.WriteAllText(dialog.FileName, CurrentIP?.ToString());
 		}
diff --git a/InternetTest/InternetTest/Pages/MyIpPage.xaml.cs b/InternetTest/InternetTest/Pages/MyIpPage.xaml.cs
index e1d31b9f..a86dd316 100644
--- a/InternetTest/InternetTest/Pages/MyIpPage.xaml.cs
+++ b/InternetTest/InternetTest/Pages/MyIpPage.xaml.cs
@@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 */
 using InternetTest.Classes;
 using InternetTest.Enums;
-using LeoCorpLibrary;
+using PeyrSharp.Core;
 using System;
 using System.Diagnostics;
 using System.Linq;
@@ -49,7 +49,7 @@ private async void InitUI()
 	{
 		try
 		{
-			if (await NetworkConnection.IsAvailableAsync())
+			if (await Internet.IsAvailableAsync())
 			{
 				GetMyIP(); // Locate the current IP
 			}
diff --git a/InternetTest/InternetTest/Pages/SettingsPage.xaml.cs b/InternetTest/InternetTest/Pages/SettingsPage.xaml.cs
index fffd0660..45af4393 100644
--- a/InternetTest/InternetTest/Pages/SettingsPage.xaml.cs
+++ b/InternetTest/InternetTest/Pages/SettingsPage.xaml.cs
@@ -23,8 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 */
 using InternetTest.Classes;
 using InternetTest.Enums;
-using LeoCorpLibrary;
 using Microsoft.Win32;
+using PeyrSharp.Core;
+using PeyrSharp.Env;
 using System;
 using System.Diagnostics;
 using System.IO;
@@ -54,7 +55,7 @@ public SettingsPage()
 					HistoryManager.Save(Global.History);
 					SettingsManager.Save();
 
-					Env.ExecuteAsAdmin(Directory.GetCurrentDirectory() + @"\Xalyus Updater.exe"); // Start the updater
+					Sys.ExecuteAsAdmin(Directory.GetCurrentDirectory() + @"\Xalyus Updater.exe"); // Start the updater
 					Application.Current.Shutdown(); // Close
 				}
 			}
@@ -107,9 +108,9 @@ private async void InitUI()
 
 		// Check for updates
 		if (!Global.Settings.CheckUpdateOnStart) return;
-		try 
-		{ 
-			if (!await NetworkConnection.IsAvailableAsync()) return;
+		try
+		{
+			if (!await Internet.IsAvailableAsync()) return;
 			if (!Update.IsAvailable(Global.Version, await Update.GetLastVersionAsync(Global.LastVersionLink))) return;
 		}
 		catch { return; }
@@ -143,7 +144,7 @@ private async void CheckUpdateBtn_Click(object sender, RoutedEventArgs e)
 			HistoryManager.Save(Global.History);
 			SettingsManager.Save();
 
-			Env.ExecuteAsAdmin(Directory.GetCurrentDirectory() + @"\Xalyus Updater.exe"); // Start the updater
+			Sys.ExecuteAsAdmin(Directory.GetCurrentDirectory() + @"\Xalyus Updater.exe"); // Start the updater
 			Application.Current.Shutdown(); // Close
 		}
 		else
diff --git a/InternetTest/InternetTest/Pages/StatusPage.xaml.cs b/InternetTest/InternetTest/Pages/StatusPage.xaml.cs
index 55c60d8d..28a7bd82 100644
--- a/InternetTest/InternetTest/Pages/StatusPage.xaml.cs
+++ b/InternetTest/InternetTest/Pages/StatusPage.xaml.cs
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE. 
 */
 using InternetTest.Classes;
-using LeoCorpLibrary;
+using PeyrSharp.Core;
 using System;
 using System.Diagnostics;
 using System.Linq;
@@ -117,8 +117,8 @@ private async void LaunchTest(string customSite)
 			dispatcherTimer.Tick += (o, e) => time++;
 			dispatcherTimer.Start();
 
-			int code = await NetworkConnection.GetWebPageStatusCodeAsync(customSite);
-			string message = await NetworkConnection.GetWebPageStatusDescriptionAsync(customSite);
+			int code = await Internet.GetStatusCodeAsync(customSite);
+			string message = await Internet.GetStatusDescriptionAsync(customSite);
 
 			dispatcherTimer.Stop();
 
diff --git a/InternetTest/InternetTest/Pages/WiFiPasswordsPage.xaml.cs b/InternetTest/InternetTest/Pages/WiFiPasswordsPage.xaml.cs
index de2d7dbc..c54129d6 100644
--- a/InternetTest/InternetTest/Pages/WiFiPasswordsPage.xaml.cs
+++ b/InternetTest/InternetTest/Pages/WiFiPasswordsPage.xaml.cs
@@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 */
 using InternetTest.Classes;
 using InternetTest.UserControls;
-using LeoCorpLibrary;
+using PeyrSharp.Env;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -130,7 +130,7 @@ internal async Task GetWiFiNetworksInfo()
 			Placeholder.Visibility = Visibility.Collapsed; // Hide the placeholder
 
 			// Check if the temp directory exists
-			string path = Env.AppDataPath + @"\Léo Corporation\InternetTest Pro\Temp";
+			string path = FileSys.AppDataPath + @"\Léo Corporation\InternetTest Pro\Temp";
 
 			if (!Directory.Exists(path))
 			{
diff --git a/InternetTest/InternetTest/Properties/Resources.Designer.cs b/InternetTest/InternetTest/Properties/Resources.Designer.cs
index fcd84b9a..727b4e35 100644
--- a/InternetTest/InternetTest/Properties/Resources.Designer.cs
+++ b/InternetTest/InternetTest/Properties/Resources.Designer.cs
@@ -78,6 +78,24 @@ public static string Agree {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to All tests have failed.
+        /// </summary>
+        public static string AllFailed {
+            get {
+                return ResourceManager.GetString("AllFailed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to All tests were successful.
+        /// </summary>
+        public static string AllSuccess {
+            get {
+                return ResourceManager.GetString("AllSuccess", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Apply.
         /// </summary>
@@ -1421,6 +1439,15 @@ public static string TestSite {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Some tests have failed.
+        /// </summary>
+        public static string TestSucessAndFailed {
+            get {
+                return ResourceManager.GetString("TestSucessAndFailed", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Test website.
         /// </summary>
diff --git a/InternetTest/InternetTest/Properties/Resources.en-US.resx b/InternetTest/InternetTest/Properties/Resources.en-US.resx
index cdfd5cd1..b219d70d 100644
--- a/InternetTest/InternetTest/Properties/Resources.en-US.resx
+++ b/InternetTest/InternetTest/Properties/Resources.en-US.resx
@@ -642,4 +642,13 @@ Using this feature, you will be able to get information about each wireless netw
   <data name="WPA2PSKNetwork" xml:space="preserve">
     <value>WPA2-Personal (802.11) Network</value>
   </data>
+  <data name="AllSuccess" xml:space="preserve">
+    <value>All tests were successful</value>
+  </data>
+  <data name="AllFailed" xml:space="preserve">
+    <value>All tests have failed</value>
+  </data>
+  <data name="TestSucessAndFailed" xml:space="preserve">
+    <value>Some tests have failed</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/InternetTest/InternetTest/Properties/Resources.fr-FR.resx b/InternetTest/InternetTest/Properties/Resources.fr-FR.resx
index 02301bdf..6f495218 100644
--- a/InternetTest/InternetTest/Properties/Resources.fr-FR.resx
+++ b/InternetTest/InternetTest/Properties/Resources.fr-FR.resx
@@ -642,4 +642,13 @@ En utilisant cette fonction, vous pourrez obtenir des informations sur chaque r
   <data name="WPA2PSKNetwork" xml:space="preserve">
     <value>Réseau personnel (WPA2-Personal 802.11)</value>
   </data>
+  <data name="AllSuccess" xml:space="preserve">
+    <value>Tous les tests ont réussi</value>
+  </data>
+  <data name="AllFailed" xml:space="preserve">
+    <value>Tous les tests ont échoué</value>
+  </data>
+  <data name="TestSucessAndFailed" xml:space="preserve">
+    <value>Certains tests ont échoué</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/InternetTest/InternetTest/Properties/Resources.resx b/InternetTest/InternetTest/Properties/Resources.resx
index 388dd158..30f37ee5 100644
--- a/InternetTest/InternetTest/Properties/Resources.resx
+++ b/InternetTest/InternetTest/Properties/Resources.resx
@@ -642,4 +642,13 @@ Using this feature, you will be able to get information about each wireless netw
   <data name="WPA2PSKNetwork" xml:space="preserve">
     <value>WPA2-Personal (802.11) Network</value>
   </data>
+  <data name="AllSuccess" xml:space="preserve">
+    <value>All tests were successful</value>
+  </data>
+  <data name="AllFailed" xml:space="preserve">
+    <value>All tests have failed</value>
+  </data>
+  <data name="TestSucessAndFailed" xml:space="preserve">
+    <value>Some tests have failed</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/InternetTest/InternetTest/Properties/Resources.zh-CN.resx b/InternetTest/InternetTest/Properties/Resources.zh-CN.resx
index 99b94ad3..92d4fa24 100644
--- a/InternetTest/InternetTest/Properties/Resources.zh-CN.resx
+++ b/InternetTest/InternetTest/Properties/Resources.zh-CN.resx
@@ -415,13 +415,13 @@
 	<value>Down</value>
   </data>
   <data name="HistoryEmpty" xml:space="preserve">
-	<value>历史是空的。</value>
+	<value>历史记录是空的。</value>
   </data>
   <data name="EmptyHistory" xml:space="preserve">
-	<value>空白历史</value>
+	<value>历史记录空白</value>
   </data>
   <data name="EmptyHistoryMsg" xml:space="preserve">
-	<value>您确定要清空此历史记录吗？ 此操作是不可逆转的。</value>
+	<value>您确定要清空此历史记录吗？ 此操作是不可恢复的。</value>
   </data>
   <data name="Pro" xml:space="preserve">
 	<value>Pro</value>
@@ -547,7 +547,7 @@
     <value>重置设置</value>
   </data>
   <data name="SynethiaEnable" xml:space="preserve">
-    <value>启用 Synethia 定制体验。</value>
+    <value>启用 Synethia 自定义体验。</value>
   </data>
   <data name="ResetSynethia" xml:space="preserve">
     <value>重置 Synethia 数据</value>
@@ -619,27 +619,36 @@
     <value>一切准备就绪</value>
   </data>
   <data name="ConfidentialModeEnabled" xml:space="preserve">
-    <value>Confidential Mode is enabled</value>
+    <value>已启用机密模式</value>
   </data>
   <data name="DetailsNotAvailableCM" xml:space="preserve">
-    <value>Details aren't available in Confidential Mode</value>
+    <value>机密模式下不提供详细信息</value>
   </data>
   <data name="OpenNetwork" xml:space="preserve">
-    <value>Open Network (802.11)</value>
+    <value>开放网络 (802.11)</value>
   </data>
   <data name="SharedNetwork" xml:space="preserve">
-    <value>Shared Network (802.11)</value>
+    <value>共享网络 (802.11)</value>
   </data>
   <data name="WPANetwork" xml:space="preserve">
-    <value>WPA-Enterprise (802.11) Network</value>
+    <value>WPA-企业 (802.11) 网络</value>
   </data>
   <data name="WPAPSKNetwork" xml:space="preserve">
-    <value>WPA-Personal (802.11) Network</value>
+    <value>WPA-个人 (802.11) 网络</value>
   </data>
   <data name="WPA2Network" xml:space="preserve">
-    <value>WPA2-Enterprise (802.11) Network</value>
+    <value>WPA2-企业 (802.11) 网络</value>
   </data>
   <data name="WPA2PSKNetwork" xml:space="preserve">
-    <value>WPA2-Personal (802.11) Network</value>
+    <value>WPA2-个人 (802.11) 网络</value>
+  </data>
+  <data name="AllSuccess" xml:space="preserve">
+    <value>All tests were successful</value>
+  </data>
+  <data name="AllFailed" xml:space="preserve">
+    <value>All tests have failed</value>
+  </data>
+  <data name="TestSucessAndFailed" xml:space="preserve">
+    <value>Some tests have failed</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/InternetTest/InternetTest/Themes/Dark.xaml b/InternetTest/InternetTest/Themes/Dark.xaml
index 479623cd..bc8dae5e 100644
--- a/InternetTest/InternetTest/Themes/Dark.xaml
+++ b/InternetTest/InternetTest/Themes/Dark.xaml
@@ -17,6 +17,7 @@
 	<sys:String x:Key="Gray">#5A5A6E</sys:String>
 	<sys:String x:Key="Green">#25DE0F</sys:String>
 	<sys:String x:Key="Red">#FF321E</sys:String>
-    <sys:String x:Key="DarkGray">#7474B1</sys:String>
+	<sys:String x:Key="Orange">#ff7a00</sys:String>
+	<sys:String x:Key="DarkGray">#7474B1</sys:String>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/InternetTest/InternetTest/Themes/Light.xaml b/InternetTest/InternetTest/Themes/Light.xaml
index 117eb270..0b28428d 100644
--- a/InternetTest/InternetTest/Themes/Light.xaml
+++ b/InternetTest/InternetTest/Themes/Light.xaml
@@ -17,6 +17,7 @@
 	<sys:String x:Key="Gray">#DEDEDE</sys:String>
 	<sys:String x:Key="Green">#25DE0F</sys:String>
 	<sys:String x:Key="Red">#FF321E</sys:String>
+    <sys:String x:Key="Orange">#ff7a00</sys:String>
 	<sys:String x:Key="DarkGray">#969696</sys:String>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/InternetTest/InternetTest/UserControls/WiFiInfoItem.xaml.cs b/InternetTest/InternetTest/UserControls/WiFiInfoItem.xaml.cs
index 8dc647f9..fc35fb31 100644
--- a/InternetTest/InternetTest/UserControls/WiFiInfoItem.xaml.cs
+++ b/InternetTest/InternetTest/UserControls/WiFiInfoItem.xaml.cs
@@ -43,8 +43,8 @@ public WiFiInfoItem(WLANProfile profile)
 
 	internal void InitUI()
 	{
-		InterfaceNameTxt.Text = Global.IsConfidentialModeEnabled 
-			? Global.ReplaceAllCharactersByAnotherOne(WLANProfile.SSIDConfig?.SSID?.Name ?? "", "•") 
+		InterfaceNameTxt.Text = Global.IsConfidentialModeEnabled
+			? Global.ReplaceAllCharactersByAnotherOne(WLANProfile.SSIDConfig?.SSID?.Name ?? "", "•")
 			: WLANProfile.SSIDConfig?.SSID?.Name;
 		ConnectionModeTxt.Text = WLANProfile.ConnectionMode == "auto" ? Properties.Resources.Automatic : WLANProfile.ConnectionMode;
 		ConnectionTypeTxt.Text = WLANProfile.ConnectionType switch
@@ -101,5 +101,5 @@ private void CopyKeyBtn_Click(object sender, RoutedEventArgs e)
 		Clipboard.SetDataObject(WLANProfile.MSM?.Security?.SharedKey?.KeyMaterial);
 	}
 
-	public override string ToString() => WLANProfile.SSIDConfig?.SSID?.Name;
+	public override string ToString() => WLANProfile.SSIDConfig?.SSID?.Name ?? "";
 }