diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..49466de3
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "dotnet.preferCSharpExtension": true
+}
diff --git a/RepoZ.Api.Common/RepoZ.Api.Common.csproj b/RepoZ.Api.Common/RepoZ.Api.Common.csproj
index 8c06305b..1f1da565 100644
--- a/RepoZ.Api.Common/RepoZ.Api.Common.csproj
+++ b/RepoZ.Api.Common/RepoZ.Api.Common.csproj
@@ -1,14 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-	<ReleaseVersion>4.0</ReleaseVersion>
-    <Version>1.0.0.0</Version>
+    <ReleaseVersion>4.0</ReleaseVersion>
+    <Version>3.0.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="LibGit2Sharp" Version="0.25.4" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="LibGit2Sharp" Version="0.30.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/RepoZ.Api.Win/RepoZ.Api.Win.csproj b/RepoZ.Api.Win/RepoZ.Api.Win.csproj
index aa8cbd51..a54c9b67 100644
--- a/RepoZ.Api.Win/RepoZ.Api.Win.csproj
+++ b/RepoZ.Api.Win/RepoZ.Api.Win.csproj
@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-	<ReleaseVersion>1.0</ReleaseVersion>
-    <Version>1.0.0.0</Version>
+    <ReleaseVersion>1.0</ReleaseVersion>
+    <Version>3.0.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Security.Permissions" Version="5.0.0" />
+    <PackageReference Include="System.Security.Permissions" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/RepoZ.Api/RepoZ.Api.csproj b/RepoZ.Api/RepoZ.Api.csproj
index 26eac4c7..22fcf47d 100644
--- a/RepoZ.Api/RepoZ.Api.csproj
+++ b/RepoZ.Api/RepoZ.Api.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
 	<ReleaseVersion>4.0</ReleaseVersion>
-    <Version>1.0.0.0</Version>
+    <Version>3.0.0.0</Version>
   </PropertyGroup>
 
 </Project>
diff --git a/RepoZ.App.Win/App.config b/RepoZ.App.Win/App.config
index 731f6de6..283eb8db 100644
--- a/RepoZ.App.Win/App.config
+++ b/RepoZ.App.Win/App.config
@@ -1,6 +1,26 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
     </startup>
-</configuration>
\ No newline at end of file
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="ControlzEx" publicKeyToken="69f1c32f803d307e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/RepoZ.App.Win/App.xaml b/RepoZ.App.Win/App.xaml
index 5ddbc5e5..c44d9373 100644
--- a/RepoZ.App.Win/App.xaml
+++ b/RepoZ.App.Win/App.xaml
@@ -1,110 +1,87 @@
-<Application x:Class="RepoZ.App.Win.App"
-			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-			 xmlns:local="clr-namespace:RepoZ.App.Win"
-			 xmlns:controls="clr-namespace:RepoZ.App.Win.Controls"
-			 ShutdownMode="OnExplicitShutdown">
-	<Application.Resources>
-
-		<!--
+<Application
+    x:Class="RepoZ.App.Win.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:RepoZ.App.Win.Controls"
+    xmlns:local="clr-namespace:RepoZ.App.Win"
+    xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    ShutdownMode="OnExplicitShutdown"
+    >
+    <Application.Resources>
+
+        <!--
             Note that this application does not have a StartupUri declared, so no Window is automatically loaded.
             Also, the ShutdownMode was set to explicit, so we have to close the application programmatically
         -->
 
-		<ResourceDictionary>
+        <ResourceDictionary>
 
-			<!--
+            <!--
                 Integrate MahApps to Material Design Toolkit
                 https://github.com/ButchersBoy/MaterialDesignInXamlToolkit/wiki/MahApps.Metro-integration
             -->
 
-			<ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary.MergedDictionaries>
 
-				<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Blue.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Blue.xaml" />
 
+                <!--  MahApps  -->
 
-				<!-- MahApps -->
+                <!--  Material Design  -->
+                <materialDesign:BundledTheme
+                    BaseTheme="Inherit"
+                    PrimaryColor="LightBlue"
+                    SecondaryColor="LightBlue"
+                    />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.Defaults.xaml" />
 
-				<!-- Material Design -->
-				<!--<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />-->
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Dark.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.LightBlue.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.LightBlue.xaml" />
+                <!--  Material Design: MahApps Compatibility  -->
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Fonts.xaml" />
+                <!-- CRASHES?! <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Flyout.xaml" />-->
 
-				<!-- Material Design: MahApps Compatibility -->
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Fonts.xaml" />
-				<!-- CRASHES?! <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Flyout.xaml" />-->
+                <!--  merge NotifyIcon and related stuff into the application  -->
+                <ResourceDictionary Source="NotifyIconResources.xaml" />
 
-				<!-- merge NotifyIcon and related stuff into the application -->
-				<ResourceDictionary Source="NotifyIconResources.xaml" />
+            </ResourceDictionary.MergedDictionaries>
 
-			</ResourceDictionary.MergedDictionaries>
+            <!--  MahApps Brushes  -->
 
-			<!-- MahApps Brushes -->
+            <!--  Light/Dark MaterialDesign themes to MahApps  -->
+            <!--  WindowTitleColorBrush		= MaterialDesignPaper  -->
+            <!--  IdealForegroundColorBrush	= MaterialDesignBody  -->
 
-			<!-- Light/Dark MaterialDesign themes to MahApps -->
-			<!--   WindowTitleColorBrush		= MaterialDesignPaper -->
-			<!--   IdealForegroundColorBrush	= MaterialDesignBody -->
-
-			<!-- Light -->
-			<!--
+            <!--  Light  -->
+            <!--
 			<SolidColorBrush x:Key="WindowTitleColorBrush" Color="#FFfafafa"/>
 			<SolidColorBrush x:Key="IdealForegroundColorBrush" Color="#DD000000"/>
 			-->
 
-			<!-- Dark -->
-			<SolidColorBrush x:Key="WindowTitleColorBrush"
-							 Color="#FF303030" />
-			<SolidColorBrush x:Key="IdealForegroundColorBrush"
-							 Color="#DDFFFFFF" />
-
-			<SolidColorBrush x:Key="HighlightBrush"
-							 Color="{DynamicResource Primary700}" />
-			<SolidColorBrush x:Key="AccentColorBrush"
-							 Color="{DynamicResource Primary500}" />
-			<!-- main accent -->
-			<SolidColorBrush x:Key="AccentColorBrush2"
-							 Color="{DynamicResource Primary400}" />
-			<SolidColorBrush x:Key="AccentColorBrush3"
-							 Color="{DynamicResource Primary300}" />
-			<SolidColorBrush x:Key="AccentColorBrush4"
-							 Color="{DynamicResource Primary200}" />
-			<SolidColorBrush x:Key="AccentSelectedColorBrush"
-							 Color="{DynamicResource Primary500Foreground}" />
-			<LinearGradientBrush x:Key="ProgressBrush"
-								 EndPoint="0.001,0.5"
-								 StartPoint="1.002,0.5">
-				<GradientStop Color="{DynamicResource Primary700}"
-							  Offset="0" />
-				<GradientStop Color="{DynamicResource Primary300}"
-							  Offset="1" />
-			</LinearGradientBrush>
-			<SolidColorBrush x:Key="CheckmarkFill"
-							 Color="{DynamicResource Primary500}" />
-			<SolidColorBrush x:Key="RightArrowFill"
-							 Color="{DynamicResource Primary500}" />
-			<SolidColorBrush x:Key="IdealForegroundDisabledBrush"
-							 Color="{DynamicResource Primary500}"
-							 Opacity="0.4" />
-
-			<Style TargetType="{x:Type controls:ZTextBox}" BasedOn="{StaticResource {x:Type TextBox}}" />
-
-			<Style TargetType="{x:Type controls:AcrylicContextMenu}" BasedOn="{StaticResource {x:Type ContextMenu}}" >
-				<Setter Property="Background" Value="#50000000" />
-				<Setter Property="FontSize" Value="13.5" />
-
-			</Style>
-
-
-			<Style TargetType="{x:Type controls:AcrylicMenuItem}" BasedOn="{StaticResource {x:Type MenuItem}}" >
-				<Setter Property="Background" Value="Transparent"/>
-			</Style>
-
-		</ResourceDictionary>
-
-	</Application.Resources>
+            <!--  Dark  -->
+            <SolidColorBrush x:Key="WindowTitleColorBrush" Color="#FF303030" />
+            <SolidColorBrush x:Key="IdealForegroundColorBrush" Color="#DDFFFFFF" />
+
+            <!--  Repo Name colour  -->
+            <SolidColorBrush x:Key="AccentColorBrush" Color="{DynamicResource Theme.PrimaryAccentColor}" />
+
+
+            <Style BasedOn="{StaticResource {x:Type TextBox}}" TargetType="{x:Type controls:ZTextBox}" />
+
+            <Style BasedOn="{StaticResource {x:Type ContextMenu}}" TargetType="{x:Type controls:AcrylicContextMenu}">
+                <Setter Property="Background" Value="#50000000" />
+                <Setter Property="FontSize" Value="13.5" />
+
+            </Style>
+
+
+            <Style BasedOn="{StaticResource {x:Type MenuItem}}" TargetType="{x:Type controls:AcrylicMenuItem}">
+                <Setter Property="Background" Value="Transparent" />
+            </Style>
+
+        </ResourceDictionary>
+
+    </Application.Resources>
 
 </Application>
