diff --git a/Installer/Package.appxmanifest b/Installer/Package.appxmanifest
index 33ee2f66..3864dbaa 100644
--- a/Installer/Package.appxmanifest
+++ b/Installer/Package.appxmanifest
@@ -11,7 +11,7 @@
 	<Identity
 	  Name="16536Shawn.V.Workshop.PRemoteM"
 	  Publisher="CN=72AC6E85-B8C4-48F8-A07B-9A985863E628"
-	  Version="1.0.68.0" />
+	  Version="1.0.69.0" />
 
 	<Properties>
 		<DisplayName>PRemoteM</DisplayName>
diff --git a/Shawn.Utils b/Shawn.Utils
index 09f13fd2..dba2e631 160000
--- a/Shawn.Utils
+++ b/Shawn.Utils
@@ -1 +1 @@
-Subproject commit 09f13fd2151d4cf55792132e92cc6900509473e9
+Subproject commit dba2e63185d6a2f3f4a53ff1a40d0ab165ebd5ef
diff --git a/Ui/AppVersion.cs b/Ui/AppVersion.cs
index 95810dba..c28cb33e 100644
--- a/Ui/AppVersion.cs
+++ b/Ui/AppVersion.cs
@@ -7,7 +7,7 @@ public static class AppVersion
         public const uint Major = 0;
         public const uint Minor = 7;
         public const uint Patch = 2;
-        public const uint Build = 7;
+        public const uint Build = 8;
         public const string PreRelease = ""; // e.g. "alpha" "beta.2"
 
         public static readonly VersionHelper.Version VersionData = new VersionHelper.Version(Major, Minor, Patch, Build, PreRelease);
@@ -17,7 +17,6 @@ public static class AppVersion
         public static readonly string[] UpdateUrls =
         {
             "https://github.com/1Remote/1Remote",
-            "https://github.com/1Remote/PRemoteM",
         };
     }
 }
\ No newline at end of file
diff --git a/Ui/Service/ConfigurationService.cs b/Ui/Service/ConfigurationService.cs
index c0ceb9f0..265e85c2 100644
--- a/Ui/Service/ConfigurationService.cs
+++ b/Ui/Service/ConfigurationService.cs
@@ -6,10 +6,12 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Newtonsoft.Json;
 using PRM.Model.DAO;
+using PRM.Utils;
 using Shawn.Utils;
 using Shawn.Utils.Wpf;
 using VariableKeywordMatcher.Provider.DirectMatch;
@@ -22,9 +24,14 @@ public class EngagementSettings
         public DateTime InstallTime = DateTime.Today;
         public bool DoNotShowAgain = false;
         public string DoNotShowAgainVersionString = "";
+        public DateTime LastRequestRatingsTime = DateTime.MinValue;
         [Newtonsoft.Json.JsonIgnore]
         public VersionHelper.Version DoNotShowAgainVersion => VersionHelper.Version.FromString(DoNotShowAgainVersionString);
-        public DateTime LastRequestRatingsTime = DateTime.MinValue;
+
+
+        public string BreakingChangeAlertVersionString = "";
+        [Newtonsoft.Json.JsonIgnore]
+        public VersionHelper.Version BreakingChangeAlertVersion => VersionHelper.Version.FromString(BreakingChangeAlertVersionString);
         public int ConnectCount = 0;
     }
     public class GeneralConfig
@@ -210,10 +217,23 @@ public void Save()
             {
                 if (!CanSave) return;
                 CanSave = false;
-                var fi = new FileInfo(AppPathHelper.Instance.ProfileJsonPath);
-                if (fi?.Directory?.Exists == false)
-                    fi.Directory.Create();
-                File.WriteAllText(AppPathHelper.Instance.ProfileJsonPath, JsonConvert.SerializeObject(this._cfg, Formatting.Indented), Encoding.UTF8);
+                for (int i = 0; i < 3; i++)
+                {
+                    if(i > 0)
+                        Thread.Sleep(100);
+                    try
+                    {
+                        var fi = new FileInfo(AppPathHelper.Instance.ProfileJsonPath);
+                        if (fi?.Directory?.Exists == false)
+                            fi.Directory.Create();
+                        File.WriteAllText(AppPathHelper.Instance.ProfileJsonPath, JsonConvert.SerializeObject(this._cfg, Formatting.Indented), Encoding.UTF8);
+                        break;
+                    }
+                    catch (Exception e)
+                    {
+                        MsAppCenterHelper.Error(e);
+                    }
+                }
                 CanSave = true;
             }
 
diff --git a/Ui/Service/LocalityService.cs b/Ui/Service/LocalityService.cs
index 373a59f7..a8a61246 100644
--- a/Ui/Service/LocalityService.cs
+++ b/Ui/Service/LocalityService.cs
@@ -7,6 +7,7 @@
 using System.Windows;
 using Newtonsoft.Json;
 using PRM.Model.Protocol;
+using PRM.Utils;
 using Shawn.Utils;
 
 namespace PRM.Service
@@ -199,7 +200,14 @@ private void Save()
                 var fi = new FileInfo(AppPathHelper.Instance.LocalityJsonPath);
                 if (fi?.Directory?.Exists == false)
                     fi.Directory.Create();
-                File.WriteAllText(AppPathHelper.Instance.LocalityJsonPath, JsonConvert.SerializeObject(this._localitySettings, Formatting.Indented), Encoding.UTF8);
+                try
+                {
+                    File.WriteAllText(AppPathHelper.Instance.LocalityJsonPath, JsonConvert.SerializeObject(this._localitySettings, Formatting.Indented), Encoding.UTF8);
+                }
+                catch (Exception e)
+                {
+                    MsAppCenterHelper.Error(e);
+                }
                 CanSave = true;
             }
         }
diff --git a/Ui/Service/ProtocolConfigurationService.cs b/Ui/Service/ProtocolConfigurationService.cs
index 7504fab2..af75259d 100644
--- a/Ui/Service/ProtocolConfigurationService.cs
+++ b/Ui/Service/ProtocolConfigurationService.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Net.Sockets;
 using System.Text;
+using System.Threading;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PRM.Model;
@@ -12,6 +13,7 @@
 using PRM.Model.Protocol.Base;
 using PRM.Model.ProtocolRunner;
 using PRM.Model.ProtocolRunner.Default;
+using PRM.Utils;
 using Shawn.Utils;
 
 namespace PRM.Service
@@ -190,7 +192,20 @@ public void Save()
                     }
                 }
                 var file = Path.Combine(AppPathHelper.Instance.ProtocolRunnerDirPath, $"{protocolName}.json");
