diff --git a/Source/NETworkManager.Setup/NETworkManager.Setup.vdproj b/Source/NETworkManager.Setup/NETworkManager.Setup.vdproj
index d0c8beca4e..216ec98be0 100644
--- a/Source/NETworkManager.Setup/NETworkManager.Setup.vdproj
+++ b/Source/NETworkManager.Setup/NETworkManager.Setup.vdproj
@@ -22,13 +22,13 @@
         "Entry"
         {
         "MsmKey" = "8:_287F82846E33E6F26968C7B256EF09F8"
-        "OwnerKey" = "8:_330E8E6DA8ED4B773D59A1586EC8F437"
+        "OwnerKey" = "8:_48ACD967FDBF43AEAF73122414146A86"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_287F82846E33E6F26968C7B256EF09F8"
-        "OwnerKey" = "8:_48ACD967FDBF43AEAF73122414146A86"
+        "OwnerKey" = "8:_330E8E6DA8ED4B773D59A1586EC8F437"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -88,13 +88,13 @@
         "Entry"
         {
         "MsmKey" = "8:_9A8619402B1C850D44680EEA483C9C4A"
-        "OwnerKey" = "8:_AD7C559AAEBD0DFD0B0A135B65E2A071"
+        "OwnerKey" = "8:_330E8E6DA8ED4B773D59A1586EC8F437"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_9A8619402B1C850D44680EEA483C9C4A"
-        "OwnerKey" = "8:_330E8E6DA8ED4B773D59A1586EC8F437"
+        "OwnerKey" = "8:_AD7C559AAEBD0DFD0B0A135B65E2A071"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -154,85 +154,85 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_F9CAC28BFA2FE24D3D55237357C2D7B6"
+        "OwnerKey" = "8:_CAE55A6A5A10C449B04915201740D438"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_AD7C559AAEBD0DFD0B0A135B65E2A071"
+        "OwnerKey" = "8:_EE6BFCCFD10E229CA82C9B6854A3FE17"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_330E8E6DA8ED4B773D59A1586EC8F437"
+        "OwnerKey" = "8:_31205BBAB900BF6933FE71AE79EC0061"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_47CE91384CFA30189E66E0927B51A477"
+        "OwnerKey" = "8:_6A57510865BA59B777DFC86A45E2DDDB"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_39FE71C6A9E783ED61B525EA2D4C772D"
+        "OwnerKey" = "8:_DF7090C238243AA0348DC046E88FDD49"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_4D64F059BE1802EEF044CE73194E762B"
+        "OwnerKey" = "8:_B2D12C55ED7E4372B6238A6AE059FF72"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_9A8619402B1C850D44680EEA483C9C4A"
+        "OwnerKey" = "8:_287F82846E33E6F26968C7B256EF09F8"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_287F82846E33E6F26968C7B256EF09F8"
+        "OwnerKey" = "8:_9A8619402B1C850D44680EEA483C9C4A"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_B2D12C55ED7E4372B6238A6AE059FF72"
+        "OwnerKey" = "8:_4D64F059BE1802EEF044CE73194E762B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_DF7090C238243AA0348DC046E88FDD49"
+        "OwnerKey" = "8:_39FE71C6A9E783ED61B525EA2D4C772D"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_6A57510865BA59B777DFC86A45E2DDDB"
+        "OwnerKey" = "8:_47CE91384CFA30189E66E0927B51A477"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_31205BBAB900BF6933FE71AE79EC0061"
+        "OwnerKey" = "8:_330E8E6DA8ED4B773D59A1586EC8F437"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_EE6BFCCFD10E229CA82C9B6854A3FE17"
+        "OwnerKey" = "8:_AD7C559AAEBD0DFD0B0A135B65E2A071"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_CAE55A6A5A10C449B04915201740D438"
+        "OwnerKey" = "8:_F9CAC28BFA2FE24D3D55237357C2D7B6"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -337,11 +337,6 @@
             "AssemblyAsmDisplayName" = "8:System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_287F82846E33E6F26968C7B256EF09F8"
-                    {
-                    "Name" = "8:System.Windows.Interactivity.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:System.Windows.Interactivity.dll"
             "TargetName" = "8:"
@@ -368,11 +363,6 @@
             "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
                 "ScatterAssemblies"
                 {
-                    "_31205BBAB900BF6933FE71AE79EC0061"
-                    {
-                    "Name" = "8:System.Net.Http.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:System.Net.Http.dll"
             "TargetName" = "8:"
@@ -399,11 +389,6 @@
             "AssemblyAsmDisplayName" = "8:MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_330E8E6DA8ED4B773D59A1586EC8F437"
-                    {
-                    "Name" = "8:MahApps.Metro.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:MahApps.Metro.dll"
             "TargetName" = "8:"
@@ -430,11 +415,6 @@
             "AssemblyAsmDisplayName" = "8:System.Net.IPNetwork, Version=2.1.2.0, Culture=neutral, PublicKeyToken=717343cc2c25edcf, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_39FE71C6A9E783ED61B525EA2D4C772D"
-                    {
-                    "Name" = "8:System.Net.IPNetwork.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:System.Net.IPNetwork.dll"
             "TargetName" = "8:"
@@ -461,11 +441,6 @@
             "AssemblyAsmDisplayName" = "8:SharpSnmpLib, Version=10.0.0.0, Culture=neutral, PublicKeyToken=4c00852d3788e005, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_47CE91384CFA30189E66E0927B51A477"
-                    {
-                    "Name" = "8:SharpSnmpLib.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:SharpSnmpLib.dll"
             "TargetName" = "8:"
@@ -492,11 +467,6 @@
             "AssemblyAsmDisplayName" = "8:Dragablz, Version=0.0.3.203, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_4D64F059BE1802EEF044CE73194E762B"
-                    {
-                    "Name" = "8:Dragablz.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:Dragablz.dll"
             "TargetName" = "8:"
@@ -523,11 +493,6 @@
             "AssemblyAsmDisplayName" = "8:MSTSCLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_6A57510865BA59B777DFC86A45E2DDDB"
-                    {
-                    "Name" = "8:MSTSCLib.DLL"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:MSTSCLib.DLL"
             "TargetName" = "8:"
@@ -554,11 +519,6 @@
             "AssemblyAsmDisplayName" = "8:ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_9A8619402B1C850D44680EEA483C9C4A"
-                    {
-                    "Name" = "8:ControlzEx.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:ControlzEx.dll"
             "TargetName" = "8:"
@@ -585,11 +545,6 @@
             "AssemblyAsmDisplayName" = "8:MahApps.Metro.IconPacks, Version=2.3.0.4, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_AD7C559AAEBD0DFD0B0A135B65E2A071"
-                    {
-                    "Name" = "8:MahApps.Metro.IconPacks.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:MahApps.Metro.IconPacks.dll"
             "TargetName" = "8:"
@@ -616,11 +571,6 @@
             "AssemblyAsmDisplayName" = "8:AirspaceFixer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_B2D12C55ED7E4372B6238A6AE059FF72"
-                    {
-                    "Name" = "8:AirspaceFixer.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:AirspaceFixer.dll"
             "TargetName" = "8:"
@@ -647,11 +597,6 @@
             "AssemblyAsmDisplayName" = "8:System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
                 "ScatterAssemblies"
                 {
-                    "_CAE55A6A5A10C449B04915201740D438"
-                    {
-                    "Name" = "8:System.IO.Compression.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:System.IO.Compression.dll"
             "TargetName" = "8:"
@@ -678,11 +623,6 @@
             "AssemblyAsmDisplayName" = "8:AxMSTSCLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_DF7090C238243AA0348DC046E88FDD49"
-                    {
-                    "Name" = "8:AxMSTSCLib.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:AxMSTSCLib.dll"
             "TargetName" = "8:"
@@ -729,11 +669,6 @@
             "AssemblyAsmDisplayName" = "8:System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
                 "ScatterAssemblies"
                 {
-                    "_EE6BFCCFD10E229CA82C9B6854A3FE17"
-                    {
-                    "Name" = "8:System.IO.Compression.FileSystem.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:System.IO.Compression.FileSystem.dll"
             "TargetName" = "8:"
@@ -760,11 +695,6 @@
             "AssemblyAsmDisplayName" = "8:Octokit, Version=0.32.0.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_F9CAC28BFA2FE24D3D55237357C2D7B6"
-                    {
-                    "Name" = "8:Octokit.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:Octokit.dll"
             "TargetName" = "8:"
@@ -851,15 +781,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:NETworkManager"
-        "ProductCode" = "8:{12150144-C241-4770-8FAA-77C730575DD8}"
-        "PackageCode" = "8:{D17BE824-DE98-473B-A4D3-77F506519E8A}"
+        "ProductCode" = "8:{37E4F852-32A5-42D7-8126-68E86F9E3096}"
+        "PackageCode" = "8:{EEC09144-289D-466A-B734-0AC49F5203FE}"
         "UpgradeCode" = "8:{FBE04B49-929D-4FB1-9A85-4F83A13E2E10}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:1.8.0"
+        "ProductVersion" = "8:1.8.1"
         "Manufacturer" = "8:BornToBeRoot"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
diff --git a/Source/NETworkManager/App.xaml.cs b/Source/NETworkManager/App.xaml.cs
index 2c7880b604..03f0494496 100644
--- a/Source/NETworkManager/App.xaml.cs
+++ b/Source/NETworkManager/App.xaml.cs
@@ -52,7 +52,6 @@ private void Application_Startup(object sender, StartupEventArgs e)
                 // Update integrated settings %LocalAppData%\NETworkManager\NETworkManager_GUID (custom settings path)
                 if (Settings.Default.UpgradeRequired)
                 {
-                    Debug.Write("Upgrade settings...");
                     Settings.Default.Upgrade();
                     Settings.Default.UpgradeRequired = false;
                 }
diff --git a/Source/NETworkManager/Controls/PuTTYControl.xaml b/Source/NETworkManager/Controls/PuTTYControl.xaml
index 92a42281f8..3bd0e069ad 100644
--- a/Source/NETworkManager/Controls/PuTTYControl.xaml
+++ b/Source/NETworkManager/Controls/PuTTYControl.xaml
@@ -31,7 +31,7 @@
             <TextBlock Grid.Row="1" Foreground="{DynamicResource AccentColorBrush}" Text="{x:Static localization:Strings.PuTTYProcessHasEnded}" Style="{DynamicResource DefaultTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanReverseToVisibilityHiddenConverter}}" />
             <mah:ProgressRing Grid.Row="0" Grid.RowSpan="2" Height="50" Width="50" IsActive="{Binding IsConnecting}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"/>
             <Button Grid.Row="3" Content="{x:Static localization:Strings.Reconnect}" Command="{Binding ReconnectCommand}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" IsDefault="True" IsEnabled="{Binding IsConnecting, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource DefaultButton}"/>
-            <TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}" Style="{StaticResource HeaderTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
+            <TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}" Style="{StaticResource MessageTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
         </Grid>
     </Grid>
 </UserControl>
diff --git a/Source/NETworkManager/Controls/PuTTYControl.xaml.cs b/Source/NETworkManager/Controls/PuTTYControl.xaml.cs
index ff7058e85e..f388603226 100644
--- a/Source/NETworkManager/Controls/PuTTYControl.xaml.cs
+++ b/Source/NETworkManager/Controls/PuTTYControl.xaml.cs
@@ -168,10 +168,10 @@ private async void Connect()
                         style &= ~(NativeMethods.WS_CAPTION | NativeMethods.WS_POPUP | NativeMethods.WS_THICKFRAME);
                         NativeMethods.SetWindowLongPtr(_appWin, NativeMethods.GWL_STYLE, new IntPtr(style));
 
-                        // Resize embedded application & refresh       
-                        ResizeEmbeddedPutty();
-
                         IsConnected = true;
+
+                        // Resize embedded application & refresh       
+                        ResizeEmbeddedPuTTY();
                     }
                 }
                 else
@@ -204,7 +204,7 @@ private void PuTTYProcess_Exited(object sender, EventArgs e)
             IsConnected = false;
         }
 
-        private void ResizeEmbeddedPutty()
+        private void ResizeEmbeddedPuTTY()
         {
             if (IsConnected)
                 NativeMethods.SetWindowPos(_puttyProcess.MainWindowHandle, IntPtr.Zero, 0, 0, PuTTYHost.ClientSize.Width, PuTTYHost.ClientSize.Height, NativeMethods.SWP_NOZORDER | NativeMethods.SWP_NOACTIVATE);
@@ -234,14 +234,14 @@ public void CloseTab()
         private void PuTTYGrid_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             if (_puttyProcess != null)
-                ResizeEmbeddedPutty();
+                ResizeEmbeddedPuTTY();
         }
 
         private void ResizeTimer_Tick(object sender, EventArgs e)
         {
             _resizeTimer.Stop();
 
-            ResizeEmbeddedPutty();
+            ResizeEmbeddedPuTTY();
         }
         #endregion
     }
diff --git a/Source/NETworkManager/Controls/RemoteDesktopControl.xaml b/Source/NETworkManager/Controls/RemoteDesktopControl.xaml
index 11cc9abba6..abf28ac14e 100644
--- a/Source/NETworkManager/Controls/RemoteDesktopControl.xaml
+++ b/Source/NETworkManager/Controls/RemoteDesktopControl.xaml
@@ -30,7 +30,7 @@
             <TextBlock Grid.Row="1" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding DisconnectReason}" Style="{DynamicResource DefaultTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanReverseToVisibilityHiddenConverter}}" />
             <mah:ProgressRing Grid.Row="0" Grid.RowSpan="2" Height="50" Width="50" IsActive="{Binding IsConnecting}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"/>
             <Button Grid.Row="3" Content="{x:Static localization:Strings.Reconnect}" Command="{Binding ReconnectCommand}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" IsDefault="True" IsEnabled="{Binding IsConnecting, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource DefaultButton}"/>
-            <TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}" Style="{StaticResource HeaderTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
+            <TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}" Style="{StaticResource MessageTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
         </Grid>
     </Grid>
 </UserControl>
diff --git a/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs b/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs
index c00e71ba85..1ff2ecd091 100644
--- a/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs
+++ b/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs
@@ -335,7 +335,7 @@ private static string GetDisconnectReason(int reason)
                 case 8711:
                     return NETworkManager.Resources.Localization.Strings.RemoteDesktopDisconnectReason_SslErrSmartcardCardBlocked;
                 default:
-                    return "reason not found!";
+                    return string.Empty;
             }
         }
         #endregion
diff --git a/Source/NETworkManager/Controls/TightVNCControl.xaml b/Source/NETworkManager/Controls/TightVNCControl.xaml
index a44a4f5c2b..fb4f3363ca 100644
--- a/Source/NETworkManager/Controls/TightVNCControl.xaml
+++ b/Source/NETworkManager/Controls/TightVNCControl.xaml
@@ -31,7 +31,7 @@
             <TextBlock Grid.Row="1" Foreground="{DynamicResource AccentColorBrush}" Text="{x:Static localization:Strings.TightVNCProcessHasEnded}" Style="{DynamicResource DefaultTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanReverseToVisibilityHiddenConverter}}" />
             <mah:ProgressRing Grid.Row="0" Grid.RowSpan="2" Height="50" Width="50" IsActive="{Binding IsConnecting}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"/>
             <Button Grid.Row="3" Content="{x:Static localization:Strings.Reconnect}" Command="{Binding ReconnectCommand}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" IsDefault="True" IsEnabled="{Binding IsConnecting, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource DefaultButton}"/>
-            <TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}" Style="{StaticResource HeaderTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
+            <TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}" Style="{StaticResource MessageTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
         </Grid>
     </Grid>
 </UserControl>
diff --git a/Source/NETworkManager/Controls/TightVNCControl.xaml.cs b/Source/NETworkManager/Controls/TightVNCControl.xaml.cs
index 2d17328d82..1d12d41821 100644
--- a/Source/NETworkManager/Controls/TightVNCControl.xaml.cs
+++ b/Source/NETworkManager/Controls/TightVNCControl.xaml.cs
@@ -167,11 +167,11 @@ private async void Connect()
                         long style = (int)NativeMethods.GetWindowLong(_appWin, NativeMethods.GWL_STYLE);
                         style &= ~(NativeMethods.WS_CAPTION | NativeMethods.WS_POPUP | NativeMethods.WS_THICKFRAME);
                         NativeMethods.SetWindowLongPtr(_appWin, NativeMethods.GWL_STYLE, new IntPtr(style));
+                        
+                        IsConnected = true;
 
                         // Resize embedded application & refresh       
                         ResizeEmbeddedTightVNC();
-
-                        IsConnected = true;
                     }
                 }
                 else
diff --git a/Source/NETworkManager/Converters/OperationalStatusToStringConverter.cs b/Source/NETworkManager/Converters/OperationalStatusToStringConverter.cs
index dedf349217..10dbbe50d5 100644
--- a/Source/NETworkManager/Converters/OperationalStatusToStringConverter.cs
+++ b/Source/NETworkManager/Converters/OperationalStatusToStringConverter.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Globalization;
 using System.Net.NetworkInformation;
 using System.Windows.Data;
@@ -10,8 +9,6 @@ public sealed class OperationalStatusToStringConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            Debug.WriteLine("Converter runs...");
-
             if (!(value is OperationalStatus operationalStatus))
                 return "-/-";
             
diff --git a/Source/NETworkManager/Properties/AssemblyInfo.cs b/Source/NETworkManager/Properties/AssemblyInfo.cs
index d10f08c60a..fcd38ffe63 100644
--- a/Source/NETworkManager/Properties/AssemblyInfo.cs
+++ b/Source/NETworkManager/Properties/AssemblyInfo.cs
@@ -49,6 +49,6 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.8.0.0")]
-[assembly: AssemblyFileVersion("1.8.0.0")]
+[assembly: AssemblyVersion("1.8.1.0")]
+[assembly: AssemblyFileVersion("1.8.1.0")]
 
diff --git a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs
index 4adea0370d..b10eaf3ef6 100644
--- a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs
+++ b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs
@@ -3716,15 +3716,6 @@ public static string RAW {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Read the MAC address from the ARP cache.
-        /// </summary>
-        public static string ReadTheMACAddressFromTheArpCache {
-            get {
-                return ResourceManager.GetString("ReadTheMACAddressFromTheArpCache", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Received / Lost.
         /// </summary>
@@ -4346,6 +4337,15 @@ public static string ResolveHostname {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Resolve MAC address and vendor.
+        /// </summary>
+        public static string ResolveMACAddressAndVendor {
+            get {
+                return ResourceManager.GetString("ResolveMACAddressAndVendor", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Resolve PTR.
         /// </summary>
@@ -4940,6 +4940,15 @@ public static string Steel {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to .
+        /// </summary>
+        public static string String1 {
+            get {
+                return ResourceManager.GetString("String1", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Subnet.
         /// </summary>
diff --git a/Source/NETworkManager/Resources/Localization/Strings.de-DE.resx b/Source/NETworkManager/Resources/Localization/Strings.de-DE.resx
index 196e2135ed..6a282a41b5 100644
--- a/Source/NETworkManager/Resources/Localization/Strings.de-DE.resx
+++ b/Source/NETworkManager/Resources/Localization/Strings.de-DE.resx
@@ -561,9 +561,6 @@
   <data name="PrimaryDNSServer" xml:space="preserve">
     <value>Primärer DNS-Server</value>
   </data>
-  <data name="ReadTheMACAddressFromTheArpCache" xml:space="preserve">
-    <value>MAC-Adresse aus dem ARP-Cache auslesen</value>
-  </data>
   <data name="ReceivedLost" xml:space="preserve">
     <value>Empfangen / Verloren</value>
   </data>
@@ -2030,4 +2027,10 @@ Wenn Sie auf "Verschieben &amp; neu starten" klicken, werden die restlichen Date
   <data name="ConnectingDots" xml:space="preserve">
     <value>Verbinde...</value>
   </data>
+  <data name="ResolveMACAddressAndVendor" xml:space="preserve">
+    <value>MAC-Adresse und Hersteller auflösen</value>
+  </data>
+  <data name="String1" xml:space="preserve">
+    <value/>
+  </data>
 </root>
diff --git a/Source/NETworkManager/Resources/Localization/Strings.es-ES.resx b/Source/NETworkManager/Resources/Localization/Strings.es-ES.resx
index 7a596f4c38..228445397b 100644
--- a/Source/NETworkManager/Resources/Localization/Strings.es-ES.resx
+++ b/Source/NETworkManager/Resources/Localization/Strings.es-ES.resx
@@ -561,9 +561,6 @@
   <data name="PrimaryDNSServer" xml:space="preserve">
     <value>Servidor DNS primario</value>
   </data>
-  <data name="ReadTheMACAddressFromTheArpCache" xml:space="preserve">
-    <value>Leer la dirección MAC de la caché ARP</value>
-  </data>
   <data name="ReceivedLost" xml:space="preserve">
     <value>Recibido / Perdido</value>
   </data>
@@ -655,7 +652,7 @@
     <value>Sí</value>
   </data>
   <data name="Add" xml:space="preserve">
-    <value>Add</value>
+    <value>Añadir</value>
   </data>
   <data name="AddATabToOpenANewConnection" xml:space="preserve">
     <value>Añadir una pestaña para abrir una nueva conexión...</value>
@@ -751,7 +748,7 @@
     <value>Comunidad</value>
   </data>
   <data name="ConfigureThePathToPuTTYInTheSettingsDots" xml:space="preserve">
-    <value>Configure la ruta a PuTTY en la configuración...</value>
+    <value>Configure la ruta de PuTTY en la configuración...</value>
   </data>
   <data name="ConfirmClose" xml:space="preserve">
     <value>Confirmar cierre</value>
@@ -829,10 +826,10 @@
     <value>Los perfiles seleccionados se eliminarán permanentemente.</value>
   </data>
   <data name="DisableTransparencyInTheSettingsToUsePuTTY" xml:space="preserve">
-    <value>Desactive la transparencia en la configuración (General/Apariencia) y reinicie la aplicación luego puede usar PuTTY.</value>
+    <value>Desactive la transparencia en la configuración (General/Apariencia) y luego reinicie la aplicación para usar PuTTY.</value>
   </data>
   <data name="DisableTransparencyInTheSettingsToUseRemoteDesktop" xml:space="preserve">
-    <value>Desactive la transparencia en la configuración (General/Apariencia) y reinicie la aplicación luego puede usar el Escritorio remoto.</value>
+    <value>Desactive la transparencia en la configuración (General/Apariencia) y luego reinicie la aplicación para usar el Escritorio remoto.</value>
   </data>
   <data name="DNSAutoconfiguration" xml:space="preserve">
     <value>Configuración automática de DNS</value>
@@ -1971,37 +1968,37 @@
     <value>ejemplo.com</value>
   </data>
   <data name="Routing" xml:space="preserve">
-    <value>Routing</value>
+    <value>Enrutado</value>
   </data>
   <data name="Release" xml:space="preserve">
-    <value>Release</value>
+    <value>Liberar</value>
   </data>
   <data name="ReleaseRenew" xml:space="preserve">
-    <value>Release &amp; Renew</value>
+    <value>Liberar y renovar</value>
   </data>
   <data name="Renew" xml:space="preserve">
-    <value>Renew</value>
+    <value>Renovar</value>
   </data>
   <data name="WindowsDNSSettings" xml:space="preserve">
-    <value>Windows DNS settings</value>
+    <value>Configuración DNS de Windows</value>
   </data>
   <data name="DeleteDNSServer" xml:space="preserve">
-    <value>Delete DNS server</value>
+    <value>Eliminar servidor DNS</value>
   </data>
   <data name="DeleteDNSServerMessage" xml:space="preserve">
-    <value>The selected DNS server will be deleted permanently.</value>
+    <value>El servidor DNS seleccionado será eliminado permanentemente.</value>
   </data>
   <data name="AddDNSServer" xml:space="preserve">
-    <value>Add DNS server</value>
+    <value>Añadir servidor DNS</value>
   </data>
   <data name="EditDNSServer" xml:space="preserve">
-    <value>Edit DNS server</value>
+    <value>Editar servidor DNS</value>
   </data>
   <data name="DNSServerWithThisNameAlreadyExists" xml:space="preserve">
-    <value>A DNS server with this name already exists!</value>
+    <value>¡Ya existe un servidor DNS con este nombre!</value>
   </data>
   <data name="RestartSession" xml:space="preserve">
-    <value>Restart session</value>
+    <value>Reiniciar sesión</value>
   </data>
   <data name="ExamplePort5900" xml:space="preserve">
     <value>5900</value>
@@ -2010,24 +2007,30 @@
     <value>TightVNC</value>
   </data>
   <data name="ConfigureThePathToTightVNCInTheSettingsDots" xml:space="preserve">
-    <value>Configure the path to TightVNC in the settings...</value>
+    <value>Configure la ruta de TightVNC en la configuración...</value>
   </data>
   <data name="ConfigureTightVNC" xml:space="preserve">
-    <value>Configure TightVNC</value>
+    <value>Configurar TightVNC</value>
   </data>
   <data name="DefaultVNCPort" xml:space="preserve">
-    <value>Default VNC port</value>
+    <value>Puerto VNC predeterminado</value>
   </data>
   <data name="DisableTransparencyInTheSettingsToUseTightVNC" xml:space="preserve">
-    <value>Disable the transparency in the settings (General/Appearance) and restart the application afterwards to use TightVNC.</value>
+    <value>Desactive la transparencia en la configuración (General/Apariencia) y luego reinicie la aplicación para usar TightVNC.</value>
   </data>
   <data name="TightVNCLocationDots" xml:space="preserve">
-    <value>TightVNC location...</value>
+    <value>Ubicación de TightVNC...</value>
   </data>
   <data name="TightVNCProcessHasEnded" xml:space="preserve">
-    <value>TightVNC process has ended!</value>
+    <value>¡El proceso de TightVNC ha finalizado!</value>
   </data>
   <data name="ConnectingDots" xml:space="preserve">
-    <value>Connecting...</value>
+    <value>Conectando...</value>
+  </data>
+  <data name="ResolveMACAddressAndVendor" xml:space="preserve">
+    <value>Resolve MAC address and vendor</value>
+  </data>
+  <data name="String1" xml:space="preserve">
+    <value/>
   </data>
 </root>
diff --git a/Source/NETworkManager/Resources/Localization/Strings.resx b/Source/NETworkManager/Resources/Localization/Strings.resx
index 69404c8485..cae8869085 100644
--- a/Source/NETworkManager/Resources/Localization/Strings.resx
+++ b/Source/NETworkManager/Resources/Localization/Strings.resx
@@ -561,9 +561,6 @@
   <data name="PrimaryDNSServer" xml:space="preserve">
     <value>Primary DNS server</value>
   </data>
-  <data name="ReadTheMACAddressFromTheArpCache" xml:space="preserve">
-    <value>Read the MAC address from the ARP cache</value>
-  </data>
   <data name="ReceivedLost" xml:space="preserve">
     <value>Received / Lost</value>
   </data>
@@ -2030,4 +2027,10 @@ If you click "Move &amp; Restart", the remaining files will be copied and the ap
   <data name="ConnectingDots" xml:space="preserve">
     <value>Connecting...</value>
   </data>
+  <data name="ResolveMACAddressAndVendor" xml:space="preserve">
+    <value>Resolve MAC address and vendor</value>
+  </data>
+  <data name="String1" xml:space="preserve">
+    <value />
+  </data>
 </root>
\ No newline at end of file
diff --git a/Source/NETworkManager/Resources/Localization/Strings.ru-RU.resx b/Source/NETworkManager/Resources/Localization/Strings.ru-RU.resx
index 373b9237f7..90c4c8c1b7 100644
--- a/Source/NETworkManager/Resources/Localization/Strings.ru-RU.resx
+++ b/Source/NETworkManager/Resources/Localization/Strings.ru-RU.resx
@@ -561,9 +561,6 @@
   <data name="PrimaryDNSServer" xml:space="preserve">
     <value>Первичный DNS-сервер</value>
   </data>
-  <data name="ReadTheMACAddressFromTheArpCache" xml:space="preserve">
-    <value>Чтение MAC-адреса в кэше ARP</value>
-  </data>
   <data name="ReceivedLost" xml:space="preserve">
     <value>Получено / Потеряно</value>
   </data>
@@ -2030,4 +2027,10 @@
   <data name="ConnectingDots" xml:space="preserve">
     <value>Connecting...</value>
   </data>
+  <data name="ResolveMACAddressAndVendor" xml:space="preserve">
+    <value>Resolve MAC address and vendor</value>
+  </data>
+  <data name="String1" xml:space="preserve">
+    <value/>
+  </data>
 </root>
diff --git a/Source/NETworkManager/ViewModels/SubnetCalculatorSupernettingViewModel.cs b/Source/NETworkManager/ViewModels/SubnetCalculatorSupernettingViewModel.cs
index 0433cac0ae..88ab5125f8 100644
--- a/Source/NETworkManager/ViewModels/SubnetCalculatorSupernettingViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SubnetCalculatorSupernettingViewModel.cs
@@ -1,4 +1,5 @@
-using NETworkManager.Models.Settings;
+using System;
+using NETworkManager.Models.Settings;
 using System.Windows.Input;
 using NETworkManager.Utilities;
 using System.Windows.Data;
@@ -6,12 +7,15 @@
 using System.Linq;
 using System.Net;
 using System.Numerics;
+using MahApps.Metro.Controls.Dialogs;
 
 namespace NETworkManager.ViewModels
 {
     public class SubnetCalculatorSupernettingViewModel : ViewModelBase
     {
         #region Variables
+        private readonly IDialogCoordinator _dialogCoordinator;
+
         private string _subnet1;
         public string Subnet1
         {
@@ -187,8 +191,10 @@ public BigInteger Hosts
         #endregion
 
         #region Constructor, load settings
-        public SubnetCalculatorSupernettingViewModel()
+        public SubnetCalculatorSupernettingViewModel(IDialogCoordinator instance)
         {
+            _dialogCoordinator = instance;
+
             // Set collection view
             Subnet1HistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.SubnetCalculator_Supernetting_Subnet1);
             Subnet2HistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.SubnetCalculator_Supernetting_Subnet2);
@@ -208,30 +214,47 @@ private void CalculateAction()
         #endregion
 
         #region Methods
-        private void Calculate()
+        private async void Calculate()
         {
-            IsCalculationRunning = true;
+            try
+            {
+                IsCalculationRunning = true;
+
+                var subnet1 = IPNetwork.Parse(Subnet1);
+                var subnet2 = IPNetwork.Parse(Subnet2);
+
+                var subnet = subnet1.Supernet(subnet2);
 
-            var subnet1 = IPNetwork.Parse(Subnet1);
-            var subnet2 = IPNetwork.Parse(Subnet2);
+                NetworkAddress = subnet.Network;
+                Broadcast = subnet.Broadcast;
+                Subnetmask = subnet.Netmask;
+                CIDR = subnet.Cidr;
+                IPAddresses = subnet.Total;
+                FirstIPAddress = subnet.FirstUsable;
+                LastIPAddress = subnet.LastUsable;
+                Hosts = subnet.Usable;
 
-            var subnet = subnet1.Supernet(subnet2);
+                IsResultVisible = true;
 
-            NetworkAddress = subnet.Network;
-            Broadcast = subnet.Broadcast;
-            Subnetmask = subnet.Netmask;
-            CIDR = subnet.Cidr;
-            IPAddresses = subnet.Total;
-            FirstIPAddress = subnet.FirstUsable;
-            LastIPAddress = subnet.LastUsable;
-            Hosts = subnet.Usable;
+                AddSubnet1ToHistory(Subnet1);
+                AddSubnet2ToHistory(Subnet2);
+            }
+            catch (ArgumentOutOfRangeException ex)
+            {
+                var settings = AppearanceManager.MetroDialog;
+                settings.AffirmativeButtonText = Resources.Localization.Strings.OK;
 
-            IsResultVisible = true;
+                ConfigurationManager.Current.IsDialogOpen = true;
 
-            AddSubnet1ToHistory(Subnet1);
-            AddSubnet2ToHistory(Subnet2);
+                await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, "This is a known error, see:\n\nhttps://github.com/BornToBeRoot/NETworkManager/issues/151\n\n\n--- Error message ---\n" + 
+                    ex.Message, MessageDialogStyle.Affirmative, settings);
 
-            IsCalculationRunning = false;
+                ConfigurationManager.Current.IsDialogOpen = false;
+            }
+            finally
+            {
+                IsCalculationRunning = false;
+            }
         }
 
         private void AddSubnet1ToHistory(string subnet)
diff --git a/Source/NETworkManager/Views/IPScannerSettingsView.xaml b/Source/NETworkManager/Views/IPScannerSettingsView.xaml
index 9f057ea468..7b4fd2482b 100644
--- a/Source/NETworkManager/Views/IPScannerSettingsView.xaml
+++ b/Source/NETworkManager/Views/IPScannerSettingsView.xaml
@@ -55,7 +55,7 @@
         <TextBlock Text="{x:Static localization:Strings.TimeoutMS}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" Margin="0,0,0,10" />
         <mah:NumericUpDown Value="{Binding DNSTimeout}" Maximum="15000" Minimum="100" Interval="100" Margin="0,0,0,20" />
         <TextBlock Text="{x:Static localization:Strings.ARP}" Style="{StaticResource HeaderTextBlock}" />
-        <mah:ToggleSwitch Header="{x:Static localization:Strings.ReadTheMACAddressFromTheArpCache}"   IsChecked="{Binding ResolveMACAddress}" Margin="0,0,0,20" />
+        <mah:ToggleSwitch Header="{x:Static localization:Strings.ResolveMACAddressAndVendor}"   IsChecked="{Binding ResolveMACAddress}" Margin="0,0,0,20" />
         <TextBlock Text="{x:Static localization:Strings.Statistics}" Style="{StaticResource HeaderTextBlock}" />
         <mah:ToggleSwitch Header="{x:Static localization:Strings.ShowStatistics}"   IsChecked="{Binding ShowStatistics}" />
     </StackPanel>
diff --git a/Source/NETworkManager/Views/SubnetCalculatorSupernettingView.xaml.cs b/Source/NETworkManager/Views/SubnetCalculatorSupernettingView.xaml.cs
index 8c15b98e41..ce5549a78d 100644
--- a/Source/NETworkManager/Views/SubnetCalculatorSupernettingView.xaml.cs
+++ b/Source/NETworkManager/Views/SubnetCalculatorSupernettingView.xaml.cs
@@ -1,10 +1,11 @@
-using NETworkManager.ViewModels;
+using MahApps.Metro.Controls.Dialogs;
+using NETworkManager.ViewModels;
 
 namespace NETworkManager.Views
 {
     public partial class SubnetCalculatorSupernettingView
     {
-        private readonly SubnetCalculatorSupernettingViewModel _viewModel = new SubnetCalculatorSupernettingViewModel();
+        private readonly SubnetCalculatorSupernettingViewModel _viewModel = new SubnetCalculatorSupernettingViewModel(DialogCoordinator.Instance);
 
         public SubnetCalculatorSupernettingView()
         {