diff --git a/RepoZ.App.Win/App.xaml.cs b/RepoZ.App.Win/App.xaml.cs
index 9aa57806..6fa727c3 100644
--- a/RepoZ.App.Win/App.xaml.cs
+++ b/RepoZ.App.Win/App.xaml.cs
@@ -1,9 +1,10 @@
-using System;
+using System;
 using System.Data;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using Hardcodet.Wpf.TaskbarNotification;
 using RepoZ.Api.Common;
 using RepoZ.Api.Common.Git;
 using RepoZ.Api.Common.IO;
@@ -11,6 +12,8 @@
 using RepoZ.Api.IO;
 using RepoZ.Api.Win.IO;
 using RepoZ.Api.Win.PInvoke.Explorer;
+using RepoZ.App.Win.i18n;
+using RepoZ.Ipc;
 using TinyIoC;
 using Hardcodet.Wpf.TaskbarNotification;
 using TinySoup.Model;
@@ -58,7 +61,7 @@ protected override void OnStartup(StartupEventArgs e)
 
 			Application.Current.Resources.MergedDictionaries[0] = ResourceDictionaryTranslationService.ResourceDictionary;
 
-			_notifyIcon = (TaskbarIcon)FindResource("NotifyIcon");
+            _notifyIcon = (TaskbarIcon) FindResource("NotifyIcon");
 
 			var container = TinyIoCContainer.Current;
 
@@ -179,8 +182,8 @@ private async Task CheckForUpdatesAsync()
 
 			AvailableUpdate = updates.FirstOrDefault();
 