-                File.WriteAllText(file, JsonConvert.SerializeObject(config, Formatting.Indented), Encoding.UTF8);
+                for (int i = 0; i < 3; i++)
+                {
+                    if (i > 0)
+                        Thread.Sleep(100);
+                    try
+                    {
+                        File.WriteAllText(file, JsonConvert.SerializeObject(config, Formatting.Indented), Encoding.UTF8);
+                        break;
+                    }
+                    catch (Exception e)
+                    {
+                        MsAppCenterHelper.Error(e);
+                    }
+                }
             }
         }
     }
diff --git a/Ui/Service/SessionControlService.cs b/Ui/Service/SessionControlService.cs
index b5b81094..f6c18282 100644
--- a/Ui/Service/SessionControlService.cs
+++ b/Ui/Service/SessionControlService.cs
@@ -5,11 +5,14 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using MSTSCLib;
+using Newtonsoft.Json;
 using PRM.Model;
+using PRM.Model.DAO.Dapper;
 using PRM.Model.Protocol;
 using PRM.Model.Protocol.Base;
 using PRM.Model.ProtocolRunner;
@@ -20,6 +23,7 @@
 using PRM.View.Host.ProtocolHosts;
 using Shawn.Utils;
 using Shawn.Utils.Wpf;
+using Shawn.Utils.WpfResources.Theme.Styles;
 using Stylet;
 using ProtocolHostStatus = PRM.View.Host.ProtocolHosts.ProtocolHostStatus;
 using Screen = System.Windows.Forms.Screen;