-			_updateTimer.Change((int)TimeSpan.FromHours(2).TotalMilliseconds, Timeout.Infinite);
-		}
+            _updateTimer.Change((int) TimeSpan.FromHours(2).TotalMilliseconds, Timeout.Infinite);
+        }
 
 		protected static void RefreshTimerCallback(object state)
 		{
diff --git a/RepoZ.App.Win/MainWindow.xaml b/RepoZ.App.Win/MainWindow.xaml
index f7606861..c69a483b 100644
--- a/RepoZ.App.Win/MainWindow.xaml
+++ b/RepoZ.App.Win/MainWindow.xaml
@@ -1,237 +1,290 @@
-<Window x:Class="RepoZ.App.Win.MainWindow"
-						xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-						xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-						xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-						xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-						xmlns:fw="clr-namespace:SourceChord.FluentWPF;assembly=FluentWPF"
-						mc:Ignorable="d"
-						xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-						xmlns:controls="clr-namespace:RepoZ.App.Win.Controls"
-						xmlns:converters="clr-namespace:RepoZ.App.Win.Converters"
-						TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-						TextElement.FontWeight="Regular"
-						TextElement.FontSize="12"
-						TextOptions.TextFormattingMode="Ideal"
-						TextOptions.TextRenderingMode="Auto"
-						BorderThickness="0"
-						Title="RepoZ"
-						Height="540"
-						Width="350"
-						ShowInTaskbar="False"
-						fw:AcrylicWindow.TintColor="#101010"
-						fw:AcrylicWindow.FallbackColor="#303030"
-						fw:AcrylicWindow.TintOpacity="0.7"
-						fw:AcrylicWindow.Enabled="True">
-	<Window.Resources>
-		<converters:UtcToHumanizedLocalDateTimeConverter x:Key="UtcToHumanizedLocalDateTimeConverter" />
-	</Window.Resources>
-	<Grid Margin="12" 
-		  Focusable="False">
-
-		<materialDesign:Transitioner Name="transitionerMain"
-									 SelectedIndex="0"
-									 Focusable="False">
-
-			<Grid>
-				<TextBlock x:Name="tbNoRepositories"
-						   Text="{DynamicResource EmptyHint}"
-						   TextWrapping="Wrap"
-						   FontSize="15"
-						   HorizontalAlignment="Center"
-						   VerticalAlignment="Center"
-						   TextAlignment="Center"
-						   Focusable="False"
-						   Foreground="Gray">
-				</TextBlock>
-
-				<DockPanel x:Name="dockMain"
-						   Focusable="False">
-					<Grid
-						Focusable="False"
-						DockPanel.Dock="Top">
-						<Grid.RowDefinitions>
-							<RowDefinition Height="*" />
-						</Grid.RowDefinitions>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="Auto" />
-							<ColumnDefinition Width="Auto" />
-						</Grid.ColumnDefinitions>
-						<Grid 
-							HorizontalAlignment="Stretch"
-							Focusable="False" 
-							Grid.Column="0"
-							>
-							<controls:ZTextBox x:Name="txtFilter"
-										   TextChanged="txtFilter_TextChanged"
-										   FontSize="17"
-										   VerticalAlignment="Top"
-										   Finish="txtFilter_Finish">
-							</controls:ZTextBox>
-
-							<TextBlock IsHitTestVisible="False"
-								   Text="{DynamicResource SearchWin}"
-								   VerticalAlignment="Center"
-								   FontSize="15"
-								   HorizontalAlignment="Left"
-								   Focusable="False"
-								   Foreground="Gray">
-								<TextBlock.Style>
-									<Style TargetType="{x:Type TextBlock}">
-										<Setter Property="Visibility"
-											Value="Collapsed" />
-										<Style.Triggers>
-											<DataTrigger Binding="{Binding Text, ElementName=txtFilter}"
-													 Value="">
-												<Setter Property="Visibility"
-													Value="Visible" />
-											</DataTrigger>
-										</Style.Triggers>
-									</Style>
-								</TextBlock.Style>
-							</TextBlock>
-
-						</Grid>
-						<Button 
-							Name="MenuButton" 
-							Click="MenuButton_Click"
-							Content="☰" 
-							HorizontalAlignment="Center"
-							Padding="0"
-							VerticalAlignment="Center" 
-							Width="32" 
-							Cursor="Arrow" 
-							FontSize="17"
-							Background="#00FFF0F0"
-							Margin="10,0,0,0"
-							Grid.Column="1"
-							Foreground="{DynamicResource MaterialDesignBody}"
-							Style="{DynamicResource MaterialDesignFlatButton}">
-							<Button.ContextMenu>
-								<controls:AcrylicContextMenu x:Name="SettingsMenu" >
-
-									<controls:AcrylicMenuItem Header="{DynamicResource ManageRepos}"  >
-										<controls:AcrylicMenuItem Header="{DynamicResource ScanComputer}" Click="ScanButton_Click" x:Name="ScanMenuItem"/>
-										<controls:AcrylicMenuItem Header="{DynamicResource Clear}" Click="ClearButton_Click"/>
-										<Separator/>
-										<controls:AcrylicMenuItem Header="{DynamicResource CustomizeRepositoryActions}" Click="CustomizeContextMenu_Click" />
-										<Separator/>
-										<controls:AcrylicMenuItem Header="{DynamicResource ResetIgnoreRules}" Click="ResetIgnoreRulesButton_Click" />
-									</controls:AcrylicMenuItem>
-
-									<controls:AcrylicMenuItem Header="{DynamicResource AutoFetch}" x:Name="AutoFetchMenuItem" >
-										<controls:AcrylicMenuItem Header="{DynamicResource Off}" IsCheckable="True" IsChecked="{Binding AutoFetchOff}"/>
-										<Separator/>
-										<controls:AcrylicMenuItem Header="{DynamicResource Discretely}" IsCheckable="True" IsChecked="{Binding AutoFetchDiscretely}"/>
-										<controls:AcrylicMenuItem Header="{DynamicResource Adequate}" IsCheckable="True" IsChecked="{Binding AutoFetchAdequate}"/>
-										<controls:AcrylicMenuItem Header="{DynamicResource Aggresive}" IsCheckable="True" IsChecked="{Binding AutoFetchAggresive}"/>
-									</controls:AcrylicMenuItem>
-
-									<controls:AcrylicMenuItem Header="{DynamicResource Advanced}" >
-										<controls:AcrylicMenuItem Header="{DynamicResource PruneOnFetch}" IsCheckable="True" IsChecked="{Binding PruneOnFetch}" />
-									</controls:AcrylicMenuItem>
-
-									<Separator/>
-
-									<controls:AcrylicMenuItem Header="{DynamicResource PingBack}" Foreground="#FFED8888">
-										<controls:AcrylicMenuItem Header="{DynamicResource Donate}" Click="SponsorButton_Click" Foreground="{DynamicResource MaterialDesignBody}"/>
-										<Separator/>
-										<controls:AcrylicMenuItem Header="{DynamicResource Follow}" Click="FollowButton_Click" Foreground="{DynamicResource MaterialDesignBody}"/>
-										<controls:AcrylicMenuItem Header="{DynamicResource Star}" Click="StarButton_Click" Foreground="{DynamicResource MaterialDesignBody}" />
-									</controls:AcrylicMenuItem>
-
-									<Separator/>
-
-									<controls:AcrylicMenuItem Header="{DynamicResource Help}" Click="HelpButton_Click"/>
-
-								</controls:AcrylicContextMenu>
-							</Button.ContextMenu>
-						</Button>
-						<Button
-							Content="🡱"
-							HorizontalAlignment="Center"
-							Padding="0"
-							VerticalAlignment="Center" 
-							Width="32" 
-							Cursor="Arrow" 
-							FontSize="17"
-							Background="#3000ff00"
-							Margin="10,0,0,0"
-							x:Name="UpdateButton"
-							Visibility="Visible"
-							Grid.Column="2"
-							Foreground="{DynamicResource MaterialDesignBody}"
-							Style="{DynamicResource MaterialDesignFlatButton}"
-							Click="UpdateButton_Click" />
-					</Grid>
-
-					<ListBox Name="lstRepositories"
-							 DockPanel.Dock="Top"
-							 HorizontalContentAlignment="Stretch"
-							 MouseDoubleClick="lstRepositories_MouseDoubleClick"
-							 KeyDown="lstRepositories_KeyDown"
-							 ContextMenuOpening="lstRepositories_ContextMenuOpening"
-							 VerticalAlignment="Top"
-							 VerticalContentAlignment="Top"
-							 SelectionMode="Extended"
-							 Margin="0,10,0,0"
-							 ScrollViewer.CanContentScroll="False"
-							 >
-						<ListBox.ItemsPanel>
-							<ItemsPanelTemplate>
-								<VirtualizingStackPanel IsVirtualizing="True" VirtualizationMode="Recycling" />
-							</ItemsPanelTemplate>
-						</ListBox.ItemsPanel>
-						<ListBox.ItemTemplate>
-							<DataTemplate>
-								<StackPanel>
-									<TextBlock Text="{Binding Name}"
-											   ToolTip="{Binding Path}"
-											   TextElement.FontSize="17"
-											   Foreground="{DynamicResource AccentColorBrush}"
-											   Margin="8, 3, 8, 3" />
-									<TextBlock Text="{Binding CurrentBranch}"
-                                               FontSize="13.5"
-                                               Margin="8, 3, 8, 3" />
-									<Border Margin="8, 5, 8, 3"
-                                            Padding="6, 2, 6, 2"
-                                            BorderThickness="0"
-                                            Background="#14FFFFFF"
-                                            CornerRadius="5"
-                                             HorizontalAlignment="Left" >
-										<TextBlock Text="{Binding Status}"
-                                               FontFamily="Consolas"   
-                                               FontSize="13.5" >
-											<TextBlock.ToolTip>
-												<TextBlock Text="{Binding UpdateStampUtc, StringFormat=HH:mm:ss, Converter={StaticResource UtcToHumanizedLocalDateTimeConverter}}"/>
-											</TextBlock.ToolTip>
-									</TextBlock>
-									</Border>
-								</StackPanel>
-							</DataTemplate>
-						</ListBox.ItemTemplate>
-						<ListBox.ContextMenu>
-							<controls:AcrylicContextMenu x:Name="mnuRepositoryContext" >
-							</controls:AcrylicContextMenu>
-						</ListBox.ContextMenu>
-					</ListBox>
-				</DockPanel>
-			</Grid>
-			<ScrollViewer>
-				<StackPanel>
-					<TextBlock Name="txtHelpCaption"
-							   TextWrapping="Wrap"
-							   TextElement.FontWeight="Bold"
-							   TextElement.FontSize="12" />
-					<TextBlock Name="txtHelp"
-							   TextWrapping="Wrap"
-							   TextElement.FontSize="12" />
-					<Button Command="{x:Static materialDesign:Transitioner.MovePreviousCommand}"
-							Content="{DynamicResource GotIt}"></Button>
-				</StackPanel>
-			</ScrollViewer>
-		</materialDesign:Transitioner>
-
-	</Grid>
+<Window
+    x:Class="RepoZ.App.Win.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:RepoZ.App.Win.Controls"
+    xmlns:converters="clr-namespace:RepoZ.App.Win.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:fw="clr-namespace:SourceChord.FluentWPF;assembly=FluentWPF"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls"
+    Title="RepoZ"
+    Width="350"
+    Height="540"
+    fw:AcrylicWindow.Enabled="True"
+    fw:AcrylicWindow.FallbackColor="#303030"
+    fw:AcrylicWindow.TintColor="#101010"
+    fw:AcrylicWindow.TintOpacity="0.7"
+    BorderThickness="0"
+    ShowInTaskbar="False"
+    Style="{StaticResource MaterialDesignWindow}"
+    TextElement.FontSize="12"
+    TextElement.FontWeight="Regular"
+    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+    TextOptions.TextFormattingMode="Ideal"
+    TextOptions.TextRenderingMode="Auto"
+    mc:Ignorable="d"
+    >
+    <Window.Resources>
+        <converters:UtcToHumanizedLocalDateTimeConverter x:Key="UtcToHumanizedLocalDateTimeConverter" />
+    </Window.Resources>
+    <Grid Margin="12" Focusable="False">
+
+        <materialDesign:Transitioner
+            Name="transitionerMain"
+            Focusable="False"
+            SelectedIndex="0"
+            >
+
+            <Grid>
+                <TextBlock
+                    x:Name="tbNoRepositories"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Focusable="False"
+                    FontSize="15"
+                    Foreground="Gray"
+                    Text="{DynamicResource EmptyHint}"
+                    TextAlignment="Center"
+                    TextWrapping="Wrap"
+                    />
+
+                <DockPanel x:Name="dockMain" Focusable="False">
+                    <Grid DockPanel.Dock="Top" Focusable="False">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Grid
+                            Grid.Column="0"
+                            HorizontalAlignment="Stretch"
+                            Focusable="False"
+                            >
+                            <controls:ZTextBox
+                                x:Name="txtFilter"
+                                VerticalAlignment="Top"
+                                Finish="txtFilter_Finish"
+                                FontSize="17"
+                                TextChanged="txtFilter_TextChanged"
+                                />
+
+                            <TextBlock
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Focusable="False"
+                                FontSize="15"
+                                Foreground="Gray"
+                                IsHitTestVisible="False"
+                                Text="{DynamicResource SearchWin}"
+                                >
+                                <TextBlock.Style>
+                                    <Style TargetType="{x:Type TextBlock}">
+                                        <Setter Property="Visibility" Value="Collapsed" />
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding Text, ElementName=txtFilter}" Value="">
+                                                <Setter Property="Visibility" Value="Visible" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+
+                        </Grid>
+                        <Button
+                            Name="MenuButton"
+                            Grid.Column="1"
+                            Width="32"
+                            Margin="10,0,0,0"
+                            Padding="0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Background="#00FFF0F0"
+                            Click="MenuButton_Click"
+                            Content="☰"
+                            Cursor="Arrow"
+                            FontSize="17"
+                            Foreground="{DynamicResource MaterialDesignBody}"
+                            Style="{DynamicResource MaterialDesignFlatButton}"
+                            >
+                            <Button.ContextMenu>
+                                <controls:AcrylicContextMenu x:Name="SettingsMenu">
+
+                                    <controls:AcrylicMenuItem Header="{DynamicResource ManageRepos}">
+                                        <controls:AcrylicMenuItem
+                                            x:Name="ScanMenuItem"
+                                            Click="ScanButton_Click"
+                                            Header="{DynamicResource ScanComputer}"
+                                            />
+                                        <controls:AcrylicMenuItem Click="ClearButton_Click" Header="{DynamicResource Clear}" />
+                                        <Separator />
+                                        <controls:AcrylicMenuItem Click="CustomizeContextMenu_Click" Header="{DynamicResource CustomizeRepositoryActions}" />
+                                        <Separator />
+                                        <controls:AcrylicMenuItem Click="ResetIgnoreRulesButton_Click" Header="{DynamicResource ResetIgnoreRules}" />
+                                    </controls:AcrylicMenuItem>
+
+                                    <controls:AcrylicMenuItem x:Name="AutoFetchMenuItem" Header="{DynamicResource AutoFetch}">
+                                        <controls:AcrylicMenuItem
+                                            Header="{DynamicResource Off}"
+                                            IsCheckable="True"
+                                            IsChecked="{Binding AutoFetchOff}"
+                                            />
+                                        <Separator />
+                                        <controls:AcrylicMenuItem
+                                            Header="{DynamicResource Discretely}"
+                                            IsCheckable="True"
+                                            IsChecked="{Binding AutoFetchDiscretely}"
+                                            />
+                                        <controls:AcrylicMenuItem
+                                            Header="{DynamicResource Adequate}"
+                                            IsCheckable="True"
+                                            IsChecked="{Binding AutoFetchAdequate}"
+                                            />
+                                        <controls:AcrylicMenuItem
+                                            Header="{DynamicResource Aggresive}"
+                                            IsCheckable="True"
+                                            IsChecked="{Binding AutoFetchAggresive}"
+                                            />
+                                    </controls:AcrylicMenuItem>
+
+                                    <controls:AcrylicMenuItem Header="{DynamicResource Advanced}">
+                                        <controls:AcrylicMenuItem
+                                            Header="{DynamicResource PruneOnFetch}"
+                                            IsCheckable="True"
+                                            IsChecked="{Binding PruneOnFetch}"
+                                            />
+                                    </controls:AcrylicMenuItem>
+
+                                    <Separator />
+
+                                    <controls:AcrylicMenuItem Foreground="#FFED8888" Header="{DynamicResource PingBack}">
+                                        <controls:AcrylicMenuItem
+                                            Click="SponsorButton_Click"
+                                            Foreground="{DynamicResource MaterialDesignBody}"
+                                            Header="{DynamicResource Donate}"
+                                            />
+                                        <Separator />
+                                        <controls:AcrylicMenuItem
+                                            Click="FollowButton_Click"
+                                            Foreground="{DynamicResource MaterialDesignBody}"
+                                            Header="{DynamicResource Follow}"
+                                            />
+                                        <controls:AcrylicMenuItem
+                                            Click="StarButton_Click"
+                                            Foreground="{DynamicResource MaterialDesignBody}"
+                                            Header="{DynamicResource Star}"
+                                            />
+                                    </controls:AcrylicMenuItem>
+
+                                    <Separator />
+
+                                    <controls:AcrylicMenuItem Click="HelpButton_Click" Header="{DynamicResource Help}" />
+
+                                </controls:AcrylicContextMenu>
+                            </Button.ContextMenu>
+                        </Button>
+                        <Button
+                            x:Name="UpdateButton"
+                            Grid.Column="2"
+                            Width="32"
+                            Margin="10,0,0,0"
+                            Padding="0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Background="#3000ff00"
+                            Click="UpdateButton_Click"
+                            Content="🡱"
+                            Cursor="Arrow"
+                            FontSize="17"
+                            Foreground="{DynamicResource MaterialDesignBody}"
+                            Style="{DynamicResource MaterialDesignFlatButton}"
+                            Visibility="Visible"
+                            />
+                    </Grid>
+
+                    <ListBox
+                        Name="lstRepositories"
+                        Margin="0,10,0,0"
+                        VerticalAlignment="Top"
+                        HorizontalContentAlignment="Stretch"
+                        VerticalContentAlignment="Top"
+                        ContextMenuOpening="lstRepositories_ContextMenuOpening"
+                        DockPanel.Dock="Top"
+                        KeyDown="lstRepositories_KeyDown"
+                        MouseDoubleClick="lstRepositories_MouseDoubleClick"
+                        ScrollViewer.CanContentScroll="False"
+                        SelectionMode="Extended"
+                        >
+                        <ListBox.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <VirtualizingStackPanel IsVirtualizing="True" VirtualizationMode="Recycling" />
+                            </ItemsPanelTemplate>
+                        </ListBox.ItemsPanel>
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel>
+                                    <TextBlock
+                                        Margin="8,3,8,3"
+                                        Foreground="{DynamicResource AccentColorBrush}"
+                                        Text="{Binding Name}"
+                                        TextElement.FontSize="17"
+                                        ToolTip="{Binding Path}"
+                                        />
+                                    <TextBlock
+                                        Margin="8,3,8,3"
+                                        FontSize="13.5"
+                                        Text="{Binding CurrentBranch}"
+                                        />
+                                    <Border
+                                        Margin="8,5,8,3"
+                                        Padding="6,2,6,2"
+                                        HorizontalAlignment="Left"
+                                        Background="#14FFFFFF"
+                                        BorderThickness="0"
+                                        CornerRadius="5"
+                                        >
+                                        <!--  {materialDesign:MaterialDesignFont}  -->
+                                        <TextBlock
+                                            FontFamily="Source Code Pro"
+                                            FontSize="13.5"
+                                            Text="{Binding Status}"
+                                            >
+                                            <TextBlock.ToolTip>
+                                                <TextBlock Text="{Binding UpdateStampUtc, StringFormat=HH:mm:ss, Converter={StaticResource UtcToHumanizedLocalDateTimeConverter}}" />
+                                            </TextBlock.ToolTip>
+                                        </TextBlock>
+                                    </Border>
+                                </StackPanel>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                        <ListBox.ContextMenu>
+                            <controls:AcrylicContextMenu x:Name="mnuRepositoryContext" />
+                        </ListBox.ContextMenu>
+                    </ListBox>
+                </DockPanel>
+            </Grid>
+            <ScrollViewer>
+                <StackPanel>
+                    <TextBlock
+                        Name="txtHelpCaption"
+                        TextElement.FontSize="12"
+                        TextElement.FontWeight="Bold"
+                        TextWrapping="Wrap"
+                        />
+                    <TextBlock
+                        Name="txtHelp"
+                        TextElement.FontSize="12"
+                        TextWrapping="Wrap"
+                        />
+                    <Button Command="{x:Static materialDesign:Transitioner.MovePreviousCommand}" Content="{DynamicResource GotIt}" />
+                </StackPanel>
+            </ScrollViewer>
+        </materialDesign:Transitioner>
+
+    </Grid>
 
 </Window>
diff --git a/RepoZ.App.Win/MainWindow.xaml.cs b/RepoZ.App.Win/MainWindow.xaml.cs
index f335eca1..a0b36993 100644
--- a/RepoZ.App.Win/MainWindow.xaml.cs
+++ b/RepoZ.App.Win/MainWindow.xaml.cs
@@ -63,10 +63,10 @@ public MainWindow(StatusCharacterMap statusCharacterMap,
 
 			lstRepositories.ItemsSource = aggregator.Repositories;
 
-			var view = (ListCollectionView)CollectionViewSource.GetDefaultView(aggregator.Repositories);
-			((ICollectionView)view).CollectionChanged += View_CollectionChanged;
-			view.Filter = FilterRepositories;
-			view.CustomSort = new CustomRepositoryViewSortBehavior();
+            var view = (ListCollectionView)CollectionViewSource.GetDefaultView(aggregator.Repositories);
+            ((ICollectionView) view).CollectionChanged += View_CollectionChanged;
+            view.Filter = FilterRepositories;
+            view.CustomSort = new CustomRepositoryViewSortBehavior();
 
 			var appName = System.Reflection.Assembly.GetEntryAssembly().GetName();
 			txtHelpCaption.Text = appName.Name + " " + appName.Version.ToString(2);
@@ -143,13 +143,13 @@ private void lstRepositories_MouseDoubleClick(object sender, MouseButtonEventArg
 				InvokeActionOnCurrentRepository();
 		}
 
-		private void lstRepositories_ContextMenuOpening(object sender, ContextMenuEventArgs e)
-		{
-			if (!LstRepositoriesContextMenuOpening(sender, ((FrameworkElement)e.Source).ContextMenu))
-			{
-				e.Handled = true;
-			}
-		}
+        private void lstRepositories_ContextMenuOpening(object sender, ContextMenuEventArgs e)
+        {
+            if (!LstRepositoriesContextMenuOpening(sender, ((FrameworkElement) e.Source).ContextMenu))
+            {
+                e.Handled = true;
+            }
+        }
 
 		private bool LstRepositoriesContextMenuOpening(object sender, ContextMenu ctxMenu)
 		{
@@ -176,22 +176,22 @@ private bool LstRepositoriesContextMenuOpening(object sender, ContextMenu ctxMen
 			return true;
 		}
 
-		private void lstRepositories_KeyDown(object sender, KeyEventArgs e)
-		{
-			if (e.Key == Key.Return || e.Key == Key.Enter)
-				InvokeActionOnCurrentRepository();
-			else if (e.Key == Key.Left || e.Key == Key.Right)
-			{
-				// try open context menu.
-				var ctxMenu = ((FrameworkElement)e.Source).ContextMenu;
-				if (ctxMenu != null && LstRepositoriesContextMenuOpening(sender, ctxMenu))
-				{
-					ctxMenu.Placement = PlacementMode.Left;
-					ctxMenu.PlacementTarget = (UIElement)e.OriginalSource;
-					ctxMenu.IsOpen = true;
-				}
-			}
-		}
+        private void lstRepositories_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Return || e.Key == Key.Enter)
+                InvokeActionOnCurrentRepository();
+            else if (e.Key == Key.Left || e.Key == Key.Right)
+            {
+                // try open context menu.
+                var ctxMenu = ((FrameworkElement)e.Source).ContextMenu;
+                if (ctxMenu != null && LstRepositoriesContextMenuOpening(sender, ctxMenu))
+                {
+                    ctxMenu.Placement = PlacementMode.Left;
+                    ctxMenu.PlacementTarget = (UIElement) e.OriginalSource;
+                    ctxMenu.IsOpen = true;
+                }
+            }
+        }
 
 		private void InvokeActionOnCurrentRepository()
 		{
diff --git a/RepoZ.App.Win/Properties/AssemblyInfo.cs b/RepoZ.App.Win/Properties/AssemblyInfo.cs
index bf16e3e5..fd7ab828 100644
--- a/RepoZ.App.Win/Properties/AssemblyInfo.cs
+++ b/RepoZ.App.Win/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyVersion("5.1.0.0")]
-[assembly: AssemblyFileVersion("5.1.0.0")]
+[assembly: AssemblyVersion("6.0.0.0")]
+[assembly: AssemblyFileVersion("6.0.0.0")]
 