@@ -73,13 +77,16 @@ private bool ActivateOrReConnIfServerSessionIsOpened(ProtocolBase server)
             if (server.IsOnlyOneInstance() && _connectionId2Hosts.ContainsKey(serverId.ToString()))
             {
                 SimpleLogHelper.Debug($"_connectionId2Hosts ContainsKey {serverId.ToString()}");
-                if (_connectionId2Hosts[serverId.ToString()].ParentWindow is TabWindowBase t)
+                if (_connectionId2Hosts[serverId.ToString()].ParentWindow is { } win)
                 {
-                    var s = t.GetViewModel().Items.FirstOrDefault(x => x.Content?.ProtocolServer?.Id == serverId);
-                    if (s != null)
-                        t.GetViewModel().SelectedItem = s;
+                    if (win is TabWindowBase tab)
+                    {
+                        var s = tab.GetViewModel().Items.FirstOrDefault(x => x.Content?.ProtocolServer?.Id == serverId);
+                        if (s != null)
+                            tab.GetViewModel().SelectedItem = s;
+                    }
 
-                    if (t.IsClosed)
+                    if (win.IsClosed)
                     {
                         MarkProtocolHostToClose(new string[] { serverId.ToString() });
                         CleanupProtocolsAndWindows();
@@ -88,8 +95,15 @@ private bool ActivateOrReConnIfServerSessionIsOpened(ProtocolBase server)
 
                     try
                     {
-                        if (t.IsClosing == false) t.Show();
-                        if (t.IsClosing == false) t.Activate();
+                        Execute.OnUIThreadSync(() =>
+                        {
+                            if (win.IsClosing == false)
+                            {
+                                win.WindowState = win.WindowState == WindowState.Minimized ? WindowState.Normal : win.WindowState;
+                                win.Show();
+                                win.Activate();
+                            }
+                        });
                     }
                     catch (Exception e)
                     {
@@ -120,7 +134,20 @@ private void ConnectRdpByMstsc(RDP rdp)
             // write a .rdp file for mstsc.exe
             if (_context.DataService != null)
             {
-                File.WriteAllText(rdpFile, rdp.ToRdpConfig(_context.DataService).ToString());
+                for (int i = 0; i < 3; i++)
+                {
+                    if (i > 0)
+                        Thread.Sleep(100);
+                    try
+                    {
+                        File.WriteAllText(rdpFile, rdp.ToRdpConfig(_context.DataService).ToString());
+                        break;
+                    }
+                    catch (Exception e)
+                    {
+                        MsAppCenterHelper.Error(e);
+                    }
+                }
                 var p = new Process
                 {
                     StartInfo =
@@ -167,7 +194,20 @@ private void ConnectRemoteApp(RdpApp remoteApp)
             // write a .rdp file for mstsc.exe
             if (_context.DataService != null)
             {
-                File.WriteAllText(rdpFile, remoteApp.ToRdpConfig(_context.DataService).ToString());
+                for (int i = 0; i < 3; i++)
+                {
+                    if (i > 0)
+                        Thread.Sleep(100);
+                    try
+                    {
+                        File.WriteAllText(rdpFile, remoteApp.ToRdpConfig(_context.DataService).ToString());
+                        break;
+                    }
+                    catch (Exception e)
+                    {
+                        MsAppCenterHelper.Error(e);
+                    }
+                }
                 var p = new Process
                 {
                     StartInfo =
@@ -290,10 +330,7 @@ private void ConnectWithTab(ProtocolBase server, Runner runner, string assignTab
                         tab.AddItem(new TabItemViewModel(host, server.DisplayName));
                         _connectionId2Hosts.TryAdd(host.ConnectionId, host);
                         host.Conn();
-                        if (tab.WindowState == WindowState.Minimized)
-                        {
-                            tab.WindowState = WindowState.Normal;
-                        }
+                        tab.WindowState = tab.WindowState == WindowState.Minimized ? WindowState.Normal : tab.WindowState;
                         tab.Activate();
                     });
                 }
diff --git a/Ui/Service/TaskTrayService.cs b/Ui/Service/TaskTrayService.cs
index 903a4987..2dde29f9 100644
--- a/Ui/Service/TaskTrayService.cs
+++ b/Ui/Service/TaskTrayService.cs
@@ -103,19 +103,19 @@ private void ReloadTaskTrayContextMenu()
             var about = new System.Windows.Forms.ToolStripMenuItem(IoC.Get<LanguageService>().Translate("About") + $" {Assert.APP_DISPLAY_NAME}");
             about.Click += (sender, args) =>
             {
-                //HyperlinkHelper.OpenUriBySystem("https://github.com/1Remote/PRemoteM");
+                //HyperlinkHelper.OpenUriBySystem("https://github.com/1Remote/1Remote");
                 IoC.Get<MainWindowViewModel>().ShowMe(true);
                 IoC.Get<MainWindowViewModel>().CmdGoAboutPage.Execute();
             };
             var linkHowToUse = new System.Windows.Forms.ToolStripMenuItem(IoC.Get<ILanguageService>().Translate("about_page_how_to_use"));
             linkHowToUse.Click += (sender, args) =>
             {
-                HyperlinkHelper.OpenUriBySystem("https://github.com/1Remote/PRemoteM/wiki");
+                HyperlinkHelper.OpenUriBySystem("https://1remote.github.io/usage/quick-start/");
             };
             var linkFeedback = new System.Windows.Forms.ToolStripMenuItem(IoC.Get<ILanguageService>().Translate("about_page_feedback"));
             linkFeedback.Click += (sender, args) =>
             {
-                HyperlinkHelper.OpenUriBySystem("https://github.com/1Remote/PRemoteM/issues");
+                HyperlinkHelper.OpenUriBySystem("https://github.com/1Remote/1Remote/issues");
             };
             var exit = new System.Windows.Forms.ToolStripMenuItem(IoC.Get<ILanguageService>().Translate("Exit"));
             exit.Click += (sender, args) =>
diff --git a/Ui/Utils/KiTTY/IKittyConnectable.cs b/Ui/Utils/KiTTY/IKittyConnectable.cs
index e2b52c38..10fcaf90 100644
--- a/Ui/Utils/KiTTY/IKittyConnectable.cs
+++ b/Ui/Utils/KiTTY/IKittyConnectable.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
+using System.Threading;
 using Microsoft.Win32;
 using Newtonsoft.Json;
 using PRM.Model;
@@ -223,8 +225,15 @@ public static void InstallKitty(this IKittyConnectable iKittyConnectable)
                 kitty.Close();
             }
 
-            File.WriteAllText(Path.Combine(fi!.Directory!.FullName, "kitty.ini"),
-                @"
+            for (int i = 0; i < 3; i++)
+            {
+                if (i > 0)
+                    Thread.Sleep(100);
+                try
+                {
+
+                    File.WriteAllText(Path.Combine(fi!.Directory!.FullName, "kitty.ini"),
+                        @"
 [Agent]
 [ConfigBox]
 dblclick=open
@@ -266,6 +275,13 @@ public static void InstallKitty(this IKittyConnectable iKittyConnectable)
 [Launcher]
 reload=yes
 ");
+                    break;
+                }
+                catch (Exception e)
+                {
+                    MsAppCenterHelper.Error(e);
+                }
+            }
         }
 
         public static string GetKittyExeFullName()
diff --git a/Ui/Utils/KiTTY/KittyConfig.cs b/Ui/Utils/KiTTY/KittyConfig.cs
index d4642462..2dce3da0 100644
--- a/Ui/Utils/KiTTY/KittyConfig.cs
+++ b/Ui/Utils/KiTTY/KittyConfig.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using Microsoft.Win32;
 using Shawn.Utils;
 
@@ -391,10 +393,23 @@ private void SaveToKittyPortableConfig(string kittyPath)
                         sb.AppendLine($@"{item.Key}\{item.Value}\");
                 }
 
-                var fi = new FileInfo(configPath);
-                if (fi?.Directory?.Exists == false)
-                    fi.Directory.Create();
-                File.WriteAllText(configPath, sb.ToString(), Encoding.UTF8);
+                for (int i = 0; i < 3; i++)
+                {
+                    if (i > 0)
+                        Thread.Sleep(100);
+                    try
+                    {
+                        var fi = new FileInfo(configPath);
+                        if (fi?.Directory?.Exists == false)
+                            fi.Directory.Create();
+                        File.WriteAllText(configPath, sb.ToString(), Encoding.UTF8);
+                        break;
+                    }
+                    catch (Exception e)
+                    {
+                        MsAppCenterHelper.Error(e);
+                    }
+                }
             }
             catch (Exception e)
             {
diff --git a/Ui/View/AboutPageView.xaml b/Ui/View/AboutPageView.xaml
index 92e52029..4927a0d1 100644
--- a/Ui/View/AboutPageView.xaml
+++ b/Ui/View/AboutPageView.xaml
@@ -105,7 +105,7 @@
 
                                     <TextBlock Text="Update" Margin="0"/>
                                     <TextBlock Grid.Column="1" Margin="0">
-                                        <Hyperlink Name="HyperlinkUpdate" NavigateUri="{Binding NewVersionUrl}" TextDecorations="{x:Null}" controls:HyperlinkHelper.IsOpenExternal="True">
+                                        <Hyperlink Name="HyperlinkUpdate" Command="{Binding CmdUpdate}" TextDecorations="{x:Null}">
                                             <Grid>
                                                 <TextBlock Name="TbNewVersion" Margin="0" Text="{Binding NewVersion}" Foreground="{Binding ElementName=HyperlinkUpdate, Path=Foreground}" />
                                                 <Path Data="F1 M 10 3.4375 C 10.605469 3.4375 11.186523 3.515625 11.743164 3.671875 C 12.299805 3.828125 12.822266 4.049479 13.310547 4.335938 C 13.798828 4.622396 14.241536 4.964193 14.638672 5.361328 C 15.035807 5.758464 15.377604 6.201172 15.664063 6.689453 C 15.950521 7.177734 16.171875 7.700195 16.328125 8.256836 C 16.484375 8.813477 16.5625 9.394531 16.5625 10 C 16.5625 10.605469 16.484375 11.186523 16.328125 11.743164 C 16.171875 12.299805 15.950521 12.822266 15.664063 13.310547 C 15.377604 13.798828 15.035807 14.241537 14.638672 14.638672 C 14.241536 15.035808 13.798828 15.377604 13.310547 15.664063 C 12.822266 15.950521 12.299805 16.171875 11.743164 16.328125 C 11.186523 16.484375 10.605469 16.5625 10 16.5625 C 9.394531 16.5625 8.813477 16.484375 8.256836 16.328125 C 7.700195 16.171875 7.177734 15.950521 6.689453 15.664063 C 6.201172 15.377604 5.758463 15.035808 5.361328 14.638672 C 4.964192 14.241537 4.622396 13.798828 4.335938 13.310547 C 4.049479 12.822266 3.828125 12.299805 3.671875 11.743164 C 3.515625 11.186523 3.4375 10.605469 3.4375 10 C 3.4375 9.394531 3.515625 8.813477 3.671875 8.256836 C 3.828125 7.700195 4.049479 7.177734 4.335938 6.689453 C 4.622396 6.201172 4.964192 5.758464 5.361328 5.361328 C 5.758463 4.964193 6.201172 4.622396 6.689453 4.335938 C 7.177734 4.049479 7.700195 3.828125 8.256836 3.671875 C 8.813477 3.515625 9.394531 3.4375 10 3.4375 Z "
@@ -150,7 +150,7 @@
                                     <Grid Style="{StaticResource RowGrid}">
                                         <StackPanel Orientation="Horizontal">
                                             <TextBlock>
-                                                <Hyperlink NavigateUri="https://github.com/1Remote/PRemoteM/wiki" TextDecorations="{x:Null}" controls:HyperlinkHelper.IsOpenExternal="True">
+                                                <Hyperlink NavigateUri="https://1remote.github.io/usage/quick-start/" TextDecorations="{x:Null}" controls:HyperlinkHelper.IsOpenExternal="True">
                                                     How to use
                                                 </Hyperlink>
                                             </TextBlock>
@@ -191,7 +191,7 @@
 
                                             <Border Margin="4, 0" VerticalAlignment="Center" CornerRadius="4" Width="130" Background="#2f855a">
                                                 <TextBlock Margin="0">
-                                                        <Hyperlink NavigateUri="https://github.com/1Remote/PRemoteM/wiki/Buy-a-coffee" controls:HyperlinkHelper.IsOpenExternal="True" TextDecorations="">
+                                                        <Hyperlink NavigateUri="https://1remote.github.io/about/" controls:HyperlinkHelper.IsOpenExternal="True" TextDecorations="">
                                                             <Grid Width="130" Background="Transparent">
                                                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                                                     <Path Width="16" Height="16" Margin="2" Fill="White" Data="M4.25 2.5c-1.336 0-2.75 1.164-2.75 3 0 2.15 1.58 4.144 3.365 5.682A20.565 20.565 0 008 13.393a20.561 20.561 0 003.135-2.211C12.92 9.644 14.5 7.65 14.5 5.5c0-1.836-1.414-3-2.75-3-1.373 0-2.609.986-3.029 2.456a.75.75 0 01-1.442 0C6.859 3.486 5.623 2.5 4.25 2.5zM8 14.25l-.345.666-.002-.001-.006-.003-.018-.01a7.643 7.643 0 01-.31-.17 22.075 22.075 0 01-3.434-2.414C2.045 10.731 0 8.35 0 5.5 0 2.836 2.086 1 4.25 1 5.797 1 7.153 1.802 8 3.02 8.847 1.802 10.203 1 11.75 1 13.914 1 16 2.836 16 5.5c0 2.85-2.045 5.231-3.885 6.818a22.08 22.08 0 01-3.744 2.584l-.018.01-.006.003h-.002L8 14.25zm0 0l.345.666a.752.752 0 01-.69 0L8 14.25z" Stretch="Uniform"></Path>
@@ -217,22 +217,6 @@
                                         </StackPanel>
                                     </StackPanel>
                                 </StackPanel>
-                                <!--<StackPanel>
-                                    <Grid Style="{StaticResource RowGrid}">
-                                        <StackPanel Orientation="Horizontal">
-                                            <TextBlock>
-                                                <Hyperlink NavigateUri="https://github.com/1Remote/PRemoteM/issues" TextDecorations="{x:Null}" controls:HyperlinkHelper.IsOpenExternal="True">
-                                                    Bug report
-                                                </Hyperlink>
-                                            </TextBlock>
-                                            <TextBlock>
-                                                <Hyperlink NavigateUri="https://github.com/1Remote/PRemoteM" TextDecorations="{x:Null}" controls:HyperlinkHelper.IsOpenExternal="True">
-                                                    Github
-                                                </Hyperlink>
-                                            </TextBlock>
-                                        </StackPanel>
-                                    </Grid>
-                                </StackPanel>-->
                             </StackPanel>
                             <StackPanel Orientation="Vertical">
                                 <TextBlock Style="{StaticResource EditorGroupTextBlockTitle}" Text="Included Components"></TextBlock>
diff --git a/Ui/View/AboutPageViewModel.cs b/Ui/View/AboutPageViewModel.cs
index 74d77d41..fcc867d0 100644
--- a/Ui/View/AboutPageViewModel.cs
+++ b/Ui/View/AboutPageViewModel.cs
@@ -1,8 +1,9 @@
 using System.Timers;
-using System.Windows.Input;
 using PRM.Service;
 using Shawn.Utils;
 using Shawn.Utils.Wpf;
+using Shawn.Utils.Wpf.Controls;
+using Stylet;
 
 namespace PRM.View
 {
@@ -26,9 +27,6 @@ public AboutPageViewModel()
                 checker.CheckUpdateAsync();
             };
             checker.CheckUpdateAsync();
-
-
-            CurrentVersion = AppVersion.Version;
         }
 
         ~AboutPageViewModel()
@@ -37,7 +35,7 @@ public AboutPageViewModel()
             _checkUpdateTimer?.Dispose();
         }
 
-        public string CurrentVersion { get; }
+        public string CurrentVersion => AppVersion.Version;
 
 
         private string _newVersion = "";
@@ -48,17 +46,33 @@ public string NewVersion
         }
 
         private string _newVersionUrl = "";
-
         public string NewVersionUrl
         {
             get => _newVersionUrl;
             set => SetAndNotifyIfChanged(ref _newVersionUrl, value);
         }
 
-        private void OnNewVersionRelease(string version, string url)
+        private bool _isBreakingNewVersion;
+        public bool IsBreakingNewVersion
+        {
+            get => _isBreakingNewVersion;
+            set => SetAndNotifyIfChanged(ref _isBreakingNewVersion, value);
+        }
+
+        private void OnNewVersionRelease(string version, string url, bool b)
         {
             this.NewVersion = version;
             this.NewVersionUrl = url;
+            this.IsBreakingNewVersion = b;
+            var v = IoC.Get<ConfigurationService>().Engagement.BreakingChangeAlertVersion;
+            if (this.IsBreakingNewVersion
+                && VersionHelper.Version.FromString(version) > v)
+            {
+                Execute.OnUIThreadSync(() =>
+                {
+                    IoC.Get<IWindowManager>().ShowDialog(IoC.Get<BreakingChangeUpdateViewModel>());
+                });
+            }
         }
 
 
@@ -74,6 +88,29 @@ public RelayCommand CmdClose
             }
         }
 
+        private RelayCommand? _cmdUpdate;
+        public RelayCommand CmdUpdate
+        {
+            get
+            {
+                return _cmdUpdate ??= new RelayCommand((o) =>
+                {
+                    if (IsBreakingNewVersion)
+                    {
+                        IoC.Get<IWindowManager>().ShowDialog(IoC.Get<BreakingChangeUpdateViewModel>(), ownerViewModel: IoC.Get<MainWindowViewModel>());
+                    }
+                    else
+                    {
+#if FOR_MICROSOFT_STORE_ONLY
+                        HyperlinkHelper.OpenUriBySystem("ms-windows-store://review/?productid=9PNMNF92JNFP");
+#else
+                        HyperlinkHelper.OpenUriBySystem(NewVersionUrl);
+#endif
+                    }
+                });
+            }
+        }
+
         //public void SupportText_OnMouseRightButtonDown(object sender, MouseButtonEventArgs e)
         //{
         //    if (e.ClickCount == 3)
diff --git a/Ui/View/BreakingChangeUpdateView.xaml b/Ui/View/BreakingChangeUpdateView.xaml
new file mode 100644
index 00000000..c45b8342
--- /dev/null
+++ b/Ui/View/BreakingChangeUpdateView.xaml
@@ -0,0 +1,53 @@
+<styles:WindowChromeBase x:Class="PRM.View.BreakingChangeUpdateView"
+                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                  xmlns:styles="clr-namespace:Shawn.Utils.WpfResources.Theme.Styles;assembly=Shawn.Utils.WpfResources"
+                  xmlns:s="https://github.com/canton7/Stylet"
+                  xmlns:view="clr-namespace:PRM.View"
+                  mc:Ignorable="d"
+                  d:DataContext="{d:DesignInstance view:BreakingChangeUpdateViewModel}"
+                  ResizeMode="NoResize"
+                  WindowStyle="None"
+                  Background="Transparent"
+                  AllowsTransparency="True"
+                  ShowInTaskbar="False"
+                  Topmost="True"
+                  SizeToContent="WidthAndHeight">
+    <Grid MouseMove="WinTitleBar_OnPreviewMouseMove" Background="Transparent">
+        <Grid Background="Transparent" Margin="15">
+            <Border Background="{DynamicResource PrimaryMidBrush}" BorderBrush="{DynamicResource DefaultBorderBrush}" BorderThickness="1"
+                    VerticalAlignment="Center" HorizontalAlignment="Center" Width="600" CornerRadius="15">
+                <Border.Effect>
+                    <DropShadowEffect BlurRadius="10" Opacity="0.8" ></DropShadowEffect>
+                </Border.Effect>
+                <StackPanel HorizontalAlignment="Center" Margin="40 30 40 0">
+                    <Grid HorizontalAlignment="Center" Margin="0 0 0 10">
+                        <Image Source="/Resources/Image/Logo/logo64.png" Width="32" HorizontalAlignment="Left"></Image>
+                    </Grid>
+                    <TextBlock FontSize="16" Foreground="Red" 
+                               FontWeight="Black" Margin="5"
+                               HorizontalAlignment="Center"
+                               TextWrapping="Wrap" Text="Breaking Change Alert!"></TextBlock>
+                    <TextBlock FontSize="16" FontWeight="Black" HorizontalAlignment="Center">
+                        <Hyperlink Name="HyperlinkUpdate" Command="{Binding AboutPageViewModel.CmdUpdate}" TextDecorations="{x:Null}">
+                            <Grid>
+                                <TextBlock Name="TbNewVersion" Margin="0" Text="{Binding AboutPageViewModel.NewVersion}" Foreground="{Binding ElementName=HyperlinkUpdate, Path=Foreground}" />
+                            </Grid>
+                        </Hyperlink>
+                    </TextBlock>
+                    <StackPanel Margin="10">
+                        <TextBlock FontSize="18" Opacity="0.7" TextWrapping="Wrap" Foreground="{DynamicResource PrimaryTextBrush}" VerticalAlignment="Center"
+                                       Text="We have some breaking changes in the next version, please pay attention to backup your data before update." />
+                    </StackPanel>
+
+
+                    <StackPanel Margin="0 15 " VerticalAlignment="Bottom">
+                        <Button Command="{Binding CmdClose}" Content="{DynamicResource Dismiss}" Style="{DynamicResource ButtonPrimaryStyle}"></Button>
+                    </StackPanel>
+                </StackPanel>
+            </Border>
+        </Grid>
+    </Grid>
+</styles:WindowChromeBase>
\ No newline at end of file
diff --git a/Ui/View/BreakingChangeUpdateViewModel.cs b/Ui/View/BreakingChangeUpdateViewModel.cs
new file mode 100644
index 00000000..84384b39
--- /dev/null
+++ b/Ui/View/BreakingChangeUpdateViewModel.cs
@@ -0,0 +1,45 @@
+using PRM.Service;
+using PRM.Utils;
+using Shawn.Utils.Wpf;
+using Shawn.Utils.Wpf.Controls;
+
+namespace PRM.View
+{
+    /// <summary>
+    /// Default implementation of IMessageBoxViewModel, and is therefore the ViewModel shown by default by ShowMessageBox
+    /// </summary>
+    public class BreakingChangeUpdateViewModel : NotifyPropertyChangedBaseScreen
+    {
+        public AboutPageViewModel AboutPageViewModel => IoC.Get<AboutPageViewModel>();
+
+
+        private RelayCommand? _cmdUpdate;
+        public RelayCommand CmdUpdate
+        {
+            get
+            {
+                return _cmdUpdate ??= new RelayCommand((o) =>
+                {
+#if FOR_MICROSOFT_STORE_ONLY
+                        HyperlinkHelper.OpenUriBySystem("ms-windows-store://review/?productid=9PNMNF92JNFP");
+#else
+                    HyperlinkHelper.OpenUriBySystem(AboutPageViewModel.NewVersionUrl);
+#endif
+                });
+            }
+        }
+        private RelayCommand? _cmdClose;
+        public RelayCommand CmdClose
+        {
+            get
+            {
+                return _cmdClose ??= new RelayCommand((o) =>
+                {
+                    IoC.Get<ConfigurationService>().Engagement.BreakingChangeAlertVersionString = AboutPageViewModel.NewVersion;
+                    IoC.Get<ConfigurationService>().Save();
+                    this.RequestClose(true);
+                });
+            }
+        }
+    }
+}
diff --git a/Ui/View/Editor/Forms/RdpAppForm.xaml b/Ui/View/Editor/Forms/RdpAppForm.xaml
index 8ccade64..999990ab 100644
--- a/Ui/View/Editor/Forms/RdpAppForm.xaml
+++ b/Ui/View/Editor/Forms/RdpAppForm.xaml
@@ -80,7 +80,7 @@
                     <StackPanel>
                         <TextBlock TextWrapping="Wrap" Foreground="{DynamicResource BackgroundTextBrush}" Text="Note: You can not register a RemoteApp directly, you have to config it on the server side first, or you will get the error 'The following RemoteApp program is not in the list of authorized programs'."></TextBlock>
                         <TextBlock>
-                                <Hyperlink NavigateUri="https://github.com/1Remote/PRemoteM/wiki/%5BProtocol%5D-RemoteApp#how-to-use" TextDecorations="{x:Null}" controls:HyperlinkHelper.IsOpenExternal="True">
+                                <Hyperlink NavigateUri="https://1remote.github.io/usage/protocol/especial/remoteapp/" TextDecorations="{x:Null}" controls:HyperlinkHelper.IsOpenExternal="True">
                                     check how to config.
                                 </Hyperlink>
                         </TextBlock>
diff --git a/Ui/View/Editor/Forms/RdpForm.xaml b/Ui/View/Editor/Forms/RdpForm.xaml
index 69fde9d7..10415cbd 100644
--- a/Ui/View/Editor/Forms/RdpForm.xaml
+++ b/Ui/View/Editor/Forms/RdpForm.xaml
@@ -112,7 +112,7 @@
                                 </Style.Triggers>
                             </Style>
                         </TextBlock.Style>
-                        <Hyperlink NavigateUri="https://github.com/1Remote/PRemoteM/wiki/%5BProtocol%5D-RDP-in-mstsc.exe-mode#additional-settings" TextDecorations="{x:Null}" 
+                        <Hyperlink NavigateUri="https://1remote.github.io/usage/protocol/especial/rdp-in-mstsc-mode/#additional-settings#additional-settings" TextDecorations="{x:Null}" 
                                    controls1:HyperlinkHelper.IsOpenExternal="True">
                             (?)
                         </Hyperlink>
@@ -338,7 +338,7 @@
                             <StackPanel Orientation="Horizontal">
                                 <TextBlock TextWrapping="Wrap" Margin="0 0 5 0">
                                     <Run Text="{DynamicResource Enabled}"></Run>
-                                    <Hyperlink NavigateUri="https://github.com/1Remote/PRemoteM/wiki/%5BProtocol%5D-RDP-in-mstsc.exe-mode" TextDecorations="{x:Null}" 
+                                    <Hyperlink NavigateUri="https://1remote.github.io/usage/protocol/especial/rdp-in-mstsc-mode/#additional-settings" TextDecorations="{x:Null}" 
                                                controls1:HyperlinkHelper.IsOpenExternal="True">
                                         (?)
                                     </Hyperlink>
@@ -440,7 +440,7 @@
                             </Grid>
 
                             <TextBlock VerticalAlignment="Top" Margin="2 0">
-                                <Hyperlink NavigateUri="https://github.com/1Remote/PRemoteM/wiki/%5BProtocol%5D-RDP-in-mstsc.exe-mode#additional-settings" TextDecorations="{x:Null}" 
+                                <Hyperlink NavigateUri="https://1remote.github.io/usage/protocol/especial/rdp-in-mstsc-mode/#additional-settings#additional-settings" TextDecorations="{x:Null}" 
                                            controls1:HyperlinkHelper.IsOpenExternal="True">
                                     (?)
                                 </Hyperlink>
diff --git a/Ui/View/Editor/Forms/VncForm.xaml b/Ui/View/Editor/Forms/VncForm.xaml
index 230decc9..ca228725 100644
--- a/Ui/View/Editor/Forms/VncForm.xaml
+++ b/Ui/View/Editor/Forms/VncForm.xaml
@@ -68,7 +68,7 @@
                         <StackPanel>
                             <TextBlock TextWrapping="WrapWithOverflow" Foreground="{DynamicResource AccentMidBrush}">
                                 <Run>Caution: RFB protocol over 3.8 are proprietary. If you would like using RFB 3.8+, you have to try your own VNC runner:</Run>
-                                <Hyperlink NavigateUri="https://github.com/1Remote/PRemoteM/wiki/%5BProtocol%5D--Protocol-Runners" TextDecorations="{x:Null}" controls:HyperlinkHelper.IsOpenExternal="True">
+                                <Hyperlink NavigateUri="https://1remote.github.io/usage/protocol/runner/" TextDecorations="{x:Null}" controls:HyperlinkHelper.IsOpenExternal="True">
                                     [More details]
                                 </Hyperlink>
                             </TextBlock>
diff --git a/Ui/View/ErrorReport/ErrorReportWindow.xaml b/Ui/View/ErrorReport/ErrorReportWindow.xaml
index 2d2744ef..5c3c8113 100644
--- a/Ui/View/ErrorReport/ErrorReportWindow.xaml
+++ b/Ui/View/ErrorReport/ErrorReportWindow.xaml
@@ -131,7 +131,7 @@
                         <Button Margin="10 5" Padding="0" Width="150" Height="40"
                                                    HorizontalAlignment="Center" HorizontalContentAlignment="Left"
                                                    Click="ButtonSendByGithub_OnClick"
-                                                   ToolTip="https://github.com/1Remote/PRemoteM/issues"
+                                                   ToolTip="https://github.com/1Remote/1Remote/issues"
                                                    BorderThickness="1">
                             <StackPanel Orientation="Horizontal">
                                 <Path Margin="5 0" Width="16" Height="16" Data="M524.979332 0C234.676191 0 0 234.676191 0 524.979332c0 232.068678 150.366597 428.501342 358.967656 498.035028 26.075132 5.215026 35.636014-11.299224 35.636014-25.205961 0-12.168395-0.869171-53.888607-0.869171-97.347161-146.020741 31.290159-176.441729-62.580318-176.441729-62.580318-23.467619-60.841976-58.234462-76.487055-58.234463-76.487055-47.804409-32.15933 3.476684-32.15933 3.476685-32.15933 53.019436 3.476684 80.83291 53.888607 80.83291 53.888607 46.935238 79.963739 122.553122 57.365291 152.97411 43.458554 4.345855-33.897672 18.252593-57.365291 33.028501-70.402857-116.468925-12.168395-239.022047-57.365291-239.022047-259.012982 0-57.365291 20.860106-104.300529 53.888607-140.805715-5.215026-13.037566-23.467619-66.926173 5.215027-139.067372 0 0 44.327725-13.906737 144.282399 53.888607 41.720212-11.299224 86.917108-17.383422 131.244833-17.383422s89.524621 6.084198 131.244833 17.383422C756.178839 203.386032 800.506564 217.29277 800.506564 217.29277c28.682646 72.1412 10.430053 126.029806 5.215026 139.067372 33.897672 36.505185 53.888607 83.440424 53.888607 140.805715 0 201.64769-122.553122 245.975415-239.891218 259.012982 19.121764 16.514251 35.636014 47.804409 35.636015 97.347161 0 70.402857-0.869171 126.898978-0.869172 144.282399 0 13.906737 9.560882 30.420988 35.636015 25.205961 208.601059-69.533686 358.967656-265.96635 358.967655-498.035028C1049.958663 234.676191 814.413301 0 524.979332 0z"
diff --git a/Ui/View/ErrorReport/ErrorReportWindow.xaml.cs b/Ui/View/ErrorReport/ErrorReportWindow.xaml.cs
index 34fbff85..fc20b5ca 100644
--- a/Ui/View/ErrorReport/ErrorReportWindow.xaml.cs
+++ b/Ui/View/ErrorReport/ErrorReportWindow.xaml.cs
@@ -170,7 +170,7 @@ private void ButtonSendByGithub_OnClick(object sender, RoutedEventArgs e)
         {
             try
             {
-                HyperlinkHelper.OpenUriBySystem("https://github.com/1Remote/PRemoteM/issues");
+                HyperlinkHelper.OpenUriBySystem("https://github.com/1Remote/1Remote/issues");
             }
             catch
             {
diff --git a/Ui/View/Guidance/GuidanceWindow.xaml b/Ui/View/Guidance/GuidanceWindow.xaml
index 84baedcd..08668fc3 100644
--- a/Ui/View/Guidance/GuidanceWindow.xaml
+++ b/Ui/View/Guidance/GuidanceWindow.xaml
@@ -141,7 +141,7 @@
                           Height="20" Width="150" />
             </StackPanel>
             <TextBlock>
-                <Hyperlink controls:HyperlinkHelper.IsOpenExternal="True" NavigateUri="https://github.com/1Remote/PRemoteM/wiki/Help-wanted-Translation" FontSize="10">
+                <Hyperlink controls:HyperlinkHelper.IsOpenExternal="True" NavigateUri="https://1remote.github.io/usage/misc/help-translation/" FontSize="10">
                     <Hyperlink.Style>
                         <Style TargetType="{x:Type Hyperlink}">
                             <Setter Property="Foreground" Value="{DynamicResource AccentMidBrush}"></Setter>
diff --git a/Ui/View/Guidance/Intro.xaml b/Ui/View/Guidance/Intro.xaml
index 927712d9..dbe4820b 100644
--- a/Ui/View/Guidance/Intro.xaml
+++ b/Ui/View/Guidance/Intro.xaml
@@ -52,7 +52,7 @@
                 </Grid>
                 <TextBlock HorizontalAlignment="Center" FontSize="24" Foreground="{DynamicResource PrimaryTextBrush}" Text="{x:Static prm:Assert.APP_NAME}"></TextBlock>
                 <TextBlock HorizontalAlignment="Center" FontSize="10" Foreground="{DynamicResource PrimaryTextBrush}">
-                    <Hyperlink controls:HyperlinkHelper.IsOpenExternal="True" NavigateUri="https://github.com/1Remote/PRemoteM">https://github.com/1Remote/PRemoteM</Hyperlink>
+                    <Hyperlink controls:HyperlinkHelper.IsOpenExternal="True" NavigateUri="https://github.com/1Remote/1Remote">https://github.com/1Remote/1Remote</Hyperlink>
                 </TextBlock>
             </StackPanel>
         </Grid>
diff --git a/Ui/View/RequestRatingView.xaml b/Ui/View/RequestRatingView.xaml
index 92ecb0e4..9728c420 100644
--- a/Ui/View/RequestRatingView.xaml
+++ b/Ui/View/RequestRatingView.xaml
@@ -39,7 +39,7 @@
                         </StackPanel.Resources>
                         <Border Margin="4, 0" VerticalAlignment="Center" CornerRadius="4" Width="130" Background="#e53e3e">
                             <TextBlock>
-                                    <Hyperlink NavigateUri="https://github.com/1Remote/PRemoteM/issues/" controls:HyperlinkHelper.IsOpenExternal="True" TextDecorations="">
+                                    <Hyperlink NavigateUri="https://github.com/1Remote/1Remote/issues/" controls:HyperlinkHelper.IsOpenExternal="True" TextDecorations="">
                                         <Grid Width="130" Background="Transparent">
                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                                 <Path Width="16" Height="16" Margin="2" Fill="White" Data="M524.979332 0C234.676191 0 0 234.676191 0 524.979332c0 232.068678 150.366597 428.501342 358.967656 498.035028 26.075132 5.215026 35.636014-11.299224 35.636014-25.205961 0-12.168395-0.869171-53.888607-0.869171-97.347161-146.020741 31.290159-176.441729-62.580318-176.441729-62.580318-23.467619-60.841976-58.234462-76.487055-58.234463-76.487055-47.804409-32.15933 3.476684-32.15933 3.476685-32.15933 53.019436 3.476684 80.83291 53.888607 80.83291 53.888607 46.935238 79.963739 122.553122 57.365291 152.97411 43.458554 4.345855-33.897672 18.252593-57.365291 33.028501-70.402857-116.468925-12.168395-239.022047-57.365291-239.022047-259.012982 0-57.365291 20.860106-104.300529 53.888607-140.805715-5.215026-13.037566-23.467619-66.926173 5.215027-139.067372 0 0 44.327725-13.906737 144.282399 53.888607 41.720212-11.299224 86.917108-17.383422 131.244833-17.383422s89.524621 6.084198 131.244833 17.383422C756.178839 203.386032 800.506564 217.29277 800.506564 217.29277c28.682646 72.1412 10.430053 126.029806 5.215026 139.067372 33.897672 36.505185 53.888607 83.440424 53.888607 140.805715 0 201.64769-122.553122 245.975415-239.891218 259.012982 19.121764 16.514251 35.636014 47.804409 35.636015 97.347161 0 70.402857-0.869171 126.898978-0.869172 144.282399 0 13.906737 9.560882 30.420988 35.636015 25.205961 208.601059-69.533686 358.967656-265.96635 358.967655-498.035028C1049.958663 234.676191 814.413301 0 524.979332 0z" Stretch="Uniform"></Path>
@@ -52,7 +52,7 @@
 
                         <Border Margin="4, 0" VerticalAlignment="Center" CornerRadius="4" Width="130" Background="#2f855a">
                             <TextBlock>
-                                    <Hyperlink NavigateUri="https://github.com/1Remote/PRemoteM/wiki/Buy-a-coffee" controls:HyperlinkHelper.IsOpenExternal="True" TextDecorations="">
+                                    <Hyperlink NavigateUri="https://1remote.github.io/about/" controls:HyperlinkHelper.IsOpenExternal="True" TextDecorations="">
                                         <Grid Width="130" Background="Transparent">
                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                                 <Path Width="16" Height="16" Margin="2" Fill="White" Data="M4.25 2.5c-1.336 0-2.75 1.164-2.75 3 0 2.15 1.58 4.144 3.365 5.682A20.565 20.565 0 008 13.393a20.561 20.561 0 003.135-2.211C12.92 9.644 14.5 7.65 14.5 5.5c0-1.836-1.414-3-2.75-3-1.373 0-2.609.986-3.029 2.456a.75.75 0 01-1.442 0C6.859 3.486 5.623 2.5 4.25 2.5zM8 14.25l-.345.666-.002-.001-.006-.003-.018-.01a7.643 7.643 0 01-.31-.17 22.075 22.075 0 01-3.434-2.414C2.045 10.731 0 8.35 0 5.5 0 2.836 2.086 1 4.25 1 5.797 1 7.153 1.802 8 3.02 8.847 1.802 10.203 1 11.75 1 13.914 1 16 2.836 16 5.5c0 2.85-2.045 5.231-3.885 6.818a22.08 22.08 0 01-3.744 2.584l-.018.01-.006.003h-.002L8 14.25zm0 0l.345.666a.752.752 0 01-.69 0L8 14.25z" Stretch="Uniform"></Path>
diff --git a/Ui/View/Settings/ProtocolConfig/ExternalRunnerSettings.xaml b/Ui/View/Settings/ProtocolConfig/ExternalRunnerSettings.xaml
index ae6b6887..07a0bb5a 100644
--- a/Ui/View/Settings/ProtocolConfig/ExternalRunnerSettings.xaml
+++ b/Ui/View/Settings/ProtocolConfig/ExternalRunnerSettings.xaml
@@ -161,7 +161,7 @@
                     </Hyperlink>
                     </TextBlock>
                     <TextBlock VerticalAlignment="Center" Margin="2 0">
-                    <Hyperlink NavigateUri="https://github.com/1Remote/PRemoteM/wiki/%5BProtocol%5D--Protocol-Runners" TextDecorations="{x:Null}" 
+                    <Hyperlink NavigateUri="https://1remote.github.io/usage/protocol/runner/" TextDecorations="{x:Null}" 
                                controls1:HyperlinkHelper.IsOpenExternal="True">
                         (?)
                     </Hyperlink>
diff --git a/Ui/View/Settings/ProtocolConfig/ExternalRunnerSettingsViewModel.cs b/Ui/View/Settings/ProtocolConfig/ExternalRunnerSettingsViewModel.cs
index 18038c78..d7b7ca2e 100644
--- a/Ui/View/Settings/ProtocolConfig/ExternalRunnerSettingsViewModel.cs
+++ b/Ui/View/Settings/ProtocolConfig/ExternalRunnerSettingsViewModel.cs
@@ -155,7 +155,7 @@ public RelayCommand CmdCopyJsonAndShare
                         );
                     if (MessageBoxHelper.Confirm($"You runner({ExternalRunner.Name}) is copied to clipboard, do you want to share to Github?", "Share "))
                     {
-                        HyperlinkHelper.OpenUriBySystem("https://github.com/1Remote/PRemoteM/wiki/Share-your-favorite-runner");
+                        HyperlinkHelper.OpenUriBySystem("https://github.com/1Remote/1Remote/issues/new?assignees=VShawn&labels=area-config&template=runner_sharing.md&title=");
                     }
                 }
                 catch
diff --git a/Ui/View/Settings/ProtocolConfig/ExternalSshRunnerSettings.xaml b/Ui/View/Settings/ProtocolConfig/ExternalSshRunnerSettings.xaml
index a3f42a1d..e3a767fb 100644
--- a/Ui/View/Settings/ProtocolConfig/ExternalSshRunnerSettings.xaml
+++ b/Ui/View/Settings/ProtocolConfig/ExternalSshRunnerSettings.xaml
@@ -168,7 +168,7 @@
                     </Hyperlink>
                     </TextBlock>
                     <TextBlock VerticalAlignment="Center" Margin="2 0">
-                    <Hyperlink NavigateUri="https://github.com/1Remote/PRemoteM/wiki/%5BProtocol%5D--Protocol-Runners" TextDecorations="{x:Null}" 
+                    <Hyperlink NavigateUri="https://1remote.github.io/usage/protocol/runner/" TextDecorations="{x:Null}" 
                                controls1:HyperlinkHelper.IsOpenExternal="True">
                         (?)
                     </Hyperlink>
@@ -226,7 +226,7 @@
                     </Hyperlink>
                     </TextBlock>
                     <TextBlock VerticalAlignment="Center" Margin="2 0">
-                    <Hyperlink NavigateUri="https://github.com/1Remote/PRemoteM/wiki/%5BProtocol%5D--Protocol-Runners" TextDecorations="{x:Null}" 
+                    <Hyperlink NavigateUri="https://1remote.github.io/usage/protocol/runner/" TextDecorations="{x:Null}" 
                                controls1:HyperlinkHelper.IsOpenExternal="True">
                         (?)
                     </Hyperlink>
diff --git a/Ui/View/Settings/SettingsPageView.xaml b/Ui/View/Settings/SettingsPageView.xaml
index 80195588..c98a6bcc 100644
--- a/Ui/View/Settings/SettingsPageView.xaml
+++ b/Ui/View/Settings/SettingsPageView.xaml
@@ -157,7 +157,7 @@
                         <TextBlock Grid.Column="1" Margin="0 0 0 0" TextAlignment="Left" TextWrapping="WrapWithOverflow">
                             <Hyperlink controls:HyperlinkHelper.IsOpenExternal="True"
                                        MouseRightButtonDown="ContentElement_OnMouseRightButtonDown"
-                                       NavigateUri="https://github.com/1Remote/PRemoteM/wiki/Help-wanted-Translation" FontSize="12">
+                                       NavigateUri="https://1remote.github.io/usage/misc/help-translation/" FontSize="12">
                                 <Hyperlink.Style>
                                     <Style TargetType="{x:Type Hyperlink}">
                                         <Setter Property="Foreground" Value="{DynamicResource AccentMidBrush}"></Setter>