-[assembly: AssemblyInformationalVersion("5.1.0-alpha+Branch.master.Sha.3b18e09d3b38ed75b305e29e5aef5f0b36a6bfee")]
+[assembly: AssemblyInformationalVersion("6.0.0.0")]
diff --git a/RepoZ.App.Win/Properties/Resources.Designer.cs b/RepoZ.App.Win/Properties/Resources.Designer.cs
index 34548afe..087b5625 100644
--- a/RepoZ.App.Win/Properties/Resources.Designer.cs
+++ b/RepoZ.App.Win/Properties/Resources.Designer.cs
@@ -8,64 +8,56 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RepoZ.App.Win.Properties
-{
-
-
-	/// <summary>
-	///   A strongly-typed resource class, for looking up localized strings, etc.
-	/// </summary>
-	// This class was auto-generated by the StronglyTypedResourceBuilder
-	// class via a tool like ResGen or Visual Studio.
-	// To add or remove a member, edit your .ResX file then rerun ResGen
-	// with the /str option, or rebuild your VS project.
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-	[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-	internal class Resources
-	{
-
-		private static global::System.Resources.ResourceManager resourceMan;
-
-		private static global::System.Globalization.CultureInfo resourceCulture;
-
-		[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-		internal Resources()
-		{
-		}
-
-		/// <summary>
-		///   Returns the cached ResourceManager instance used by this class.
-		/// </summary>
-		[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-		internal static global::System.Resources.ResourceManager ResourceManager
-		{
-			get
-			{
-				if ((resourceMan == null))
-				{
-					global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("RepoZ.App.Win.Properties.Resources", typeof(Resources).Assembly);
-					resourceMan = temp;
-				}
-				return resourceMan;
-			}
-		}
-
-		/// <summary>
-		///   Overrides the current thread's CurrentUICulture property for all
-		///   resource lookups using this strongly typed resource class.
-		/// </summary>
-		[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-		internal static global::System.Globalization.CultureInfo Culture
-		{
-			get
-			{
-				return resourceCulture;
-			}
-			set
-			{
-				resourceCulture = value;
-			}
-		}
-	}
+namespace RepoZ.App.Win.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("RepoZ.App.Win.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
 }
diff --git a/RepoZ.App.Win/Properties/Settings.Designer.cs b/RepoZ.App.Win/Properties/Settings.Designer.cs
index 229b411a..db905c52 100644
--- a/RepoZ.App.Win/Properties/Settings.Designer.cs
+++ b/RepoZ.App.Win/Properties/Settings.Designer.cs
@@ -8,23 +8,19 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RepoZ.App.Win.Properties
-{
-
-
-	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-	internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-	{
-
-		private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-		public static Settings Default
-		{
-			get
-			{
-				return defaultInstance;
-			}
-		}
-	}
+namespace RepoZ.App.Win.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.11.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
 }
diff --git a/RepoZ.App.Win/RepoZ.App.Win.csproj b/RepoZ.App.Win/RepoZ.App.Win.csproj
index 191d474d..7813d210 100644
--- a/RepoZ.App.Win/RepoZ.App.Win.csproj
+++ b/RepoZ.App.Win/RepoZ.App.Win.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.252\build\net461\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.252\build\net461\LibGit2Sharp.NativeBinaries.props')" />
+  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.2.0.322\build\net46\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.2.0.322\build\net46\LibGit2Sharp.NativeBinaries.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,13 +10,29 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RepoZ.App.Win</RootNamespace>
     <AssemblyName>RepoZ</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -27,6 +43,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -48,49 +65,77 @@
     <Reference Include="AsyncIO, Version=0.1.69.0, Culture=neutral, PublicKeyToken=44a94435bd6f33f8, processorArchitecture=MSIL">
       <HintPath>..\packages\AsyncIO.0.1.69\lib\net40\AsyncIO.dll</HintPath>
     </Reference>
-    <Reference Include="ControlzEx, Version=4.0.0.0, Culture=neutral, PublicKeyToken=69f1c32f803d307e, processorArchitecture=MSIL">
-      <HintPath>..\packages\ControlzEx.4.3.0\lib\net45\ControlzEx.dll</HintPath>
+    <Reference Include="ControlzEx, Version=6.0.0.0, Culture=neutral, PublicKeyToken=69f1c32f803d307e, processorArchitecture=MSIL">
+      <HintPath>..\packages\ControlzEx.6.0.0\lib\net462\ControlzEx.dll</HintPath>
     </Reference>
-    <Reference Include="FluentWPF, Version=0.8.0.6, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentWPF.0.8.0\lib\net45\FluentWPF.dll</HintPath>
+    <Reference Include="FluentWPF, Version=0.10.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentWPF.0.10.2\lib\net45\FluentWPF.dll</HintPath>
     </Reference>
-    <Reference Include="Hardcodet.Wpf.TaskbarNotification, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Hardcodet.NotifyIcon.Wpf.1.0.8\lib\net451\Hardcodet.Wpf.TaskbarNotification.dll</HintPath>
+    <Reference Include="Hardcodet.NotifyIcon.Wpf, Version=1.1.0.0, Culture=neutral, PublicKeyToken=682384a853a08aad, processorArchitecture=MSIL">
+      <HintPath>..\packages\Hardcodet.NotifyIcon.Wpf.1.1.0\lib\net472\Hardcodet.NotifyIcon.Wpf.dll</HintPath>
     </Reference>
-    <Reference Include="LibGit2Sharp, Version=0.25.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
-      <HintPath>..\packages\LibGit2Sharp.0.25.4\lib\netstandard2.0\LibGit2Sharp.dll</HintPath>
+    <Reference Include="LibGit2Sharp, Version=0.30.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
+      <HintPath>..\packages\LibGit2Sharp.0.30.0\lib\net472\LibGit2Sharp.dll</HintPath>
     </Reference>
     <Reference Include="MahApps.Metro, Version=2.0.0.0, Culture=neutral, PublicKeyToken=51482d6f650b2b3f, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.2.0.1\lib\net46\MahApps.Metro.dll</HintPath>
+      <HintPath>..\packages\MahApps.Metro.2.4.10\lib\net47\MahApps.Metro.dll</HintPath>
     </Reference>
-    <Reference Include="MaterialDesignColors, Version=1.2.6.1513, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaterialDesignColors.1.2.6\lib\net45\MaterialDesignColors.dll</HintPath>
+    <Reference Include="MaterialDesignColors, Version=3.1.0.0, Culture=neutral, PublicKeyToken=df2a72020bd7962a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MaterialDesignColors.3.1.0\lib\net462\MaterialDesignColors.dll</HintPath>
     </Reference>
-    <Reference Include="MaterialDesignThemes.MahApps, Version=0.1.4.1513, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaterialDesignThemes.MahApps.0.1.4\lib\net452\MaterialDesignThemes.MahApps.dll</HintPath>
+    <Reference Include="MaterialDesignThemes.MahApps, Version=3.1.0.0, Culture=neutral, PublicKeyToken=df2a72020bd7962a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MaterialDesignThemes.MahApps.3.1.0\lib\net462\MaterialDesignThemes.MahApps.dll</HintPath>
     </Reference>
-    <Reference Include="MaterialDesignThemes.Wpf, Version=3.1.3.1513, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaterialDesignThemes.3.1.3\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
+    <Reference Include="MaterialDesignThemes.Wpf, Version=5.1.0.0, Culture=neutral, PublicKeyToken=df2a72020bd7962a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MaterialDesignThemes.5.1.0\lib\net462\MaterialDesignThemes.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.19\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.122\lib\net462\Microsoft.Xaml.Behaviors.dll</HintPath>
     </Reference>
-    <Reference Include="NetMQ, Version=4.0.0.207, Culture=neutral, PublicKeyToken=a6decef4ddc58b3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\NetMQ.4.0.0.207\lib\net40\NetMQ.dll</HintPath>
+    <Reference Include="NaCl, Version=0.1.13.0, Culture=neutral, PublicKeyToken=827c20e50a9775fa, processorArchitecture=MSIL">
+      <HintPath>..\packages\NaCl.Net.0.1.13\lib\net472\NaCl.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="NetMQ, Version=4.0.1.13, Culture=neutral, PublicKeyToken=a6decef4ddc58b3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\NetMQ.4.0.1.13\lib\net47\NetMQ.dll</HintPath>
     </Reference>
-    <Reference Include="protobuf-net, Version=2.4.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
-      <HintPath>..\packages\protobuf-net.2.4.6\lib\net40\protobuf-net.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.3.2.30\lib\net462\protobuf-net.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.Core.3.2.30\lib\net462\protobuf-net.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
+    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Windows.Forms" />
@@ -120,6 +165,7 @@
     <Compile Include="MainWindowPageModel.cs" />
     <Compile Include="NotifyIconViewModel.cs" />
     <Compile Include="TaskbarLocator.cs" />
+    <Compile Include="TinyIoC.cs" />
     <Compile Include="TinySoup.cs" />
     <Compile Include="WindowsCompositionHelper.cs" />
     <Compile Include="WpfThreadDispatcher.cs" />
@@ -127,7 +173,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Compile Include="TinyIoC.cs" />
     <Compile Include="UIErrorHandler.cs" />
     <Page Include="i18n\de-DE.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -180,9 +225,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -213,7 +256,18 @@
   <ItemGroup>
     <Resource Include="App.ico" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.8">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.8 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
@@ -221,12 +275,12 @@
   </PropertyGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.252\build\net461\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.252\build\net461\LibGit2Sharp.NativeBinaries.props'))" />
-    <Error Condition="!Exists('..\packages\MaterialDesignThemes.3.1.3\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MaterialDesignThemes.3.1.3\build\MaterialDesignThemes.targets'))" />
+    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.2.0.322\build\net46\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.2.0.322\build\net46\LibGit2Sharp.NativeBinaries.props'))" />
+    <Error Condition="!Exists('..\packages\MaterialDesignThemes.5.1.0\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MaterialDesignThemes.5.1.0\build\MaterialDesignThemes.targets'))" />
   </Target>
-  <Import Project="..\packages\MaterialDesignThemes.3.1.3\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.3.1.3\build\MaterialDesignThemes.targets')" />
+  <Import Project="..\packages\MaterialDesignThemes.5.1.0\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.5.1.0\build\MaterialDesignThemes.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/RepoZ.App.Win/packages.config b/RepoZ.App.Win/packages.config
index 928c9687..4c5d7b7e 100644
--- a/RepoZ.App.Win/packages.config
+++ b/RepoZ.App.Win/packages.config
@@ -1,18 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AsyncIO" version="0.1.69" targetFramework="net461" />
-  <package id="ControlzEx" version="4.3.0" targetFramework="net461" />
-  <package id="FluentWPF" version="0.8.0" targetFramework="net461" />
-  <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net461" />
-  <package id="LibGit2Sharp" version="0.25.4" targetFramework="net461" />
-  <package id="LibGit2Sharp.NativeBinaries" version="1.0.252" targetFramework="net461" />
-  <package id="MahApps.Metro" version="2.0.1" targetFramework="net461" />
-  <package id="MaterialDesignColors" version="1.2.6" targetFramework="net461" />
-  <package id="MaterialDesignThemes" version="3.1.3" targetFramework="net461" />
-  <package id="MaterialDesignThemes.MahApps" version="0.1.4" targetFramework="net461" />
-  <package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.19" targetFramework="net461" />
-  <package id="NetMQ" version="4.0.0.207" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
-  <package id="protobuf-net" version="2.4.6" targetFramework="net461" />
-  <package id="TinyIoC" version="1.3" targetFramework="net461" developmentDependency="true" />
+  <package id="AsyncIO" version="0.1.69" targetFramework="net481" />
+  <package id="ControlzEx" version="6.0.0" targetFramework="net481" />
+  <package id="FluentWPF" version="0.10.2" targetFramework="net481" />
+  <package id="Hardcodet.NotifyIcon.Wpf" version="1.1.0" targetFramework="net481" />
+  <package id="LibGit2Sharp" version="0.30.0" targetFramework="net481" />
+  <package id="LibGit2Sharp.NativeBinaries" version="2.0.322" targetFramework="net481" />
+  <package id="MahApps.Metro" version="2.4.10" targetFramework="net481" />
+  <package id="MaterialDesignColors" version="3.1.0" targetFramework="net481" />
+  <package id="MaterialDesignThemes" version="5.1.0" targetFramework="net481" />
+  <package id="MaterialDesignThemes.MahApps" version="3.1.0" targetFramework="net481" />
+  <package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.122" targetFramework="net481" />
+  <package id="NaCl.Net" version="0.1.13" targetFramework="net481" />
+  <package id="NetMQ" version="4.0.1.13" targetFramework="net481" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net481" />
+  <package id="protobuf-net" version="3.2.30" targetFramework="net481" />
+  <package id="protobuf-net.Core" version="3.2.30" targetFramework="net481" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net481" />
+  <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net481" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net481" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net481" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net481" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net481" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net481" />
+  <package id="TinyIoC" version="1.3" targetFramework="net481" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/RepoZ.Ipc/DefaultIpcEndpoint.cs b/RepoZ.Ipc/DefaultIpcEndpoint.cs
index d4242959..ca55b940 100644
--- a/RepoZ.Ipc/DefaultIpcEndpoint.cs
+++ b/RepoZ.Ipc/DefaultIpcEndpoint.cs
@@ -1,7 +1,11 @@
 namespace RepoZ.Ipc
 {
-	public class DefaultIpcEndpoint : IIpcEndpoint
-	{
-		public string Address => "tcp://localhost:18181";
-	}
+    public class DefaultIpcEndpoint : IIpcEndpoint
+    {
+#if DEBUG
+        public string Address => "tcp://localhost:18183";
+#else
+        public string Address => "tcp://localhost:18182";
+#endif
+    }
 }
\ No newline at end of file
diff --git a/RepoZ.Ipc/RepoZ.Ipc.csproj b/RepoZ.Ipc/RepoZ.Ipc.csproj
index 6d76615e..922b9af8 100644
--- a/RepoZ.Ipc/RepoZ.Ipc.csproj
+++ b/RepoZ.Ipc/RepoZ.Ipc.csproj
@@ -3,11 +3,11 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
 	<ReleaseVersion>4.0</ReleaseVersion>
-    <Version>1.0.0.0</Version>
+    <Version>3.0.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetMQ" Version="4.0.0.207" />
+    <PackageReference Include="NetMQ" Version="4.0.1.13" />
   </ItemGroup>
 
 </Project>
diff --git a/Specs/Ipc/TestIpcEndpoint.cs b/Specs/Ipc/TestIpcEndpoint.cs
index 9d2ac13f..f11b3a50 100644
--- a/Specs/Ipc/TestIpcEndpoint.cs
+++ b/Specs/Ipc/TestIpcEndpoint.cs
@@ -1,14 +1,14 @@
 using RepoZ.Ipc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Specs.Ipc
 {
-	class TestIpcEndpoint : IIpcEndpoint
-	{
-		public string Address => "tcp://localhost:18182";
-	}
+    class TestIpcEndpoint : IIpcEndpoint
+    {
+
+#if DEBUG
+        public string Address => "tcp://localhost:18183";
+#else
+        public string Address => "tcp://localhost:18182";
+#endif
+    }
 }
diff --git a/Specs/Properties/AssemblyInfo.cs b/Specs/Properties/AssemblyInfo.cs
index e3a4d49b..a36f74c2 100644
--- a/Specs/Properties/AssemblyInfo.cs
+++ b/Specs/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0")]
+[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyFileVersion("3.0.0.0")]
 
-[assembly: AssemblyInformationalVersion("4.0.0-alpha+Branch.master.Sha.3b18e09d3b38ed75b305e29e5aef5f0b36a6bfee")]
+[assembly: AssemblyInformationalVersion("3.0.0.0")]
diff --git a/Specs/Specs.csproj b/Specs/Specs.csproj
index 286a6f73..63f541fe 100644
--- a/Specs/Specs.csproj
+++ b/Specs/Specs.csproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props')" />
-  <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
-  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.252\build\net461\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.252\build\net461\LibGit2Sharp.NativeBinaries.props')" />
+  <Import Project="..\packages\NUnit3TestAdapter.4.6.0\build\net462\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.4.6.0\build\net462\NUnit3TestAdapter.props')" />
+  <Import Project="..\packages\NUnit.4.2.2\build\NUnit.props" Condition="Exists('..\packages\NUnit.4.2.2\build\NUnit.props')" />
+  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.2.0.322\build\net46\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.2.0.322\build\net46\LibGit2Sharp.NativeBinaries.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,10 +12,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Specs</RootNamespace>
     <AssemblyName>Specs</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -38,36 +39,52 @@
     <Reference Include="AsyncIO, Version=0.1.69.0, Culture=neutral, PublicKeyToken=44a94435bd6f33f8, processorArchitecture=MSIL">
       <HintPath>..\packages\AsyncIO.0.1.69\lib\net40\AsyncIO.dll</HintPath>
     </Reference>
-    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>
+    <Reference Include="Castle.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="FluentAssertions, Version=5.10.3.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.5.10.3\lib\net45\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=6.12.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.6.12.0\lib\net47\FluentAssertions.dll</HintPath>
     </Reference>
-    <Reference Include="LibGit2Sharp, Version=0.25.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
-      <HintPath>..\packages\LibGit2Sharp.0.25.4\lib\netstandard2.0\LibGit2Sharp.dll</HintPath>
+    <Reference Include="LibGit2Sharp, Version=0.30.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
+      <HintPath>..\packages\LibGit2Sharp.0.30.0\lib\net472\LibGit2Sharp.dll</HintPath>
     </Reference>
-    <Reference Include="Moq, Version=4.14.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.14.1\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.20.71.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.20.71\lib\net462\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="NetMQ, Version=4.0.0.207, Culture=neutral, PublicKeyToken=a6decef4ddc58b3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\NetMQ.4.0.0.207\lib\net40\NetMQ.dll</HintPath>
+    <Reference Include="NaCl, Version=0.1.13.0, Culture=neutral, PublicKeyToken=827c20e50a9775fa, processorArchitecture=MSIL">
+      <HintPath>..\packages\NaCl.Net.0.1.13\lib\net472\NaCl.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="NetMQ, Version=4.0.1.13, Culture=neutral, PublicKeyToken=a6decef4ddc58b3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\NetMQ.4.0.1.13\lib\net47\NetMQ.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=4.2.2.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.4.2.2\lib\net462\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework.legacy, Version=4.2.2.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.4.2.2\lib\net462\nunit.framework.legacy.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -112,10 +129,10 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.252\build\net461\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.252\build\net461\LibGit2Sharp.NativeBinaries.props'))" />
-    <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
-    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.2.0.322\build\net46\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.2.0.322\build\net46\LibGit2Sharp.NativeBinaries.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit.4.2.2\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.4.2.2\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.4.6.0\build\net462\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.4.6.0\build\net462\NUnit3TestAdapter.props'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Specs/app.config b/Specs/app.config
index 14ab9438..fa53a4e3 100644
--- a/Specs/app.config
+++ b/Specs/app.config
@@ -12,8 +12,16 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>
diff --git a/Specs/packages.config b/Specs/packages.config
index 7d82e21e..c357c46f 100644
--- a/Specs/packages.config
+++ b/Specs/packages.config
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AsyncIO" version="0.1.69" targetFramework="net461" />
-  <package id="Castle.Core" version="4.4.1" targetFramework="net461" />
-  <package id="FluentAssertions" version="5.10.3" targetFramework="net461" />
-  <package id="LibGit2Sharp" version="0.25.4" targetFramework="net461" />
-  <package id="LibGit2Sharp.NativeBinaries" version="1.0.252" targetFramework="net461" />
-  <package id="Moq" version="4.14.1" targetFramework="net461" />
-  <package id="NetMQ" version="4.0.0.207" targetFramework="net461" />
-  <package id="NUnit" version="3.12.0" targetFramework="net461" />
-  <package id="NUnit3TestAdapter" version="3.16.1" targetFramework="net461" developmentDependency="true" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net461" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
+  <package id="AsyncIO" version="0.1.69" targetFramework="net481" />
+  <package id="Castle.Core" version="5.1.1" targetFramework="net481" />
+  <package id="FluentAssertions" version="6.12.0" targetFramework="net481" />
+  <package id="LibGit2Sharp" version="0.30.0" targetFramework="net481" />
+  <package id="LibGit2Sharp.NativeBinaries" version="2.0.322" targetFramework="net481" />
+  <package id="Moq" version="4.20.71" targetFramework="net481" />
+  <package id="NaCl.Net" version="0.1.13" targetFramework="net481" />
+  <package id="NetMQ" version="4.0.1.13" targetFramework="net481" />
+  <package id="NUnit" version="4.2.2" targetFramework="net481" />
+  <package id="NUnit3TestAdapter" version="4.6.0" targetFramework="net481" developmentDependency="true" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net481" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net481" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net481" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net481" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net481" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net481" />
 </packages>
\ No newline at end of file
diff --git a/Tests/Properties/AssemblyInfo.cs b/Tests/Properties/AssemblyInfo.cs
index 3f457441..b2441efe 100644
--- a/Tests/Properties/AssemblyInfo.cs
+++ b/Tests/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0")]
+[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyFileVersion("3.0.0.0")]
 
-[assembly: AssemblyInformationalVersion("4.0.0-alpha+Branch.master.Sha.3b18e09d3b38ed75b305e29e5aef5f0b36a6bfee")]
+[assembly: AssemblyInformationalVersion("3.0.0.0")]
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index e06b7680..b4a7272b 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props')" />
-  <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
+  <Import Project="..\packages\NUnit3TestAdapter.4.6.0\build\net462\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.4.6.0\build\net462\NUnit3TestAdapter.props')" />
+  <Import Project="..\packages\NUnit.4.2.2\build\NUnit.props" Condition="Exists('..\packages\NUnit.4.2.2\build\NUnit.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,10 +11,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Tests</RootNamespace>
     <AssemblyName>Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -34,29 +35,42 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
+    <Reference Include="Castle.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="FluentAssertions, Version=5.10.3.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.5.10.3\lib\net45\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=6.12.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.6.12.0\lib\net47\FluentAssertions.dll</HintPath>
     </Reference>
-    <Reference Include="Moq, Version=4.14.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.14.1\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.20.71.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.20.71\lib\net462\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=4.2.2.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.4.2.2\lib\net462\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework.legacy, Version=4.2.2.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.4.2.2\lib\net462\nunit.framework.legacy.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -101,10 +115,10 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
-    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit.4.2.2\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.4.2.2\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.4.6.0\build\net462\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.4.6.0\build\net462\NUnit3TestAdapter.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Tests/app.config b/Tests/app.config
index 557095a4..0481baf3 100644
--- a/Tests/app.config
+++ b/Tests/app.config
@@ -6,6 +6,18 @@
         <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>
diff --git a/Tests/packages.config b/Tests/packages.config
index 86d4e176..f525f23c 100644
--- a/Tests/packages.config
+++ b/Tests/packages.config
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Castle.Core" version="4.4.0" targetFramework="net461" />
-  <package id="FluentAssertions" version="5.10.3" targetFramework="net461" />
-  <package id="Moq" version="4.14.1" targetFramework="net461" />
-  <package id="NUnit" version="3.12.0" targetFramework="net461" />
-  <package id="NUnit3TestAdapter" version="3.16.1" targetFramework="net461" developmentDependency="true" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net461" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
+  <package id="Castle.Core" version="5.1.1" targetFramework="net481" />
+  <package id="FluentAssertions" version="6.12.0" targetFramework="net481" />
+  <package id="Moq" version="4.20.71" targetFramework="net481" />
+  <package id="NUnit" version="4.2.2" targetFramework="net481" />
+  <package id="NUnit3TestAdapter" version="4.6.0" targetFramework="net481" developmentDependency="true" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net481" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net481" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net481" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net481" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net481" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net481" />
 </packages>
\ No newline at end of file
diff --git a/build.cake b/build.cake
index cbe668fc..a9dd0c15 100644
--- a/build.cake
+++ b/build.cake
@@ -240,4 +240,4 @@ Task("Default")
 // EXECUTION
 ///////////////////////////////////////////////////////////////////////////////
 
-RunTarget(target);
\ No newline at end of file
+RunTarget(target);
diff --git a/grr/grr.csproj b/grr/grr.csproj
index 783f0868..a3cb6522 100644
--- a/grr/grr.csproj
+++ b/grr/grr.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Authors>Andreas Wäscher</Authors>
     <Product>Git Repositories of RepoZ</Product>
     <Description>Command line interface to query repository information from RepoZ</Description>
@@ -10,12 +10,12 @@
     <PackageIconUrl>https://raw.githubusercontent.com/awaescher/RepoZ/master/grr/grr.ico</PackageIconUrl>
     <RepositoryUrl>https://github.com/awaescher/RepoZ</RepositoryUrl>
     <ReleaseVersion>4.0</ReleaseVersion>
-    <Version>1.0.0.0</Version>
+    <Version>3.0.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.8.0" />
-    <PackageReference Include="TextCopy" Version="4.2.0" />
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
+    <PackageReference Include="TextCopy" Version="6.2.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/grrui/Program.cs b/grrui/Program.cs
index 18202285..fe86277e 100644
--- a/grrui/Program.cs
+++ b/grrui/Program.cs
@@ -1,189 +1,199 @@
-using grrui.Model;
-using grrui.UI;
-using RepoZ.Ipc;
-using System;
+using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using grrui.Model;
+using grrui.UI;
+using RepoZ.Ipc;
 using Terminal.Gui;
 
 namespace grrui
 {
-	class Program
-	{
-		private const int BUTTON_BORDER = 4; // 2 chars to the left, 2 to the right
-		private const int BUTTON_DISTANCE = 1;
-
-		private static IpcClient _client;
-		private static ListView _repositoryList;
-		private static RepositoriesView _repositoriesView;
-		private static TextField _filterField;
-
-		static void Main(string[] args)
-		{
-			_client = new IpcClient(new DefaultIpcEndpoint());
-			var answer = _client.GetRepositories();
-
-			var repositoryCount = answer?.Repositories?.Length ?? 0;
-			if (repositoryCount == 0)
-			{
-				if (!string.IsNullOrEmpty(answer?.Answer))
-					Console.WriteLine(answer.Answer);
-				else
-					Console.WriteLine("No repositories yet");
-
-				return;
-			}
-
-			_repositoriesView = new RepositoriesView(answer.Repositories);
-
-			Application.Init();
-
-			var filterLabel = new Label(1, 1, "Filter: ");
-			_filterField = new TextField("")
-			{
-				X = Pos.Right(filterLabel) + 2,
-				Y = Pos.Top(filterLabel),
-				Width = Dim.Fill(margin: 1),
-			};
-			_filterField.Changed += FilterField_Changed;
-
-			_repositoryList = new ListView(_repositoriesView.Repositories)
-			{
-				X = Pos.Left(filterLabel),
-				Y = Pos.Bottom(filterLabel) + 1,
-				Width = Dim.Fill(margin: 1),
-				Height = Dim.Fill() - 2
-			};
-
-			var win = new KeyPreviewWindow("grr: Git repositories of RepoZ")
-			{
-				filterLabel,
-				_filterField,
-				_repositoryList
-			};
-
-			var buttonX = Pos.Left(filterLabel);
-
-			var navigationButton = new Button("Navigate")
-			{
-				Clicked = Navigate,
-				X = buttonX,
-				Y = Pos.AnchorEnd(1),
-				CanFocus = false
-			};
-
-			if (!CanNavigate)
-				navigationButton.Clicked = CopyNavigationCommandAndQuit;
-
-			buttonX = buttonX + navigationButton.Text.Length + BUTTON_BORDER + BUTTON_DISTANCE;
-			var copyPathButton = new Button("Copy")
-			{
-				Clicked = Copy,
-				X = buttonX,
-				Y = Pos.AnchorEnd(1),
-				CanFocus = false
-			};
-
-			buttonX = buttonX + copyPathButton.Text.Length + BUTTON_BORDER + BUTTON_DISTANCE;
-			var browseButton = new Button("Browse")
-			{
-				Clicked = Browse,
-				X = buttonX,
-				Y = Pos.AnchorEnd(1),
-				CanFocus = false
-			};
-
-			var quitButton = new Button("Quit")
-			{
-				Clicked = Application.RequestStop,
-				X = Pos.AnchorEnd("Quit".Length + BUTTON_BORDER + BUTTON_DISTANCE),
-				Y = Pos.AnchorEnd(1),
-				CanFocus = false
-			};
-
-			win.Add(navigationButton, copyPathButton, browseButton, quitButton);
-
-			win.DefineKeyAction(Key.Enter, () => win.SetFocus(_repositoryList));
-			win.DefineKeyAction(Key.Esc, () =>
-			{
-				if (_filterField.HasFocus)
-					SetFilterText("");
-				else
-					win.SetFocus(_filterField);
-			});
-
-			if (args?.Length > 0)
-				SetFilterText(String.Join(" ", args));
-
-			Application.Top.Add(win);
-			Application.Run();
-		}
-
-		private static void SetFilterText(string filter)
-		{
-			_filterField.Text = filter;
-			_filterField.PositionCursor();
-			FilterField_Changed(_filterField, NStack.ustring.Empty);
-		}
-
-		private static void Navigate()
-		{
-			ExecuteOnSelectedRepository(r =>
-			{
-				var command = $"cd \"{r.SafePath}\"";
-
-				// type the path into the console which is hosting grrui.exe to change to the directory
-				TextCopy.ClipboardService.SetText(command);
-				grr.ConsoleExtensions.WriteConsoleInput(Process.GetCurrentProcess(), command, waitMilliseconds: 1000);
-
-				Application.RequestStop();
-			});
-		}
-
-		private static void CopyNavigationCommandAndQuit()
-		{
-			ExecuteOnSelectedRepository(r =>
-			{
-				var command = $"cd \"{r.SafePath}\"";
-				TextCopy.ClipboardService.SetText(command);
-				TimelyMessage.ShowMessage("Copied to clipboard. Please paste and run the command manually now.", TimeSpan.FromMilliseconds(1000));
-				Application.RequestStop();
-			});
-		}
-
-		private static void Copy()
-		{
-			ExecuteOnSelectedRepository(r =>
-			{
-				var command = $"\"{r.SafePath}\"";
-				TextCopy.ClipboardService.SetText(command);
-			});
-		}
-
-		private static void Browse()
-		{
-			ExecuteOnSelectedRepository(r =>
-			{
-				Process.Start(new ProcessStartInfo(r.SafePath) { UseShellExecute = true });
-			});
-		}
-
-		private static void ExecuteOnSelectedRepository(Action<Repository> action)
-		{
-			var repositories = _repositoriesView?.Repositories;
-			if (repositories?.Length > _repositoryList.SelectedItem)
-			{
-				var current = repositories[_repositoryList.SelectedItem];
-				action(current.Repository);
-			}
-		}
-
-		private static void FilterField_Changed(object sender, NStack.ustring e)
-		{
-			_repositoriesView.Filter = (sender as TextField)?.Text?.ToString() ?? "";
-			_repositoryList.SetSource(_repositoriesView.Repositories);
-		}
-
-		private static bool CanNavigate => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-	}
+    class Program
+    {
+        private const int BUTTON_BORDER = 4; // 2 chars to the left, 2 to the right
+        private const int BUTTON_DISTANCE = 1;
+
+        private static IpcClient _client;
+        private static ListView _repositoryList;
+        private static RepositoriesView _repositoriesView;
+        private static TextField _filterField;
+
+
+        static void Main(string[] args)
+        {
+#if DEBUG
+            Console.WriteLine("Waiting a few seconds for server to initialise and load the data...");
+            System.Threading.Thread.Sleep(7000);
+#endif
+            _client = new IpcClient(new DefaultIpcEndpoint());
+            var answer = _client.GetRepositories();
+
+            var repositoryCount = answer?.Repositories?.Length ?? 0;
+            if (repositoryCount == 0)
+            {
+                if (!string.IsNullOrEmpty(answer?.Answer))
+                    Console.WriteLine(answer.Answer);
+                else
+                    Console.WriteLine("No repositories yet");
+
+                return;
+            }
+
+            _repositoriesView = new RepositoriesView(answer.Repositories);
+
+            Application.Init();
+
+            var filterLabel = new Label(1, 1, "Filter: ");
+            _filterField = new TextField("")
+            {
+                X = Pos.Right(filterLabel) + 2,
+                Y = Pos.Top(filterLabel),
+                Width = Dim.Fill(margin: 1),
+            };
+            _filterField.TextChanged += FilterField_Changed;
+
+            _repositoryList = new ListView(_repositoriesView.Repositories)
+            {
+                X = Pos.Left(filterLabel),
+                Y = Pos.Bottom(filterLabel) + 1,
+                Width = Dim.Fill(margin: 1),
+                Height = Dim.Fill() - 2
+            };
+
+            var win = new KeyPreviewWindow("grr: Git repositories of RepoZ")
+            {
+            };
+            win.Add(filterLabel);
+            win.Add(_filterField);
+            win.Add(_repositoryList);
+
+            var buttonX = Pos.Left(filterLabel);
+
+            var navigationButton = new Button("Navigate")
+            {
+                //Clicked = Navigate,
+                X = buttonX,
+                Y = Pos.AnchorEnd(1),
+                CanFocus = false
+            };
+            navigationButton.Clicked += Navigate;
+
+            if (!CanNavigate)
+                navigationButton.Clicked += CopyNavigationCommandAndQuit;
+
+            buttonX = buttonX + navigationButton.Text.Length + BUTTON_BORDER + BUTTON_DISTANCE;
+            var copyPathButton = new Button("Copy")
+            {
+
+                X = buttonX,
+                Y = Pos.AnchorEnd(1),
+                CanFocus = false
+            };
+            copyPathButton.Clicked += Copy;
+
+            buttonX = buttonX + copyPathButton.Text.Length + BUTTON_BORDER + BUTTON_DISTANCE;
+            var browseButton = new Button("Browse")
+            {
+                X = buttonX,
+                Y = Pos.AnchorEnd(1),
+                CanFocus = false
+            };
+            browseButton.Clicked += Browse;
+
+            var quitButton = new Button("Quit")
+            {
+                X = Pos.AnchorEnd("Quit".Length + BUTTON_BORDER + BUTTON_DISTANCE),
+                Y = Pos.AnchorEnd(1),
+                CanFocus = false
+            };
+            quitButton.Clicked += () =>
+            {
+                Application.RequestStop();
+            };
+
+            win.Add(navigationButton, copyPathButton, browseButton, quitButton);
+
+            win.DefineKeyAction(Key.Enter, () => _repositoryList.SetFocus());
+            win.DefineKeyAction(Key.Esc, () =>
+            {
+                if (_filterField.HasFocus)
+                    SetFilterText("");
+                else
+                    _filterField.SetFocus();
+            });
+
+            if (args?.Length > 0)
+                SetFilterText(String.Join(" ", args));
+
+            Application.Top.Add(win);
+            Application.Run();
+        }
+
+        private static void SetFilterText(string filter)
+        {
+            _filterField.Text = filter;
+            _filterField.PositionCursor();
+            FilterField_Changed(_filterField);
+        }
+
+        private static void Navigate()
+        {
+            ExecuteOnSelectedRepository(r =>
+            {
+                var command = $"cd \"{r.SafePath}\"";
+
+                // type the path into the console which is hosting grrui.exe to change to the directory
+                TextCopy.ClipboardService.SetText(command);
+                grr.ConsoleExtensions.WriteConsoleInput(Process.GetCurrentProcess(), command, waitMilliseconds: 1000);
+
+                Application.RequestStop();
+            });
+        }
+
+        private static void CopyNavigationCommandAndQuit()
+        {
+            ExecuteOnSelectedRepository(r =>
+            {
+                var command = $"cd \"{r.SafePath}\"";
+                TextCopy.ClipboardService.SetText(command);
+                TimelyMessage.ShowMessage("Copied to clipboard. Please paste and run the command manually now.", TimeSpan.FromMilliseconds(1000));
+                Application.RequestStop();
+            });
+        }
+
+        private static void Copy()
+        {
+            ExecuteOnSelectedRepository(r =>
+            {
+                var command = $"\"{r.SafePath}\"";
+                TextCopy.ClipboardService.SetText(command);
+            });
+        }
+
+        private static void Browse()
+        {
+            ExecuteOnSelectedRepository(r =>
+            {
+                Process.Start(new ProcessStartInfo(r.SafePath) { UseShellExecute = true });
+            });
+        }
+
+        private static void ExecuteOnSelectedRepository(Action<Repository> action)
+        {
+            var repositories = _repositoriesView?.Repositories;
+            if (repositories?.Length > _repositoryList.SelectedItem)
+            {
+                var current = repositories[_repositoryList.SelectedItem];
+                action(current.Repository);
+            }
+        }
+
+        private static void FilterField_Changed(object sender)
+        {
+            _repositoriesView.Filter = (sender as TextField)?.Text?.ToString() ?? "";
+            _repositoryList.SetSource(_repositoriesView.Repositories);
+        }
+
+        private static bool CanNavigate => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+    }
 }
\ No newline at end of file
diff --git a/grrui/UI/TimelyMessage.cs b/grrui/UI/TimelyMessage.cs
index 418a35a4..10949542 100644
--- a/grrui/UI/TimelyMessage.cs
+++ b/grrui/UI/TimelyMessage.cs
@@ -1,28 +1,25 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using Terminal.Gui;
 
 namespace grrui.UI
 {
-	public static class TimelyMessage
-	{
-		public static void ShowMessage(string message, TimeSpan duration)
-		{
-			int width = message.Length + 6;
-			int height = 5;
-			int lines = Label.MeasureLines(message, width);
+    public static class TimelyMessage
+    {
+        public static void ShowMessage(string message, TimeSpan duration)
+        {
+            int width = message.Length + 6;
+            int height = 5;
+            //int lines = Label.MeasureLines(message, width);
 
-			var dialog = new Dialog(null, width, height);
+            var dialog = new Dialog(null, width, height);
 
-			var label = new Label((width - 4 - message.Length) / 2, 0, message);
-				dialog.Add(label);
+            var label = new Label((width - 4 - message.Length) / 2, 0, message);
+            dialog.Add(label);
 
-			Task.Delay(duration).ContinueWith(t => dialog.Running = false);
-			Application.Run(dialog);
-			
-		}
-	}
+            Task.Delay(duration).ContinueWith(t => dialog.Running = false);
+            Application.Run(dialog);
+
+        }
+    }
 }
diff --git a/grrui/grrui.csproj b/grrui/grrui.csproj
index b9bf89ca..c319e2c8 100644
--- a/grrui/grrui.csproj
+++ b/grrui/grrui.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ReleaseVersion>4.0</ReleaseVersion>
-    <Version>1.0.0.0</Version>
+    <Version>3.0.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Terminal.Gui" Version="0.81.0" />
-    <PackageReference Include="TextCopy" Version="4.2.0" />
+    <PackageReference Include="Terminal.Gui" Version="1.17.1" />
+    <PackageReference Include="TextCopy" Version="6.2.1" />
   </ItemGroup>
 
   <ItemGroup>