fix flute run not respecting UseConPty setting

fixes #941

.gitattributes

@@ -0,0 +1,3 @@
+# Git will handle the files in whatever way it thinks is best.
+# Overwrites global core.autocrlf git setting
+* text=auto

.github/workflows/main.yml

@@ -0,0 +1,23 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@master
+    
+    - name: Build client
+      working-directory: ./FluentTerminal.Client
+      run: |
+        yarn
+        yarn build
+
+    - name: Setup MSBuild.exe
+      uses: microsoft/setup-msbuild@v1.0.2
+    
+    - name: MSBuild
+      run: msbuild FluentTerminal.sln -t:build -p:Configuration=Debug -p:Platform=x64 -m -restore

.gitignore

@@ -292,3 +292,5 @@ __pycache__/
 *.btm.cs
 *.odx.cs
 *.xsd.cs
+
+!FluentTerminal.App/MoshExecutables/*

Explorer Context Menu Integration/Install.bat

@@ -1,3 +1,4 @@
-reg add "HKCU\Software\Classes\Directory\shell\Open Fluent Terminal here\command" /d "\"%LOCALAPPDATA%\Microsoft\WindowsApps\flute.exe\" new %%1" /f
-reg add "HKCU\Software\Classes\Directory\Background\shell\Open Fluent Terminal here\command" /d "\"%LOCALAPPDATA%\Microsoft\WindowsApps\flute.exe\" new %%V" /f
-reg add "HKCU\Software\Classes\LibraryFolder\Background\shell\Open Fluent Terminal here\command" /d "\"%LOCALAPPDATA%\Microsoft\WindowsApps\flute.exe\" new %%V" /f
+reg add "HKCU\Software\Classes\Directory\shell\Open Fluent Terminal here\command" /d "\"%LOCALAPPDATA%\Microsoft\WindowsApps\flute.exe\" new \"%%V\"" /f
+reg add "HKCU\Software\Classes\Directory\Background\shell\Open Fluent Terminal here\command" /d "\"%LOCALAPPDATA%\Microsoft\WindowsApps\flute.exe\" new \"%%V\"" /f
+reg add "HKCU\Software\Classes\Drive\shell\Open Fluent Terminal here\command" /d "\"%LOCALAPPDATA%\Microsoft\WindowsApps\flute.exe\" new \"%%V\"" /f
+reg add "HKCU\Software\Classes\LibraryFolder\Background\shell\Open Fluent Terminal here\command" /d "\"%LOCALAPPDATA%\Microsoft\WindowsApps\flute.exe\" new \"%%V\"" /f

Explorer Context Menu Integration/Install_with_icon.bat

@@ -0,0 +1,9 @@
+copy /y FluentTerminal.ico "%LOCALAPPDATA%\Microsoft\WindowsApps"
+reg add "HKCU\Software\Classes\Directory\shell\Open Fluent Terminal here\command" /d "\"%LOCALAPPDATA%\Microsoft\WindowsApps\flute.exe\" new \"%%V\"" /f
+reg add "HKCU\Software\Classes\Directory\shell\Open Fluent Terminal here" /v icon /t REG_SZ /d "%LOCALAPPDATA%\Microsoft\WindowsApps\FluentTerminal.ico" /f
+reg add "HKCU\Software\Classes\Directory\Background\shell\Open Fluent Terminal here\command" /d "\"%LOCALAPPDATA%\Microsoft\WindowsApps\flute.exe\" new \"%%V\"" /f
+reg add "HKCU\Software\Classes\Directory\Background\shell\Open Fluent Terminal here" /v icon /t REG_SZ /d "%LOCALAPPDATA%\Microsoft\WindowsApps\FluentTerminal.ico" /f
+reg add "HKCU\Software\Classes\Drive\shell\Open Fluent Terminal here\command" /d "\"%LOCALAPPDATA%\Microsoft\WindowsApps\flute.exe\" new \"%%V\"" /f
+reg add "HKCU\Software\Classes\Drive\shell\Open Fluent Terminal here" /v icon /t REG_SZ /d "%LOCALAPPDATA%\Microsoft\WindowsApps\FluentTerminal.ico" /f
+reg add "HKCU\Software\Classes\LibraryFolder\Background\shell\Open Fluent Terminal here\command" /d "\"%LOCALAPPDATA%\Microsoft\WindowsApps\flute.exe\" new \"%%V\"" /f
+reg add "HKCU\Software\Classes\LibraryFolder\Background\shell\Open Fluent Terminal here" /v icon /t REG_SZ /d "%LOCALAPPDATA%\Microsoft\WindowsApps\FluentTerminal.ico" /f

Explorer Context Menu Integration/README.md

@@ -0,0 +1,2 @@
+If you want a an icon for the context menu entries, download the .ico file and put in the same directory as the Install_with_icon.bat file then run it.
+The same Uninstall.bat works for both Install.bat files.

Explorer Context Menu Integration/Uninstall.bat

@@ -1,3 +1,5 @@
 reg delete "HKCU\Software\Classes\Directory\shell\Open Fluent Terminal here" /f
 reg delete "HKCU\Software\Classes\Directory\Background\shell\Open Fluent Terminal here" /f
+reg delete "HKCU\Software\Classes\Drive\shell\Open Fluent Terminal here" /f
 reg delete "HKCU\Software\Classes\LibraryFolder\Background\shell\Open Fluent Terminal here" /f
+del %LOCALAPPDATA%\Microsoft\WindowsApps\FluentTerminal.ico

FluentTerminal.App.Services.Test/DialogServiceTests.cs

@@ -23,7 +23,7 @@ namespace FluentTerminal.App.Services.Test
         public void ShowCreateKeyBindingDialog_Default_UsesCreateKeyBindingDialog()
         {
             var createKeyBindingDialog = new Mock<ICreateKeyBindingDialog>();
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, () => createKeyBindingDialog.Object, Mock.Of<IInputDialog>);
+            var dialogService = new DialogService(Mock.Of<IMessageDialog>, () => createKeyBindingDialog.Object, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ICustomCommandDialog>, Mock.Of<IAboutDialog>);
 
             dialogService.ShowCreateKeyBindingDialog();
 
@@ -36,9 +36,9 @@ namespace FluentTerminal.App.Services.Test
             var title = string.Empty;
             var content = _fixture.Create<string>();
             var buttons = _fixture.CreateMany<DialogButton>(2);
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>);
+            var dialogService = new DialogService(Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ICustomCommandDialog>, Mock.Of<IAboutDialog>);
 
-            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
+            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsync(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
 
             showMessageDialogAsnyc.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("title");
         }
@@ -49,9 +49,9 @@ namespace FluentTerminal.App.Services.Test
             var title = _fixture.Create<string>();
             var content = string.Empty;
             var buttons = _fixture.CreateMany<DialogButton>(2);
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>);
+            var dialogService = new DialogService(Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ICustomCommandDialog>, Mock.Of<IAboutDialog>);
 
-            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
+            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsync(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
 
             showMessageDialogAsnyc.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("content");
         }
@@ -61,9 +61,9 @@ namespace FluentTerminal.App.Services.Test
         {
             var title = _fixture.Create<string>();
             var content = _fixture.Create<string>();
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>);
+            var dialogService = new DialogService(Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ICustomCommandDialog>, Mock.Of<IAboutDialog>);
 
-            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content);
+            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsync(title, content);
 
             showMessageDialogAsnyc.Should().Throw<ArgumentException>().And.ParamName.Should().Be("buttons");
         }
@@ -75,22 +75,24 @@ namespace FluentTerminal.App.Services.Test
             var content = _fixture.Create<string>();
             var buttons = _fixture.CreateMany<DialogButton>(2);
             var messageDialog = new Mock<IMessageDialog>();
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, () => messageDialog.Object, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>);
+            var dialogService = new DialogService(() => messageDialog.Object, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ICustomCommandDialog>, Mock.Of<IAboutDialog>);
 
-            dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
+            dialogService.ShowMessageDialogAsync(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
 
             messageDialog.Verify(x => x.ShowAsync(), Times.Once);
         }
-
+        
         [Fact]
-        public void ShowProfileSelectionDialogAsync_Default_UsesShellProfileSelectionDialog()
+        public void ShowInputDialogAsync_UsesIInputDialogSetTitle()
         {
-            var shellProfileSelectionDialog = new Mock<IShellProfileSelectionDialog>();
-            var dialogService = new DialogService(() => shellProfileSelectionDialog.Object, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>);
+            var title = "title";
+            var inputDialog = new Mock<IInputDialog>();            
+            var dialogService = new DialogService(Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, () => inputDialog.Object, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ICustomCommandDialog>, Mock.Of<IAboutDialog>);
 
-            dialogService.ShowProfileSelectionDialogAsync();
+            dialogService.ShowInputDialogAsync(title);
 
-            shellProfileSelectionDialog.Verify(x => x.SelectProfile(), Times.Once);
+            inputDialog.Verify(x => x.SetTitle(title), Times.Once);
+            inputDialog.Verify(x => x.GetInput(), Times.Once);
         }
     }
-}
+}

FluentTerminal.App.Services.Test/FluentTerminal.App.Services.Test.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -11,13 +11,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.8.0" />
-    <PackageReference Include="FluentAssertions" Version="5.6.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="Moq" Version="4.10.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="AutoFixture" Version="4.17.0" />
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
@@ -34,4 +34,11 @@
     <ProjectReference Include="..\FluentTerminal.App.Services\FluentTerminal.App.Services.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="Windows.Foundation.FoundationContract">
+      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+
 </Project>

FluentTerminal.App.Services.Test/KeyboardCommandServiceTests.cs

@@ -41,6 +41,41 @@ namespace FluentTerminal.App.Services.Test
 
             invoke.Should().Throw<InvalidOperationException>();
         }
+        
+        [Fact]
+        public void DeregisterCommandHandler_CommandIsNull_ThrowsArgumentNullException()
+        {
+            var keyboardCommandService = new KeyboardCommandService();
+
+            Action invoke = () => keyboardCommandService.DeregisterCommandHandler(null);
+
+            invoke.Should().Throw<ArgumentNullException>();
+        }
+
+        [Fact]
+        public void DeregisterCommandHandler_CommandRegistered_HandlerGetsRemoved()
+        {
+            var command = ((Command)new Random().Next(1, Enum.GetValues(typeof(Command)).Length)).ToString();
+            var handler = _fixture.Create<Action>();
+            var keyboardCommandService = new KeyboardCommandService();
+
+            keyboardCommandService.RegisterCommandHandler(command, handler);
+
+            Action invoke = () => keyboardCommandService.DeregisterCommandHandler(command);
+
+            invoke.Should().NotThrow();
+        }
+
+        [Fact]
+        public void DeregisterCommandHandler_CommandNotRegistered_ShouldNotThrow()
+        {
+            var command = ((Command)new Random().Next(1, Enum.GetValues(typeof(Command)).Length)).ToString();
+            var keyboardCommandService = new KeyboardCommandService();
+
+            Action invoke = () => keyboardCommandService.DeregisterCommandHandler(command);
+
+            invoke.Should().NotThrow();
+        }
 
         [Fact]
         public void SendCommand_CommandIsRegistered_HandlerGetsInvoked()

FluentTerminal.App.Services.Test/SettingsServiceTests.cs

@@ -1,7 +1,6 @@
 using AutoFixture;
 using FluentAssertions;
 using FluentTerminal.App.Services.Implementation;
-using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using Moq;
@@ -10,7 +9,9 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using FluentTerminal.Models.Messages;
 using Xunit;
+using Microsoft.Toolkit.Mvvm.Messaging;
 
 namespace FluentTerminal.App.Services.Test
 {
@@ -36,7 +37,8 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(), 
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
 
             new SettingsService(defaultValueProvider.Object, applicationDataContainers);
@@ -58,6 +60,7 @@ namespace FluentTerminal.App.Services.Test
             var applicationDataContainers = new ApplicationDataContainers
             {
                 ShellProfiles = shellProfilesContainer.Object,
+                SshProfiles = Mock.Of<IApplicationDataContainer>(),
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
@@ -86,6 +89,7 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
@@ -111,6 +115,7 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
@@ -134,6 +139,7 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
@@ -155,11 +161,13 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>()
             };
             var currentThemeChangedEventInvoked = false;
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            settingsService.CurrentThemeChanged += (s, e) => currentThemeChangedEventInvoked = true;
+            WeakReferenceMessenger.Default.Register<CurrentThemeChangedMessage>(this,
+                (r, m) => currentThemeChangedEventInvoked = true);
 
             settingsService.SaveCurrentThemeId(currentThemeId);
 
@@ -178,7 +186,8 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -203,10 +212,12 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = roamingSettings.Object,
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            settingsService.CurrentThemeChanged += (s, e) => currentThemeChangedEventInvoked = true;
+            WeakReferenceMessenger.Default.Register<CurrentThemeChangedMessage>(this,
+                (r, m) => currentThemeChangedEventInvoked = true);
 
             settingsService.SaveTheme(theme);
 
@@ -225,7 +236,8 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -247,7 +259,8 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -270,7 +283,8 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -293,7 +307,8 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -316,7 +331,8 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -338,7 +354,8 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -360,10 +377,12 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            settingsService.TerminalOptionsChanged += (s, e) => terminalOptionsChangedEventInvoked = true;
+            WeakReferenceMessenger.Default.Register<TerminalOptionsChangedMessage>(this,
+                (r, m) => terminalOptionsChangedEventInvoked = true);
 
             settingsService.SaveTerminalOptions(terminalOptions);
 
@@ -383,7 +402,8 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -405,7 +425,8 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -427,10 +448,11 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            settingsService.ApplicationSettingsChanged += (s, e) => applicationSettingsChangedEventInvoked = true;
+            WeakReferenceMessenger.Default.Register<ApplicationSettingsChangedMessage>(this, (r, m) => applicationSettingsChangedEventInvoked = true);
 
             settingsService.SaveApplicationSettings(applicationSettings);
 
@@ -453,7 +475,8 @@ namespace FluentTerminal.App.Services.Test
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -471,17 +494,14 @@ namespace FluentTerminal.App.Services.Test
             var commands = _fixture.CreateMany<Command>(5);
             var defaultValueProvider = new Mock<IDefaultValueProvider>();
             var keyBindingsContainer = new Mock<IApplicationDataContainer>();
-            foreach (var command in commands)
-            {
-                keyBindingsContainer.Setup(x => x.ReadValueFromJson<Collection<KeyBinding>>(EnumHelper.GetEnumDescription(command), null)).Returns(new Collection<KeyBinding> { });
-            }
             var applicationDataContainers = new ApplicationDataContainers
             {
                 KeyBindings = keyBindingsContainer.Object,
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
 
@@ -506,7 +526,8 @@ namespace FluentTerminal.App.Services.Test
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -529,10 +550,12 @@ namespace FluentTerminal.App.Services.Test
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            settingsService.KeyBindingsChanged += (s, e) => keyBindingsChangedEventInvoked = true;
+            WeakReferenceMessenger.Default.Register<KeyBindingsChangedMessage>(this,
+                (r, m) => keyBindingsChangedEventInvoked = true);
 
             settingsService.SaveKeyBindings(command.ToString(), keyBindings);
 
@@ -550,7 +573,8 @@ namespace FluentTerminal.App.Services.Test
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
 
@@ -575,10 +599,12 @@ namespace FluentTerminal.App.Services.Test
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            settingsService.KeyBindingsChanged += (s, e) => keyBindingsChangedEventInvoked = true;
+            WeakReferenceMessenger.Default.Register<KeyBindingsChangedMessage>(this,
+                (r, m) => keyBindingsChangedEventInvoked = true);
 
             settingsService.ResetKeyBindings();
 
@@ -598,6 +624,7 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
                 ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
@@ -623,6 +650,7 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
                 ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
@@ -644,6 +672,7 @@ namespace FluentTerminal.App.Services.Test
             var applicationDataContainers = new ApplicationDataContainers
             {
                 ShellProfiles = shellProfilesContainer.Object,
+                SshProfiles = Mock.Of<IApplicationDataContainer>(),
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
@@ -653,7 +682,7 @@ namespace FluentTerminal.App.Services.Test
 
             var result = settingsService.GetShellProfiles();
 
-            result.Should().BeEquivalentTo(shellProfiles);
+            result.Select(p => p.EqualTo(shellProfiles.FirstOrDefault(x => x.Id == p.Id)).Should().BeTrue());
             shellProfilesContainer.Verify(x => x.GetAll(), Times.Once);
         }
 
@@ -666,6 +695,7 @@ namespace FluentTerminal.App.Services.Test
             var applicationDataContainers = new ApplicationDataContainers
             {
                 ShellProfiles = shellProfilesContainer.Object,
+                SshProfiles = Mock.Of<IApplicationDataContainer>(),
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
@@ -687,6 +717,7 @@ namespace FluentTerminal.App.Services.Test
             var applicationDataContainers = new ApplicationDataContainers
             {
                 ShellProfiles = shellProfilesContainer.Object,
+                SshProfiles = Mock.Of<IApplicationDataContainer>(),
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
@@ -711,6 +742,7 @@ namespace FluentTerminal.App.Services.Test
             var applicationDataContainers = new ApplicationDataContainers
             {
                 ShellProfiles = shellProfilesContainer.Object,
+                SshProfiles = Mock.Of<IApplicationDataContainer>(),
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = localSettings.Object,
@@ -739,6 +771,7 @@ namespace FluentTerminal.App.Services.Test
             var applicationDataContainers = new ApplicationDataContainers
             {
                 ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                SshProfiles = Mock.Of<IApplicationDataContainer>(),
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = roamingSettings.Object,

FluentTerminal.App.Services.Test/TrayProcessCommunicationServiceTests.cs

@@ -10,6 +10,7 @@ using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Windows.Foundation.Collections;
 using Xunit;
 
 namespace FluentTerminal.App.Services.Test
@@ -34,20 +35,20 @@ namespace FluentTerminal.App.Services.Test
             });
             var appServiceConnection = new Mock<IAppServiceConnection>();
             var response = _fixture.Create<CreateTerminalResponse>();
-            var responseMessage = new Dictionary<string, string>
+            var responseMessage = new ValueSet
             {
                 [MessageKeys.Type] = _fixture.Create<string>(),
                 [MessageKeys.Content] = JsonConvert.SerializeObject(response)
             };
-            appServiceConnection.Setup(x => x.SendMessageAsync(It.IsAny<IDictionary<string, string>>())).Returns(Task.FromResult((IDictionary<string, string>)responseMessage));
+            appServiceConnection.Setup(x => x.SendMessageAsync(It.IsAny<ValueSet>())).Returns(Task.FromResult(responseMessage));
             var terminalSize = _fixture.Create<TerminalSize>();
             var shellProfile = _fixture.Create<ShellProfile>();
             var sessionType = _fixture.Create<SessionType>();
-            var id = _fixture.Create<int>();
+            var id = _fixture.Create<byte>();
             var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
             trayProcessCommunicationService.Initialize(appServiceConnection.Object);
 
-            var result = await trayProcessCommunicationService.CreateTerminal(id, terminalSize, shellProfile, sessionType);
+            var result = await trayProcessCommunicationService.CreateTerminalAsync(id, terminalSize, shellProfile, sessionType);
 
             result.Should().BeEquivalentTo(response);
         }
@@ -55,7 +56,7 @@ namespace FluentTerminal.App.Services.Test
         [Fact]
         public async Task ResizeTerminal_Default_SendsResizeTerminalRequest()
         {
-            var terminalId = _fixture.Create<int>();
+            var terminalId = _fixture.Create<byte>();
             var terminalSize = _fixture.Create<TerminalSize>();
             var settingsService = new Mock<ISettingsService>();
             var keyBindings = _fixture.CreateMany<KeyBinding>(3);
@@ -67,15 +68,15 @@ namespace FluentTerminal.App.Services.Test
             var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
             trayProcessCommunicationService.Initialize(appServiceConnection.Object);
 
-            await trayProcessCommunicationService.ResizeTerminal(terminalId, terminalSize);
+            await trayProcessCommunicationService.ResizeTerminalAsync(terminalId, terminalSize);
 
-            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<IDictionary<string, string>>(d => d[MessageKeys.Type] == nameof(ResizeTerminalRequest))), Times.Once);
+            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<ValueSet>(d => (byte)d[MessageKeys.Type] == (byte)MessageIdentifiers.ResizeTerminalRequest)), Times.Once);
         }
 
         [Fact]
         public async Task Write_Default_SendsWriteDataRequest()
         {
-            var terminalId = _fixture.Create<int>();
+            var terminalId = _fixture.Create<byte>();
             var data = _fixture.Create<byte[]>();
             var settingsService = new Mock<ISettingsService>();
             var keyBindings = _fixture.CreateMany<KeyBinding>(3);
@@ -87,15 +88,15 @@ namespace FluentTerminal.App.Services.Test
             var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
             trayProcessCommunicationService.Initialize(appServiceConnection.Object);
 
-            await trayProcessCommunicationService.Write(terminalId, data);
+            await trayProcessCommunicationService.WriteAsync(terminalId, data);
 
-            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<IDictionary<string, string>>(d => d[MessageKeys.Type] == nameof(WriteDataRequest))), Times.Once);
+            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<ValueSet>(d => (byte)d[MessageKeys.Type] == Constants.TerminalBufferRequestIdentifier)), Times.Once);
         }
 
         [Fact]
         public async Task CloseTerminal_Default_SendsTerminalExitedRequest()
         {
-            var terminalId = _fixture.Create<int>();
+            var terminalId = _fixture.Create<byte>();
             var settingsService = new Mock<ISettingsService>();
             var keyBindings = _fixture.CreateMany<KeyBinding>(3);
             settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
@@ -106,24 +107,21 @@ namespace FluentTerminal.App.Services.Test
             var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
             trayProcessCommunicationService.Initialize(appServiceConnection.Object);
 
-            await trayProcessCommunicationService.CloseTerminal(terminalId);
+            await trayProcessCommunicationService.CloseTerminalAsync(terminalId);
 
-            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<IDictionary<string, string>>(d => d[MessageKeys.Type] == nameof(TerminalExitedRequest))), Times.Once);
+            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<ValueSet>(d => (byte)d[MessageKeys.Type] == (byte)MessageIdentifiers.TerminalExitedRequest)), Times.Once);
         }
 
         [Fact]
         public void OnMessageReceived_TerminalExitedRequest_InvokesTerminalExitedEvent()
         {
-            var terminalId = _fixture.Create<int>();
-            var receivedTerminalId = 0;
-            var terminalExitedEventCalled = false;
-            var request = new TerminalExitedRequest
+            var request = new TerminalExitedRequest(_fixture.Create<byte>(), _fixture.Create<int>());
+
+            var receivedExitStatus = (TerminalExitStatus) null;
+
+            var message = new ValueSet
             {
-                TerminalId = terminalId
-            };
-            var message = new Dictionary<string, string>
-            {
-                [MessageKeys.Type] = nameof(TerminalExitedRequest),
+                [MessageKeys.Type] = (byte) MessageIdentifiers.TerminalExitedRequest,
                 [MessageKeys.Content] = JsonConvert.SerializeObject(request)
             };
             var settingsService = new Mock<ISettingsService>();
@@ -135,33 +133,29 @@ namespace FluentTerminal.App.Services.Test
             var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
             var appServiceConnection = new Mock<IAppServiceConnection>();
             trayProcessCommunicationService.Initialize(appServiceConnection.Object);
-            trayProcessCommunicationService.TerminalExited += (s, e) =>
+            trayProcessCommunicationService.TerminalExited += (s, status) =>
             {
-                terminalExitedEventCalled = true;
-                receivedTerminalId = e;
+                receivedExitStatus = status;
             };
 
             appServiceConnection.Raise(x => x.MessageReceived += null, null, message);
 
-            terminalExitedEventCalled.Should().BeTrue();
-            receivedTerminalId.Should().Be(terminalId);
+            receivedExitStatus.Should().NotBeNull();
+            receivedExitStatus.TerminalId.Should().Be(request.TerminalId);
+            receivedExitStatus.ExitCode.Should().Be(request.ExitCode);
         }
 
         [Fact]
         public void OnMessageReceived_DisplayTerminalOutputRequest_InvokesCorrectOutputHandler()
         {
-            var terminalId = _fixture.Create<int>();
+            var terminalId = _fixture.Create<byte>();
             var output = _fixture.Create<byte[]>();
             var receivedOutput = default(byte[]);
-            var request = new DisplayTerminalOutputRequest
+            var message = new ValueSet
             {
-                TerminalId = terminalId,
-                Output = output
-            };
-            var message = new Dictionary<string, string>
-            {
-                [MessageKeys.Type] = nameof(DisplayTerminalOutputRequest),
-                [MessageKeys.Content] = JsonConvert.SerializeObject(request)
+                [MessageKeys.Type] = Constants.TerminalBufferRequestIdentifier,
+                [MessageKeys.TerminalId] = terminalId,
+                [MessageKeys.Content] = output
             };
             var settingsService = new Mock<ISettingsService>();
             var keyBindings = _fixture.CreateMany<KeyBinding>(3);

FluentTerminal.App.Services/Adapters/ApplicationDataContainerAdapter.cs

@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Windows.Storage;
+using FluentTerminal.App.Services.Utilities;
 
 namespace FluentTerminal.App.Services.Adapters
 {
@@ -20,6 +21,11 @@ namespace FluentTerminal.App.Services.Adapters
             _applicationDataContainer.Values.Remove(key);
         }
 
+        public void Clear()
+        {
+            _applicationDataContainer.Values.Clear();
+        }
+
         public IEnumerable<object> GetAll()
         {
             return _applicationDataContainer.Values.Select(x => x.Value);
@@ -51,7 +57,8 @@ namespace FluentTerminal.App.Services.Adapters
 
         public void WriteValueAsJson<T>(string name, T value)
         {
-            _applicationDataContainer.Values[name] = JsonConvert.SerializeObject(value);
+            _applicationDataContainer.Values[name] = JsonConvert.SerializeObject(value,
+                PreserveDictionaryKeyCaseContractResolver.SerializerSettings);
         }
     }
 }

FluentTerminal.App.Services/ApplicationDataContainers.cs

@@ -7,5 +7,7 @@
         public IApplicationDataContainer Themes { get; set; }
         public IApplicationDataContainer KeyBindings { get; set; }
         public IApplicationDataContainer ShellProfiles { get; set; }
+        public IApplicationDataContainer SshProfiles { get; set; }
+        public IApplicationDataContainer HistoryContainer { get; set; }
     }
 }

FluentTerminal.App.Services/Constants.cs

@@ -5,5 +5,11 @@
         public const string ThemesContainerName = "Themes";
         public const string KeyBindingsContainerName = "KeyBindings";
         public const string ShellProfilesContainerName = "ShellProfiles";
+        public const string SshProfilesContainerName = "SshProfiles";
+        public const byte TerminalBufferRequestIdentifier = 0;
+        public const string SshCommandName = "ssh";
+        public const string MoshCommandName = "mosh";
+        public const string ExecutedCommandsContainerName = "HistoryContainer";
+        public const string TerminalViewModelStateId = "TerminalViewModelState";
     }
 }

FluentTerminal.App.Services/Dialogs/IAboutDialog.cs

@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Services.Dialogs
+{
+    public interface IAboutDialog
+    {
+        Task ShowAsync();
+    }
+}

FluentTerminal.App.Services/Dialogs/ICustomCommandDialog.cs

@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using FluentTerminal.Models;
+
+namespace FluentTerminal.App.Services.Dialogs
+{
+    public interface ICustomCommandDialog
+    {
+        Task<ShellProfile> GetCustomCommandAsync(ShellProfile input = null);
+    }
+}

FluentTerminal.App.Services/Dialogs/IShellProfileSelectionDialog.cs

@@ -1,12 +0,0 @@
-using FluentTerminal.Models;
-using System.Threading.Tasks;
-
-namespace FluentTerminal.App.Services.Dialogs
-{
-    public interface IShellProfileSelectionDialog
-    {
-        ShellProfile SelectedProfile { get; }
-
-        Task<ShellProfile> SelectProfile();
-    }
-}

FluentTerminal.App.Services/Dialogs/ISshConnectionInfoDialog.cs

@@ -0,0 +1,10 @@
+using FluentTerminal.Models;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Services.Dialogs
+{
+    public interface ISshConnectionInfoDialog
+    {
+        Task<SshProfile> GetSshConnectionInfoAsync(SshProfile input = null);
+    }
+}

FluentTerminal.App.Services/EventArgs/NewTabRequestedEventArgs.cs

@@ -0,0 +1,10 @@
+using Windows.UI.Xaml;
+
+namespace FluentTerminal.App.Services.EventArgs
+{
+    public class NewTabRequestedEventArgs : System.EventArgs
+    {
+        public DragEventArgs DragEventArgs { get; set; }
+        public int Position { get; set; }
+    }
+}

FluentTerminal.App.Services/EventArgs/NewWindowRequestedEventArgs.cs

@@ -1,7 +1,13 @@
-namespace FluentTerminal.App.Services.EventArgs
+using System;
+using FluentTerminal.Models;
+
+namespace FluentTerminal.App.Services.EventArgs
 {
     public class NewWindowRequestedEventArgs : System.EventArgs
     {
-        public bool ShowProfileSelection { get; set; }
+        public ShellProfile Profile { get; }
+
+        public NewWindowRequestedEventArgs(ShellProfile profile) =>
+            Profile = profile ?? throw new ArgumentNullException(nameof(profile));
     }
 }

FluentTerminal.App.Services/Exceptions/ReadTextFileException.cs

@@ -0,0 +1,23 @@
+using System;
+
+namespace FluentTerminal.App.Services.Exceptions
+{
+    public class ReadTextFileException : Exception
+    {
+        public ReadTextFileException() : base()
+        {
+        }
+
+        public ReadTextFileException(string message) : base(message)
+        {
+        }
+
+        public ReadTextFileException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+
+        protected ReadTextFileException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}

FluentTerminal.App.Services/Exceptions/SaveTextFileException.cs

@@ -0,0 +1,23 @@
+using System;
+
+namespace FluentTerminal.App.Services.Exceptions
+{
+    public class SaveTextFileException : Exception
+    {
+        public SaveTextFileException() : base()
+        {
+        }
+
+        public SaveTextFileException(string message) : base(message)
+        {
+        }
+
+        public SaveTextFileException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+
+        protected SaveTextFileException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}

FluentTerminal.App.Services/FluentTerminal.App.Services.csproj

@@ -6,12 +6,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="PListNet" Version="2.0.3" />
-    <PackageReference Include="RestSharp" Version="106.6.9" />
-    <PackageReference Include="Serilog.Sinks.Async" Version="1.3.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="PListNet" Version="3.2.0" />
+    <PackageReference Include="RestSharp" Version="106.12.0" />
+    <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageReference Include="System.Runtime.InteropServices.WindowsRuntime" Version="4.3.0" />
   </ItemGroup>
 

FluentTerminal.App.Services/IAppServiceConnection.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
+using Windows.Foundation.Collections;
 
 namespace FluentTerminal.App.Services
 {
     public interface IAppServiceConnection
     {
-        event EventHandler<IDictionary<string, string>> MessageReceived;
+        event EventHandler<ValueSet> MessageReceived;
 
-        Task<IDictionary<string, string>> SendMessageAsync(IDictionary<string, string> message);
+        Task<ValueSet> SendMessageAsync(ValueSet message);
     }
 }

FluentTerminal.App.Services/IApplicationDataContainer.cs

@@ -14,6 +14,8 @@ namespace FluentTerminal.App.Services
 
         void Delete(string key);
 
+        void Clear();
+
         IEnumerable<object> GetAll();
     }
 }

FluentTerminal.App.Services/IApplicationLanguageService.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+namespace FluentTerminal.App.Services
+{
+    public interface IApplicationLanguageService
+    {
+        IEnumerable<string> Languages { get; }
+
+        void SetLanguage(string language);
+
+        string GetCurrentLanguage();
+    }
+}

FluentTerminal.App.Services/IApplicationView.cs

@@ -1,6 +1,7 @@
 using FluentTerminal.App.Services.EventArgs;
 using System;
 using System.Threading.Tasks;
+using Windows.UI.Core;
 
 namespace FluentTerminal.App.Services
 {
@@ -14,9 +15,13 @@ namespace FluentTerminal.App.Services
         int Id { get; }
         string Title { get; set; }
 
-        Task RunOnDispatcherThread(Action action);
+        Task ExecuteOnUiThreadAsync(Action action, CoreDispatcherPriority priority = CoreDispatcherPriority.Normal,
+            bool enforceNewSchedule = false);
 
-        Task<bool> TryClose();
+        Task<T> ExecuteOnUiThreadAsync<T>(Func<T> func, CoreDispatcherPriority priority = CoreDispatcherPriority.Normal,
+            bool enforceNewSchedule = false);
+
+        Task<bool> TryCloseAsync();
 
         bool ToggleFullScreen();
         bool IsApiContractPresent(string api, ushort version);

FluentTerminal.App.Services/IClipboardService.cs

@@ -4,7 +4,7 @@ namespace FluentTerminal.App.Services
 {
     public interface IClipboardService
     {
-        Task<string> GetText();
+        Task<string> GetTextAsync();
 
         void SetText(string text);
     }

FluentTerminal.App.Services/ICommandHistoryService.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using FluentTerminal.Models;
+
+namespace FluentTerminal.App.Services
+{
+    public interface ICommandHistoryService
+    {
+        /// <summary>
+        /// Returns the most recent <paramref name="top"/> commands from history.
+        /// </summary>
+        /// <param name="includeProfiles">Indicates if never used saved profiles should also be returned.</param>
+        /// <param name="top">Maximal number of items to return.</param>
+        /// <param name="profilesProvider">List of all saved profiles. If this argument isn't specified, the method will
+        /// get the list from <see cref="ISettingsService"/>. The purpose of this argument is to avoid loading the
+        /// profiles from settings again (since it includes file system access and JSON deserialization), if we
+        /// already have them loaded.</param>
+        List<ExecutedCommand> GetHistoryRecentFirst(bool includeProfiles = false, int top = int.MaxValue,
+            Func<List<ShellProfile>> profilesProvider = null);
+
+        /// <summary>
+        /// Returns the most used <paramref name="top"/> commands from history.
+        /// </summary>
+        /// <param name="includeProfiles">Indicates if never used saved profiles should also be returned.</param>
+        /// <param name="top">Maximal number of items to return.</param>
+        /// <param name="profilesProvider">List of all saved profiles. If this argument isn't specified, the method will
+        /// get the list from <see cref="ISettingsService"/>. The purpose of this argument is to avoid loading the
+        /// profiles from settings again (since it includes file system access and JSON deserialization), if we
+        /// already have them loaded.</param>
+        List<ExecutedCommand> GetHistoryMostUsedFirst(bool includeProfiles = false, int top = int.MaxValue,
+            Func<List<ShellProfile>> profilesProvider = null);
+
+        void MarkUsed(ShellProfile profile);
+
+        void Delete(ExecutedCommand executedCommand);
+    }
+}

FluentTerminal.App.Services/IDialogService.cs

@@ -5,17 +5,23 @@ namespace FluentTerminal.App.Services
 {
     public enum DialogButton
     {
+        // ReSharper disable once InconsistentNaming
         OK,
         Cancel
     }
 
     public interface IDialogService
     {
-        Task<DialogButton> ShowMessageDialogAsnyc(string title, string content, params DialogButton[] buttons);
-
-        Task<ShellProfile> ShowProfileSelectionDialogAsync();
+        Task<DialogButton> ShowMessageDialogAsync(string title, string content, params DialogButton[] buttons);
 
         Task<KeyBinding> ShowCreateKeyBindingDialog();
+
         Task<string> ShowInputDialogAsync(string title);
+
+        Task<SshProfile> ShowSshConnectionInfoDialogAsync(SshProfile input = null);
+
+        Task<ShellProfile> ShowCustomCommandDialogAsync(ShellProfile input = null);
+
+        Task ShowAboutDialogAsync();
     }
 }

FluentTerminal.App.Services/IDispatcherTimer.cs

@@ -1,16 +0,0 @@
-using System;
-
-namespace FluentTerminal.App.Services
-{
-    public interface IDispatcherTimer
-    {
-        void Start();
-
-        void Stop();
-
-        TimeSpan Interval { get; set; }
-        bool IsEnabled { get; }
-
-        event EventHandler<object> Tick;
-    }
-}

FluentTerminal.App.Services/IFileSystemService.cs

@@ -6,10 +6,12 @@ namespace FluentTerminal.App.Services
 {
     public interface IFileSystemService
     {
-        Task<File> OpenFile(IEnumerable<string> fileTypes);
+        Task<File> OpenFileAsync(IEnumerable<string> fileTypes);
 
-        Task<string> BrowseForDirectory();
+        Task<string> BrowseForDirectoryAsync();
 
-        Task SaveTextFile(string name, string fileTypeDescription, string fileType, string content);
+        Task SaveTextFileAsync(string name, string fileTypeDescription, string fileType, string content);
+
+        Task<ImageFile> SaveImageInRoamingAsync(ImageFile imageFile);
     }
 }

FluentTerminal.App.Services/IImageFileSystemService.cs

@@ -0,0 +1,19 @@
+using FluentTerminal.Models;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Services
+{
+    public interface IImageFileSystemService
+    {
+        Task<ImageFile> ImportTemporaryImageFileAsync(IEnumerable<string> fileTypes);
+
+        Task RemoveTemporaryBackgroundThemeImageAsync();
+
+        Task RemoveImportedImageAsync(string fileName);
+
+        string EncodeImage(ImageFile imageFile);
+
+        Task<ImageFile> ImportThemeImageAsync(ImageFile backgroundImage, string encodedImage);
+    }
+}

FluentTerminal.App.Services/IKeyboardCommandService.cs

@@ -8,5 +8,6 @@ namespace FluentTerminal.App.Services
 
         void SendCommand(string command);
         void DeregisterCommandHandler(string command);
+        void ClearCommandHandlers();
     }
 }

FluentTerminal.App.Services/ISettingsService.cs

@@ -6,16 +6,8 @@ namespace FluentTerminal.App.Services
 {
     public interface ISettingsService
     {
-        event EventHandler<ApplicationSettings> ApplicationSettingsChanged;
-        event EventHandler<Guid> CurrentThemeChanged;
-        event EventHandler KeyBindingsChanged;
-        event EventHandler<ShellProfile> ShellProfileAdded;
-        event EventHandler<Guid> ShellProfileDeleted;
-        event EventHandler<TerminalOptions> TerminalOptionsChanged;
-        event EventHandler<Guid> ThemeDeleted;
-        event EventHandler<TerminalTheme> ThemeAdded;
-
         void DeleteShellProfile(Guid id);
+        void DeleteSshProfile(Guid id);
         void DeleteTheme(Guid id);
         ApplicationSettings GetApplicationSettings();
         TerminalTheme GetCurrentTheme();
@@ -24,18 +16,28 @@ namespace FluentTerminal.App.Services
         Guid GetDefaultShellProfileId();
         IDictionary<string, ICollection<KeyBinding>> GetCommandKeyBindings();
         IEnumerable<ShellProfile> GetShellProfiles();
+        IEnumerable<SshProfile> GetSshProfiles();
+        /// <summary>
+        /// Returns union of <see cref="GetShellProfiles"/> and <see cref="GetSshProfiles"/>.
+        /// </summary>
+        IEnumerable<ShellProfile> GetAllProfiles();
         IEnumerable<TabTheme> GetTabThemes();
         TerminalOptions GetTerminalOptions();
         TerminalTheme GetTheme(Guid id);
         IEnumerable<TerminalTheme> GetThemes();
         void ResetKeyBindings();
         void SaveApplicationSettings(ApplicationSettings applicationSettings);
+        void NotifyApplicationSettingsChanged(ApplicationSettings applicationSettings);
         void SaveCurrentThemeId(Guid id);
         void SaveDefaultShellProfileId(Guid id);
         void SaveKeyBindings(string command, ICollection<KeyBinding> keyBindings);
         void SaveShellProfile(ShellProfile shellProfile, bool newShell = false);
+        void SaveSshProfile(SshProfile sshProfile, bool newShell = false);
         void SaveTerminalOptions(TerminalOptions terminalOptions);
         void SaveTheme(TerminalTheme theme, bool newTheme = false);
         ShellProfile GetShellProfile(Guid id);
+        SshProfile GetSshProfile(Guid id);
+        string ExportSettings();
+        void ImportSettings(string serializedSettings);
     }
 }

FluentTerminal.App.Services/IShellProfileMigrationService.cs

@@ -0,0 +1,9 @@
+using FluentTerminal.Models;
+
+namespace FluentTerminal.App.Services
+{
+    public interface IShellProfileMigrationService
+    {
+        void Migrate(ShellProfile profile);
+    }
+}

FluentTerminal.App.Services/IStartupTaskService.cs

@@ -5,8 +5,8 @@ namespace FluentTerminal.App.Services
 {
     public interface IStartupTaskService
     {
-        Task DisableStartupTask();
-        Task<StartupTaskStatus> EnableStartupTask();
-        Task<StartupTaskStatus> GetStatus();
+        Task DisableStartupTaskAsync();
+        Task<StartupTaskStatus> EnableStartupTaskAsync();
+        Task<StartupTaskStatus> GetStatusAsync();
     }
 }

FluentTerminal.App.Services/IThemeParser.cs

@@ -10,5 +10,7 @@ namespace FluentTerminal.App.Services
         IEnumerable<string> SupportedFileTypes { get; }
 
         Task<TerminalTheme> Parse(string fileName, Stream fileContent);
+
+        Task<ExportedTerminalTheme> Import(string fileName, Stream fileContent);
     }
 }

FluentTerminal.App.Services/ITrayProcessCommunicationService.cs

@@ -8,22 +8,47 @@ namespace FluentTerminal.App.Services
 {
     public interface ITrayProcessCommunicationService
     {
-        event EventHandler<int> TerminalExited;
+        event EventHandler<TerminalExitStatus> TerminalExited;
 
         void Initialize(IAppServiceConnection appServiceConnection);
 
-        Task<CreateTerminalResponse> CreateTerminal(int id, TerminalSize size, ShellProfile shellProfile, SessionType sessionType);
+        Task<CreateTerminalResponse> CreateTerminalAsync(byte id, TerminalSize size, ShellProfile shellProfile,
+            SessionType sessionType);
 
-        Task ResizeTerminal(int id, TerminalSize size);
+        Task<PauseTerminalOutputResponse> PauseTerminalOutputAsync(byte id, bool pause);
 
-        Task UpdateToggleWindowKeyBindings();
+        Task ResizeTerminalAsync(byte id, TerminalSize size);
 
-        Task Write(int terminalId, byte[] data);
+        Task UpdateToggleWindowKeyBindingsAsync();
 
-        void SubscribeForTerminalOutput(int terminalId, Action<byte[]> callback);
+        Task WriteAsync(byte terminalId, byte[] data);
 
-        Task CloseTerminal(int terminalId);
-        Task<GetAvailablePortResponse> GetAvailablePort();
-        int GetNextTerminalId();
+        void SubscribeForTerminalOutput(byte terminalId, Action<byte[]> callback);
+
+        void UnsubscribeFromTerminalOutput(byte terminalId);
+
+        Task CloseTerminalAsync(byte terminalId);
+
+        byte GetNextTerminalId();
+
+        Task<string> GetUserNameAsync();
+
+        Task SaveTextFileAsync(string path, string content);
+
+        Task<string> ReadTextFileAsync(string path);
+
+        Task<string> GetSshConfigDirAsync();
+
+        Task<string[]> GetFilesFromSshConfigDirAsync();
+
+        Task<bool> CheckFileExistsAsync(string path);
+
+        Task MuteTerminalAsync(bool mute);
+
+        void UpdateSettings(ApplicationSettings settings);
+
+        Task<string> GetCommandPathAsync(string command);
+
+        Task QuitApplicationAsync();
     }
 }

FluentTerminal.App.Services/IUpdateService.cs

@@ -5,7 +5,7 @@ namespace FluentTerminal.App.Services
 {
     public interface IUpdateService
     {
-        Task CheckForUpdate(bool notifyNoUpdate = false);
+        Task CheckForUpdateAsync(bool notifyNoUpdate = false);
         Version GetCurrentVersion();
         Task<Version> GetLatestVersionAsync();
     }

FluentTerminal.App.Services/Implementation/DefaultValueProvider.cs

@@ -2,6 +2,8 @@
 using FluentTerminal.Models.Enums;
 using System;
 using System.Collections.Generic;
+using Windows.Foundation.Metadata;
+using Windows.Storage;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -9,6 +11,14 @@ namespace FluentTerminal.App.Services.Implementation
     {
         public ApplicationSettings GetDefaultApplicationSettings()
         {
+            var logDirectoryPath = string.Empty;
+            try
+            {
+                // Accessing ApplicationData.Current during run of unit tests causes
+                // "System.InvalidOperationException : The process has no package identity" exception.
+                logDirectoryPath = ApplicationData.Current.LocalCacheFolder.Path;
+            } catch (InvalidOperationException) { }
+
             return new ApplicationSettings
             {
                 ConfirmClosingTabs = false,
@@ -16,15 +26,23 @@ namespace FluentTerminal.App.Services.Implementation
                 UnderlineSelectedTab = false,
                 InactiveTabColorMode = InactiveTabColorMode.Background,
                 NewTerminalLocation = NewTerminalLocation.Tab,
+                TabWindowCascadingAppMenu = true,
                 TabsPosition = TabsPosition.Top,
                 CopyOnSelect = false,
                 MouseMiddleClickAction = MouseAction.None,
                 MouseRightClickAction = MouseAction.ContextMenu,
-                AlwaysShowTabs = false,
-                AlwaysUseWinPty = true,
                 ShowNewOutputIndicator = false,
                 EnableTrayIcon = true,
-                ShowCustomTitleInTitlebar = true
+                ShowCustomTitleInTitlebar = true,
+                UseMoshByDefault = true,
+                AutoFallbackToWindowsUsernameInLinks = true,
+                RTrimCopiedLines = true,
+                MuteTerminalBeeps = true,
+                EnableLogging = false,
+                PrintableOutputOnly = true,
+                LogDirectoryPath = logDirectoryPath,
+                UseConPty = true,
+                ShowTextCopied = false
             };
         }
 
@@ -38,9 +56,6 @@ namespace FluentTerminal.App.Services.Implementation
                     new KeyBinding
                     {
                         Command = nameof(Command.ToggleWindow),
-                        Ctrl = false,
-                        Alt = false,
-                        Shift = false,
                         Key = (int)ExtendedVirtualKey.Scroll
                     }
                 };
@@ -52,8 +67,6 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.NextTab),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
                         Key = (int)ExtendedVirtualKey.Tab
                     }
                 };
@@ -65,7 +78,6 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.PreviousTab),
                         Ctrl = true,
-                        Alt = false,
                         Shift = true,
                         Key = (int)ExtendedVirtualKey.Tab
                     }
@@ -85,13 +97,35 @@ namespace FluentTerminal.App.Services.Implementation
                     new KeyBinding
                     {
                         Command = command.ToString(),
-                        Ctrl = true,
-                        Alt = false,
-                        Shift = false,
+                        Alt = true,
                         Key = (int)ExtendedVirtualKey.Number1 + (command - Command.SwitchToTerm1)
                     }
                 };
 
+                case Command.DuplicateTab:
+                    return new List<KeyBinding>
+                {
+                    new KeyBinding
+                    {
+                        Command = nameof(Command.DuplicateTab),
+                        Ctrl = true,
+                        Shift = true,
+                        Key = (int)ExtendedVirtualKey.D
+                    }
+                };
+
+                case Command.ReconnectTab:
+                    return new List<KeyBinding>
+                {
+                    new KeyBinding
+                    {
+                        Command = nameof(Command.ReconnectTab),
+                        Ctrl = true,
+                        Alt = true,
+                        Key = (int)ExtendedVirtualKey.R
+                    }
+                };
+
                 case Command.NewTab:
                     return new List<KeyBinding>
                 {
@@ -99,25 +133,59 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.NewTab),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
-                        Key = (int)ExtendedVirtualKey.T
-                    }
-                };
-
-                case Command.ConfigurableNewTab:
-                    return new List<KeyBinding>
-                {
-                    new KeyBinding
-                    {
-                        Command = nameof(Command.ConfigurableNewTab),
-                        Ctrl = true,
-                        Alt = false,
                         Shift = true,
                         Key = (int)ExtendedVirtualKey.T
                     }
                 };
 
+                case Command.NewSshTab:
+                    return new List<KeyBinding>
+                    {
+                        new KeyBinding
+                        {
+                            Command = nameof(Command.NewSshTab),
+                            Ctrl = true,
+                            Shift = true,
+                            Key = (int)ExtendedVirtualKey.Y
+                        }
+                    };
+
+                case Command.NewSshWindow:
+                    return new List<KeyBinding>
+                    {
+                        new KeyBinding
+                        {
+                            Command = nameof(Command.NewSshWindow),
+                            Ctrl = true,
+                            Alt = true,
+                            Key = (int)ExtendedVirtualKey.Y
+                        }
+                    };
+
+                case Command.NewCustomCommandTab:
+                    return new List<KeyBinding>
+                    {
+                        new KeyBinding
+                        {
+                            Command = nameof(Command.NewCustomCommandTab),
+                            Ctrl = true,
+                            Alt = true,
+                            Key = (int)ExtendedVirtualKey.T
+                        }
+                    };
+
+                case Command.NewCustomCommandWindow:
+                    return new List<KeyBinding>
+                    {
+                        new KeyBinding
+                        {
+                            Command = nameof(Command.NewCustomCommandWindow),
+                            Ctrl = true,
+                            Alt = true,
+                            Key = (int)ExtendedVirtualKey.N
+                        }
+                    };
+                    
                 case Command.ChangeTabTitle:
                     return new List<KeyBinding>
                 {
@@ -125,7 +193,6 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.ChangeTabTitle),
                         Ctrl = true,
-                        Alt = false,
                         Shift = true,
                         Key = (int)ExtendedVirtualKey.R
                     }
@@ -138,8 +205,7 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.CloseTab),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
+                        Shift = true,
                         Key = (int)ExtendedVirtualKey.W
                     }
                 };
@@ -151,20 +217,6 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.NewWindow),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
-                        Key = (int)ExtendedVirtualKey.N
-                    }
-                };
-
-                case Command.ConfigurableNewWindow:
-                    return new List<KeyBinding>
-                {
-                    new KeyBinding
-                    {
-                        Command = nameof(Command.ConfigurableNewWindow),
-                        Ctrl = true,
-                        Alt = false,
                         Shift = true,
                         Key = (int)ExtendedVirtualKey.N
                     }
@@ -177,8 +229,7 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.ShowSettings),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
+                        Shift = true,
                         Key = (int)ExtendedVirtualKey.Comma
                     }
                 };
@@ -190,8 +241,7 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.Copy),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
+                        Shift = true,
                         Key = (int)ExtendedVirtualKey.C
                     }
                 };
@@ -203,8 +253,7 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.Paste),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
+                        Shift = true,
                         Key = (int)ExtendedVirtualKey.V
                     }
                 };
@@ -217,8 +266,7 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.PasteWithoutNewlines),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = true,
+                        Alt = true,
                         Key = (int)ExtendedVirtualKey.V
                     }
                 };
@@ -230,22 +278,34 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.Search),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
+                        Shift = true,
                         Key = (int)ExtendedVirtualKey.F
                     }
                 };
 
+                case Command.CloseSearch:
+                    return new List<KeyBinding>
+                {
+                    new KeyBinding
+                    {
+                        Command = nameof(Command.CloseSearch),
+                        Key = (int)ExtendedVirtualKey.Escape
+                    }
+                };
+
                 case Command.ToggleFullScreen:
                     return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
                         Command = nameof(Command.ToggleFullScreen),
-                        Ctrl = false,
                         Alt = true,
-                        Shift = false,
                         Key = (int)ExtendedVirtualKey.Enter
+                    },
+                    new KeyBinding
+                    {
+                        Command = nameof(Command.ToggleFullScreen),
+                        Key = (int)ExtendedVirtualKey.F11
                     }
                 };
 
@@ -256,8 +316,7 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.SelectAll),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
+                        Shift = true,
                         Key = (int)ExtendedVirtualKey.A
                     }
                 };
@@ -269,14 +328,43 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.Clear),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
+                        Alt = true,
                         Key = (int)ExtendedVirtualKey.L
                     }
                 };
+                case Command.IncreaseFontSize:
+                    return new List<KeyBinding>
+                    {
+                        new KeyBinding
+                        {
+                            Command = nameof(Command.IncreaseFontSize),
+                            Ctrl = true,
+                            Key = (int)ExtendedVirtualKey.Plus
+                        }
+                    };
+                case Command.DecreaseFontSize:
+                    return new List<KeyBinding>
+                    {
+                        new KeyBinding
+                        {
+                            Command = nameof(Command.DecreaseFontSize),
+                            Ctrl = true,
+                            Key = (int)ExtendedVirtualKey.Minus
+                        }
+                    };
+                case Command.ResetFontSize:
+                    return new List<KeyBinding>
+                    {
+                        new KeyBinding
+                        {
+                            Command = nameof(Command.ResetFontSize),
+                            Ctrl = true,
+                            Key = (int)ExtendedVirtualKey.Number0
+                        }
+                    };
+                default:
+                    throw new InvalidOperationException($"Default keybindings for Command '{command}' are missing");
             }
-
-            return null;
         }
 
         public Guid GetDefaultShellProfileId()
@@ -291,7 +379,7 @@ namespace FluentTerminal.App.Services.Implementation
                 new TabTheme
                 {
                     Id = 0,
-                    Name = "None",
+                    Name = "TabTheme.None",
                     BackgroundOpacity = double.NaN,
                     BackgroundPointerOverOpacity = double.NaN,
                     BackgroundPressedOpacity = double.NaN,
@@ -302,41 +390,42 @@ namespace FluentTerminal.App.Services.Implementation
                 new TabTheme
                 {
                     Id = 1,
-                    Name = "Red",
+                    Name = "TabTheme.Red",
                     Color = "#E81123"
                 },
                 new TabTheme
                 {
                     Id = 2,
-                    Name = "Green",
+                    Name = "TabTheme.Green",
                     Color = "#10893E"
                 },
                 new TabTheme
                 {
                     Id = 3,
-                    Name = "Blue",
+                    Name = "TabTheme.Blue",
                     Color = "#0078D7"
                 },
                 new TabTheme
                 {
                     Id = 4,
-                    Name = "Purple",
+                    Name = "TabTheme.Purple",
                     Color = "#881798"
                 },
                 new TabTheme
                 {
                     Id = 5,
-                    Name = "Orange",
+                    Name = "TabTheme.Orange",
                     Color = "#FF8C00"
                 },
                 new TabTheme
                 {
                     Id = 6,
-                    Name = "Teal",
+                    Name = "TabTheme.Teal",
                     Color = "#00B7C3"
                 }
             };
         }
+
         public TerminalOptions GetDefaultTerminalOptions()
         {
             return new TerminalOptions
@@ -347,10 +436,12 @@ namespace FluentTerminal.App.Services.Implementation
                 ScrollBarStyle = ScrollBarStyle.Hidden,
                 FontFamily = "Consolas",
                 FontSize = 13,
-                BoldText = false,
+                FontWeight = 400,
                 BackgroundOpacity = 0.8,
                 Padding = 12,
-                ScrollBackLimit = 1000
+                ScrollBackLimit = 1000,
+                WordSeparator = " ()[]{}:;|│!&*<>@&quot;&squo;",
+                UseAcrylicBackground = true
             };
         }
 
@@ -367,11 +458,17 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     Id = GetDefaultShellProfileId(),
                     Name = "Powershell",
+                    MigrationVersion = ShellProfile.CurrentMigrationVersion,
                     Arguments = string.Empty,
                     Location = @"C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe",
                     PreInstalled = true,
                     WorkingDirectory = string.Empty,
-                    LineEndingTranslation = LineEndingStyle.DoNotModify,
+                    UseConPty = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8), // Windows 10 1903+
+                    UseBuffer = false,
+                    EnvironmentVariables = new Dictionary<string, string>
+                    {
+                        ["TERM"] = "xterm-256color"
+                    },
                     KeyBindings = new []
                     {
                         new KeyBinding
@@ -389,11 +486,17 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     Id = Guid.Parse("ab942a61-7673-4755-9bd8-765aff91d9a3"),
                     Name = "CMD",
+                    MigrationVersion = ShellProfile.CurrentMigrationVersion,
                     Arguments = string.Empty,
                     Location = @"C:\Windows\System32\cmd.exe",
                     PreInstalled = true,
                     WorkingDirectory = string.Empty,
-                    LineEndingTranslation = LineEndingStyle.DoNotModify,
+                    UseConPty = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 7), // Windows 10 1809+
+                    UseBuffer = true,
+                    EnvironmentVariables = new Dictionary<string, string>
+                    {
+                        ["TERM"] = "xterm-256color"
+                    },
                     KeyBindings = new []
                     {
                         new KeyBinding
@@ -411,11 +514,17 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     Id= Guid.Parse("e5785ad6-584f-40cb-bdcd-d5b3b3953e7f"),
                     Name = "WSL",
+                    MigrationVersion = ShellProfile.CurrentMigrationVersion,
                     Arguments = string.Empty,
                     Location = @"C:\windows\system32\wsl.exe",
                     PreInstalled = true,
                     WorkingDirectory = string.Empty,
-                    LineEndingTranslation = LineEndingStyle.DoNotModify,
+                    UseConPty = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 7), // Windows 10 1809+
+                    UseBuffer = true, //TODO: Set to false if the buffer causes issues with WSL.
+                    EnvironmentVariables = new Dictionary<string, string>
+                    {
+                        ["TERM"] = "xterm-256color"
+                    },
                     KeyBindings = new []
                     {
                         new KeyBinding
@@ -578,18 +687,18 @@ namespace FluentTerminal.App.Services.Implementation
                     Black = "#300A24",
                     Red = "#CC0000",
                     Green = "#4E9A06",
-                    Yellow = "#06989A",
+                    Yellow = "#C4A000",
                     Blue = "#3465A4",
                     Magenta = "#75507B",
-                    Cyan = "#C4A000",
+                    Cyan = "#06989A",
                     White = "#D3D7CF",
                     BrightBlack = "#554E53",
                     BrightRed = "#EF2929",
                     BrightGreen = "#8AE234",
-                    BrightYellow = "#34E2E2",
+                    BrightYellow = "#FCE94F",
                     BrightBlue = "#729FCF",
                     BrightMagenta = "#AD7FA8",
-                    BrightCyan = "#FCE94F",
+                    BrightCyan = "#34E2E2",
                     BrightWhite = "#EEEEEE"
                 }
             };

FluentTerminal.App.Services/Implementation/DialogService.cs

@@ -7,17 +7,24 @@ namespace FluentTerminal.App.Services.Implementation
 {
     public class DialogService : IDialogService
     {
-        private readonly Func<IShellProfileSelectionDialog> _shellProfileSelectionDialogFactory;
         private readonly Func<IMessageDialog> _messageDialogFactory;
         private readonly Func<ICreateKeyBindingDialog> _createKeyBindingDialogFactory;
         private readonly Func<IInputDialog> _inputDialogFactory;
+        private readonly Func<ISshConnectionInfoDialog> _sshConnectionInfoDialogFactory;
+        private readonly Func<ICustomCommandDialog> _customCommandDialogFactory;
+        private readonly Func<IAboutDialog> _aboutDialogFactory;
 
-        public DialogService(Func<IShellProfileSelectionDialog> shellProfileSelectionDialogFactory, Func<IMessageDialog> messageDialogFactory, Func<ICreateKeyBindingDialog> createKeyBindingDialogFactory, Func<IInputDialog> inputDialogFactory)
+        public DialogService(Func<IMessageDialog> messageDialogFactory, Func<ICreateKeyBindingDialog> createKeyBindingDialogFactory,
+            Func<IInputDialog> inputDialogFactory, Func<ISshConnectionInfoDialog> sshConnectionInfoDialogFactory,
+            Func<ICustomCommandDialog> customCommandDialogFactory,
+            Func<IAboutDialog> aboutDialogFactory)
         {
-            _shellProfileSelectionDialogFactory = shellProfileSelectionDialogFactory;
             _messageDialogFactory = messageDialogFactory;
             _createKeyBindingDialogFactory = createKeyBindingDialogFactory;
             _inputDialogFactory = inputDialogFactory;
+            _sshConnectionInfoDialogFactory = sshConnectionInfoDialogFactory;
+            _customCommandDialogFactory = customCommandDialogFactory;
+            _aboutDialogFactory = aboutDialogFactory;
         }
 
         public Task<KeyBinding> ShowCreateKeyBindingDialog()
@@ -27,7 +34,7 @@ namespace FluentTerminal.App.Services.Implementation
             return dialog.CreateKeyBinding();
         }
 
-        public Task<DialogButton> ShowMessageDialogAsnyc(string title, string content, params DialogButton[] buttons)
+        public Task<DialogButton> ShowMessageDialogAsync(string title, string content, params DialogButton[] buttons)
         {
             if (string.IsNullOrWhiteSpace(title))
             {
@@ -64,11 +71,17 @@ namespace FluentTerminal.App.Services.Implementation
             return dialog.GetInput();
         }
 
-        public Task<ShellProfile> ShowProfileSelectionDialogAsync()
-        {
-            var dialog = _shellProfileSelectionDialogFactory();
+        public Task<SshProfile> ShowSshConnectionInfoDialogAsync(SshProfile input = null) =>
+            _sshConnectionInfoDialogFactory().GetSshConnectionInfoAsync(input);
 
-            return dialog.SelectProfile();
+        public Task<ShellProfile> ShowCustomCommandDialogAsync(ShellProfile input = null) =>
+            _customCommandDialogFactory().GetCustomCommandAsync(input);
+
+        public Task ShowAboutDialogAsync()
+        {
+            var dialog = _aboutDialogFactory();
+
+            return dialog.ShowAsync();
         }
     }
 }

FluentTerminal.App.Services/Implementation/FluentTerminalThemeParser.cs

@@ -9,9 +9,20 @@ namespace FluentTerminal.App.Services.Implementation
 {
     public class FluentTerminalThemeParser : IThemeParser
     {
-        public IEnumerable<string> SupportedFileTypes { get; } = new string[] { ".flutecolors" };
+        public IEnumerable<string> SupportedFileTypes { get; } = new[] { ".flutecolors" };
 
-        public async Task<TerminalTheme> Parse(string fileName, Stream fileContent)
+        public Task<ExportedTerminalTheme> Import(string fileName, Stream fileContent)
+        {
+            return DeserializeThemeAsync<ExportedTerminalTheme>(fileName, fileContent);
+        }
+
+        public Task<TerminalTheme> Parse(string fileName, Stream fileContent)
+        {
+            return DeserializeThemeAsync<TerminalTheme>(fileName, fileContent);
+        }
+
+        private async Task<T> DeserializeThemeAsync<T>(string fileName, Stream fileContent)
+            where T : TerminalTheme
         {
             if (string.IsNullOrWhiteSpace(fileName))
             {
@@ -25,8 +36,8 @@ namespace FluentTerminal.App.Services.Implementation
 
             using (var streamReader = new StreamReader(fileContent))
             {
-                var content = await streamReader.ReadToEndAsync();
-                var theme = JsonConvert.DeserializeObject<TerminalTheme>(content);
+                var content = await streamReader.ReadToEndAsync().ConfigureAwait(false);
+                var theme = JsonConvert.DeserializeObject<T>(content);
 
                 theme.PreInstalled = false;
                 theme.Id = Guid.NewGuid();

FluentTerminal.App.Services/Implementation/ITermThemeParser.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Threading.Tasks;
+// ReSharper disable InconsistentNaming
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -14,7 +15,7 @@ namespace FluentTerminal.App.Services.Implementation
     {
         private const byte Opacity30Percent = 77;
 
-        public IEnumerable<string> SupportedFileTypes { get; } = new string[] { ".itermcolors" };
+        public IEnumerable<string> SupportedFileTypes { get; } = new[] { ".itermcolors" };
 
         private static class ITermThemeKeys
         {
@@ -36,7 +37,7 @@ namespace FluentTerminal.App.Services.Implementation
             public const string Ansi15Color = "Ansi 15 Color";
 
             public const string BackgroundColor = "Background Color";
-            public const string BoldColor = "Bold Color";
+            //public const string BoldColor = "Bold Color";
             public const string CursorColor = "Cursor Color";
             public const string CursorTextColor = "Cursor Text Color";
             public const string ForegroundColor = "Foreground Color";
@@ -51,7 +52,7 @@ namespace FluentTerminal.App.Services.Implementation
             public const string RedComponent = "Red Component";
         }
 
-        public async Task<TerminalTheme> Parse(string fileName, Stream fileContent)
+        public Task<TerminalTheme> Parse(string fileName, Stream fileContent)
         {
             if (string.IsNullOrWhiteSpace(fileName))
             {
@@ -65,13 +66,13 @@ namespace FluentTerminal.App.Services.Implementation
 
             var node = PList.Load(fileContent) as DictionaryNode ?? throw new ParseThemeException("Root node was not a dictionary.");
 
-            return new TerminalTheme
+            return Task.FromResult(new TerminalTheme
             {
                 Name = Path.GetFileNameWithoutExtension(fileName),
                 Colors = GetColors(node),
                 Id = Guid.NewGuid(),
                 PreInstalled = false
-            };
+            });
         }
 
         private TerminalColors GetColors(DictionaryNode themeDictionary)
@@ -83,6 +84,8 @@ namespace FluentTerminal.App.Services.Implementation
                 Cursor = GetColorString(themeDictionary[ITermThemeKeys.CursorColor]),
                 CursorAccent = GetColorString(themeDictionary[ITermThemeKeys.CursorTextColor]),
                 Selection = GetColorString(themeDictionary[ITermThemeKeys.SelectionColor], Opacity30Percent),
+                SelectionForeground = GetColorString(themeDictionary[ITermThemeKeys.SelectedTextColor]),
+                SelectionBackground = GetColorString(themeDictionary[ITermThemeKeys.SelectionColor]),
                 Black = GetColorString(themeDictionary[ITermThemeKeys.Ansi0Color]),
                 Red = GetColorString(themeDictionary[ITermThemeKeys.Ansi1Color]),
                 Green = GetColorString(themeDictionary[ITermThemeKeys.Ansi2Color]),
@@ -110,8 +113,6 @@ namespace FluentTerminal.App.Services.Implementation
             var green = dictionaryNode[ITermThemeColorKeys.GreenComponent] as RealNode ?? throw new ParseThemeException("Green node value was not a real number");
             var blue = dictionaryNode[ITermThemeColorKeys.BlueComponent] as RealNode ?? throw new ParseThemeException("Blue node value was not a real number");
 
-            var color = $"#{alpha:X2}{GetByteValue(red):X2}{GetByteValue(green):X2}{GetByteValue(blue):X2}";
-
             if (alpha == byte.MaxValue)
             {
                 return $"#{GetByteValue(red):X2}{GetByteValue(green):X2}{GetByteValue(blue):X2}";
@@ -133,5 +134,30 @@ namespace FluentTerminal.App.Services.Implementation
         {
             return (alpha / 256.0).ToString(CultureInfo.InvariantCulture);
         }
+
+        public Task<ExportedTerminalTheme> Import(string fileName, Stream fileContent)
+        {
+            if (string.IsNullOrWhiteSpace(fileName))
+            {
+                throw new ArgumentNullException(nameof(fileName));
+            }
+
+            if (fileContent == null)
+            {
+                throw new ArgumentNullException(nameof(fileContent));
+            }
+
+            var node = PList.Load(fileContent) as DictionaryNode ?? throw new ParseThemeException("Root node was not a dictionary.");
+
+            var terminalTheme = new TerminalTheme
+            {
+                Name = Path.GetFileNameWithoutExtension(fileName),
+                Colors = GetColors(node),
+                Id = Guid.NewGuid(),
+                PreInstalled = false
+            };
+
+            return Task.FromResult(new ExportedTerminalTheme(terminalTheme, string.Empty));
+        }
     }
 }

FluentTerminal.App.Services/Implementation/KeyboardCommandService.cs

@@ -42,5 +42,10 @@ namespace FluentTerminal.App.Services.Implementation
 
             throw new KeyNotFoundException($"No handler registered for command: {command}");
         }
+
+        public void ClearCommandHandlers()
+        {
+            _commandHandlers.Clear();
+        }
     }
 }

FluentTerminal.App.Services/Implementation/MoshBackwardCompatibility.cs

@@ -0,0 +1,94 @@
+using System;
+using System.Text.RegularExpressions;
+using FluentTerminal.Models;
+
+namespace FluentTerminal.App.Services.Implementation
+{
+    // The purpose of this class is to ensure backward compatibility of mosh profiles and command history
+    // TODO: This class should be probably deleted in few months or so
+    public static class MoshBackwardCompatibility
+    {
+        private static readonly string MoshCommandExe = $"{Constants.MoshCommandName}.exe";
+
+        private static readonly Regex OldFormatRx = new Regex(@".+\s(?<ports>\d{1,5}:\d{1,5})$", RegexOptions.Compiled);
+
+        private static readonly Regex TargetRx =
+            new Regex(@"(^|\s+)(?<user>[^\s@;]+)@(?<host>[^\s@:]+)(:(?<port>\d{1,5}))?\s+", RegexOptions.Compiled);
+
+        private static bool IsMoshProfile(ShellProfile profile) =>
+            Constants.MoshCommandName.Equals(profile.Location, StringComparison.OrdinalIgnoreCase) ||
+            MoshCommandExe.Equals(profile.Location, StringComparison.OrdinalIgnoreCase);
+
+        /// <summary>
+        /// Checks if the profile contains obsolete mosh syntax, and changes it if it does.
+        /// </summary>
+        /// <param name="profile">The profile. Note that the method doesn't change the input profile at all, but creates and
+        /// returns its clone if there's something to change.</param>
+        /// <remarks>
+        /// The method actually checks if <see cref="ShellProfile.Arguments"/> of the input <paramref name="profile"/> is in
+        /// obsolete <c>mosh</c> format <c>[ssh_arguments] [target] [mosh_port_range]</c>, and if it is changes it to the new
+        /// format <c>--ssh="[ssh_arguments]" -p [mosh_ports] [target]</c>.
+        /// </remarks>
+        /// <returns>
+        /// If the method detected that the input profile is obsolete mosh profile, it will create its clone with the updated
+        /// command line arguments, and return it. Otherwise it will simply return unchanged input profile (the same reference
+        /// as the input profile). It allows us to simply check if anything is changed by comparing the input and output
+        /// profiles for reference equality.
+        /// </returns>
+        public static ShellProfile FixProfile(ShellProfile profile)
+        {
+            // If there aren't any arguments, or if the profile isn't a mosh profile, there's nothing to do. Just return.
+            if (string.IsNullOrWhiteSpace(profile.Arguments) || !IsMoshProfile(profile)) return profile;
+
+            var arguments = profile.Arguments.Trim();
+
+            var moshPortsMatch = OldFormatRx.Match(arguments);
+
+            if (!moshPortsMatch.Success) return profile;// Arguments don't end with mosh ports (i.e. 60000:61000), so it isn't an obsolete format.
+
+            var targetMatches = TargetRx.Matches(arguments);
+
+            if (targetMatches.Count != 1) return profile;// Target part (user@host:port) not found or found multiple times. Cannot reliably determine the target, so don't change.
+
+            var targetMatch = targetMatches[0];
+
+            // Removing [mosh_ports] from the original arguments
+            arguments = arguments.Substring(0, arguments.Length - moshPortsMatch.Groups["ports"].Length).Trim();
+
+            var newProfile = profile.Clone();
+
+            // Removing [target] from the original arguments, thus getting "pure" ssh arguments
+            var sshArguments = targetMatch.Index > 0 ? arguments.Substring(0, targetMatch.Index).Trim() : string.Empty;
+
+            if (targetMatch.Index + targetMatch.Length < arguments.Length)
+            {
+                sshArguments += $" {arguments.Substring(targetMatch.Index + targetMatch.Length).Trim()}";
+            }
+
+            // If the ssh port is defined in the original target (i.e. user@host:port), which was allowed in the obsolete mosh, extracting the port part into a separate ssh argument
+            if (targetMatch.Groups["port"].Success && uint.TryParse(targetMatch.Groups["port"].Value, out var port) &&
+                port != SshProfile.DefaultSshPort)
+            {
+                sshArguments += $" -p {targetMatch.Groups["port"].Value}";
+            }
+
+            // Replacing any double quotes in ssh arguments with single quotes, since ssh arguments will be double-quoted as a whole
+            sshArguments = sshArguments.Replace("\"", "'").Trim();
+
+            arguments = $"-p {moshPortsMatch.Groups["ports"].Value}";
+
+            if (!string.IsNullOrEmpty(sshArguments))
+            {
+                // If there were some ssh arguments, add them as defined in the new format
+                arguments += $" --ssh=\"ssh {sshArguments}\"";
+            }
+
+            // Finally append the target to the arguments
+            arguments += $" {targetMatch.Groups["user"]}@{targetMatch.Groups["host"]}";
+
+            newProfile.Arguments = arguments;
+
+            return newProfile;
+        }
+    }
+}

FluentTerminal.App.Services/Implementation/SettingsService.cs

@@ -5,6 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.Models.Messages;
+using Microsoft.Toolkit.Mvvm.Messaging;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -12,12 +15,14 @@ namespace FluentTerminal.App.Services.Implementation
     {
         public const string CurrentThemeKey = "CurrentTheme";
         public const string DefaultShellProfileKey = "DefaultShellProfile";
+        public const string DefaultSshProfileKey = "DefaultSshProfile";
 
         private readonly IDefaultValueProvider _defaultValueProvider;
         private readonly IApplicationDataContainer _keyBindings;
         private readonly IApplicationDataContainer _localSettings;
         private readonly IApplicationDataContainer _roamingSettings;
         private readonly IApplicationDataContainer _shellProfiles;
+        private readonly IApplicationDataContainer _sshProfiles;
         private readonly IApplicationDataContainer _themes;
 
         public SettingsService(IDefaultValueProvider defaultValueProvider, ApplicationDataContainers containers)
@@ -29,6 +34,8 @@ namespace FluentTerminal.App.Services.Implementation
             _themes = containers.Themes;
             _keyBindings = containers.KeyBindings;
             _shellProfiles = containers.ShellProfiles;
+            _sshProfiles = containers.SshProfiles;
+
 
             foreach (var theme in _defaultValueProvider.GetPreInstalledThemes())
             {
@@ -47,25 +54,132 @@ namespace FluentTerminal.App.Services.Implementation
             }
         }
 
-        public event EventHandler<ApplicationSettings> ApplicationSettingsChanged;
+        public string ExportSettings()
+        {
+            var config = new
+            {
+                App = GetApplicationSettings(),
+                KeyBindings = GetCommandKeyBindings(),
+                TerminalOptions = GetTerminalOptions(),
+                Themes = new List<TerminalTheme>(),
+                Profiles = new List<ShellProfile>(),
+                SshProfiles = new List<SshProfile>(),
+                DefaultSettings = GetDefaultSettings(),
+            };
 
-        public event EventHandler<TerminalTheme> ThemeAdded;
-        public event EventHandler<Guid> CurrentThemeChanged;
-        public event EventHandler<Guid> ThemeDeleted;
+            foreach (var theme in GetThemes().Where(x => !x.PreInstalled))
+            {
+                config.Themes.Add(theme);
+            }
 
-        public event EventHandler KeyBindingsChanged;
+            foreach (var profile in GetShellProfiles())
+            {
+                config.Profiles.Add(profile);
+            }
 
-        public event EventHandler<ShellProfile> ShellProfileAdded;
-        public event EventHandler<Guid> ShellProfileDeleted;
+            foreach (var profile in GetSshProfiles())
+            {
+                config.SshProfiles.Add(profile);
+            }
 
-        public event EventHandler<TerminalOptions> TerminalOptionsChanged;
+            return JsonConvert.SerializeObject(config, PreserveDictionaryKeyCaseContractResolver.SerializerSettings);
+        }
+
+        private Dictionary<string, string> GetDefaultSettings()
+        {
+            return new Dictionary<string, string>
+            {
+                [DefaultShellProfileKey] = GetDefaultShellProfileId().ToString(),
+                [CurrentThemeKey] = GetCurrentThemeId().ToString(),
+            };
+        }
+
+        public void ImportSettings(string serializedSettings)
+        {
+            var config = new
+            {
+                App = GetApplicationSettings(),
+                KeyBindings = new Dictionary<string, ICollection<KeyBinding>>(),
+                Themes = new List<TerminalTheme>(),
+                Profiles = new List<ShellProfile>(),
+                SshProfiles = new List<SshProfile>(),
+                TerminalOptions = GetTerminalOptions(),
+                DefaultSettings = new Dictionary<string, string>(),
+            };
+
+            JsonConvert.PopulateObject(serializedSettings, config);
+
+            SaveApplicationSettings(config.App);
+
+            // Since we set each command sepaartely, we don't need all existing settings
+            foreach (var pair in config.KeyBindings)
+            {
+                SaveKeyBindings(pair.Key, pair.Value);
+            }
+
+            // Can't create/modify pre-installed themes
+            foreach (var theme in config.Themes.Where(x => !x.PreInstalled))
+            {
+                var existingTheme = GetTheme(theme.Id);
+                if (existingTheme?.PreInstalled == true)
+                {
+                    continue;
+                }
+                SaveTheme(theme, existingTheme != null);
+            }
+
+            foreach (var profile in config.Profiles)
+            {
+                var existingProfile = GetShellProfile(profile.Id);
+                var isNew = existingProfile == default;
+
+                if (!isNew && existingProfile.PreInstalled)
+                {
+                    // those cannot be edited
+                    profile.Name = existingProfile.Name;
+                    profile.Location = existingProfile.Location;
+
+                    SaveShellProfile(profile, false);
+                    continue;
+                }
+                SaveShellProfile(profile, isNew);
+            }
+
+            foreach (var profile in config.SshProfiles)
+            {
+                var existingProfile = GetSshProfile(profile.Id);
+                var isNew = existingProfile == default;
+
+                SaveSshProfile(profile, isNew);
+            }
+
+            SaveTerminalOptions(config.TerminalOptions);
+
+            if (config.DefaultSettings.ContainsKey(DefaultShellProfileKey))
+            {
+                SaveDefaultShellProfileId(new Guid(config.DefaultSettings[DefaultShellProfileKey]));
+            }
+
+            if (config.DefaultSettings.ContainsKey(CurrentThemeKey))
+            {
+                SaveCurrentThemeId(new Guid(config.DefaultSettings[CurrentThemeKey]));
+            }
+        }
 
         public void DeleteShellProfile(Guid id)
         {
             _shellProfiles.Delete(id.ToString());
-            ShellProfileDeleted?.Invoke(this, id);
+            WeakReferenceMessenger.Default.Send(new ShellProfileDeletedMessage(id));
         }
 
+        public void DeleteSshProfile(Guid id)
+        {
+            _sshProfiles.Delete(id.ToString());
+            WeakReferenceMessenger.Default.Send(new ShellProfileDeletedMessage(id));
+            WeakReferenceMessenger.Default.Send(new KeyBindingsChangedMessage());
+        }
+
+
         public void DeleteTheme(Guid id)
         {
             _themes.Delete(id.ToString());
@@ -79,7 +193,7 @@ namespace FluentTerminal.App.Services.Implementation
                 }
             }
 
-            ThemeDeleted?.Invoke(this, id);
+            WeakReferenceMessenger.Default.Send(new ThemeDeletedMessage(id));
         }
 
         public ApplicationSettings GetApplicationSettings()
@@ -126,6 +240,10 @@ namespace FluentTerminal.App.Services.Implementation
         {
             return _shellProfiles.ReadValueFromJson(id.ToString(), default(ShellProfile));
         }
+        public SshProfile GetSshProfile(Guid id)
+        {
+            return _sshProfiles.ReadValueFromJson(id.ToString(), default(SshProfile));
+        }
 
         public Guid GetDefaultShellProfileId()
         {
@@ -149,7 +267,43 @@ namespace FluentTerminal.App.Services.Implementation
 
         public IEnumerable<ShellProfile> GetShellProfiles()
         {
-            return _shellProfiles.GetAll().Select(x => JsonConvert.DeserializeObject<ShellProfile>((string)x)).ToList();
+            return _shellProfiles.GetAll().Select(x => JsonConvert.DeserializeObject<ShellProfile>((string) x))
+                .Select(MoshBackwardCompatibilityFixProfile);
+        }
+
+        public IEnumerable<SshProfile> GetSshProfiles()
+        {
+            return _sshProfiles.GetAll().Select(x => JsonConvert.DeserializeObject<SshProfile>((string) x))
+                .Select(MoshBackwardCompatibilityFixProfile).Cast<SshProfile>();
+        }
+
+        public IEnumerable<ShellProfile> GetAllProfiles()
+        {
+            return GetShellProfiles().Union(GetSshProfiles());
+        }
+
+        private ShellProfile MoshBackwardCompatibilityFixProfile(ShellProfile profile)
+        {
+            var fixedProfile = MoshBackwardCompatibility.FixProfile(profile);
+
+            if (ReferenceEquals(fixedProfile, profile))
+            {
+                // Nothing changed
+                return fixedProfile;
+            }
+
+            if (fixedProfile is SshProfile sshProfile)
+            {
+                DeleteSshProfile(profile.Id);
+                SaveSshProfile(sshProfile);
+            }
+            else
+            {
+                DeleteShellProfile(profile.Id);
+                SaveShellProfile(fixedProfile);
+            }
+
+            return fixedProfile;
         }
 
         public IEnumerable<TabTheme> GetTabThemes()
@@ -179,36 +333,43 @@ namespace FluentTerminal.App.Services.Implementation
                 _keyBindings.WriteValueAsJson(command.ToString(), _defaultValueProvider.GetDefaultKeyBindings(command));
             }
 
-            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
+            WeakReferenceMessenger.Default.Send(new KeyBindingsChangedMessage());
         }
 
         public void SaveApplicationSettings(ApplicationSettings applicationSettings)
         {
             _roamingSettings.WriteValueAsJson(nameof(ApplicationSettings), applicationSettings);
-            ApplicationSettingsChanged?.Invoke(this, applicationSettings);
+            WeakReferenceMessenger.Default.Send(new ApplicationSettingsChangedMessage(applicationSettings.Clone()));
+        }
+
+        public void NotifyApplicationSettingsChanged(ApplicationSettings applicationSettings)
+        {
+            WeakReferenceMessenger.Default.Send(new ApplicationSettingsChangedMessage(applicationSettings.Clone()));
         }
 
         public void SaveCurrentThemeId(Guid id)
         {
             _roamingSettings.SetValue(CurrentThemeKey, id);
 
-            CurrentThemeChanged?.Invoke(this, id);
+            WeakReferenceMessenger.Default.Send(new CurrentThemeChangedMessage(id));
         }
 
         public void SaveDefaultShellProfileId(Guid id)
         {
             _localSettings.SetValue(DefaultShellProfileKey, id);
+
+            WeakReferenceMessenger.Default.Send(new DefaultShellProfileChangedMessage(id));
         }
 
         public void SaveKeyBindings(string command, ICollection<KeyBinding> keyBindings)
         {
-            if (!Enum.IsDefined(typeof(Command), command))
+            if (!Enum.TryParse<Command>(command, true, out var enumValue))
             {
                 throw new InvalidOperationException();
             }
 
-            _keyBindings.WriteValueAsJson(command.ToString(), keyBindings);
-            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
+            _keyBindings.WriteValueAsJson(enumValue.ToString(), keyBindings);
+            WeakReferenceMessenger.Default.Send(new KeyBindingsChangedMessage());
         }
 
         public void SaveShellProfile(ShellProfile shellProfile, bool newShell = false)
@@ -216,18 +377,39 @@ namespace FluentTerminal.App.Services.Implementation
             _shellProfiles.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile);
 
             // When saving the shell profile, we also need to update keybindings for everywhere.
-            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
+            WeakReferenceMessenger.Default.Send(new KeyBindingsChangedMessage());
 
             if (newShell)
             {
-                ShellProfileAdded?.Invoke(this, shellProfile);
+                WeakReferenceMessenger.Default.Send(new ShellProfileAddedMessage(shellProfile));
+            }
+            else
+            {
+                WeakReferenceMessenger.Default.Send(new ShellProfileChangedMessage(shellProfile));
+            }
+        }
+
+        public void SaveSshProfile(SshProfile sshProfile, bool newShell = false)
+        {
+            _sshProfiles.WriteValueAsJson(sshProfile.Id.ToString(), sshProfile);
+
+            // When saving the shell profile, we also need to update keybindings for everywhere.
+            WeakReferenceMessenger.Default.Send(new KeyBindingsChangedMessage());
+
+            if (newShell)
+            {
+                WeakReferenceMessenger.Default.Send(new ShellProfileAddedMessage(sshProfile));
+            }
+            else
+            {
+                WeakReferenceMessenger.Default.Send(new ShellProfileChangedMessage(sshProfile));
             }
         }
 
         public void SaveTerminalOptions(TerminalOptions terminalOptions)
         {
             _roamingSettings.WriteValueAsJson(nameof(TerminalOptions), terminalOptions);
-            TerminalOptionsChanged?.Invoke(this, terminalOptions);
+            WeakReferenceMessenger.Default.Send(new TerminalOptionsChangedMessage(terminalOptions));
         }
 
         public void SaveTheme(TerminalTheme theme, bool newTheme = false)
@@ -236,12 +418,12 @@ namespace FluentTerminal.App.Services.Implementation
 
             if (theme.Id == GetCurrentThemeId())
             {
-                CurrentThemeChanged?.Invoke(this, theme.Id);
+                WeakReferenceMessenger.Default.Send(new CurrentThemeChangedMessage(theme.Id));
             }
 
             if (newTheme)
             {
-                ThemeAdded?.Invoke(this, theme);
+                WeakReferenceMessenger.Default.Send(new ThemeAddedMessage(theme));
             }
         }
     }

FluentTerminal.App.Services/Implementation/ShellProfileMigrationService.cs

@@ -0,0 +1,32 @@
+using FluentTerminal.Models;
+using System;
+using System.Collections.Generic;
+
+namespace FluentTerminal.App.Services.Implementation
+{
+    public class ShellProfileMigrationService : IShellProfileMigrationService
+    {
+        private readonly Dictionary<int, Action<ShellProfile>> _migrationSteps = new Dictionary<int, Action<ShellProfile>>
+        {
+            [1] = new Action<ShellProfile>(profile =>
+            {
+                profile.EnvironmentVariables["TERM"] = "xterm-256color";
+            })
+        };
+
+
+        public void Migrate(ShellProfile profile)
+        {
+            while(profile.MigrationVersion < ShellProfile.CurrentMigrationVersion)
+            {
+                ApplyMigrationStep(profile, profile.MigrationVersion + 1);
+            }
+        }
+
+        private void ApplyMigrationStep(ShellProfile profile, int targetVersion)
+        {
+            _migrationSteps[targetVersion](profile);
+            profile.MigrationVersion = targetVersion;
+        }
+    }
+}

FluentTerminal.App.Services/Implementation/ThemeParserFactory.cs

@@ -5,7 +5,7 @@ namespace FluentTerminal.App.Services.Implementation
 {
     public class ThemeParserFactory : IThemeParserFactory
     {
-        private IEnumerable<IThemeParser> _parsers;
+        private readonly IEnumerable<IThemeParser> _parsers;
 
         public IEnumerable<string> SupportedFileTypes { get; }
 

FluentTerminal.App.Services/Implementation/TrayProcessCommunicationService.cs

@@ -1,4 +1,5 @@
-using FluentTerminal.Models;
+using FluentTerminal.App.Services.Exceptions;
+using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using FluentTerminal.Models.Requests;
 using FluentTerminal.Models.Responses;
@@ -6,42 +7,150 @@ using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Windows.Foundation.Collections;
+using FluentTerminal.App.Services.Utilities;
 
 namespace FluentTerminal.App.Services.Implementation
 {
     public class TrayProcessCommunicationService : ITrayProcessCommunicationService
     {
+        #region Static
+
+        private static string _userName;
+        private static string _sshConfigDir;
+        private static readonly Dictionary<string, string> CommandPaths = new Dictionary<string, string>();
+        private static readonly Dictionary<string, string> CommandErrors = new Dictionary<string, string>();
+
+        private static ValueSet CreateMessage(IMessage content)
+        {
+            return new ValueSet
+            {
+                [MessageKeys.Type] = content.Identifier,
+                [MessageKeys.Content] = JsonConvert.SerializeObject(content,
+                    PreserveDictionaryKeyCaseContractResolver.SerializerSettings)
+            };
+        }
+
+        #endregion Static
+
         private readonly ISettingsService _settingsService;
         private IAppServiceConnection _appServiceConnection;
-        private readonly Dictionary<int, Action<byte[]>> _terminalOutputHandlers;
-        private int _nextTerminalId = 0;
+        private readonly Dictionary<byte, Action<byte[]>> _terminalOutputHandlers;
+        // ReSharper disable once RedundantDefaultMemberInitializer
+        private byte _nextTerminalId = 0;
 
-        public event EventHandler<int> TerminalExited;
+        public event EventHandler<TerminalExitStatus> TerminalExited;
 
         public TrayProcessCommunicationService(ISettingsService settingsService)
         {
             _settingsService = settingsService;
-            _terminalOutputHandlers = new Dictionary<int, Action<byte[]>>();
+            _terminalOutputHandlers = new Dictionary<byte, Action<byte[]>>();
         }
 
-        public int GetNextTerminalId()
+        public byte GetNextTerminalId()
         {
             return _nextTerminalId++;
         }
 
-        public async Task<GetAvailablePortResponse> GetAvailablePort()
+        public async Task<string> GetUserNameAsync()
         {
-            var request = new GetAvailablePortRequest();
+            if (!string.IsNullOrEmpty(_userName))
+            {
+                // Returning the username from cache
+                return _userName;
+            }
 
-            var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(request));
-            var response = JsonConvert.DeserializeObject<GetAvailablePortResponse>(responseMessage[MessageKeys.Content]);
+            var response = await GetResponseAsync<StringValueResponse>(new GetUserNameRequest()).ConfigureAwait(false);
 
-            Logger.Instance.Debug("Received GetAvailablePortResponse: {@response}", response);
+            if (response.Success)
+            {
+                _userName = response.Value;
+            }
 
-            return response;
+            return _userName;
         }
 
-        public async Task<CreateTerminalResponse> CreateTerminal(int id, TerminalSize size, ShellProfile shellProfile, SessionType sessionType)
+        public async Task SaveTextFileAsync(string path, string content)
+        {
+            var response =
+                await GetResponseAsync<CommonResponse>(new SaveTextFileRequest {Path = path, Content = content})
+                    .ConfigureAwait(false);
+
+            if (!response.Success)
+            {
+                throw new SaveTextFileException(string.IsNullOrEmpty(response.Error)
+                    ? "Failed to save the file."
+                    : response.Error);
+            }
+        }
+
+        public async Task<string> ReadTextFileAsync(string path)
+        {
+            var response = await GetResponseAsync<StringValueResponse>(new ReadTextFileRequest { Path = path }).ConfigureAwait(false);
+
+            if (!response.Success)
+            {
+                throw new ReadTextFileException(string.IsNullOrWhiteSpace(response.Error) ? "Failed to read the file." : response.Error);
+            }
+
+            return response.Value;
+        }
+
+        public async Task<string> GetSshConfigDirAsync()
+        {
+            if (!string.IsNullOrEmpty(_sshConfigDir))
+            {
+                return _sshConfigDir;
+            }
+
+            var response =
+                await GetResponseAsync<GetSshConfigFolderResponse>(new GetSshConfigFolderRequest
+                    { IncludeContent = false }).ConfigureAwait(false);
+
+            if (response.Success)
+            {
+                _sshConfigDir = response.Path;
+            }
+
+            return _sshConfigDir;
+        }
+
+        public async Task<string[]> GetFilesFromSshConfigDirAsync()
+        {
+            var response =
+                await GetResponseAsync<GetSshConfigFolderResponse>(new GetSshConfigFolderRequest
+                    {IncludeContent = true}).ConfigureAwait(false);
+
+            if (response.Success)
+            {
+                _sshConfigDir = response.Path;
+
+                return response.Files;
+            }
+
+            return null;
+        }
+
+        public async Task<bool> CheckFileExistsAsync(string path)
+        {
+            var response = await GetResponseAsync<CommonResponse>(new CheckFileExistsRequest {Path = path})
+                .ConfigureAwait(false);
+
+            return response.Success;
+        }
+
+        public Task MuteTerminalAsync(bool mute)
+        {
+            return _appServiceConnection.SendMessageAsync(CreateMessage(new MuteTerminalRequest {Mute = mute}));
+        }
+
+        public void UpdateSettings(ApplicationSettings settings)
+        {
+            _appServiceConnection.SendMessageAsync(CreateMessage(new UpdateSettingsRequest { Settings = settings }));
+        }
+
+        public async Task<CreateTerminalResponse> CreateTerminalAsync(byte id, TerminalSize size, ShellProfile shellProfile,
+            SessionType sessionType)
         {
             var request = new CreateTerminalRequest
             {
@@ -53,106 +162,151 @@ namespace FluentTerminal.App.Services.Implementation
 
             Logger.Instance.Debug("Sending CreateTerminalRequest: {@request}", request);
 
-            var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(request));
-            var response = JsonConvert.DeserializeObject<CreateTerminalResponse>(responseMessage[MessageKeys.Content]);
+            var response = await GetResponseAsync<CreateTerminalResponse>(request).ConfigureAwait(false);
 
             Logger.Instance.Debug("Received CreateTerminalResponse: {@response}", response);
 
             return response;
         }
 
+        public Task<PauseTerminalOutputResponse> PauseTerminalOutputAsync(byte id, bool pause)
+        {
+            return GetResponseAsync<PauseTerminalOutputResponse>(
+                new PauseTerminalOutputRequest {Id = id, Pause = pause});
+        }
+
         public void Initialize(IAppServiceConnection appServiceConnection)
         {
             _appServiceConnection = appServiceConnection;
             _appServiceConnection.MessageReceived += OnMessageReceived;
         }
 
-        private void OnMessageReceived(object sender, IDictionary<string, string> e)
+        private void OnMessageReceived(object sender, IDictionary<string, object> e)
         {
-            var messageType = e[MessageKeys.Type];
+            var messageType = (byte)e[MessageKeys.Type];
             var messageContent = e[MessageKeys.Content];
 
-            if (messageType == nameof(DisplayTerminalOutputRequest))
+            switch (messageType)
             {
-                var request = JsonConvert.DeserializeObject<DisplayTerminalOutputRequest>(messageContent);
+                case Constants.TerminalBufferRequestIdentifier:
+                    var terminalId = (byte)e[MessageKeys.TerminalId];
 
-                if (_terminalOutputHandlers.ContainsKey(request.TerminalId))
-                {
-                    _terminalOutputHandlers[request.TerminalId].Invoke(request.Output);
-                }
-                else
-                {
-                    Logger.Instance.Error("Received output for unknown terminal Id {id}", request.TerminalId);
-                }
-            }
-            else if (messageType == nameof(TerminalExitedRequest))
-            {
-                var request = JsonConvert.DeserializeObject<TerminalExitedRequest>(messageContent);
+                    if (_terminalOutputHandlers.ContainsKey(terminalId))
+                    {
+                        _terminalOutputHandlers[terminalId].Invoke((byte[])messageContent);
+                    }
+                    else
+                    {
+                        Logger.Instance.Error("Received output for unknown terminal Id {id}", terminalId);
+                    }
+                    break;
+                case (byte) MessageIdentifiers.TerminalExitedRequest:
+                    var request = JsonConvert.DeserializeObject<TerminalExitedRequest>((string)messageContent);
+                    Logger.Instance.Debug("Received TerminalExitedRequest: {@request}", request);
 
-                Logger.Instance.Debug("Received TerminalExitedRequest: {@request}", request);
-
-                TerminalExited?.Invoke(this, request.TerminalId);
+                    TerminalExited?.Invoke(this, request.ToStatus());
+                    break;
+                default:
+                    Logger.Instance.Error("Received unknown message type: {messageType}", messageType);
+                    break;
             }
         }
 
-        public Task ResizeTerminal(int id, TerminalSize size)
+        public Task ResizeTerminalAsync(byte id, TerminalSize size)
         {
-            var request = new ResizeTerminalRequest
-            {
-                TerminalId = id,
-                NewSize = size
-            };
-
-            return _appServiceConnection.SendMessageAsync(CreateMessage(request));
+            return _appServiceConnection.SendMessageAsync(CreateMessage(new ResizeTerminalRequest
+                {TerminalId = id, NewSize = size}));
         }
 
-        public void SubscribeForTerminalOutput(int terminalId, Action<byte[]> callback)
+        public void SubscribeForTerminalOutput(byte terminalId, Action<byte[]> callback)
         {
             _terminalOutputHandlers[terminalId] = callback;
         }
 
-        public Task UpdateToggleWindowKeyBindings()
+        public void UnsubscribeFromTerminalOutput(byte id)
+        {
+            if (_terminalOutputHandlers.ContainsKey(id))
+            {
+                _terminalOutputHandlers.Remove(id);
+            }
+        }
+
+        public Task UpdateToggleWindowKeyBindingsAsync()
         {
             var keyBindings = _settingsService.GetCommandKeyBindings()[nameof(Command.ToggleWindow)];
 
-            var request = new SetToggleWindowKeyBindingsRequest
-            {
-                KeyBindings = keyBindings
-            };
-
-            return _appServiceConnection.SendMessageAsync(CreateMessage(request));
+            return _appServiceConnection.SendMessageAsync(CreateMessage(new SetToggleWindowKeyBindingsRequest
+                {KeyBindings = keyBindings}));
         }
 
-        public Task Write(int id, byte[] data)
+        public Task WriteAsync(byte id, byte[] data)
         {
-            var request = new WriteDataRequest
+            var message = new ValueSet
             {
-                TerminalId = id,
-                Data = data
+                [MessageKeys.Type] = Constants.TerminalBufferRequestIdentifier,
+                [MessageKeys.TerminalId] = id,
+                [MessageKeys.Content] = data
             };
 
-            return _appServiceConnection.SendMessageAsync(CreateMessage(request));
+            return _appServiceConnection.SendMessageAsync(message);
         }
 
-        public Task CloseTerminal(int terminalId)
+        public Task CloseTerminalAsync(byte terminalId)
         {
-            var request = new TerminalExitedRequest
-            {
-                TerminalId = terminalId
-            };
+            var request = new TerminalExitedRequest(terminalId, -1);
 
             Logger.Instance.Debug("Sending TerminalExitedRequest: {@request}", request);
 
             return _appServiceConnection.SendMessageAsync(CreateMessage(request));
         }
 
-        private IDictionary<string, string> CreateMessage(object content)
+        public async Task<string> GetCommandPathAsync(string command)
         {
-            return new Dictionary<string, string>
+            if (string.IsNullOrWhiteSpace(command))
             {
-                [MessageKeys.Type] = content.GetType().Name,
-                [MessageKeys.Content] = JsonConvert.SerializeObject(content)
-            };
+                throw new ArgumentException("Input value is null or empty.", nameof(command));
+            }
+
+            command = command.Trim();
+
+            var commandLower = command.ToLowerInvariant();
+
+            if (CommandPaths.TryGetValue(commandLower, out var path))
+            {
+                return path;
+            }
+
+            if (CommandErrors.TryGetValue(commandLower, out var error))
+            {
+                throw new Exception(error);
+            }
+
+            var response = await GetResponseAsync<StringValueResponse>(new GetCommandPathRequest {Command = command})
+                .ConfigureAwait(false);
+
+            if (response.Success)
+            {
+                CommandPaths[commandLower] = response.Value;
+
+                return response.Value;
+            }
+
+            CommandErrors[commandLower] = response.Error;
+
+            throw new Exception(response.Error);
+        }
+
+        public Task QuitApplicationAsync()
+        {
+            return _appServiceConnection.SendMessageAsync(CreateMessage(new QuitApplicationRequest()));
+        }
+
+        private async Task<T> GetResponseAsync<T>(IMessage request)
+        {
+            var messageResponse =
+                await _appServiceConnection.SendMessageAsync(CreateMessage(request)).ConfigureAwait(false);
+
+            return JsonConvert.DeserializeObject<T>((string)messageResponse[MessageKeys.Content]);
         }
     }
 }

FluentTerminal.App.Services/Implementation/UpdateService.cs

@@ -17,9 +17,9 @@ namespace FluentTerminal.App.Services.Implementation
             _notificationService = notificationService;
         }
 
-        public async Task CheckForUpdate(bool notifyNoUpdate = false)
+        public async Task CheckForUpdateAsync(bool notifyNoUpdate = false)
         {
-            var latest = await GetLatestVersionAsync();
+            var latest = await GetLatestVersionAsync().ConfigureAwait(false);
             if (latest > GetCurrentVersion())
             {
                 _notificationService.ShowNotification("Update available",
@@ -42,7 +42,7 @@ namespace FluentTerminal.App.Services.Implementation
             var restClient = new RestClient(apiEndpoint);
             var restRequest = new RestRequest("/repos/felixse/fluentterminal/releases", Method.GET);
 
-            var restResponse = await restClient.ExecuteTaskAsync(restRequest);
+            var restResponse = await restClient.ExecuteAsync(restRequest).ConfigureAwait(false);
             if (restResponse.IsSuccessful)
             {
                 dynamic restResponseData = JsonConvert.DeserializeObject(restResponse.Content);

FluentTerminal.App.Services/Logger.cs

@@ -35,7 +35,9 @@ namespace FluentTerminal.App.Services
             .MinimumLevel.Is((LogEventLevel)configuration.LogLevel)
             .CreateLogger();
 
-            Log.Information("Initialized");
+            // Log file is not created during unhandled exception processing.
+            // Force log file creation with the highest severity initialization record.
+            Log.Fatal("Initialized");
         }
 
         public void Debug(string text, params object[] propertyValues)

FluentTerminal.App.Services/Terminal.cs

@@ -1,134 +1,188 @@
-using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
-using System;
-using System.Threading.Tasks;
-
-namespace FluentTerminal.App.Services
-{
-    public class Terminal
-    {
-        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
-        private Func<Task<string>> _selectedTextCallback;
-
-        public Terminal(ITrayProcessCommunicationService trayProcessCommunicationService)
-        {
-            _trayProcessCommunicationService = trayProcessCommunicationService;
-            _trayProcessCommunicationService.TerminalExited += OnTerminalExited;
-            Id = _trayProcessCommunicationService.GetNextTerminalId();
-        }
-
-        private void OnTerminalExited(object sender, int e)
-        {
-            if (e == Id)
-            {
-                Closed?.Invoke(this, System.EventArgs.Empty);
-            }
-        }
-
-        /// <summary>
-        /// To be observed by both view and viewmodel
-        /// </summary>
-        public event EventHandler Closed;
-
-        /// <summary>
-        /// to be observed by viewmodel
-        /// </summary>
-        public event EventHandler<string> KeyboardCommandReceived;
-
-        /// <summary>
-        /// to be observed by view
-        /// </summary>
-        public event EventHandler<byte[]> OutputReceived;
-
-        /// <summary>
-        /// to be observed by viewmodel
-        /// </summary>
-        public event EventHandler<TerminalSize> SizeChanged;
-
-        /// <summary>
-        /// to be observed by viewmodel
-        /// </summary>
-        public event EventHandler<string> TitleChanged;
-
-        public string FallbackTitle { get; private set; }
-
-        public int Id { get; }
-
-        /// <summary>
-        /// To be called by either view or viewmodel
-        /// </summary>
-        public async Task Close()
-        {
-            await _trayProcessCommunicationService.CloseTerminal(Id).ConfigureAwait(true);
-        }
-
-        /// <summary>
-        /// to be called by viewmodel
-        /// </summary>
-        /// <returns></returns>
-        public Task<string> GetSelectedText()
-        {
-            return _selectedTextCallback();
-        }
-
-        /// <summary>
-        /// to be called by view
-        /// </summary>
-        public void ProcessKeyboardCommand(string command)
-        {
-            KeyboardCommandReceived?.Invoke(this, command);
-        }
-
-        /// <summary>
-        /// To be set by view
-        /// </summary>
-        public void RegisterSelectedTextCallback(Func<Task<string>> selectedTextCallback)
-        {
-            _selectedTextCallback = selectedTextCallback;
-        }
-
-        /// <summary>
-        /// To be called by view
-        /// </summary>
-        public async Task SetSize(TerminalSize size)
-        {
-            await _trayProcessCommunicationService.ResizeTerminal(Id, size);
-            SizeChanged?.Invoke(this, size);
-        }
-
-        /// <summary>
-        /// to be called by view
-        /// </summary>
-        public void SetTitle(string title)
-        {
-            if (string.IsNullOrWhiteSpace(title))
-            {
-                title = FallbackTitle;
-            }
-            TitleChanged?.Invoke(this, title);
-        }
-
-        /// <summary>
-        /// to be called by view when ready
-        /// </summary>
-        /// <param name="shellProfile"></param>
-        /// <param name="size"></param>
-        /// <param name="sessionType"></param>
-        public async Task StartShellProcess(ShellProfile shellProfile, TerminalSize size, SessionType sessionType)
-        {
-            _trayProcessCommunicationService.SubscribeForTerminalOutput(Id, t => OutputReceived?.Invoke(this, t));
-            var response = await _trayProcessCommunicationService.CreateTerminal(Id, size, shellProfile, sessionType).ConfigureAwait(true);
-
-            if (response.Success)
-            {
-                FallbackTitle = response.ShellExecutableName;
-                SetTitle(FallbackTitle);
-            }
-        }
-
-        public Task Write(byte[] data)
-        {
-            return _trayProcessCommunicationService.Write(Id, data);
-        }
-    }
+using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
+using FluentTerminal.Models.Responses;
+using System;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Services
+{
+    public class Terminal
+    {
+        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
+        private Func<Task<string>> _selectedTextCallback;
+        private bool _closingFromUi;
+        private bool _exited;
+        private readonly bool _requireShellProcessStart;
+        private string _fallbackTitle;
+
+        public Terminal(ITrayProcessCommunicationService trayProcessCommunicationService, byte? terminalId = null)
+        {
+            _trayProcessCommunicationService = trayProcessCommunicationService;
+            _trayProcessCommunicationService.TerminalExited += OnTerminalExited;
+            Id = terminalId ?? trayProcessCommunicationService.GetNextTerminalId();
+            _requireShellProcessStart = !terminalId.HasValue;
+        }
+
+        public void Reconnect()
+        {
+            _exited = false;
+            _trayProcessCommunicationService.TerminalExited += OnTerminalExited;
+        }
+
+        private void OnTerminalExited(object sender, TerminalExitStatus status)
+        {
+            if (status.TerminalId != Id)
+            {
+                return;
+            }
+
+            _exited = true;
+            Exited?.Invoke(this, status.ExitCode);
+
+            if (_closingFromUi || status.ExitCode <= 0)
+            {
+                Closed?.Invoke(this, System.EventArgs.Empty);
+            }
+
+            _trayProcessCommunicationService.TerminalExited -= OnTerminalExited;
+        }
+
+        public event EventHandler<int> Exited;
+
+        /// <summary>
+        /// To be observed by both view and viewmodel
+        /// </summary>
+        public event EventHandler Closed;
+
+        /// <summary>
+        /// to be observed by viewmodel
+        /// </summary>
+        public event EventHandler<string> KeyboardCommandReceived;
+
+        /// <summary>
+        /// to be observed by view
+        /// </summary>
+        public event EventHandler<byte[]> OutputReceived;
+
+        /// <summary>
+        /// to be observed by viewmodel
+        /// </summary>
+        public event EventHandler<TerminalSize> SizeChanged;
+
+        /// <summary>
+        /// to be observed by viewmodel
+        /// </summary>
+        public event EventHandler<string> TitleChanged;
+
+        public byte Id { get; }
+
+        public ShellProfile Profile { get; private set; }
+
+        /// <summary>
+        /// To be called by either view or viewmodel
+        /// </summary>
+        public Task CloseAsync()
+        {
+            if (_exited)
+            {
+                Closed?.Invoke(this, System.EventArgs.Empty);
+                return Task.CompletedTask;
+            }
+            _closingFromUi = true;
+            _trayProcessCommunicationService.UnsubscribeFromTerminalOutput(Id);
+            return _trayProcessCommunicationService.CloseTerminalAsync(Id);
+        }
+
+        /// <summary>
+        /// to be called by viewmodel
+        /// </summary>
+        /// <returns></returns>
+        public Task<string> GetSelectedText()
+        {
+            return _selectedTextCallback?.Invoke();
+        }
+
+        /// <summary>
+        /// to be called by view
+        /// </summary>
+        public void ProcessKeyboardCommand(string command)
+        {
+            KeyboardCommandReceived?.Invoke(this, command);
+        }
+
+        /// <summary>
+        /// To be set by view
+        /// </summary>
+        public void RegisterSelectedTextCallback(Func<Task<string>> selectedTextCallback)
+        {
+            _selectedTextCallback = selectedTextCallback;
+        }
+
+        /// <summary>
+        /// To be called by view
+        /// </summary>
+        public async Task SetSizeAsync(TerminalSize size)
+        {
+            await _trayProcessCommunicationService.ResizeTerminalAsync(Id, size).ConfigureAwait(false);
+            SizeChanged?.Invoke(this, size);
+        }
+
+        /// <summary>
+        /// to be called by view
+        /// </summary>
+        public void SetTitle(string title)
+        {
+            if (string.IsNullOrWhiteSpace(title))
+            {
+                title = _fallbackTitle;
+            }
+            TitleChanged?.Invoke(this, title);
+        }
+
+        /// <summary>
+        /// To be called by view when ready
+        /// </summary>
+        public async Task<TerminalResponse> StartShellProcessAsync(ShellProfile shellProfile, TerminalSize size, SessionType sessionType, string termState)
+        {
+            Profile = shellProfile;
+
+            if (!_requireShellProcessStart && !string.IsNullOrEmpty(termState))
+            {
+                OutputReceived?.Invoke(this, Encoding.UTF8.GetBytes(termState));
+            }
+
+            _trayProcessCommunicationService.SubscribeForTerminalOutput(Id, t => OutputReceived?.Invoke(this, t));
+
+            if (_requireShellProcessStart)
+            {
+                var response = await _trayProcessCommunicationService
+                    .CreateTerminalAsync(Id, size, shellProfile, sessionType).ConfigureAwait(false);
+
+                if (response.Success)
+                {
+                    _fallbackTitle = response.Name;
+                    SetTitle(_fallbackTitle);
+                }
+                return response;
+            }
+            else
+            {
+                return await _trayProcessCommunicationService.PauseTerminalOutputAsync(Id, false);
+            }
+        }
+
+        public Task Write(byte[] data)
+        {
+            return _trayProcessCommunicationService.WriteAsync(Id, data);
+        }
+
+        /// <summary>
+        /// Tells the ViewModel that this view failed to launch and can be closed.
+        /// </summary>
+        public void ReportLauchFailed()
+        {
+            Closed?.Invoke(this, System.EventArgs.Empty);
+        }
+    }
 }

FluentTerminal.App.Services/Utilities/I18N.cs

@@ -0,0 +1,25 @@
+using Windows.ApplicationModel.Resources;
+
+namespace FluentTerminal.App.Services.Utilities
+{
+    /// <summary>
+    /// Get strings in different languages.
+    /// Author: Zuozishi
+    /// </summary>
+    public static class I18N
+    {
+        private static readonly ResourceLoader ResourceLoader = ResourceLoader.GetForViewIndependentUse();
+
+        public static string Translate(string resource)
+        {
+            return ResourceLoader.GetString(resource.Replace('.', '/'));
+        }
+
+        public static string TranslateWithFallback(string resource, string fallback)
+        {
+            var result = Translate(resource);
+
+            return string.IsNullOrEmpty(result) ? fallback : result;
+        }
+    }
+}

FluentTerminal.App.Services/Utilities/PreserveDictionaryKeyCaseContractResolver.cs

@@ -0,0 +1,21 @@
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+
+namespace FluentTerminal.App.Services.Utilities
+{
+    public class PreserveDictionaryKeyCaseContractResolver : DefaultContractResolver
+    {
+        public static readonly JsonSerializerSettings SerializerSettings = new JsonSerializerSettings
+            { ContractResolver = new PreserveDictionaryKeyCaseContractResolver() };
+
+        protected override JsonDictionaryContract CreateDictionaryContract(Type objectType)
+        {
+            var contract = base.CreateDictionaryContract(objectType);
+
+            contract.DictionaryKeyResolver = key => key;
+
+            return contract;
+        }
+    }
+}

FluentTerminal.App.Services/Utilities/TerminalThemeContractResolver.cs

@@ -5,7 +5,7 @@ using System.Reflection;
 
 namespace FluentTerminal.App.Services.Utilities
 {
-    public class TerminalThemeContractResolver : DefaultContractResolver
+    public class TerminalThemeContractResolver : PreserveDictionaryKeyCaseContractResolver
     {
         protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
         {
@@ -24,4 +24,4 @@ namespace FluentTerminal.App.Services.Utilities
             return property;
         }
     }
-}
+}

FluentTerminal.App.ViewModels/DelayedHistorySaver.cs

@@ -0,0 +1,101 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.ViewModels
+{
+    internal class DelayedHistorySaver : ISessionSuccessTracker
+    {
+        private const int DelayMilliseconds = 5000;
+
+        private readonly Action _saveAction;
+
+        private readonly object _lock = new object();
+
+        private CancellationTokenSource _cts;
+
+        private bool _sessionStarted;
+        private bool _outputReceived;
+
+        private bool _toSave = true;
+
+        internal DelayedHistorySaver(Action saveAction)
+        {
+            _saveAction = saveAction;
+        }
+
+        public void SetSuccessfulSessionStart()
+        {
+            lock (_lock)
+            {
+                if (!_toSave || _sessionStarted)
+                {
+                    return;
+                }
+
+                _sessionStarted = true;
+
+                if (_outputReceived)
+                {
+                    InitiateSave();
+                }
+            }
+        }
+
+        public void SetOutputReceived()
+        {
+            lock (_lock)
+            {
+                if (!_toSave || _outputReceived)
+                {
+                    return;
+                }
+
+                _outputReceived = true;
+
+                if (_sessionStarted)
+                {
+                    InitiateSave();
+                }
+            }
+        }
+
+        public void SetInvalid()
+        {
+            lock (_lock)
+            {
+                if (!_toSave || !(_cts is CancellationTokenSource cts))
+                {
+                    return;
+                }
+
+                _toSave = false;
+
+                cts.Cancel();
+                cts.Dispose();
+                _cts = null;
+            }
+        }
+
+        private void InitiateSave()
+        {
+            _cts = new CancellationTokenSource();
+
+            Task.Delay(DelayMilliseconds, _cts.Token).ContinueWith(t =>
+                {
+                    lock (_lock)
+                    {
+                        if (_toSave)
+                        {
+                            _saveAction.Invoke();
+                        }
+
+                        _toSave = false;
+
+                        _cts?.Dispose();
+                        _cts = null;
+                    }
+                });
+        }
+    }
+}

FluentTerminal.App.ViewModels/EnvironmentVariableViewModel.cs

@@ -0,0 +1,25 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+
+namespace FluentTerminal.App.ViewModels
+{
+    public class EnvironmentVariableViewModel : ObservableObject
+    {
+        private string _name;
+        private string _value;
+
+        public Guid Id { get; } = Guid.NewGuid();
+
+        public string Name
+        {
+            get => _name;
+            set => SetProperty(ref _name, value);
+        }
+
+        public string Value
+        {
+            get => _value;
+            set => SetProperty(ref _value, value);
+        }
+    }
+}

FluentTerminal.App.ViewModels/FluentTerminal.App.ViewModels.csproj

@@ -1,12 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fleck" Version="1.0.3" />
-    <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
+    <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.0.2" />
   </ItemGroup>
 
   <ItemGroup>
@@ -14,4 +13,11 @@
     <ProjectReference Include="..\FluentTerminal.Models\FluentTerminal.Models.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="Windows.Foundation.UniversalApiContract">
+      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.UniversalApiContract\5.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+
 </Project>

FluentTerminal.App.ViewModels/ISessionSuccessTracker.cs

@@ -0,0 +1,11 @@
+namespace FluentTerminal.App.ViewModels
+{
+    public interface ISessionSuccessTracker
+    {
+        void SetSuccessfulSessionStart();
+
+        void SetOutputReceived();
+
+        void SetInvalid();
+    }
+}

FluentTerminal.App.ViewModels/ITerminalView.cs

@@ -0,0 +1,22 @@
+using System;
+using FluentTerminal.Models;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.ViewModels
+{
+    public interface ITerminalView : IDisposable
+    {
+        Task ChangeFontSize(int fontSize);
+        Task ChangeThemeAsync(TerminalTheme theme);
+        Task ChangeKeyBindingsAsync();
+        Task ChangeOptionsAsync(TerminalOptions options);
+        Task InitializeAsync(TerminalViewModel viewModel);
+        Task ReconnectAsync();
+        void DisposalPrepare();
+        Task FindNextAsync(SearchRequest request);
+        Task FindPreviousAsync(SearchRequest request);
+        Task FocusTerminalAsync();
+        Task<string> SerializeXtermStateAsync();
+        void Paste(string text);
+    }
+}

FluentTerminal.App.ViewModels/Infrastructure/AsyncCommand.cs

@@ -1,124 +0,0 @@
-using FluentTerminal.App.ViewModels.Utilities;
-using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
-
-namespace FluentTerminal.App.ViewModels.Infrastructure
-{
-    public class AsyncCommand : IAsyncCommand
-    {
-        public event EventHandler CanExecuteChanged;
-
-        private bool _isExecuting;
-        private readonly Func<Task> _execute;
-        private readonly Func<bool> _canExecute;
-        private readonly IErrorHandler _errorHandler;
-
-        public AsyncCommand(
-            Func<Task> execute,
-            Func<bool> canExecute = null,
-            IErrorHandler errorHandler = null)
-        {
-            _execute = execute;
-            _canExecute = canExecute;
-            _errorHandler = errorHandler;
-        }
-
-        public bool CanExecute()
-        {
-            return !_isExecuting && (_canExecute?.Invoke() ?? true);
-        }
-
-        public async Task ExecuteAsync()
-        {
-            if (CanExecute())
-            {
-                try
-                {
-                    _isExecuting = true;
-                    await _execute();
-                }
-                finally
-                {
-                    _isExecuting = false;
-                }
-            }
-
-            RaiseCanExecuteChanged();
-        }
-
-        public void RaiseCanExecuteChanged()
-        {
-            CanExecuteChanged?.Invoke(this, EventArgs.Empty);
-        }
-
-        #region Explicit implementations
-        bool ICommand.CanExecute(object parameter)
-        {
-            return CanExecute();
-        }
-
-        void ICommand.Execute(object parameter)
-        {
-            ExecuteAsync().FireAndForgetSafeAsync(_errorHandler);
-        }
-        #endregion
-    }
-
-    public class AsyncCommand<T> : IAsyncCommand<T>
-    {
-        public event EventHandler CanExecuteChanged;
-
-        private bool _isExecuting;
-        private readonly Func<T, Task> _execute;
-        private readonly Func<T, bool> _canExecute;
-        private readonly IErrorHandler _errorHandler;
-
-        public AsyncCommand(Func<T, Task> execute, Func<T, bool> canExecute = null, IErrorHandler errorHandler = null)
-        {
-            _execute = execute;
-            _canExecute = canExecute;
-            _errorHandler = errorHandler;
-        }
-
-        public bool CanExecute(T parameter)
-        {
-            return !_isExecuting && (_canExecute?.Invoke(parameter) ?? true);
-        }
-
-        public async Task ExecuteAsync(T parameter)
-        {
-            if (CanExecute(parameter))
-            {
-                try
-                {
-                    _isExecuting = true;
-                    await _execute(parameter);
-                }
-                finally
-                {
-                    _isExecuting = false;
-                }
-            }
-
-            RaiseCanExecuteChanged();
-        }
-
-        public void RaiseCanExecuteChanged()
-        {
-            CanExecuteChanged?.Invoke(this, EventArgs.Empty);
-        }
-
-        #region Explicit implementations
-        bool ICommand.CanExecute(object parameter)
-        {
-            return CanExecute((T)parameter);
-        }
-
-        void ICommand.Execute(object parameter)
-        {
-            ExecuteAsync((T)parameter).FireAndForgetSafeAsync(_errorHandler);
-        }
-        #endregion
-    }
-}

FluentTerminal.App.ViewModels/Infrastructure/IAsyncCommand.cs

@@ -1,20 +0,0 @@
-using System.Threading.Tasks;
-using System.Windows.Input;
-
-namespace FluentTerminal.App.ViewModels.Infrastructure
-{
-    /// <summary>
-    /// based on: https://github.com/johnthiriet/AsyncVoid
-    /// </summary>
-    public interface IAsyncCommand : ICommand
-    {
-        Task ExecuteAsync();
-        bool CanExecute();
-    }
-
-    public interface IAsyncCommand<T> : ICommand
-    {
-        Task ExecuteAsync(T parameter);
-        bool CanExecute(T parameter);
-    }
-}

FluentTerminal.App.ViewModels/MainViewModel.cs

@@ -1,58 +1,87 @@
-using FluentTerminal.App.Services;
+using FluentTerminal.App.Services;
 using FluentTerminal.App.Services.EventArgs;
+using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Linq;
 using System.Threading.Tasks;
+using Windows.UI.Core;
+using FluentTerminal.App.ViewModels.Menu;
+using FluentTerminal.Models.Messages;
+using System.Windows.Input;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Messaging;
+using Microsoft.Toolkit.Mvvm.Input;
 
 namespace FluentTerminal.App.ViewModels
 {
-    public class MainViewModel : ViewModelBase
+    public class MainViewModel : ObservableObject,
+        IRecipient<ApplicationSettingsChangedMessage>,
+        IRecipient<ShellProfileAddedMessage>,
+        IRecipient<ShellProfileDeletedMessage>,
+        IRecipient<ShellProfileChangedMessage>,
+        IRecipient<DefaultShellProfileChangedMessage>,
+        IRecipient<TerminalOptionsChangedMessage>,
+        IRecipient<CommandHistoryChangedMessage>,
+        IRecipient<KeyBindingsChangedMessage>
     {
         private readonly IClipboardService _clipboardService;
         private readonly IDialogService _dialogService;
-        private readonly IDispatcherTimer _dispatcherTimer;
         private readonly IKeyboardCommandService _keyboardCommandService;
         private readonly ISettingsService _settingsService;
         private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
+        private readonly ICommandHistoryService _commandHistoryService;
         private ApplicationSettings _applicationSettings;
-        private string _background;
+        private bool _useAcrylicBackground;
         private double _backgroundOpacity;
         private TerminalViewModel _selectedTerminal;
         private TabsPosition _tabsPosition;
         private string _windowTitle;
+        private IDictionary<string, ICollection<KeyBinding>> _keyBindings;
 
-        public MainViewModel(ISettingsService settingsService, ITrayProcessCommunicationService trayProcessCommunicationService, IDialogService dialogService, IKeyboardCommandService keyboardCommandService,
-            IApplicationView applicationView, IDispatcherTimer dispatcherTimer, IClipboardService clipboardService)
+        public MainViewModel(ISettingsService settingsService, ITrayProcessCommunicationService trayProcessCommunicationService, IDialogService dialogService, IKeyboardCommandService keyboardCommandService, 
+            IApplicationView applicationView, IClipboardService clipboardService, ICommandHistoryService commandHistoryService)
         {
             _settingsService = settingsService;
-            _settingsService.CurrentThemeChanged += OnCurrentThemeChanged;
-            _settingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
-            _settingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
-            _settingsService.ShellProfileAdded += OnShellProfileAdded;
-            _settingsService.ShellProfileDeleted += OnShellProfileDeleted;
 
             _trayProcessCommunicationService = trayProcessCommunicationService;
             _dialogService = dialogService;
             ApplicationView = applicationView;
-            _dispatcherTimer = dispatcherTimer;
             _clipboardService = clipboardService;
             _keyboardCommandService = keyboardCommandService;
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewTab), () => AddTerminal());
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ConfigurableNewTab), () => AddConfigurableTerminal());
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ChangeTabTitle), () => SelectedTerminal.EditTitle());
+            _commandHistoryService = commandHistoryService;
+
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewTab), async () => await AddDefaultProfileAsync(NewTerminalLocation.Tab));
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewWindow), async () => await AddDefaultProfileAsync(NewTerminalLocation.Window));
+
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewSshTab), async () => await AddSshProfileAsync(NewTerminalLocation.Tab));
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewSshWindow), async () => await AddSshProfileAsync(NewTerminalLocation.Window));
+
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewCustomCommandTab), async () => await AddQuickLaunchProfileAsync(NewTerminalLocation.Tab));
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewCustomCommandWindow), async () => await AddQuickLaunchProfileAsync(NewTerminalLocation.Window));
+
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ChangeTabTitle), async () => await SelectedTerminal.EditTitleAsync());
             _keyboardCommandService.RegisterCommandHandler(nameof(Command.CloseTab), CloseCurrentTab);
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.DuplicateTab), async () => await AddTabAsync(SelectedTerminal.ShellProfile.Clone()));
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ReconnectTab), async () => { if (SelectedTerminal.ReconnectTabCommand.CanExecute(null)) await SelectedTerminal.ReconnectTabAsync(); });
+
+            // empty command handlers for copy and paste so that the main window does not execute these when copy keyboard shortcut is used in a popup search panel 
+            // in such a case an exception would be thrown if no handlers are available so these empty ones mitigate that. Also there is no need for these on the main window anyway
+            // so leaving them empty is fine.
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.Paste), () => { });
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.Copy), () => { });
 
             // Add all of the commands for switching to a tab of a given ID, if there's one open there
             for (int i = 0; i < 9; i++)
             {
-                var switchCmd = Command.SwitchToTerm1 + i;
+                var switchCmd = Command.SwitchToTerm1 + i; 
                 int tabNumber = i;
+                // ReSharper disable once InconsistentNaming
                 void handler() => SelectTabNumber(tabNumber);
                 _keyboardCommandService.RegisterCommandHandler(switchCmd.ToString(), handler);
             }
@@ -60,52 +89,93 @@ namespace FluentTerminal.App.ViewModels
             _keyboardCommandService.RegisterCommandHandler(nameof(Command.NextTab), SelectNextTab);
             _keyboardCommandService.RegisterCommandHandler(nameof(Command.PreviousTab), SelectPreviousTab);
 
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewWindow), () => NewWindow(false));
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ConfigurableNewWindow), () => NewWindow(true));
-
             _keyboardCommandService.RegisterCommandHandler(nameof(Command.ShowSettings), ShowSettings);
             _keyboardCommandService.RegisterCommandHandler(nameof(Command.ToggleFullScreen), ToggleFullScreen);
 
             foreach (ShellProfile profile in _settingsService.GetShellProfiles())
             {
-                _keyboardCommandService.RegisterCommandHandler(profile.Id.ToString(), () => AddTerminal(profile.Id));
+                _keyboardCommandService.RegisterCommandHandler(profile.Id.ToString(), async () => await AddProfileByGuidAsync(profile.Id));
+            }
+
+            foreach (SshProfile profile in _settingsService.GetSshProfiles())
+            {
+                _keyboardCommandService.RegisterCommandHandler(profile.Id.ToString(), async () => await AddProfileByGuidAsync(profile.Id));
             }
 
             var currentTheme = _settingsService.GetCurrentTheme();
             var options = _settingsService.GetTerminalOptions();
-            Background = currentTheme.Colors.Background;
+            UseAcrylicBackground = options.UseAcrylicBackground;
             BackgroundOpacity = options.BackgroundOpacity;
             _applicationSettings = _settingsService.GetApplicationSettings();
             TabsPosition = _applicationSettings.TabsPosition;
 
-            AddTerminalCommand = new RelayCommand(() => AddTerminal());
-            ShowAboutCommand = new RelayCommand(ShowAbout);
-            ShowSettingsCommand = new RelayCommand(ShowSettings);
+            AddDefaultTabCommand = new RelayCommand(async () => await AddDefaultProfileAsync(NewTerminalLocation.Tab));
 
             ApplicationView.CloseRequested += OnCloseRequest;
             ApplicationView.Closed += OnClosed;
             Terminals.CollectionChanged += OnTerminalsCollectionChanged;
+
+            LoadKeyBindings();
+
+            _newDefaultTabCommand = new RelayCommand(async () => await AddDefaultProfileAsync(NewTerminalLocation.Tab));
+            _newDefaultWindowCommand = new RelayCommand(async () => await AddDefaultProfileAsync(NewTerminalLocation.Window));
+            _newRemoteTabCommand = new RelayCommand(async () => await AddSshProfileAsync(NewTerminalLocation.Tab));
+            _newRemoteWindowCommand = new RelayCommand(async () => await AddSshProfileAsync(NewTerminalLocation.Window));
+            _newQuickLaunchTabCommand = new RelayCommand(async () => await AddQuickLaunchProfileAsync(NewTerminalLocation.Tab));
+            _newQuickLaunchWindowCommand = new RelayCommand(async () => await AddQuickLaunchProfileAsync(NewTerminalLocation.Window));
+
+            _settingsCommand = new RelayCommand(ShowSettings);
+            _aboutCommand = new AsyncRelayCommand(_dialogService.ShowAboutDialogAsync);
+            _quitCommand = new AsyncRelayCommand(_trayProcessCommunicationService.QuitApplicationAsync);
+
+            _defaultProfile = _settingsService.GetDefaultShellProfile();
+
+            CreateMenuViewModel();
+
+            WeakReferenceMessenger.Default.RegisterAll(this);
         }
 
+        private ShellProfile _defaultProfile;
+
+        private void UpdateDefaultShellProfile()
+        {
+            var defaultProfile = _settingsService.GetDefaultShellProfile();
+
+            // We need to rebuild the menu only if default profile Id or Name is changed
+            var changeMenu = _defaultProfile == null || !_defaultProfile.Id.Equals(defaultProfile.Id) ||
+                             !string.Equals(_defaultProfile.Name, defaultProfile.Name, StringComparison.Ordinal);
+
+            _defaultProfile = defaultProfile;
+
+            if (changeMenu)
+            {
+                ApplicationView.ExecuteOnUiThreadAsync(CreateMenuViewModel, CoreDispatcherPriority.Low, true);
+            }
+        }
+
+        private void LoadKeyBindings() => _keyBindings = _settingsService.GetCommandKeyBindings();
+
         private void OnClosed(object sender, EventArgs e)
         {
+            //MessengerInstance.Unregister(this); todo do we still need this?
+
+            ApplicationView.CloseRequested -= OnCloseRequest;
+            ApplicationView.Closed -= OnClosed;
+            Terminals.CollectionChanged -= OnTerminalsCollectionChanged;
+
+            _keyboardCommandService.ClearCommandHandlers();
+
+            _applicationSettings = null;
+
+            AddDefaultTabCommand = null;
+
             Closed?.Invoke(this, e);
         }
 
-        private void OnShellProfileDeleted(object sender, Guid e)
-        {
-            _keyboardCommandService.DeregisterCommandHandler(e.ToString());
-        }
-
-        private void OnShellProfileAdded(object sender, ShellProfile e)
-        {
-            _keyboardCommandService.RegisterCommandHandler(e.Id.ToString(), () => AddTerminal(e.Id));
-        }
-
         private void OnTerminalsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            RaisePropertyChanged(nameof(ShowTabsOnTop));
-            RaisePropertyChanged(nameof(ShowTabsOnBottom));
+            OnPropertyChanged(nameof(ShowTabsOnTop));
+            OnPropertyChanged(nameof(ShowTabsOnBottom));
         }
 
         public event EventHandler Closed;
@@ -114,16 +184,28 @@ namespace FluentTerminal.App.ViewModels
 
         public event EventHandler ShowSettingsRequested;
 
-        public event EventHandler ShowAboutRequested;
+        public event EventHandler ActivatedMv;
 
-        public RelayCommand AddTerminalCommand { get; }
+        public event EventHandler<TerminalViewModel> TabTearedOff;
+
+        public void TearOffTab(TerminalViewModel model)
+        {
+            TabTearedOff?.Invoke(this, model);
+        }
+
+        public void FocusWindow()
+        {
+            ActivatedMv?.Invoke(this, EventArgs.Empty);
+        }
+
+        public ICommand AddDefaultTabCommand { get; private set; }
 
         public string WindowTitle
         {
             get => _windowTitle;
             set
             {
-                if (Set(ref _windowTitle, value))
+                if (SetProperty(ref _windowTitle, value))
                 {
                     ApplicationView.Title = value;
                 }
@@ -132,24 +214,24 @@ namespace FluentTerminal.App.ViewModels
 
         public bool ShowTabsOnTop
         {
-            get => TabsPosition == TabsPosition.Top && (Terminals.Count > 1 || _applicationSettings.AlwaysShowTabs);
+            get => TabsPosition == TabsPosition.Top;
         }
 
         public bool ShowTabsOnBottom
         {
-            get => TabsPosition == TabsPosition.Bottom && (Terminals.Count > 1 || _applicationSettings.AlwaysShowTabs);
+            get => TabsPosition == TabsPosition.Bottom;
         }
 
-        public string Background
+        public bool UseAcrylicBackground
         {
-            get => _background;
-            set => Set(ref _background, value);
+            get => _useAcrylicBackground;
+            set => SetProperty(ref _useAcrylicBackground, value);
         }
 
         public double BackgroundOpacity
         {
             get => _backgroundOpacity;
-            set => Set(ref _backgroundOpacity, value);
+            set => SetProperty(ref _backgroundOpacity, value);
         }
 
         public TerminalViewModel SelectedTerminal
@@ -157,171 +239,227 @@ namespace FluentTerminal.App.ViewModels
             get => _selectedTerminal;
             set
             {
-                if (SelectedTerminal != null)
+                var oldValue = _selectedTerminal;
+
+                if (SetProperty(ref _selectedTerminal, value))
                 {
-                    _selectedTerminal.IsSelected = false;
-                }
-                if (Set(ref _selectedTerminal, value))
-                {
-                    SelectedTerminal?.FocusTerminal();
-                    if (SelectedTerminal != null)
+                    if (oldValue != null)
                     {
-                        SelectedTerminal.IsSelected = true;
-                        if (_applicationSettings.ShowCustomTitleInTitlebar)
-                        {
-                            WindowTitle = SelectedTerminal.TabTitle;
-                        }
-                        else
-                        {
-                            WindowTitle = SelectedTerminal.ShellTitle;
-                        }
+                        oldValue.IsSelected = false;
+                    }
+
+                    if (_selectedTerminal != null)
+                    {
+                        _selectedTerminal.IsSelected = true;
+                        _selectedTerminal.FocusTerminal();
+
+                        SetWindowTitle(_selectedTerminal);
                     }
                 }
             }
         }
 
-        public RelayCommand ShowAboutCommand { get; }
-
-        public RelayCommand ShowSettingsCommand { get; }
-
         public TabsPosition TabsPosition
         {
             get => _tabsPosition;
-            set => Set(ref _tabsPosition, value);
+            set => SetProperty(ref _tabsPosition, value);
         }
 
         public ObservableCollection<TerminalViewModel> Terminals { get; } = new ObservableCollection<TerminalViewModel>();
 
         public IApplicationView ApplicationView { get; }
 
-        public Task AddConfigurableTerminal()
-        {
-            return ApplicationView.RunOnDispatcherThread(async () =>
-            {
-                var profile = await _dialogService.ShowProfileSelectionDialogAsync();
+        #region Launching terminal sessions
 
-                if (profile == null)
-                {
-                    if (Terminals.Count == 0)
-                    {
-                        await ApplicationView.TryClose();
-                    }
-
-                    return;
-                }
-
-                AddTerminal(profile);
-            });
-        }
-
-        public void AddTerminal()
+        public Task AddDefaultProfileAsync(NewTerminalLocation location)
         {
             var profile = _settingsService.GetDefaultShellProfile();
-            AddTerminal(profile);
+
+            return AddProfileAsync(profile, location);
         }
 
-        public void AddTerminal(Guid shellProfileId)
+        private async Task AddSshProfileAsync(NewTerminalLocation location)
         {
-            var profile = _settingsService.GetShellProfile(shellProfileId);
-            AddTerminal(profile);
+            var profile = await _dialogService.ShowSshConnectionInfoDialogAsync().ConfigureAwait(true);
+
+            await AddProfileAsync(profile, location).ConfigureAwait(false);
         }
 
-        public void AddTerminal(ShellProfile profile)
+        private async Task AddQuickLaunchProfileAsync(NewTerminalLocation location)
         {
-            ApplicationView.RunOnDispatcherThread(() =>
+            var profile = await _dialogService.ShowCustomCommandDialogAsync().ConfigureAwait(true);
+
+            await AddProfileAsync(profile, location).ConfigureAwait(false);
+        }
+
+        public Task AddProfileByGuidAsync(Guid profileId) =>
+            AddProfileByGuidAsync(profileId, _applicationSettings.NewTerminalLocation);
+
+        private async Task AddProfileByGuidAsync(Guid profileId, NewTerminalLocation location)
+        {
+            var profile = _settingsService.GetShellProfile(profileId) ?? _settingsService.GetSshProfile(profileId);
+
+            await AddProfileAsync(profile, location).ConfigureAwait(false);
+        }
+
+        // For serialization
+        public Task AddTabAsync(string terminalState, int position)
+        {
+            return AddTabAsync(new ShellProfile(), terminalState, position);
+        }
+
+        private Task AddProfileAsync(ShellProfile profile) =>
+            AddProfileAsync(profile, _applicationSettings.NewTerminalLocation);
+
+        private Task AddProfileAsync(ShellProfile profile, NewTerminalLocation location)
+        {
+            if (profile == null)
+            {
+                return Task.CompletedTask;
+            }
+
+            if (location == NewTerminalLocation.Tab)
+            {
+                return AddTabAsync(profile);
+            }
+
+            NewWindowRequested?.Invoke(this, new NewWindowRequestedEventArgs(profile));
+
+            return Task.CompletedTask;
+        }
+
+        public Task AddTabAsync(ShellProfile profile) => AddTabAsync(profile, string.Empty, Terminals.Count);
+
+        private Task AddTabAsync(ShellProfile profile, string terminalState, int position)
+        {
+            profile.Tag = new DelayedHistorySaver(() => _commandHistoryService.MarkUsed(profile));
+
+            return ApplicationView.ExecuteOnUiThreadAsync(() =>
             {
                 var terminal = new TerminalViewModel(_settingsService, _trayProcessCommunicationService, _dialogService, _keyboardCommandService,
-                    _applicationSettings, profile, ApplicationView, _dispatcherTimer, _clipboardService);
+                    _applicationSettings, profile, ApplicationView, _clipboardService, terminalState);
+
+                terminal.PropertyChanged += Terminal_PropertyChanged;
                 terminal.Closed += OnTerminalClosed;
-                terminal.ShellTitleChanged += Terminal_ShellTitleChanged;
-                terminal.CustomTitleChanged += Terminal_CustomTitleChanged;
-                Terminals.Add(terminal);
+                terminal.CloseLeftTabsRequested += Terminal_CloseLeftTabsRequested;
+                terminal.CloseRightTabsRequested += Terminal_CloseRightTabsRequested;
+                terminal.CloseOtherTabsRequested += Terminal_CloseOtherTabsRequested;
+                terminal.DuplicateTabRequested += Terminal_DuplicateTabRequested;
+                Terminals.Insert(Math.Min(position, Terminals.Count), terminal);
 
                 SelectedTerminal = terminal;
             });
         }
 
-        private void Terminal_CustomTitleChanged(object sender, string e)
+        #endregion Launching terminal sessions
+
+        private void Terminal_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (!(sender is TerminalViewModel terminalViewModel))
+            {
+                return;
+            }
+
+            switch (e.PropertyName)
+            {
+                case nameof(TerminalViewModel.ShellTitle):
+                case nameof(TerminalViewModel.TabTitle):
+
+                    SetWindowTitle(terminalViewModel);
+
+                    break;
+            }
+        }
+
+        // ReSharper disable once UnusedMethodReturnValue.Local
+        private Task SetWindowTitle(TerminalViewModel terminalViewModel)
+        {
+            return ApplicationView.ExecuteOnUiThreadAsync(() =>
+            {
+                WindowTitle = !_applicationSettings.ShowCustomTitleInTitlebar ||
+                              string.IsNullOrEmpty(terminalViewModel?.TabTitle)
+                    ? terminalViewModel?.ShellTitle
+                    : terminalViewModel.TabTitle;
+            }, CoreDispatcherPriority.Low);
+        }
+
+        private async void Terminal_DuplicateTabRequested(object sender, EventArgs e)
         {
             if (sender is TerminalViewModel terminal)
             {
-                if (terminal.IsSelected && _applicationSettings.ShowCustomTitleInTitlebar)
+                await AddTabAsync(terminal.ShellProfile.Clone()).ConfigureAwait(false);
+            }
+        }
+
+        private async void Terminal_CloseOtherTabsRequested(object sender, EventArgs e)
+        {
+            if (sender is TerminalViewModel terminal)
+            {
+                await Task.WhenAll(Terminals.Where(t => t != terminal).Select(t =>
                 {
-                    if (string.IsNullOrWhiteSpace(e))
-                    {
-                        WindowTitle = terminal.ShellTitle;
-                    }
-                    else
-                    {
-                        WindowTitle = e;
-                    }
-                }
+                    Logger.Instance.Debug("Terminal with Id: {@id} closed.", t.Terminal.Id);
+                    return t.CloseAsync();
+                })).ConfigureAwait(false);
             }
         }
 
-        private void Terminal_ShellTitleChanged(object sender, string e)
+        private async void Terminal_CloseRightTabsRequested(object sender, EventArgs e)
         {
-            if (sender is TerminalViewModel terminal && terminal.IsSelected && !_applicationSettings.ShowCustomTitleInTitlebar)
+            if (sender is TerminalViewModel terminal)
             {
-                WindowTitle = e;
+                var toRemove = Terminals.Skip(Terminals.IndexOf(terminal) + 1).ToList();
+
+                await Task.WhenAll(toRemove.Select(t =>
+                {
+                    Logger.Instance.Debug("Terminal with Id: {@id} closed.", t.Terminal.Id);
+                    return t.CloseAsync();
+                })).ConfigureAwait(false);
             }
         }
 
-        public async Task CloseAllTerminals()
+        private async void Terminal_CloseLeftTabsRequested(object sender, EventArgs e)
         {
-            foreach (var terminal in Terminals)
+            if (sender is TerminalViewModel terminal)
             {
+                var toRemove = Terminals.Take(Terminals.IndexOf(terminal)).ToList();
+
+                await Task.WhenAll(toRemove.Select(t =>
+                {
+                    Logger.Instance.Debug("Terminal with Id: {@id} closed.", t.Terminal.Id);
+                    return t.CloseAsync();
+                })).ConfigureAwait(false);
+            }
+        }
+
+        private Task CloseAllTerminalsAsync()
+        {
+            return Task.WhenAll(Terminals.Select(terminal =>
+            {
+                terminal.PropertyChanged -= Terminal_PropertyChanged;
                 terminal.Closed -= OnTerminalClosed;
-                terminal.ShellTitleChanged -= Terminal_ShellTitleChanged;
-                terminal.CustomTitleChanged -= Terminal_CustomTitleChanged;
-                await terminal.Close();
-            }
+                terminal.CloseLeftTabsRequested -= Terminal_CloseLeftTabsRequested;
+                terminal.CloseRightTabsRequested -= Terminal_CloseRightTabsRequested;
+                terminal.CloseOtherTabsRequested -= Terminal_CloseOtherTabsRequested;
+                terminal.DuplicateTabRequested -= Terminal_DuplicateTabRequested;
+                return terminal.CloseAsync();
+            }));
         }
 
         private void CloseCurrentTab()
         {
-            SelectedTerminal?.CloseCommand.Execute(null);
-        }
-
-        private void NewWindow(bool showProfileSelection)
-        {
-            var args = new NewWindowRequestedEventArgs
-            {
-                ShowProfileSelection = showProfileSelection
-            };
-
-            NewWindowRequested?.Invoke(this, args);
-        }
-
-        private async void OnApplicationSettingsChanged(object sender, ApplicationSettings e)
-        {
-            await ApplicationView.RunOnDispatcherThread(() =>
-            {
-                _applicationSettings = e;
-                TabsPosition = e.TabsPosition;
-                RaisePropertyChanged(nameof(ShowTabsOnTop));
-                RaisePropertyChanged(nameof(ShowTabsOnBottom));
-
-                if (e.ShowCustomTitleInTitlebar)
-                {
-                    WindowTitle = SelectedTerminal?.TabTitle;
-                }
-                else
-                {
-                    WindowTitle = SelectedTerminal?.ShellTitle;
-                }
-            });
+            SelectedTerminal?.CloseAsync();
         }
 
         private async Task OnCloseRequest(object sender, CancelableEventArgs e)
         {
             if (_applicationSettings.ConfirmClosingWindows)
             {
-                var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to close this window?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(false);
+                var result = await _dialogService.ShowMessageDialogAsync(I18N.Translate("PleaseConfirm"),
+                    I18N.Translate("ConfirmCloseWindow"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(false);
 
                 if (result == DialogButton.OK)
                 {
-                    await CloseAllTerminals();
+                    await CloseAllTerminalsAsync().ConfigureAwait(false);
                 }
                 else
                 {
@@ -330,43 +468,119 @@ namespace FluentTerminal.App.ViewModels
             }
             else
             {
-                await CloseAllTerminals();
+                await CloseAllTerminalsAsync().ConfigureAwait(false);
             }
         }
 
-        private async void OnCurrentThemeChanged(object sender, Guid e)
+        private void OnTerminalClosed(object sender, EventArgs e)
         {
-            await ApplicationView.RunOnDispatcherThread(() =>
-             {
-                 var currentTheme = _settingsService.GetTheme(e);
-                 Background = currentTheme.Colors.Background;
-             });
-        }
-
-        private async void OnTerminalClosed(object sender, EventArgs e)
-        {
-            if (sender is TerminalViewModel terminal)
+            if (!(sender is TerminalViewModel terminal))
             {
-                if (SelectedTerminal == terminal)
-                {
-                    SelectedTerminal = Terminals.LastOrDefault(t => t != terminal);
-                }
-                Logger.Instance.Debug("Terminal with Id: {@id} closed.", terminal.Terminal.Id);
+                return;
+            }
+
+            Logger.Instance.Debug("Terminal with Id: {@id} closed.", terminal.Terminal.Id);
+
+            terminal.PropertyChanged -= Terminal_PropertyChanged;
+            terminal.Closed -= OnTerminalClosed;
+            terminal.CloseLeftTabsRequested -= Terminal_CloseLeftTabsRequested;
+            terminal.CloseRightTabsRequested -= Terminal_CloseRightTabsRequested;
+            terminal.CloseOtherTabsRequested -= Terminal_CloseOtherTabsRequested;
+            terminal.DuplicateTabRequested -= Terminal_DuplicateTabRequested;
+
+            ApplicationView.ExecuteOnUiThreadAsync(() =>
+            {
+                var wasSelected = _selectedTerminal == terminal;
+
                 Terminals.Remove(terminal);
 
                 if (Terminals.Count == 0)
                 {
-                    await ApplicationView.TryClose();
+                    ApplicationView.TryCloseAsync();
                 }
+                else if (wasSelected)
+                {
+                    SelectedTerminal = Terminals.LastOrDefault(t => t != terminal);
+                }
+            });
+        }
+
+        public void Receive(ShellProfileDeletedMessage message)
+        {
+            _keyboardCommandService.DeregisterCommandHandler(message.ProfileId.ToString());
+
+            UpdateDefaultShellProfile();
+
+            ApplicationView.ExecuteOnUiThreadAsync(CreateMenuViewModel, CoreDispatcherPriority.Low, true);
+        }
+
+        public void Receive(ShellProfileChangedMessage message)
+        {
+            UpdateDefaultShellProfile();
+
+            ApplicationView.ExecuteOnUiThreadAsync(CreateMenuViewModel, CoreDispatcherPriority.Low, true);
+        }
+
+        public void Receive(ShellProfileAddedMessage message)
+        {
+            _keyboardCommandService.RegisterCommandHandler(message.ShellProfile.Id.ToString(),
+                async () => await AddProfileByGuidAsync(message.ShellProfile.Id));
+
+            UpdateDefaultShellProfile();
+
+            ApplicationView.ExecuteOnUiThreadAsync(CreateMenuViewModel, CoreDispatcherPriority.Low, true);
+        }
+
+        public void Receive(DefaultShellProfileChangedMessage message)
+        {
+            UpdateDefaultShellProfile();
+        }
+
+        public void Receive(ApplicationSettingsChangedMessage message)
+        {
+            var updateMenu = _applicationSettings != null &&
+                             (_applicationSettings.TabWindowCascadingAppMenu !=
+                              message.ApplicationSettings.TabWindowCascadingAppMenu ||
+                              !message.ApplicationSettings.TabWindowCascadingAppMenu &&
+                              _applicationSettings.NewTerminalLocation !=
+                              message.ApplicationSettings.NewTerminalLocation);
+
+            _applicationSettings = message.ApplicationSettings;
+
+            SetWindowTitle(SelectedTerminal);
+
+            ApplicationView.ExecuteOnUiThreadAsync(() =>
+            {
+                TabsPosition = message.ApplicationSettings.TabsPosition;
+                OnPropertyChanged(nameof(ShowTabsOnTop));
+                OnPropertyChanged(nameof(ShowTabsOnBottom));
+            });
+
+            if (updateMenu)
+            {
+                ApplicationView.ExecuteOnUiThreadAsync(CreateMenuViewModel, CoreDispatcherPriority.Low, true);
             }
         }
 
-        private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
+        public void Receive(TerminalOptionsChangedMessage message)
         {
-            await ApplicationView.RunOnDispatcherThread(() =>
+            ApplicationView.ExecuteOnUiThreadAsync(() =>
             {
-                BackgroundOpacity = e.BackgroundOpacity;
-            });
+                BackgroundOpacity = message.TerminalOptions.BackgroundOpacity;
+                UseAcrylicBackground = message.TerminalOptions.UseAcrylicBackground;
+            }, CoreDispatcherPriority.Low);
+        }
+
+        public void Receive(KeyBindingsChangedMessage message)
+        {
+            LoadKeyBindings();
+
+            ApplicationView.ExecuteOnUiThreadAsync(CreateMenuViewModel, CoreDispatcherPriority.Low, true);
+        }
+
+        public void Receive(CommandHistoryChangedMessage message)
+        {
+            ApplicationView.ExecuteOnUiThreadAsync(CreateMenuViewModel, CoreDispatcherPriority.Low, true);
         }
 
         private void SelectTabNumber(int tabNumber)
@@ -391,12 +605,7 @@ namespace FluentTerminal.App.ViewModels
             SelectedTerminal = Terminals[previousIndex];
         }
 
-        private void ShowAbout()
-        {
-            ShowAboutRequested?.Invoke(this, EventArgs.Empty);
-        }
-
-        private void ShowSettings()
+        public void ShowSettings()
         {
             ShowSettingsRequested?.Invoke(this, EventArgs.Empty);
         }
@@ -405,5 +614,214 @@ namespace FluentTerminal.App.ViewModels
         {
             ApplicationView.ToggleFullScreen();
         }
+
+        public void OnWindowKeyDown(int key, bool control, bool alt, bool shift, bool meta)
+        {
+            var binding = _keyBindings.Values.SelectMany(bs => bs).FirstOrDefault(b =>
+                b.Key == key && b.Ctrl == control && b.Alt == alt && b.Shift == shift && b.Meta == meta);
+
+            if (binding != null)
+            {
+                _keyboardCommandService.SendCommand(binding.Command);
+            }
+        }
+
+        #region App menu
+
+        private const int RecentItemsMaxCount = 10;
+
+        private MenuViewModel _menuViewModel;
+
+        private readonly ICommand _newDefaultTabCommand;
+        private readonly ICommand _newDefaultWindowCommand;
+        private readonly ICommand _newRemoteTabCommand;
+        private readonly ICommand _newRemoteWindowCommand;
+        private readonly ICommand _newQuickLaunchTabCommand;
+        private readonly ICommand _newQuickLaunchWindowCommand;
+        private readonly ICommand _settingsCommand;
+        private readonly ICommand _aboutCommand;
+        private readonly ICommand _quitCommand;
+
+        public MenuViewModel AppMenuViewModel
+        {
+            get => _menuViewModel;
+            private set => SetProperty(ref _menuViewModel, value);
+        }
+
+        private void CreateMenuViewModel()
+        {
+            var appMenuViewModel = new MenuViewModel();
+
+            if (_applicationSettings.TabWindowCascadingAppMenu)
+            {
+                var tabItem = new ExpandableMenuItemViewModel(
+                    I18N.TranslateWithFallback("MenuItem_NewTab_Text", "New Tab"),
+                    description: I18N.TranslateWithFallback("MenuItem_NewTab_Text", "Launches a session in a new tab."),
+                    icon: Mdl2Icon.Add());
+
+                FillCoreItems(tabItem.SubItems, NewTerminalLocation.Tab);
+
+                appMenuViewModel.Items.Add(tabItem);
+
+                var windowItem = new ExpandableMenuItemViewModel(
+                    I18N.TranslateWithFallback("MenuItem_NewWindow_Text", "New Window"),
+                    description: I18N.TranslateWithFallback("MenuItem_NewWindow_Description", "Launches a session in a new window."),
+                    icon: Mdl2Icon.NewWindow());
+
+                FillCoreItems(windowItem.SubItems, NewTerminalLocation.Window);
+
+                appMenuViewModel.Items.Add(windowItem);
+            }
+            else
+            {
+                FillCoreItems(appMenuViewModel.Items, _applicationSettings.NewTerminalLocation);
+            }
+
+            appMenuViewModel.Items.Add(new ExpandableMenuItemViewModel(I18N.TranslateWithFallback("Recent.Text", "Recent"),
+                GetRecentMenuItems(), I18N.TranslateWithFallback("Recent_Description", "Recently opened sessions."),
+                icon: Mdl2Icon.History()));
+
+            appMenuViewModel.Items.Add(new SeparatorMenuItemViewModel());
+
+            var settingsItem = new MenuItemViewModel(I18N.TranslateWithFallback("Settings.Text", "Settings"),
+                _settingsCommand, I18N.TranslateWithFallback("Settings_Description", "Opens settings window."),
+                icon: Mdl2Icon.Settings());
+
+            if (_keyBindings.TryGetValue(nameof(Command.ShowSettings), out var keyBindings) &&
+                keyBindings.FirstOrDefault() is KeyBinding settingsKeyBinding)
+            {
+                LoadKeyBindingsFromModel(settingsItem, settingsKeyBinding);
+            }
+            else
+            {
+                settingsItem.KeyBinding = null;
+            }
+
+            appMenuViewModel.Items.Add(settingsItem);
+
+            appMenuViewModel.Items.Add(new MenuItemViewModel(I18N.TranslateWithFallback("AboutDialog.Title", "About"), _aboutCommand,
+                I18N.TranslateWithFallback("About_Description", "Basic info about the app."),
+                icon: Mdl2Icon.Info()));
+
+            appMenuViewModel.Items.Add(new SeparatorMenuItemViewModel());
+
+            var quitItem = new MenuItemViewModel(I18N.TranslateWithFallback("Quit.Text", "Quit"), _quitCommand,
+                I18N.TranslateWithFallback("Quit.Description", "Quit Fluent Terminal"),
+                icon: Mdl2Icon.Cancel());
+            appMenuViewModel.Items.Add(quitItem);
+
+            if (!appMenuViewModel.EquivalentTo(_menuViewModel))
+            {
+                AppMenuViewModel = appMenuViewModel;
+            }
+        }
+
+        private void FillCoreItems(ObservableCollection<MenuItemViewModelBase> items, NewTerminalLocation location)
+        {
+            var tab = location == NewTerminalLocation.Tab;
+
+            if (_defaultProfile?.Name is string defaultProfileName)
+            {
+                var defaultProfileItem = new MenuItemViewModel(
+                    defaultProfileName, tab ? _newDefaultTabCommand : _newDefaultWindowCommand,
+                    I18N.TranslateWithFallback("MenuItem_DefaultProfile_Description",
+                        "Starts new terminal session based on the default profile."), icon: Mdl2Icon.FavoriteStar());
+
+                var defaultProfileCommand = tab ? nameof(Command.NewTab) : nameof(Command.NewWindow);
+
+                if (_keyBindings.TryGetValue(defaultProfileCommand, out var kbs) &&
+                    kbs.FirstOrDefault() is KeyBinding tabKeyBindings)
+                {
+                    LoadKeyBindingsFromModel(defaultProfileItem, tabKeyBindings);
+                }
+                else
+                {
+                    defaultProfileItem.KeyBinding = null;
+                }
+
+                items.Add(defaultProfileItem);
+            }
+
+            var remoteConnectItem = new MenuItemViewModel(
+                I18N.TranslateWithFallback("MenuItem_Remote_Text", "Remote Connect..."),
+                tab ? _newRemoteTabCommand : _newRemoteWindowCommand,
+                I18N.TranslateWithFallback("MenuItem_Remote_Description",
+                    "Opens a dialog for launching a new SSH or Mosh terminal session."),
+                icon: Mdl2Icon.Globe());
+
+            var command = tab ? nameof(Command.NewSshTab) : nameof(Command.NewSshWindow);
+
+            if (_keyBindings.TryGetValue(command, out var keyBindings) &&
+                keyBindings.FirstOrDefault() is KeyBinding remoteTabKeyBinding)
+            {
+                LoadKeyBindingsFromModel(remoteConnectItem, remoteTabKeyBinding);
+            }
+            else
+            {
+                remoteConnectItem.KeyBinding = null;
+            }
+
+            items.Add(remoteConnectItem);
+
+            var quickLaunchItem = new MenuItemViewModel(
+                I18N.TranslateWithFallback("MenuItem_QuickLaunch_Text", "Quick Launch..."),
+                tab ? _newQuickLaunchTabCommand : _newQuickLaunchWindowCommand,
+                I18N.TranslateWithFallback("MenuItem_QuickLaunch_Description",
+                    "Opens a \"Quick Launch\" dialog for starting a new terminal session."),
+                icon: Mdl2Icon.Play());
+
+            command = tab ? nameof(Command.NewCustomCommandTab) : nameof(Command.NewCustomCommandWindow);
+
+            if (_keyBindings.TryGetValue(command, out keyBindings) &&
+                keyBindings.FirstOrDefault() is KeyBinding quickTabKeyBinding)
+            {
+                LoadKeyBindingsFromModel(quickLaunchItem, quickTabKeyBinding);
+            }
+            else
+            {
+                quickLaunchItem.KeyBinding = null;
+            }
+
+            items.Add(quickLaunchItem);
+
+            items.Add(new SeparatorMenuItemViewModel());
+
+            foreach (var profile in _settingsService.GetShellProfiles().Concat(_settingsService.GetSshProfiles()).OrderBy(x => x.Name))
+            {
+                items.Add(new MenuItemViewModel(profile.Name, new AsyncRelayCommand(() => AddProfileAsync(profile, location))));
+            }
+        }
+
+        private ObservableCollection<MenuItemViewModel> GetRecentMenuItems() =>
+            new ObservableCollection<MenuItemViewModel>(_commandHistoryService
+                .GetHistoryRecentFirst(top: RecentItemsMaxCount).Select(CommandToMenuItem));
+
+        private MenuItemViewModel CommandToMenuItem(ExecutedCommand command)
+        {
+            var itemCommand = new AsyncRelayCommand(() => AddProfileAsync(command.ShellProfile));
+            var keyBinding = command.ShellProfile.KeyBindings?.FirstOrDefault() is KeyBinding kb
+                ? new MenuItemKeyBindingViewModel(kb)
+                : null;
+
+            return new MenuItemViewModel(command.Value, itemCommand, keyBinding: keyBinding);
+        }
+
+        private void LoadKeyBindingsFromModel(MenuItemViewModel menuItemViewModel, KeyBinding keyBinding)
+        {
+            if (menuItemViewModel.KeyBinding == null)
+            {
+                menuItemViewModel.KeyBinding = new MenuItemKeyBindingViewModel(keyBinding);
+            }
+            else
+            {
+                menuItemViewModel.KeyBinding.Key = keyBinding.Key;
+                menuItemViewModel.KeyBinding.Ctrl = keyBinding.Ctrl;
+                menuItemViewModel.KeyBinding.Alt = keyBinding.Alt;
+                menuItemViewModel.KeyBinding.Shift = keyBinding.Shift;
+                menuItemViewModel.KeyBinding.Windows = keyBinding.Meta;
+            }
+        }
+
+        #endregion App menu
     }
 }

FluentTerminal.App.ViewModels/Menu/ExpandableMenuItemViewModel.cs

@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace FluentTerminal.App.ViewModels.Menu
+{
+    public class ExpandableMenuItemViewModel : MenuItemViewModelBase
+    {
+        public ObservableCollection<MenuItemViewModelBase> SubItems { get; }
+
+        public ExpandableMenuItemViewModel(string text, IEnumerable<MenuItemViewModelBase> subItems = null,
+            string description = null, Mdl2Icon icon = null) : base(text, description, icon)
+        {
+            if (subItems == null)
+            {
+                SubItems = new ObservableCollection<MenuItemViewModelBase>();
+            }
+            else if (subItems is ObservableCollection<MenuItemViewModelBase> observableSubItems)
+            {
+                SubItems = observableSubItems;
+            }
+            else
+            {
+                SubItems = new ObservableCollection<MenuItemViewModelBase>(subItems);
+            }
+        }
+
+        public override bool EquivalentTo(MenuItemViewModelBase other)
+        {
+            if (!base.EquivalentTo(other)) return false;
+
+            if (!(other is ExpandableMenuItemViewModel otherExpandable) ||
+                SubItems.Count != otherExpandable.SubItems.Count)
+            {
+                return false;
+            }
+
+            return !SubItems.Where((t, i) => !t.EquivalentTo(otherExpandable.SubItems[i])).Any();
+        }
+    }
+}

FluentTerminal.App.ViewModels/Menu/Mdl2Icon.cs

@@ -0,0 +1,46 @@
+namespace FluentTerminal.App.ViewModels.Menu
+{
+    public sealed class Mdl2Icon
+    {
+        public string Color { get; }
+        public string Glyph { get; }
+
+        private Mdl2Icon(string glyph, string color = null)
+        {
+            Glyph = glyph;
+            Color = color;
+        }
+
+        public static Mdl2Icon Link(string color = null) => new Mdl2Icon("\uE71B", color);
+
+        public static Mdl2Icon Copy(string color = null) => new Mdl2Icon("\uE8C8", color);
+
+        public static Mdl2Icon Paste(string color = null) => new Mdl2Icon("\uE77F", color);
+
+        public static Mdl2Icon Edit(string color = null) => new Mdl2Icon("\uE70F", color);
+
+        public static Mdl2Icon Search(string color = null) => new Mdl2Icon("\uE721", color);
+
+        public static Mdl2Icon Add(string color = null) => new Mdl2Icon("\uE710", color);
+
+        public static Mdl2Icon Cancel(string color = null) => new Mdl2Icon("\uE711", color);
+
+        public static Mdl2Icon PaginationDotOutline10(string color = null) => new Mdl2Icon("\uF126", color);
+
+        public static Mdl2Icon PaginationDotSolid10(string color = null) => new Mdl2Icon("\uF127", color);
+
+        public static Mdl2Icon NewWindow(string color = null) => new Mdl2Icon("\uE78B", color);
+
+        public static Mdl2Icon History(string color = null) => new Mdl2Icon("\uE81C", color);
+
+        public static Mdl2Icon Settings(string color = null) => new Mdl2Icon("\uE713", color);
+
+        public static Mdl2Icon Info(string color = null) => new Mdl2Icon("\uE946", color);
+
+        public static Mdl2Icon FavoriteStar(string color = null) => new Mdl2Icon("\uE734", color);
+
+        public static Mdl2Icon Globe(string color = null) => new Mdl2Icon("\uE774", color);
+
+        public static Mdl2Icon Play(string color = null) => new Mdl2Icon("\uE768", color);
+    }
+}

FluentTerminal.App.ViewModels/Menu/MenuItemKeyBindingViewModel.cs

@@ -0,0 +1,159 @@
+using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using Windows.System;
+
+namespace FluentTerminal.App.ViewModels.Menu
+{
+    public class MenuItemKeyBindingViewModel : ObservableObject
+    {
+        private int _key;
+
+        public int Key
+        {
+            get => _key;
+            set => SetProperty(ref _key, value);
+        }
+
+        private int _keyModifiers;
+
+        // Corresponds to https://docs.microsoft.com/en-us/uwp/api/windows.system.virtualkeymodifiers
+        public int KeyModifiers
+        {
+            get => _keyModifiers;
+            private set => SetProperty(ref _keyModifiers, value);
+        }
+
+        private bool _ctrl;
+
+        public bool Ctrl
+        {
+            get => _ctrl;
+            set
+            {
+                if (SetProperty(ref _ctrl, value))
+                {
+                    SetKeyModifiers();
+                }
+            }
+        }
+
+        private bool _alt;
+
+        public bool Alt
+        {
+            get => _alt;
+            set
+            {
+                if (SetProperty(ref _alt, value))
+                {
+                    SetKeyModifiers();
+                }
+            }
+        }
+
+        private bool _shift;
+
+        public bool Shift
+        {
+            get => _shift;
+            set
+            {
+                if (SetProperty(ref _shift, value))
+                {
+                    SetKeyModifiers();
+                }
+            }
+        }
+
+        private bool _windows;
+
+        public bool Windows
+        {
+            get => _windows;
+            set
+            {
+                if (SetProperty(ref _windows, value))
+                {
+                    SetKeyModifiers();
+                }
+            }
+        }
+
+        public bool IsExtendedVirtualKey => !Enum.IsDefined(typeof(VirtualKey), Key);
+
+        public string GetOverrideText()
+        {
+            var segments = new List<string>();
+
+            if (Ctrl) segments.Add("Ctrl");
+            if (Alt) segments.Add("Alt");
+            if (Windows) segments.Add("Windows");
+            if (Shift) segments.Add("Shift");
+
+            segments.Add(EnumHelper.GetEnumDescription((ExtendedVirtualKey)Key));
+
+            return string.Join("+", segments);
+        }
+
+        public MenuItemKeyBindingViewModel(int key = 0, bool ctrl = false, bool alt = false, bool shift = false,
+            bool windows = false)
+        {
+            _key = key;
+            _ctrl = ctrl;
+            _alt = alt;
+            _shift = shift;
+            _windows = windows;
+
+            SetKeyModifiers();
+        }
+
+        public MenuItemKeyBindingViewModel(KeyBinding keyBinding) : this(keyBinding.Key, keyBinding.Ctrl,
+            keyBinding.Alt, keyBinding.Shift, keyBinding.Meta)
+        {
+        }
+
+
+
+        private void SetKeyModifiers()
+        {
+            // Based on VirtualKeyModifiers enum values (https://docs.microsoft.com/en-us/uwp/api/windows.system.virtualkeymodifiers)
+            var result = 0;
+
+            if (_ctrl)
+            {
+                result |= 1;
+            }
+
+            if (_alt)
+            {
+                result |= 2;
+            }
+
+            if (_shift)
+            {
+                result |= 4;
+            }
+
+            if (_windows)
+            {
+                result |= 8;
+            }
+
+            KeyModifiers = result;
+        }
+
+        public bool EquivalentTo(MenuItemKeyBindingViewModel other)
+        {
+            if (ReferenceEquals(this, other)) return true;
+
+            if (other == null) return false;
+
+            return _key == other._key && _keyModifiers == other._keyModifiers;
+        }
+
+    }
+}

FluentTerminal.App.ViewModels/Menu/MenuItemViewModel.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Windows.Input;
+
+namespace FluentTerminal.App.ViewModels.Menu
+{
+    public class MenuItemViewModel : MenuItemViewModelBase
+    {
+        #region Properties
+
+        private MenuItemKeyBindingViewModel _keyBinding;
+
+        public MenuItemKeyBindingViewModel KeyBinding
+        {
+            get => _keyBinding;
+            set => SetProperty(ref _keyBinding, value);
+        }
+
+        public ICommand Command { get; }
+
+        #endregion Properties
+
+        #region Constructors
+
+        public MenuItemViewModel(string text, ICommand command, string description = null, Mdl2Icon icon = null,
+            MenuItemKeyBindingViewModel keyBinding = null) : base(text, description, icon)
+        {
+            _keyBinding = keyBinding;
+            Command = command ?? throw new ArgumentNullException(nameof(command));
+        }
+
+        #endregion Constructors
+
+        #region Methods
+
+        public override bool EquivalentTo(MenuItemViewModelBase other)
+        {
+            if (!base.EquivalentTo(other)) return false;
+
+            if (!(other is MenuItemViewModel menuItem)) return false;
+
+            return _keyBinding?.EquivalentTo(menuItem._keyBinding) ?? menuItem._keyBinding == null;
+        }
+
+        #endregion Methods
+    }
+}

FluentTerminal.App.ViewModels/Menu/MenuItemViewModelBase.cs

@@ -0,0 +1,61 @@
+using FluentTerminal.Models;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace FluentTerminal.App.ViewModels.Menu
+{
+    public class MenuItemViewModelBase : ObservableObject
+    {
+        #region Properties
+
+        private string _text;
+
+        public string Text
+        {
+            get => _text;
+            set => SetProperty(ref _text, value);
+        }
+
+        private string _description;
+
+        public string Description
+        {
+            get => _description;
+            set => SetProperty(ref _description, value);
+        }
+
+        private Mdl2Icon _icon;
+
+        public Mdl2Icon Icon
+        {
+            get => _icon;
+            set => SetProperty(ref _icon, value);
+        }
+
+        #endregion Properties
+
+        #region Constructor
+
+        protected MenuItemViewModelBase(string text, string description, Mdl2Icon icon)
+        {
+            _text = text;
+            _description = description;
+            _icon = icon;
+        }
+
+        #endregion Constructor
+
+        #region Methods
+
+        public virtual bool EquivalentTo(MenuItemViewModelBase other)
+        {
+            if (ReferenceEquals(this, other)) return true;
+
+            if (other == null) return false;
+
+            return _text.NullableEqualTo(other._text) && _description.NullableEqualTo(other._description) &&
+                   (_icon?.Equals(other._icon) ?? other._icon == null);
+        }
+
+        #endregion Methods
+    }
+}

FluentTerminal.App.ViewModels/Menu/MenuViewModel.cs

@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace FluentTerminal.App.ViewModels.Menu
+{
+    public class MenuViewModel : ObservableObject
+    {
+        public ObservableCollection<MenuItemViewModelBase> Items { get; }
+
+        public MenuViewModel(IEnumerable<MenuItemViewModelBase> items = null)
+        {
+            if (items == null)
+            {
+                Items = new ObservableCollection<MenuItemViewModelBase>();
+            }
+            else if (items is ObservableCollection<MenuItemViewModelBase> observableItems)
+            {
+                Items = observableItems;
+            }
+            else
+            {
+                Items = new ObservableCollection<MenuItemViewModelBase>(items);
+            }
+        }
+
+        public bool EquivalentTo(MenuViewModel other)
+        {
+            if (ReferenceEquals(this, other)) return true;
+
+            if (other == null) return false;
+
+            if (Items.Count != other.Items.Count) return false;
+
+            return !Items.Where((t, i) => !t.EquivalentTo(other.Items[i])).Any();
+        }
+    }
+}

FluentTerminal.App.ViewModels/Menu/RadioMenuItemViewModel.cs

@@ -0,0 +1,28 @@
+using System;
+
+namespace FluentTerminal.App.ViewModels.Menu
+{
+    public class RadioMenuItemViewModel : MenuItemViewModelBase
+    {
+        public object BindingSource { get; }
+        public string BindingPath { get; }
+        public string GroupName { get; }
+
+        public RadioMenuItemViewModel(string text, string groupName, object bindingSource, string bindingPath = null, string description = null, Mdl2Icon icon = null)
+            : base(text, description, icon)
+        {
+            GroupName = groupName ?? throw new ArgumentNullException(nameof(groupName));
+            BindingSource = bindingSource ?? throw new ArgumentNullException(nameof(bindingSource));
+            BindingPath = bindingPath;
+        }
+
+        public override bool EquivalentTo(MenuItemViewModelBase other)
+        {
+            if (!base.EquivalentTo(other)) return false;
+
+            if (!(other is RadioMenuItemViewModel radioMenuItem)) return false;
+
+            return GroupName == radioMenuItem.GroupName &&  BindingSource == radioMenuItem.BindingSource && BindingPath == radioMenuItem.BindingPath;
+        }
+    }
+}

FluentTerminal.App.ViewModels/Menu/SeparatorMenuItemViewModel.cs

@@ -0,0 +1,15 @@
+namespace FluentTerminal.App.ViewModels.Menu
+{
+    public class SeparatorMenuItemViewModel : MenuItemViewModelBase
+    {
+        public SeparatorMenuItemViewModel()
+            : base(string.Empty, string.Empty, null)
+        {
+        }
+
+        public override bool EquivalentTo(MenuItemViewModelBase other)
+        {
+            return other is SeparatorMenuItemViewModel;
+        }
+    }
+}

FluentTerminal.App.ViewModels/Menu/ToggleMenuItemViewModel.cs

@@ -0,0 +1,26 @@
+using System;
+
+namespace FluentTerminal.App.ViewModels.Menu
+{
+    public class ToggleMenuItemViewModel : MenuItemViewModelBase
+    {
+        public object BindingSource { get; }
+        public string BindingPath { get; }
+
+        public ToggleMenuItemViewModel(string text, object bindingSource, string bindingPath = null, string description = null, Mdl2Icon icon = null)
+            : base(text, description, icon)
+        {
+            BindingSource = bindingSource ?? throw new ArgumentNullException(nameof(bindingSource));
+            BindingPath = bindingPath;
+        }
+
+        public override bool EquivalentTo(MenuItemViewModelBase other)
+        {
+            if (!base.EquivalentTo(other)) return false;
+
+            if (!(other is ToggleMenuItemViewModel toggleMenuItem)) return false;
+
+            return BindingSource == toggleMenuItem.BindingSource && BindingPath == toggleMenuItem.BindingPath;
+        }
+    }
+}

FluentTerminal.App.ViewModels/OverlayViewModel.cs

@@ -0,0 +1,53 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using Windows.UI.Xaml;
+
+namespace FluentTerminal.App.ViewModels
+{
+    public class OverlayViewModel : ObservableObject
+    {
+        private readonly DispatcherTimer _overlayTimer;
+        private bool _showOverlay;
+        private string _overlayContent;
+
+        // Important! The constructor has to be called from the UI thread.
+        public OverlayViewModel()
+        {
+            _overlayTimer = new DispatcherTimer {Interval = new TimeSpan(0, 0, 2)};
+        }
+
+        public bool ShowOverlay
+        {
+            get => _showOverlay;
+            set => SetProperty(ref _showOverlay, value);
+        }
+
+        public string OverlayContent
+        {
+            get => _overlayContent;
+            set => SetProperty(ref _overlayContent, value);
+        }
+
+        public void Show(string message)
+        {
+            OverlayContent = message; 
+            ShowOverlay = true;
+
+            if (_overlayTimer.IsEnabled)
+            {
+                _overlayTimer.Stop();
+                _overlayTimer.Tick -= OnResizeOverlayTimerFinished;
+            }
+            _overlayTimer.Start();
+            _overlayTimer.Tick += OnResizeOverlayTimerFinished;
+        }
+
+        private void OnResizeOverlayTimerFinished(object sender, object e)
+        {
+            _overlayTimer.Stop();
+            _overlayTimer.Tick -= OnResizeOverlayTimerFinished;
+            ShowOverlay = false;
+        }
+
+    }
+}

FluentTerminal.App.ViewModels/ProfileViewModelBase.cs

@@ -0,0 +1,258 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.App.ViewModels.Profiles;
+using FluentTerminal.App.ViewModels.Settings;
+using FluentTerminal.Models;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+
+namespace FluentTerminal.App.ViewModels
+{
+    /// <summary>
+    /// Base class for all profile view models. Implements logic for saving, editing, resetting, etc.
+    /// </summary>
+    public abstract class ProfileViewModelBase<T> : ObservableObject where T : ProfileProviderViewModelBase
+    {
+        #region Fields
+
+        protected readonly IDialogService DialogService;
+        protected readonly ISettingsService SettingsService;
+
+        private List<KeyBinding> _bindingsBeforeEdit;
+        private Dictionary<string, string> _environmentVariablesBeforeEdit;
+        private string _nameBeforeEdit;
+
+        #endregion Fields
+
+        #region Properties
+
+        protected bool IsNew { get; private set; }
+
+        public Guid Id { get; private set; }
+
+        private bool _inEditMode;
+
+        public bool InEditMode
+        {
+            get => _inEditMode;
+            set => SetProperty(ref _inEditMode, value);
+        }
+
+        private string _name;
+
+        public string Name
+        {
+            get => _name;
+            set => SetProperty(ref _name, value);
+        }
+
+        public KeyBindingsViewModel KeyBindings { get; }
+
+        public ObservableCollection<EnvironmentVariableViewModel> EnvironmentVariables { get; } = new ObservableCollection<EnvironmentVariableViewModel>();
+
+        public T ProfileVm { get; protected set; }
+
+        #endregion Properties
+
+        #region Events
+
+        // Needs to be triggered from UI thread
+        public event EventHandler Deleted;
+
+        #endregion Events
+
+        #region Commands
+
+        public ICommand CancelEditCommand { get; }
+
+        public ICommand DeleteCommand { get; }
+
+        public ICommand EditCommand { get; }
+
+        public ICommand SaveChangesCommand { get; }
+
+        public ICommand AddKeyboardShortcutCommand { get; }
+
+        #endregion Commands
+
+        #region Constructor
+
+        protected ProfileViewModelBase(ShellProfile shellProfile, ISettingsService settingsService, IDialogService dialogService, bool isNew)
+        {
+            SettingsService = settingsService;
+            DialogService = dialogService;
+            IsNew = isNew;
+
+            KeyBindings = new KeyBindingsViewModel(shellProfile.Id.ToString(), dialogService, string.Empty, false);
+
+            foreach (var environmentVariable in shellProfile.EnvironmentVariables)
+            {
+                EnvironmentVariables.Add(new EnvironmentVariableViewModel
+                {
+                    Name = environmentVariable.Key,
+                    Value = environmentVariable.Value
+                });
+            }
+
+            Initialize(shellProfile);
+
+            DeleteCommand = new AsyncRelayCommand(DeleteAsync, CanDelete);
+            EditCommand = new RelayCommand(Edit);
+            CancelEditCommand = new AsyncRelayCommand(CancelEditAsync);
+            SaveChangesCommand = new AsyncRelayCommand(SaveChangesAsync);
+            AddKeyboardShortcutCommand = new AsyncRelayCommand(AddKeyboardShortcutAsync);
+        }
+
+        #endregion Constructor
+
+        #region Methods
+
+        // Requires UI thread
+        // Loads view model properties from the input shellProfile
+        protected void Initialize(ShellProfile shellProfile)
+        {
+            Id = shellProfile.Id;
+            Name = shellProfile.Name;
+
+            KeyBindings.Clear();
+            foreach (var keyBinding in shellProfile.KeyBindings.Select(x => new KeyBinding(x)).ToList())
+            {
+                KeyBindings.Add(keyBinding);
+            }
+        }
+
+        protected virtual bool HasChanges()
+        {
+            return ProfileVm.HasChanges()
+                || !_nameBeforeEdit.NullableEqualTo(_name)
+                || !(_bindingsBeforeEdit?.SequenceEqual(KeyBindings.KeyBindings.Select(x => x.Model).ToList()) ?? false)
+                || !(_environmentVariablesBeforeEdit?.SequenceEqual(EnvironmentVariables.ToDictionary(x => x.Name, x => x.Value)) ?? false);
+        }
+
+        // Requires UI thread
+        private async Task DeleteAsync()
+        {
+            // ConfigureAwait(true) because we need to trigger Deleted event from the calling (UI) thread.
+            var result = await DialogService.ShowMessageDialogAsync(I18N.Translate("PleaseConfirm"),
+                I18N.Translate("ConfirmDeleteProfile"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+
+            if (result == DialogButton.OK)
+            {
+                Deleted?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        protected abstract bool CanDelete();
+
+        private void Edit()
+        {
+            if (InEditMode)
+            {
+                return;
+            }
+
+            _bindingsBeforeEdit = KeyBindings.KeyBindings.Select(x => x.Model).ToList();
+            _environmentVariablesBeforeEdit = EnvironmentVariables.ToDictionary(x => x.Name, x => x.Value);
+            _nameBeforeEdit = _name;
+
+            KeyBindings.Editable = true;
+            InEditMode = true;
+        }
+
+        // Requires UI thread
+        private async Task CancelEditAsync()
+        {
+            if (IsNew)
+            {
+                await DeleteAsync().ConfigureAwait(false);
+
+                return;
+            }
+
+            if (!HasChanges())
+            {
+                KeyBindings.Editable = false;
+                InEditMode = false;
+
+                return;
+            }
+
+            // ConfigureAwait(true) because we're setting some view-model properties afterwards
+            if (await DialogService.ShowMessageDialogAsync(I18N.Translate("PleaseConfirm"),
+                        I18N.Translate("ConfirmDiscardChanges"), DialogButton.OK, DialogButton.Cancel)
+                    .ConfigureAwait(true) == DialogButton.OK)
+            {
+                // Cancelled, so rollback
+                // ConfigureAwait(true) because we're setting some view-model properties afterwards
+                await ProfileVm.RejectChangesAsync().ConfigureAwait(true);
+
+                KeyBindings.Editable = false;
+                InEditMode = false;
+            }
+        }
+
+        // Requires UI thread
+        private async Task SaveChangesAsync()
+        {
+            // ConfigureAwait(true) because we're setting some view-model properties afterwards.
+            var error = await ProfileVm.AcceptChangesAsync().ConfigureAwait(true);
+
+            if (!string.IsNullOrEmpty(error))
+            {
+                await DialogService.ShowMessageDialogAsync(I18N.Translate("InvalidInput"), error, DialogButton.OK)
+                    .ConfigureAwait(false);
+
+                return;
+            }
+
+            if (EnvironmentVariables.Select(x => x.Name).Any(string.IsNullOrWhiteSpace))
+            {
+                await DialogService.ShowMessageDialogAsync(I18N.Translate("InvalidInput"),
+                    I18N.Translate("EmptyEnvironmentVariableName"), DialogButton.OK).ConfigureAwait(false);
+
+                return;
+            }
+
+            if (EnvironmentVariables.Select(x => x.Name).Distinct().Count() != EnvironmentVariables.Count)
+            {
+                await DialogService.ShowMessageDialogAsync(I18N.Translate("InvalidInput"),
+                    I18N.Translate("DuplicateEnvironmentVariable"), DialogButton.OK).ConfigureAwait(false);
+
+                return;
+            }
+
+            var profile = ProfileVm.Model;
+
+            profile.Id = Id;
+            profile.Name = _name;
+            profile.KeyBindings = KeyBindings.KeyBindings.Select(x => x.Model).ToList();
+            profile.EnvironmentVariables = EnvironmentVariables.ToDictionary(x => x.Name, x => x.Value);
+
+            if (profile is SshProfile sshProfile)
+            {
+                SettingsService.SaveSshProfile(sshProfile, IsNew);
+            }
+            else
+            {
+                SettingsService.SaveShellProfile(profile, IsNew);
+            }
+
+            KeyBindings.Editable = false;
+            InEditMode = false;
+            IsNew = false;
+        }
+
+        private Task AddKeyboardShortcutAsync()
+        {
+            return KeyBindings.ShowAddKeyBindingDialogAsync();
+        }
+
+        #endregion Methods
+    }
+}

FluentTerminal.App.ViewModels/Profiles/CommonProfileProviderViewModel.cs

@@ -0,0 +1,151 @@
+using System.Threading.Tasks;
+using System.Windows.Input;
+using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.Models;
+using Microsoft.Toolkit.Mvvm.Input;
+
+namespace FluentTerminal.App.ViewModels.Profiles
+{
+    /// <summary>
+    /// Used for common profiles (PowerShell, CMD, WSL).
+    /// </summary>
+    public class CommonProfileProviderViewModel : ProfileProviderViewModelBase
+    {
+        #region Fields
+
+        private readonly IFileSystemService _fileSystemService;
+
+        #endregion Fields
+
+        #region Properties
+
+        public bool PreInstalled { get; private set; }
+
+        private string _location;
+
+        public string Location
+        {
+            get => _location;
+            set => SetProperty(ref _location, value);
+        }
+
+        private string _workingDirectory;
+
+        public string WorkingDirectory
+        {
+            get => _workingDirectory;
+            set => SetProperty(ref _workingDirectory, value);
+        }
+
+        private string _arguments;
+
+        public string Arguments
+        {
+            get => _arguments;
+            set => SetProperty(ref _arguments, value);
+        }
+
+        #endregion Properties
+
+        #region Commands
+
+        public ICommand BrowseForCustomShellCommand { get; }
+
+        public ICommand BrowseForWorkingDirectoryCommand { get; }
+
+        #endregion Commands
+
+        #region Constructor
+
+        public CommonProfileProviderViewModel(ISettingsService settingsService, IApplicationView applicationView,
+            IFileSystemService fileSystemService, ShellProfile original = null) : base(settingsService, applicationView,
+            true, original)
+        {
+            _fileSystemService = fileSystemService;
+
+            BrowseForCustomShellCommand = new AsyncRelayCommand(BrowseForCustomShell);
+            BrowseForWorkingDirectoryCommand = new AsyncRelayCommand(BrowseForWorkingDirectory);
+
+            Initialize(Model);
+        }
+
+        #endregion Constructor
+
+        #region Methods
+
+        private void Initialize(ShellProfile profile)
+        {
+            PreInstalled = profile.PreInstalled;
+            Location = profile.Location;
+            Arguments = profile.Arguments;
+            WorkingDirectory = profile.WorkingDirectory;
+        }
+
+        protected override void LoadFromProfile(ShellProfile profile)
+        {
+            base.LoadFromProfile(profile);
+
+            Initialize(profile);
+        }
+
+        protected override async Task CopyToProfileAsync(ShellProfile profile)
+        {
+            await base.CopyToProfileAsync(profile).ConfigureAwait(false);
+
+            profile.Location = _location;
+            profile.Arguments = _arguments;
+            profile.WorkingDirectory = _workingDirectory;
+        }
+
+        public override async Task<string> ValidateAsync()
+        {
+            var error = await base.ValidateAsync().ConfigureAwait(false);
+
+            if (!string.IsNullOrEmpty(error))
+            {
+                return error;
+            }
+
+            if (!string.IsNullOrEmpty(_location))
+            {
+                return null;
+            }
+
+            error = I18N.Translate("LocationCantBeEmpty");
+
+            return string.IsNullOrEmpty(error) ? "Location cannot be empty." : error;
+        }
+
+        public override bool HasChanges()
+        {
+            return base.HasChanges() || !Model.Location.NullableEqualTo(_location) ||
+                   !Model.WorkingDirectory.NullableEqualTo(_workingDirectory) ||
+                   !Model.Arguments.NullableEqualTo(_arguments);
+        }
+
+        // Requires UI thread
+        private async Task BrowseForCustomShell()
+        {
+            // ConfigureAwait(true) because we're setting some view-model properties afterwards.
+            var file = await _fileSystemService.OpenFileAsync(new[] { ".exe" }).ConfigureAwait(true);
+            if (file != null)
+            {
+                Location = file.Path;
+            }
+        }
+
+        // Requires UI thread
+        private async Task BrowseForWorkingDirectory()
+        {
+            // ConfigureAwait(true) because we're setting some view-model properties afterwards.
+            var directory = await _fileSystemService.BrowseForDirectoryAsync().ConfigureAwait(true);
+            if (directory != null)
+            {
+                WorkingDirectory = directory;
+            }
+        }
+
+        #endregion Methods
+    }
+}

FluentTerminal.App.ViewModels/Profiles/ProfileProviderViewModelBase.cs

@@ -0,0 +1,386 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Web;
+using Windows.UI.Core;
+using FluentTerminal.App.Services;
+using FluentTerminal.Models;
+using FluentTerminal.Models.Messages;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Messaging;
+
+namespace FluentTerminal.App.ViewModels.Profiles
+{
+    /// <summary>
+    /// Base class for all profile view model classes. It contains properties shared by all other view models
+    /// (theme-related properties, line-ending translation, and WinPTY/ConPTY selection).
+    /// </summary>
+    public abstract class ProfileProviderViewModelBase : ObservableObject,
+        IRecipient<ThemeAddedMessage>,
+        IRecipient<ThemeDeletedMessage>
+    {
+        #region Fields
+
+        protected readonly ISettingsService SettingsService;
+        protected readonly IApplicationView ApplicationView;
+        private readonly bool _strictProfileType;
+
+        #endregion Fields
+
+        #region Properties
+
+        private ShellProfile _model;
+
+        public ShellProfile Model
+        {
+            get => _model;
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                if (ReferenceEquals(_model, value))
+                {
+                    return;
+                }
+
+                if (_strictProfileType && _model != null && _model.GetType() != value.GetType())
+                {
+                    throw new ArgumentException($"The value has to be of type {_model.GetType().Name}.");
+                }
+
+                _model = value;
+
+                LoadFromProfile(value);
+            }
+        }
+
+        public ObservableCollection<TabTheme> TabThemes { get; }
+
+        public ObservableCollection<TerminalTheme> TerminalThemes { get; }
+
+        private TabTheme _selectedTabTheme;
+
+        public TabTheme SelectedTabTheme
+        {
+            get => _selectedTabTheme ?? (_selectedTabTheme = TabThemes.FirstOrDefault(t => t.Id.Equals(_tabThemeId)));
+            set
+            {
+                if (value == null)
+                {
+                    // Ignore attempt setting null.
+                    return;
+                }
+
+                // Ensure that it's from the list
+                var theme = TabThemes.Contains(value)
+                    ? value
+                    : TabThemes.FirstOrDefault(t => t.Id == value.Id) ?? TabThemes.First();
+
+                if (SetProperty(ref _selectedTabTheme, theme))
+                {
+                    _tabThemeId = theme.Id;
+                }
+            }
+        }
+
+        private int _tabThemeId;
+
+        public int TabThemeId
+        {
+            get => _tabThemeId;
+            set
+            {
+                if (SetProperty(ref _tabThemeId, value))
+                {
+                    SelectedTabTheme = TabThemes.FirstOrDefault(t => t.Id.Equals(value));
+                }
+            }
+        }
+
+        private TerminalTheme _selectedTerminalTheme;
+
+        public TerminalTheme SelectedTerminalTheme
+        {
+            get => _selectedTerminalTheme ??
+                   (_selectedTerminalTheme = TerminalThemes.FirstOrDefault(t => t.Id.Equals(_terminalThemeId)));
+            set
+            {
+                TerminalTheme theme = value;
+
+                if (theme == null)
+                {
+                    return;
+                }
+                else if (!TerminalThemes.Contains(theme))
+                {
+                    // Ensure that it's from the list
+                    theme = TerminalThemes.FirstOrDefault(t => t.Id.Equals(theme.Id)) ?? TerminalThemes.First();
+                }
+
+                if (SetProperty(ref _selectedTerminalTheme, theme))
+                {
+                    _terminalThemeId = theme.Id;
+                }
+            }
+        }
+
+        private Guid _terminalThemeId;
+
+        public Guid TerminalThemeId
+        {
+            get => _terminalThemeId;
+            set
+            {
+                if (SetProperty(ref _terminalThemeId, value))
+                {
+                    SelectedTerminalTheme = TerminalThemes.FirstOrDefault(t => t.Id.Equals(value));
+                }
+            }
+        }
+
+        private bool _useConPty;
+
+        public bool UseConPty
+        {
+            get => _useConPty;
+            set => SetProperty(ref _useConPty, value);
+        }
+
+        private bool _useBuffer;
+
+        public bool UseBuffer
+        {
+            get => _useBuffer;
+            set => SetProperty(ref _useBuffer, value);
+        }
+
+        #endregion Properties
+
+        #region Constructor
+
+        protected ProfileProviderViewModelBase(ISettingsService settingsService, IApplicationView applicationView,
+            bool strictProfileType, ShellProfile original = null)
+        {
+            SettingsService = settingsService;
+            ApplicationView = applicationView;
+            _strictProfileType = strictProfileType;
+
+            _model = original ?? new ShellProfile();
+
+            TabThemes = new ObservableCollection<TabTheme>(settingsService.GetTabThemes());
+
+            SelectedTabTheme = TabThemes.First();
+
+            TerminalThemes = new ObservableCollection<TerminalTheme>(settingsService.GetThemes());
+
+            TerminalThemes.Insert(0, new TerminalTheme {Id = Guid.Empty, Name = "Default"});
+
+            SelectedTerminalTheme = TerminalThemes.First();
+
+            Initialize(Model);
+
+            WeakReferenceMessenger.Default.RegisterAll(this);
+        }
+
+        #endregion Constructor
+
+        #region Methods
+
+        public void Receive(ThemeDeletedMessage message)
+        {
+            var theme = TerminalThemes.FirstOrDefault(t => t.Id.Equals(message.ThemeId));
+
+            if (theme == null)
+            {
+                return;
+            }
+
+            ApplicationView.ExecuteOnUiThreadAsync(() =>
+            {
+                TerminalThemes.Remove(theme);
+
+                if (_terminalThemeId.Equals(message.ThemeId))
+                {
+                    SelectedTerminalTheme = TerminalThemes.First();
+                }
+            }, CoreDispatcherPriority.Low, true);
+        }
+
+        public void Receive(ThemeAddedMessage message)
+        {
+            ApplicationView.ExecuteOnUiThreadAsync(() => TerminalThemes.Add(message.Theme), CoreDispatcherPriority.Low);
+        }
+
+        private void Initialize(ShellProfile profile)
+        {
+            UseConPty = profile.UseConPty;
+            UseBuffer = profile.UseBuffer;
+            TerminalThemeId = profile.TerminalThemeId;
+            TabThemeId = profile.TabThemeId;
+        }
+
+        protected virtual void LoadFromProfile(ShellProfile profile)
+        {
+            Initialize(profile);
+        }
+
+        protected virtual Task CopyToProfileAsync(ShellProfile profile)
+        {
+            profile.UseConPty = _useConPty;
+            profile.UseBuffer = _useBuffer;
+            profile.TerminalThemeId = _terminalThemeId;
+            profile.TabThemeId = _tabThemeId;
+            return Task.CompletedTask;
+        }
+
+        public virtual Task<string> ValidateAsync()
+        {
+            return Task.FromResult<string>(null);
+        }
+
+        /// <summary>
+        /// Returns <c>true</c> if view model values aren't equal to the corresponding values of the
+        /// underlying <see cref="ShellProfile"/>.
+        /// </summary>
+        public virtual bool HasChanges()
+        {
+            return Model.UseConPty != _useConPty ||
+                   Model.UseBuffer != _useBuffer ||
+                   !Model.TerminalThemeId.Equals(_terminalThemeId) ||
+                   Model.TabThemeId != _tabThemeId;
+        }
+
+        /// <summary>
+        /// Copies values from the view model to the underlying <see cref="ShellProfile"/>.
+        /// </summary>
+        /// <param name="acceptIfInvalid">Defines what will happen if the view model data is invalid (if
+        /// <see cref="ValidateAsync"/> returns non-empty string). If this parameter is set to <c>true</c>, the
+        /// data will be copied to the underlying <see cref="ShellProfile"/> anyway. If it's set to <c>false</c>,
+        /// (default) the underlying <see cref="ShellProfile"/> won't be changed at all.</param>
+        /// <returns><c>null</c> or empty string if the operation was successful (the data is valid), or an error
+        /// message returned by <see cref="ValidateAsync"/> method.</returns>
+        public async Task<string> AcceptChangesAsync(bool acceptIfInvalid = false)
+        {
+            var error = await ValidateAsync().ConfigureAwait(false);
+
+            if (acceptIfInvalid || string.IsNullOrEmpty(error))
+            {
+                await CopyToProfileAsync(Model).ConfigureAwait(false);
+            }
+
+            return error;
+        }
+
+        public Task RejectChangesAsync()
+        {
+            return ApplicationView.ExecuteOnUiThreadAsync(() => LoadFromProfile(Model));
+        }
+
+        #endregion Methods
+
+        #region Links/shortcuts related
+
+        private const string UseConPtyQueryStringName = "conpty";
+        private const string UseBufferQueryStringName = "buffer";
+        private const string TerminalThemeIdQueryStringName = "theme";
+        private const string TabThemeIdQueryStringName = "tab";
+
+        private const string ShortcutFileFormat = @"[{{000214A0-0000-0000-C000-000000000046}}]
+Prop3=19,0
+[InternetShortcut]
+IDList=
+URL={0}
+";
+
+        public static string GetShortcutFileContent(string url) => string.Format(ShortcutFileFormat, url);
+
+        public static IEnumerable<Tuple<string, string>> ParseParams(string uriOpts, char separator) =>
+            uriOpts.Split(separator).Select(ParseSshOptionFromUri).Where(p => p != null);
+
+        private static Tuple<string, string> ParseSshOptionFromUri(string option)
+        {
+            string[] nv = option.Split('=');
+
+            if (nv.Length != 2 || string.IsNullOrEmpty(nv[0]))
+            {
+                // For now simply ignore invalid options
+                return null;
+                //throw new FormatException($"Invalid SSH option '{option}'.");
+            }
+
+            return Tuple.Create(HttpUtility.UrlDecode(nv[0]), HttpUtility.UrlDecode(nv[1]));
+        }
+
+        /// <summary>
+        /// Generates URL.
+        /// </summary>
+        /// <returns><see cref="Tuple"/> whose first item represents success. If the first item is <c>true</c>,
+        /// the second contains the URL. If the first item is <c>false</c>, the second contains error message.</returns>
+        public virtual Task<Tuple<bool, string>> GetUrlAsync() =>
+            Task.FromResult(Tuple.Create(false, "Not supported."));
+
+        public string GetBaseQueryString()
+        {
+            var queryString = $"{UseConPtyQueryStringName}={_useConPty}&{UseBufferQueryStringName}={_useBuffer}";
+
+            if (_tabThemeId != TabThemes.First().Id)
+            {
+                queryString += $"&{TabThemeIdQueryStringName}={_tabThemeId:##########}";
+            }
+
+            if (!_terminalThemeId.Equals(TerminalThemes.First().Id))
+            {
+                queryString += $"&{TerminalThemeIdQueryStringName}={_terminalThemeId}";
+            }
+
+            return queryString;
+        }
+
+        public void LoadBaseFromQueryString(IList<Tuple<string, string>> queryStringParams)
+        {
+            if (queryStringParams == null)
+            {
+                return;
+            }
+
+            var keyValue = queryStringParams.FirstOrDefault(t =>
+                UseConPtyQueryStringName.Equals(t.Item1, StringComparison.OrdinalIgnoreCase));
+
+            if (!string.IsNullOrEmpty(keyValue?.Item2) && bool.TryParse(keyValue.Item2?.ToLower(), out bool useConPty))
+            {
+                UseConPty = useConPty;
+            }
+
+            keyValue = queryStringParams.FirstOrDefault(t =>
+                UseBufferQueryStringName.Equals(t.Item1, StringComparison.OrdinalIgnoreCase));
+
+            if (!string.IsNullOrEmpty(keyValue?.Item2) && bool.TryParse(keyValue.Item2?.ToLower(), out bool useBuffer))
+            {
+                UseConPty = useBuffer;
+            }
+
+            keyValue = queryStringParams.FirstOrDefault(t =>
+                TabThemeIdQueryStringName.Equals(t.Item1, StringComparison.OrdinalIgnoreCase));
+
+            if (!string.IsNullOrEmpty(keyValue?.Item2) && int.TryParse(keyValue.Item2, out int tabThemeId))
+            {
+                TabThemeId = tabThemeId;
+            }
+
+            keyValue = queryStringParams.FirstOrDefault(t =>
+                TerminalThemeIdQueryStringName.Equals(t.Item1, StringComparison.OrdinalIgnoreCase));
+
+            if (!string.IsNullOrEmpty(keyValue?.Item2) && Guid.TryParse(keyValue.Item2, out Guid terminalThemeId))
+            {
+                TerminalThemeId = terminalThemeId;
+            }
+        }
+
+        #endregion Links/shortcuts related
+    }
+}

FluentTerminal.App.ViewModels/Profiles/SshConnectViewModel.cs

@@ -0,0 +1,537 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Web;
+using System.Windows.Input;
+using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.Models;
+using Microsoft.Toolkit.Mvvm.Input;
+
+namespace FluentTerminal.App.ViewModels.Profiles
+{
+    /// <summary>
+    /// View-model for rich-UI based SSH profiles.
+    /// </summary>
+    public class SshConnectViewModel : ProfileProviderViewModelBase
+    {
+        #region Static
+
+        public static string GetErrorString(SshConnectionInfoValidationResult result, string separator = "; ") =>
+            string.Join(separator, GetErrors(result));
+
+        public static IEnumerable<string> GetErrors(SshConnectionInfoValidationResult result)
+        {
+            if (result == SshConnectionInfoValidationResult.Valid)
+            {
+                yield break;
+            }
+
+            foreach (var value in Enum.GetValues(typeof(SshConnectionInfoValidationResult))
+                .Cast<SshConnectionInfoValidationResult>().Where(r => r != SshConnectionInfoValidationResult.Valid))
+            {
+                if ((value & result) == value)
+                {
+                    yield return I18N.Translate($"{nameof(SshConnectionInfoValidationResult)}.{value}");
+                }
+            }
+        }
+
+        #endregion Static
+
+        #region Fields
+
+        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
+        private readonly IFileSystemService _fileSystemService;
+
+        // To prevent validating the existence of the same file multiple times because it's kinda expensive
+        private string _validatedIdentityFile;
+
+        #endregion Fields
+
+        #region Properties
+
+        private string _host;
+
+        public string Host
+        {
+            get => _host;
+            set => SetProperty(ref _host, value);
+        }
+
+        private ushort _sshPort;
+
+        public ushort SshPort
+        {
+            get => _sshPort;
+            set => SetProperty(ref _sshPort, value);
+        }
+
+        private string _username;
+
+        public string Username
+        {
+            get => _username;
+            set => SetProperty(ref _username, value);
+        }
+
+        private string _identityFile;
+
+        public string IdentityFile
+        {
+            get => _identityFile;
+            set => SetProperty(ref _identityFile, value);
+        }
+
+        private bool _useMosh;
+
+        public bool UseMosh
+        {
+            get => _useMosh;
+            set => SetProperty(ref _useMosh, value);
+        }
+
+        private ushort _moshPortFrom;
+
+        public ushort MoshPortFrom
+        {
+            get => _moshPortFrom;
+            set => SetProperty(ref _moshPortFrom, value);
+        }
+
+        private ushort _moshPortTo;
+
+        public ushort MoshPortTo
+        {
+            get => _moshPortTo;
+            set => SetProperty(ref _moshPortTo, value);
+        }
+
+        #endregion Properties
+
+        #region Commands
+
+        public ICommand BrowseForIdentityFileCommand { get; }
+
+        #endregion Commands
+
+        #region Constructor
+
+        public SshConnectViewModel(ISettingsService settingsService, IApplicationView applicationView,
+            ITrayProcessCommunicationService trayProcessCommunicationService, IFileSystemService fileSystemService,
+            SshProfile original = null) : base(settingsService, applicationView, true,
+            original ?? new SshProfile { UseMosh = settingsService.GetApplicationSettings().UseMoshByDefault,
+                RequestConPty = settingsService.GetApplicationSettings().UseConPty
+            })
+        {
+            _trayProcessCommunicationService = trayProcessCommunicationService;
+            _fileSystemService = fileSystemService;
+
+            Initialize((SshProfile)Model);
+
+            BrowseForIdentityFileCommand = new AsyncRelayCommand(BrowseForIdentityFileAsync);
+        }
+
+        #endregion Constructor
+
+        #region Methods
+
+        // Fills the view model properties from the input sshProfile
+        private void Initialize(SshProfile sshProfile)
+        {
+            Host = sshProfile.Host;
+            SshPort = sshProfile.SshPort;
+
+            Username = sshProfile.Username;
+
+            if (string.IsNullOrEmpty(Username))
+            {
+                _trayProcessCommunicationService.GetUserNameAsync().ContinueWith(t =>
+                {
+                    var username = t.Result;
+
+                    if (string.IsNullOrEmpty(Username) && !string.IsNullOrEmpty(username))
+                    {
+                        ApplicationView.ExecuteOnUiThreadAsync(() => Username = username);
+                    }
+                }, TaskContinuationOptions.OnlyOnRanToCompletion);
+            }
+
+            IdentityFile = sshProfile.IdentityFile;
+            UseMosh = sshProfile.UseMosh;
+            MoshPortFrom = sshProfile.MoshPortFrom;
+            MoshPortTo = sshProfile.MoshPortTo;
+        }
+
+        // Requires UI thread
+        private async Task BrowseForIdentityFileAsync()
+        {
+            // ConfigureAwait(true) because we're setting some view-model properties afterwards.
+            var file = await _fileSystemService.OpenFileAsync(new[] { "*" }).ConfigureAwait(true);
+            if (file != null)
+            {
+                IdentityFile = file.Path;
+            }
+        }
+
+        private string GetArgumentsString()
+        {
+            var sshArguments = GetSshArguments();
+
+            if (!_useMosh)
+            {
+                return string.IsNullOrWhiteSpace(sshArguments) ? $"{_username}@{_host}" : $"{sshArguments} {_username}@{_host}";
+            }
+
+            return string.IsNullOrEmpty(sshArguments)
+                ? $"-p {_moshPortFrom}:{_moshPortTo} {_username}@{_host}"
+                : $"-p {_moshPortFrom}:{_moshPortTo} --ssh=\"ssh {sshArguments}\" {_username}@{_host}";
+        }
+
+        private string GetSshArguments()
+        {
+            if (string.IsNullOrEmpty(_identityFile))
+            {
+                return _sshPort == SshProfile.DefaultSshPort ? null : $"-p {_sshPort:#####}";
+            }
+
+            return _sshPort == SshProfile.DefaultSshPort
+                ? $"-i \"{_identityFile}\""
+                : $"-p {_sshPort:#####} -i \"{_identityFile}\"";
+        }
+
+        protected override void LoadFromProfile(ShellProfile profile)
+        {
+            base.LoadFromProfile(profile);
+
+            Initialize((SshProfile)profile);
+        }
+
+        protected override async Task CopyToProfileAsync(ShellProfile profile)
+        {
+            await base.CopyToProfileAsync(profile).ConfigureAwait(false);
+
+            var sshProfile = (SshProfile) profile;
+
+            sshProfile.Location = _useMosh ? Constants.MoshCommandName : Constants.SshCommandName;
+            sshProfile.Arguments = GetArgumentsString();
+
+            sshProfile.WorkingDirectory = null;
+
+            sshProfile.Host = _host;
+            sshProfile.SshPort = _sshPort;
+            sshProfile.Username = _username;
+            sshProfile.IdentityFile = _identityFile;
+            sshProfile.UseMosh = _useMosh;
+            sshProfile.MoshPortFrom = _moshPortFrom;
+            sshProfile.MoshPortTo = _moshPortTo;
+        }
+
+        public override async Task<string> ValidateAsync()
+        {
+            var error = await base.ValidateAsync().ConfigureAwait(false);
+
+            if (!string.IsNullOrEmpty(error))
+            {
+                return error;
+            }
+
+            var result = await GetSshInfoValidationResultAsync().ConfigureAwait(false);
+
+            if (result == SshConnectionInfoValidationResult.Valid)
+            {
+                return null;
+            }
+
+            error = GetErrorString(result, Environment.NewLine);
+
+            if (string.IsNullOrEmpty(error))
+            {
+                error = "Invalid input.";
+            }
+
+            return error;
+        }
+
+        public override bool HasChanges()
+        {
+            var original = (SshProfile)Model;
+
+            return base.HasChanges() || !original.Host.NullableEqualTo(_host) || original.SshPort != _sshPort ||
+                   !original.Username.NullableEqualTo(_username) ||
+                   !original.IdentityFile.NullableEqualTo(_identityFile) || original.UseMosh != _useMosh ||
+                   original.MoshPortFrom != _moshPortFrom || original.MoshPortTo != _moshPortTo;
+        }
+
+        private async Task<SshConnectionInfoValidationResult> GetSshInfoValidationResultAsync()
+        {
+            var result = SshConnectionInfoValidationResult.Valid;
+
+            if (string.IsNullOrEmpty(_username))
+            {
+                result |= SshConnectionInfoValidationResult.UsernameEmpty;
+            }
+
+            if (string.IsNullOrEmpty(_host))
+            {
+                result |= SshConnectionInfoValidationResult.HostEmpty;
+            }
+
+            if (_sshPort < 1)
+            {
+                result |= SshConnectionInfoValidationResult.SshPortZeroOrNegative;
+            }
+
+            if (!await CheckIdentityFileExistsAsync().ConfigureAwait(false))
+            {
+                result |= SshConnectionInfoValidationResult.IdentityFileDoesNotExist;
+            }
+
+            if (!_useMosh)
+            {
+                return result;
+            }
+
+            if (_moshPortFrom < 1)
+            {
+                result |= SshConnectionInfoValidationResult.MoshPortZeroOrNegative;
+            }
+
+            if (_moshPortFrom > _moshPortTo)
+            {
+                result |= SshConnectionInfoValidationResult.MoshPortRangeInvalid;
+            }
+
+            return result;
+        }
+
+        // Requires UI thread
+        private async Task<bool> CheckIdentityFileExistsAsync()
+        {
+            var identityFile = _identityFile;
+
+            if (string.IsNullOrEmpty(identityFile) ||
+                identityFile.Equals(_validatedIdentityFile, StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            // Here we need to take into account that files from ssh config dir can be provided by name, without full path.
+            string fullPath;
+
+            if (Path.IsPathRooted(identityFile))
+            {
+                fullPath = identityFile;
+            }
+            else
+            {
+                // ConfigureAwait(true) because we're setting some view-model properties afterwards.
+                var sshConfigDir = await _trayProcessCommunicationService.GetSshConfigDirAsync().ConfigureAwait(true);
+
+                if (string.IsNullOrEmpty(sshConfigDir))
+                {
+                    return false;
+                }
+
+                fullPath = Path.Combine(sshConfigDir, identityFile);
+            }
+
+            // ConfigureAwait(true) because we're setting some view-model properties afterwards.
+            if (await _trayProcessCommunicationService.CheckFileExistsAsync(fullPath).ConfigureAwait(true))
+            {
+                _validatedIdentityFile = identityFile;
+
+                IdentityFile = fullPath;
+
+                return true;
+            }
+
+            return false;
+        }
+
+        public void SetValidatedIdentityFile(string identityFile)
+        {
+            _validatedIdentityFile = identityFile;
+            IdentityFile = identityFile;
+        }
+
+        #endregion Methods
+
+        #region Links/shortcuts related
+
+        // Resources:
+        // https://tools.ietf.org/html/draft-ietf-secsh-scp-sftp-ssh-uri-04#section-3
+        // https://man.openbsd.org/ssh
+
+        private const string SshUriScheme = "ssh";
+        private const string MoshUriScheme = "mosh";
+
+        // Constant derived from https://man.openbsd.org/ssh
+        private const string IdentityFileOptionName = "IdentityFile";
+
+        private static readonly string[] ValidMoshPortsNames = { "mosh_ports", "mosh-ports" };
+
+        private static readonly Regex MoshRangeRx =
+            new Regex(@"^(?<from>\d{1,5})[:-](?<to>\d{1,5})$", RegexOptions.Compiled);
+
+        public static bool CheckScheme(Uri uri) =>
+            SshUriScheme.Equals(uri?.Scheme, StringComparison.OrdinalIgnoreCase) ||
+            MoshUriScheme.Equals(uri?.Scheme, StringComparison.OrdinalIgnoreCase);
+
+        public static SshConnectViewModel ParseUri(Uri uri, ISettingsService settingsService,
+            IApplicationView applicationView, ITrayProcessCommunicationService trayProcessCommunicationService,
+            IFileSystemService fileSystemService, IApplicationDataContainer historyContainer)
+        {
+            var vm = new SshConnectViewModel(settingsService, applicationView, trayProcessCommunicationService,
+                fileSystemService)
+            {
+                Host = uri.Host,
+                UseMosh = MoshUriScheme.Equals(uri.Scheme, StringComparison.OrdinalIgnoreCase)
+            };
+
+            if (uri.Port >= 0)
+                vm.SshPort = (ushort)uri.Port;
+
+            if (!string.IsNullOrEmpty(uri.UserInfo))
+            {
+                string[] parts = uri.UserInfo.Split(';');
+
+                if (parts.Length > 2)
+                    throw new FormatException($"UserInfo part contains {parts.Length} elements.");
+
+                vm.Username = HttpUtility.UrlDecode(parts[0]);
+
+                if (parts.Length > 1)
+                {
+                    // For now we are only interested in IdentityFile option
+                    Tuple<string, string> identityFileOption = ParseParams(parts[1], ',').FirstOrDefault(p =>
+                        string.Equals(p.Item1, IdentityFileOptionName, StringComparison.OrdinalIgnoreCase));
+
+                    vm.IdentityFile = identityFileOption?.Item2;
+                }
+            }
+
+            // ReSharper disable once ConstantConditionalAccessQualifier
+            string queryString = uri.Query?.Trim();
+
+            if (string.IsNullOrEmpty(queryString))
+            {
+                return vm;
+            }
+
+            if (queryString.StartsWith("?", StringComparison.Ordinal))
+            {
+                queryString = queryString.Substring(1);
+            }
+
+            var queryStringParams = ParseParams(queryString, '&').ToList();
+
+            var moshPorts = queryStringParams.FirstOrDefault(p =>
+                ValidMoshPortsNames.Any(n => string.Equals(p.Item1, n, StringComparison.OrdinalIgnoreCase)));
+
+            if (moshPorts != null)
+            {
+                Match match = MoshRangeRx.Match(moshPorts.Item2);
+
+                if (match.Success)
+                {
+                    vm.MoshPortFrom = ushort.Parse(match.Groups["from"].Value);
+                    vm.MoshPortTo = ushort.Parse(match.Groups["to"].Value);
+                }
+            }
+
+            vm.LoadBaseFromQueryString(queryStringParams);
+
+            return vm;
+        }
+
+        public override async Task<Tuple<bool, string>> GetUrlAsync()
+        {
+            var error = await base.ValidateAsync().ConfigureAwait(false);
+
+            if (!string.IsNullOrEmpty(error))
+            {
+                return Tuple.Create(false, error);
+            }
+
+            var result = await GetSshInfoValidationResultAsync().ConfigureAwait(false);
+
+            if (result != SshConnectionInfoValidationResult.Valid &&
+                // For links we can ignore missing username
+                result != SshConnectionInfoValidationResult.UsernameEmpty)
+            {
+
+                error = GetErrorString(result, Environment.NewLine);
+
+                if (string.IsNullOrEmpty(error))
+                {
+                    error = "Invalid input.";
+                }
+
+                return Tuple.Create(false, error);
+            }
+
+            var sb = new StringBuilder(_useMosh ? MoshUriScheme : SshUriScheme);
+
+            sb.Append("://");
+
+            bool containsUserInfo = false;
+
+            if (!string.IsNullOrEmpty(_username))
+            {
+                sb.Append(HttpUtility.UrlEncode(_username));
+
+                containsUserInfo = true;
+            }
+
+            if (!string.IsNullOrEmpty(_identityFile))
+            {
+                sb.Append(";");
+
+                if (!string.IsNullOrEmpty(_identityFile))
+                {
+                    sb.Append($"{IdentityFileOptionName}={HttpUtility.UrlEncode(_identityFile)}");
+                }
+
+                containsUserInfo = true;
+            }
+
+            if (containsUserInfo)
+                sb.Append("@");
+
+            sb.Append(_host);
+
+            if (_sshPort != SshProfile.DefaultSshPort)
+            {
+                sb.Append($":{_sshPort:#####}");
+            }
+
+            sb.Append("/");
+
+            bool queryStringAdded = false;
+
+            if (_useMosh)
+            {
+                sb.Append(
+                    $"?{ValidMoshPortsNames[0]}={_moshPortFrom:#####}-{_moshPortTo:#####}");
+
+                queryStringAdded = true;
+            }
+
+            var terminalInfoQueryString = GetBaseQueryString();
+
+            if (!string.IsNullOrEmpty(terminalInfoQueryString))
+            {
+                sb.Append($"{(queryStringAdded ? "&" : "?")}{terminalInfoQueryString}");
+            }
+
+            return Tuple.Create(true, sb.ToString());
+        }
+
+        #endregion Links/shortcuts related
+    }
+}

FluentTerminal.App.ViewModels/Profiles/SshConnectionInfoValidationResult.cs

@@ -0,0 +1,16 @@
+using System;
+
+namespace FluentTerminal.App.ViewModels.Profiles
+{
+    [Flags]
+    public enum SshConnectionInfoValidationResult
+    {
+        Valid = 0, 
+        UsernameEmpty = 1,
+        HostEmpty = 2,
+        SshPortZeroOrNegative = 4,
+        MoshPortZeroOrNegative = 8,
+        MoshPortRangeInvalid = 16, 
+        IdentityFileDoesNotExist = 32
+    }
+}

FluentTerminal.App.ViewModels/Settings/AboutPageViewModel.cs

@@ -1,36 +1,34 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.ViewModels.Infrastructure;
-using GalaSoft.MvvmLight;
-using System;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
 using System.Threading.Tasks;
+using System.Windows.Input;
 
 namespace FluentTerminal.App.ViewModels.Settings
 {
-    public class AboutPageViewModel : ViewModelBase
+    public class AboutPageViewModel : ObservableObject
     {
         private const string BaseUrl = "https://github.com/felixse/FluentTerminal/releases/tag/";
-        private readonly ISettingsService _settingsService;
         private readonly IUpdateService _updateService;
         private string _latestVersion;
         private readonly IApplicationView _applicationView;
 
-        public AboutPageViewModel(ISettingsService settingsService, IUpdateService updateService, IApplicationView applicationView)
+        public AboutPageViewModel(IUpdateService updateService, IApplicationView applicationView)
         {
-            _settingsService = settingsService;
             _updateService = updateService;
             _applicationView = applicationView;
 
-            CheckForUpdatesCommand = new AsyncCommand(() => CheckForUpdate(true));
+            CheckForUpdatesCommand = new AsyncRelayCommand(() => CheckForUpdateAsync(true));
         }
 
-        public IAsyncCommand CheckForUpdatesCommand { get; }
+        public ICommand CheckForUpdatesCommand { get; }
 
         public string CurrentVersion
         {
             get
             {
                 var version = _updateService.GetCurrentVersion();
-                return ConvertVersionToString(version);
+                return $"{version.Major}.{version.Minor}.{version.Build}.{version.Revision}";
             }
         }
 
@@ -41,12 +39,12 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _latestVersion;
             set
             {
-                if (Set(ref _latestVersion, value))
+                if (SetProperty(ref _latestVersion, value))
                 {
-                    RaisePropertyChanged(nameof(LatestVersionFound));
-                    RaisePropertyChanged(nameof(LatestVersionLoading));
-                    RaisePropertyChanged(nameof(LatestVersionNotFound));
-                    RaisePropertyChanged(nameof(LatestVersionReleaseNotesURL));
+                    OnPropertyChanged(nameof(LatestVersionFound));
+                    OnPropertyChanged(nameof(LatestVersionLoading));
+                    OnPropertyChanged(nameof(LatestVersionNotFound));
+                    OnPropertyChanged(nameof(LatestVersionReleaseNotesURL));
                 }
             }
         }
@@ -61,19 +59,16 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         public Task OnNavigatedTo()
         {
-            return CheckForUpdate(false);
+            return CheckForUpdateAsync(false);
         }
 
-        public async Task CheckForUpdate(bool notifyNoUpdate)
+        private async Task CheckForUpdateAsync(bool notifyNoUpdate)
         {
-            var version = ConvertVersionToString(await _updateService.GetLatestVersionAsync());
-            await _applicationView.RunOnDispatcherThread(() => LatestVersion = version);
-            await _updateService.CheckForUpdate(notifyNoUpdate);
-        }
-
-        private string ConvertVersionToString(Version version)
-        {
-            return string.Format("{0}.{1}.{2}.{3}", version.Major, version.Minor, version.Build, version.Revision);
+            var version = await _updateService.GetLatestVersionAsync().ConfigureAwait(false);
+            await _applicationView.ExecuteOnUiThreadAsync(() =>
+                    LatestVersion = $"{version.Major}.{version.Minor}.{version.Build}.{version.Revision}")
+                .ConfigureAwait(false);
+            await _updateService.CheckForUpdateAsync(notifyNoUpdate).ConfigureAwait(false);
         }
     }
 }

FluentTerminal.App.ViewModels/Settings/GeneralPageViewModel.cs

@@ -1,13 +1,16 @@
 using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using System.Windows.Input;
 
 namespace FluentTerminal.App.ViewModels.Settings
 {
-    public class GeneralPageViewModel : ViewModelBase
+    public class GeneralPageViewModel : ObservableObject
     {
         private readonly ApplicationSettings _applicationSettings;
         private readonly IDefaultValueProvider _defaultValueProvider;
@@ -15,59 +18,58 @@ namespace FluentTerminal.App.ViewModels.Settings
         private readonly ISettingsService _settingsService;
         private readonly IStartupTaskService _startupTaskService;
         private bool _canEnableStartupTask;
-        private bool _editingNewTerminalLocation;
-        private bool _editingTabsPosition;
-        private bool _editingInactiveTabColorMode;
         private bool _startupTaskEnabled;
         private bool _shouldRestartForTrayMessage;
         private string _startupTaskErrorMessage;
+        private bool _needsToRestart;
+        private readonly IApplicationLanguageService _applicationLanguageService;
+        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
+        private readonly IFileSystemService _fileSystemService;
 
-        public GeneralPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider, IStartupTaskService startupTaskService)
+        public GeneralPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider,
+            IStartupTaskService startupTaskService, IApplicationLanguageService applicationLanguageService,
+            ITrayProcessCommunicationService trayProcessCommunicationService, IFileSystemService fileSystemService)
         {
             _settingsService = settingsService;
             _dialogService = dialogService;
             _defaultValueProvider = defaultValueProvider;
             _startupTaskService = startupTaskService;
+            _applicationLanguageService = applicationLanguageService;
+            _trayProcessCommunicationService = trayProcessCommunicationService;
+            _fileSystemService = fileSystemService;
 
             _applicationSettings = _settingsService.GetApplicationSettings();
 
-            RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
+            RestoreDefaultsCommand = new AsyncRelayCommand(RestoreDefaultsAsync);
+            BrowseLogDirectoryCommand = new AsyncRelayCommand(BrowseLogDirectoryAsync);
         }
 
-        public async Task OnNavigatedTo()
+        public IEnumerable<string> Languages => _applicationLanguageService.Languages;
+
+        public bool NeedsToRestart
         {
-            var startupTaskStatus = await _startupTaskService.GetStatus();
+            get => _needsToRestart;
+            set => SetProperty(ref _needsToRestart, value);
+        }
+
+        public string SelectedLanguage
+        {
+            get => _applicationLanguageService.GetCurrentLanguage();
+            set
+            {
+                _applicationLanguageService.SetLanguage(value);
+                NeedsToRestart = true;
+            }
+        }
+
+        // Requires UI thread
+        public async Task OnNavigatedToAsync()
+        {
+            // ConfigureAwait(true) because we want to execute SetStartupTaskPropertiesForStatus from the calling (UI) thread.
+            var startupTaskStatus = await _startupTaskService.GetStatusAsync().ConfigureAwait(true);
             SetStartupTaskPropertiesForStatus(startupTaskStatus);
         }
 
-        public bool AlwaysShowTabs
-        {
-            get => _applicationSettings.AlwaysShowTabs;
-            set
-            {
-                if (_applicationSettings.AlwaysShowTabs != value)
-                {
-                    _applicationSettings.AlwaysShowTabs = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public bool AlwaysUseWinPty
-        {
-            get => _applicationSettings.AlwaysUseWinPty;
-            set
-            {
-                if (_applicationSettings.AlwaysUseWinPty != value)
-                {
-                    _applicationSettings.AlwaysUseWinPty = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
         public bool ShowCustomTitleInTitlebar
         {
             get => _applicationSettings.ShowCustomTitleInTitlebar;
@@ -77,7 +79,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 {
                     _applicationSettings.ShowCustomTitleInTitlebar = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
                 }
             }
         }
@@ -91,7 +93,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 {
                     _applicationSettings.EnableTrayIcon = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
 
                     // Toggle message telling user to restart the program
                     ShouldRestartForTrayMessage = !ShouldRestartForTrayMessage;
@@ -102,7 +104,7 @@ namespace FluentTerminal.App.ViewModels.Settings
         public bool ShouldRestartForTrayMessage
         {
             get => _shouldRestartForTrayMessage;
-            set => Set(ref _shouldRestartForTrayMessage, value);
+            set => SetProperty(ref _shouldRestartForTrayMessage, value);
         }
 
         public bool ShowNewOutputIndicator
@@ -114,7 +116,120 @@ namespace FluentTerminal.App.ViewModels.Settings
                 {
                     _applicationSettings.ShowNewOutputIndicator = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        public bool UseMoshByDefault
+        {
+            get => _applicationSettings.UseMoshByDefault;
+            set
+            {
+                if (_applicationSettings.UseMoshByDefault != value)
+                {
+                    _applicationSettings.UseMoshByDefault = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        public bool AutoFallbackToWindowsUsernameInLinks
+        {
+            get => _applicationSettings.AutoFallbackToWindowsUsernameInLinks;
+            set
+            {
+                if (_applicationSettings.AutoFallbackToWindowsUsernameInLinks != value)
+                {
+                    _applicationSettings.AutoFallbackToWindowsUsernameInLinks = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        public bool RTrimCopiedLines
+        {
+            get => _applicationSettings.RTrimCopiedLines;
+            set
+            {
+                if (_applicationSettings.RTrimCopiedLines != value)
+                {
+                    _applicationSettings.RTrimCopiedLines = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        public bool MuteTerminalBeeps
+        {
+            get => _applicationSettings.MuteTerminalBeeps;
+            set
+            {
+                if (_applicationSettings.MuteTerminalBeeps != value)
+                {
+                    _applicationSettings.MuteTerminalBeeps = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    OnPropertyChanged();
+
+                    _trayProcessCommunicationService.MuteTerminalAsync(value);
+                }
+            }
+        }
+        public bool EnableLogging
+        {
+            get => _applicationSettings.EnableLogging;
+            set
+            {
+                if (_applicationSettings.EnableLogging != value)
+                {
+                    _applicationSettings.EnableLogging = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        public bool PrintableOutputOnly
+        {
+            get => _applicationSettings.PrintableOutputOnly;
+            set
+            {
+                if (_applicationSettings.PrintableOutputOnly != value)
+                {
+                    _applicationSettings.PrintableOutputOnly = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        public string LogDirectoryPath
+        {
+            get => _applicationSettings.LogDirectoryPath;
+            set
+            {
+                if (_applicationSettings.LogDirectoryPath != value)
+                {
+                    _applicationSettings.LogDirectoryPath = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        public bool UseConPty
+        {
+            get => _applicationSettings.UseConPty;
+            set
+            {
+                if (_applicationSettings.UseConPty != value)
+                {
+                    _applicationSettings.UseConPty = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    OnPropertyChanged();
                 }
             }
         }
@@ -122,13 +237,13 @@ namespace FluentTerminal.App.ViewModels.Settings
         public bool BottomIsSelected
         {
             get => TabsPosition == TabsPosition.Bottom;
-            set => TabsPosition = TabsPosition.Bottom;
+            set { if (value) TabsPosition = TabsPosition.Bottom; }
         }
 
         public bool CanEnableStartupTask
         {
             get => _canEnableStartupTask;
-            set => Set(ref _canEnableStartupTask, value);
+            set => SetProperty(ref _canEnableStartupTask, value);
         }
 
         public bool ConfirmClosingTabs
@@ -140,7 +255,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 {
                     _applicationSettings.ConfirmClosingTabs = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
                 }
             }
         }
@@ -154,7 +269,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 {
                     _applicationSettings.ConfirmClosingWindows = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
                 }
             }
         }
@@ -164,31 +279,43 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _applicationSettings.NewTerminalLocation;
             set
             {
-                if (_applicationSettings.NewTerminalLocation != value && !_editingNewTerminalLocation)
+                if (_applicationSettings.NewTerminalLocation != value)
                 {
-                    _editingNewTerminalLocation = true;
                     _applicationSettings.NewTerminalLocation = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                    RaisePropertyChanged(nameof(WindowIsSelected));
-                    RaisePropertyChanged(nameof(TabIsSelected));
-                    _editingNewTerminalLocation = false;
+                    OnPropertyChanged();
+                    OnPropertyChanged(nameof(TabIsSelected));
                 }
             }
         }
 
-        public RelayCommand RestoreDefaultsCommand { get; }
+        public bool TabWindowCascadingAppMenu
+        {
+            get => _applicationSettings.TabWindowCascadingAppMenu;
+            set
+            {
+                if (_applicationSettings.TabWindowCascadingAppMenu != value)
+                {
+                    _applicationSettings.TabWindowCascadingAppMenu = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        public ICommand RestoreDefaultsCommand { get; }
+
+        public ICommand BrowseLogDirectoryCommand { get; }
 
         public bool StartupTaskEnabled
         {
             get => _startupTaskEnabled;
             set
             {
-                if (_startupTaskEnabled != value)
+                if (SetProperty(ref _startupTaskEnabled, value))
                 {
-                    _startupTaskEnabled = value;
-                    RaisePropertyChanged(nameof(StartupTaskEnabled));
-                    SetStartupTaskState(value);
+                    // ReSharper disable once AssignmentIsFullyDiscarded
+                    _ = SetStartupTaskStateAsync(value);
                 }
             }
         }
@@ -196,13 +323,13 @@ namespace FluentTerminal.App.ViewModels.Settings
         public string StartupTaskErrorMessage
         {
             get => _startupTaskErrorMessage;
-            set => Set(ref _startupTaskErrorMessage, value);
+            set => SetProperty(ref _startupTaskErrorMessage, value);
         }
 
         public bool TabIsSelected
         {
             get => NewTerminalLocation == NewTerminalLocation.Tab;
-            set => NewTerminalLocation = NewTerminalLocation.Tab;
+            set => NewTerminalLocation = value ? NewTerminalLocation.Tab : NewTerminalLocation.Window;
         }
 
         public TabsPosition TabsPosition
@@ -210,15 +337,11 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _applicationSettings.TabsPosition;
             set
             {
-                if (_applicationSettings.TabsPosition != value && !_editingTabsPosition)
+                if (_applicationSettings.TabsPosition != value)
                 {
-                    _editingTabsPosition = true;
                     _applicationSettings.TabsPosition = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                    RaisePropertyChanged(nameof(TopIsSelected));
-                    RaisePropertyChanged(nameof(BottomIsSelected));
-                    _editingTabsPosition = false;
+                    OnPropertyChanged();
                 }
             }
         }
@@ -226,7 +349,7 @@ namespace FluentTerminal.App.ViewModels.Settings
         public bool TopIsSelected
         {
             get => TabsPosition == TabsPosition.Top;
-            set => TabsPosition = TabsPosition.Top;
+            set { if (value) TabsPosition = TabsPosition.Top; }
         }
 
         public bool UnderlineSelectedTab
@@ -238,7 +361,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 {
                     _applicationSettings.UnderlineSelectedTab = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
                 }
             }
         }
@@ -246,13 +369,13 @@ namespace FluentTerminal.App.ViewModels.Settings
         public bool BackgroundIsSelected
         {
             get => InactiveTabColorMode == InactiveTabColorMode.Background;
-            set => InactiveTabColorMode = InactiveTabColorMode.Background;
+            set { if (value) InactiveTabColorMode = InactiveTabColorMode.Background; }
         }
 
         public bool UnderlinedIsSelected
         {
             get => InactiveTabColorMode == InactiveTabColorMode.Underlined;
-            set => InactiveTabColorMode = InactiveTabColorMode.Underlined;
+            set { if (value) InactiveTabColorMode = InactiveTabColorMode.Underlined; }
         }
 
         public InactiveTabColorMode InactiveTabColorMode
@@ -260,28 +383,36 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _applicationSettings.InactiveTabColorMode;
             set
             {
-                if (_applicationSettings.InactiveTabColorMode != value && !_editingInactiveTabColorMode)
+                if (_applicationSettings.InactiveTabColorMode != value)
                 {
-                    _editingInactiveTabColorMode = true;
                     _applicationSettings.InactiveTabColorMode = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                    RaisePropertyChanged(nameof(BackgroundIsSelected));
-                    RaisePropertyChanged(nameof(UnderlinedIsSelected));
-                    _editingInactiveTabColorMode = false;
+                    OnPropertyChanged();
                 }
             }
         }
 
-        public bool WindowIsSelected
+        public bool ShowTextCopied
         {
-            get => NewTerminalLocation == NewTerminalLocation.Window;
-            set => NewTerminalLocation = NewTerminalLocation.Window;
+            get => _applicationSettings.ShowTextCopied;
+            set
+            {
+                if (_applicationSettings.ShowTextCopied != value)
+                {
+                    _applicationSettings.ShowTextCopied = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    OnPropertyChanged();
+                }
+            }
         }
 
-        private async Task RestoreDefaults()
+        // Requires UI thread
+        private async Task RestoreDefaultsAsync()
         {
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the general settings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            // ConfigureAwait(true) because we're setting some view-model properties afterwards
+            var result = await _dialogService.ShowMessageDialogAsync(I18N.Translate("PleaseConfirm"),
+                    I18N.Translate("ConfirmRestoreGeneralSettings"), DialogButton.OK, DialogButton.Cancel)
+                .ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {
@@ -291,14 +422,22 @@ namespace FluentTerminal.App.ViewModels.Settings
                 UnderlineSelectedTab = defaults.UnderlineSelectedTab;
                 InactiveTabColorMode = defaults.InactiveTabColorMode;
                 NewTerminalLocation = defaults.NewTerminalLocation;
-                AlwaysShowTabs = defaults.AlwaysShowTabs;
-                AlwaysUseWinPty = defaults.AlwaysUseWinPty;
                 ShowNewOutputIndicator = defaults.ShowNewOutputIndicator;
                 EnableTrayIcon = defaults.EnableTrayIcon;
                 ShowCustomTitleInTitlebar = defaults.ShowCustomTitleInTitlebar;
+                UseMoshByDefault = defaults.UseMoshByDefault;
+                AutoFallbackToWindowsUsernameInLinks = defaults.AutoFallbackToWindowsUsernameInLinks;
+                RTrimCopiedLines = defaults.RTrimCopiedLines;
+                MuteTerminalBeeps = defaults.MuteTerminalBeeps;
+                EnableLogging = defaults.EnableLogging;
+                PrintableOutputOnly = defaults.PrintableOutputOnly;
+                LogDirectoryPath = defaults.LogDirectoryPath;
+                UseConPty = defaults.UseConPty;
+                ShowTextCopied = defaults.ShowTextCopied;
             }
         }
 
+        // Requires UI thread
         private void SetStartupTaskPropertiesForStatus(StartupTaskStatus startupTaskStatus)
         {
             switch (startupTaskStatus)
@@ -317,31 +456,53 @@ namespace FluentTerminal.App.ViewModels.Settings
 
                 case StartupTaskStatus.DisabledByUser:
                     StartupTaskEnabled = false;
-                    StartupTaskErrorMessage = "Disabled by user. Please reactivate it in the Startup tab of the Task Manager.";
+                    StartupTaskErrorMessage = I18N.Translate("DisabledByUser");
                     CanEnableStartupTask = false;
                     break;
 
                 case StartupTaskStatus.DisabledByPolicy:
                     StartupTaskEnabled = false;
-                    StartupTaskErrorMessage = "Disabled by policy.";
+                    StartupTaskErrorMessage = I18N.Translate("DisabledByPolicy");
+                    CanEnableStartupTask = false;
+                    break;
+
+                case StartupTaskStatus.EnabledByPolicy:
+                    StartupTaskEnabled = true;
+                    StartupTaskErrorMessage = I18N.TranslateWithFallback("EnabledByPolicy", "Enabled by policy.");
                     CanEnableStartupTask = false;
                     break;
             }
         }
 
-        private async Task SetStartupTaskState(bool enabled)
+        // Requires UI thread
+        private async Task SetStartupTaskStateAsync(bool enabled)
         {
             StartupTaskStatus status;
             if (enabled)
             {
-                status = await _startupTaskService.EnableStartupTask();
+                // ConfigureAwait(true) because we need to execute SetStartupTaskPropertiesForStatus in the calling (UI) thread.
+                status = await _startupTaskService.EnableStartupTaskAsync().ConfigureAwait(true);
             }
             else
             {
-                _startupTaskService.DisableStartupTask();
-                status = await _startupTaskService.GetStatus();
+                // ConfigureAwait(true) because we need to execute SetStartupTaskPropertiesForStatus in the calling (UI) thread.
+                await _startupTaskService.DisableStartupTaskAsync().ConfigureAwait(true);
+                // ConfigureAwait(true) because we need to execute SetStartupTaskPropertiesForStatus in the calling (UI) thread.
+                status = await _startupTaskService.GetStatusAsync().ConfigureAwait(true);
             }
             SetStartupTaskPropertiesForStatus(status);
         }
+
+        // Requires UI thread
+        private async Task BrowseLogDirectoryAsync()
+        {
+            // ConfigureAwait(true) because we're setting some view-model properties afterwards.
+            var folder = await _fileSystemService.BrowseForDirectoryAsync().ConfigureAwait(true);
+
+            if (folder != null)
+            {
+                LogDirectoryPath = folder;
+            }
+        }
     }
 }

FluentTerminal.App.ViewModels/Settings/KeyBindingViewModel.cs

@@ -1,13 +1,15 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.ViewModels.Infrastructure;
+using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.Models;
-using GalaSoft.MvvmLight;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Threading.Tasks;
+using System.Windows.Input;
 
 namespace FluentTerminal.App.ViewModels.Settings
 {
-    public class KeyBindingViewModel : ViewModelBase
+    public class KeyBindingViewModel : ObservableObject
     {
         private readonly IDialogService _dialogService;
 
@@ -16,10 +18,11 @@ namespace FluentTerminal.App.ViewModels.Settings
             Model = keyBinding;
             Parent = parent;
             _dialogService = dialogService;
-            EditCommand = new AsyncCommand(Edit);
-            DeleteCommand = new AsyncCommand(Delete);
+            EditCommand = new AsyncRelayCommand(EditAsync);
+            DeleteCommand = new AsyncRelayCommand(DeleteAsync);
         }
 
+        // Needs to be triggered from the UI thread
         public event EventHandler Deleted;
 
         public event EventHandler Edited;
@@ -34,7 +37,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 if (Model.Meta != value)
                 {
                     Model.Meta = value;
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
                 }
             }
         }
@@ -47,7 +50,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 if (Model.Alt != value)
                 {
                     Model.Alt = value;
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
                 }
             }
         }
@@ -60,13 +63,13 @@ namespace FluentTerminal.App.ViewModels.Settings
                 if (Model.Ctrl != value)
                 {
                     Model.Ctrl = value;
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
                 }
             }
         }
 
-        public IAsyncCommand DeleteCommand { get; }
-        public IAsyncCommand EditCommand { get; }
+        public ICommand DeleteCommand { get; }
+        public ICommand EditCommand { get; }
 
         public int Key
         {
@@ -76,7 +79,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 if (Model.Key != value)
                 {
                     Model.Key = value;
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
                 }
             }
         }
@@ -91,13 +94,15 @@ namespace FluentTerminal.App.ViewModels.Settings
                 if (Model.Shift != value)
                 {
                     Model.Shift = value;
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
                 }
             }
         }
 
-        public async Task<bool> Edit()
+        // Requires UI thread
+        public async Task<bool> EditAsync()
         {
+            // ConfigureAwait(true) because we're setting some view-model properties afterwards.
             var keyBinding = await _dialogService.ShowCreateKeyBindingDialog().ConfigureAwait(true);
 
             if (keyBinding != null)
@@ -116,9 +121,12 @@ namespace FluentTerminal.App.ViewModels.Settings
             return false;
         }
 
-        private async Task Delete()
+        // Requires UI thread
+        private async Task DeleteAsync()
         {
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to delete this keybinding?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            // ConfigureAwait(true) because we need to trigger Deleted event in the calling (UI) thread.
+            var result = await _dialogService.ShowMessageDialogAsync(I18N.Translate("PleaseConfirm"),
+                I18N.Translate("ConfirmDeleteKeybindings"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {

FluentTerminal.App.ViewModels/Settings/KeyBindingsPageViewModel.cs

@@ -2,46 +2,44 @@
 using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Windows.Input;
 
 namespace FluentTerminal.App.ViewModels.Settings
 {
-    public class KeyBindingsPageViewModel : ViewModelBase
+    public class KeyBindingsPageViewModel : ObservableObject
     {
-        private readonly IDefaultValueProvider _defaultValueProvider;
         private readonly IDialogService _dialogService;
         private readonly ISettingsService _settingsService;
         private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
-        private IDictionary<string, ICollection<KeyBinding>> _keyBindings;
 
-        public KeyBindingsPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider, ITrayProcessCommunicationService trayProcessCommunicationService)
+        public KeyBindingsPageViewModel(ISettingsService settingsService, IDialogService dialogService, ITrayProcessCommunicationService trayProcessCommunicationService)
         {
             _settingsService = settingsService;
             _dialogService = dialogService;
-            _defaultValueProvider = defaultValueProvider;
             _trayProcessCommunicationService = trayProcessCommunicationService;
-            RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
-            AddCommand = new RelayCommand<string>(async command => await Add(command).ConfigureAwait(false));
+            RestoreDefaultsCommand = new AsyncRelayCommand(RestoreDefaultsAsync);
+            AddCommand = new AsyncRelayCommand<string>(AddAsync);
 
             Initialize(_settingsService.GetCommandKeyBindings());
         }
 
-        public RelayCommand<string> AddCommand { get; }
+        public ICommand AddCommand { get; }
         public ObservableCollection<KeyBindingsViewModel> KeyBindings { get; } = new ObservableCollection<KeyBindingsViewModel>();
-        public RelayCommand RestoreDefaultsCommand { get; }
+        public ICommand RestoreDefaultsCommand { get; }
 
-        private async Task Add(string command)
+        private Task AddAsync(string command)
         {
-            var keyBinding = KeyBindings.FirstOrDefault(k => k.Command == command);
-            await keyBinding?.ShowAddKeyBindingDialog();
+            return KeyBindings.First(k => k.Command == command).ShowAddKeyBindingDialogAsync();
         }
 
+        // Requires UI thread
         private void ClearKeyBindings()
         {
             foreach (var keyBinding in KeyBindings)
@@ -52,17 +50,16 @@ namespace FluentTerminal.App.ViewModels.Settings
             KeyBindings.Clear();
         }
 
+        // Requires UI thread
         private void Initialize(IDictionary<string, ICollection<KeyBinding>> keyBindings)
         {
-            _keyBindings = keyBindings;
-
             ClearKeyBindings();
 
             foreach (var value in Enum.GetValues(typeof(Command)))
             {
                 var command = (Command)value;
-                var viewModel = new KeyBindingsViewModel(command.ToString(), _dialogService, EnumHelper.GetEnumDescription(command), true);
-                foreach (var keyBinding in _keyBindings[command.ToString()])
+                var viewModel = new KeyBindingsViewModel(command.ToString(), _dialogService, I18N.Translate($"{nameof(Command)}.{command}"), true);
+                foreach (var keyBinding in keyBindings[command.ToString()])
                 {
                     viewModel.Add(keyBinding);
                 }
@@ -74,12 +71,15 @@ namespace FluentTerminal.App.ViewModels.Settings
         private void OnEdited(string command, ICollection<KeyBinding> keyBindings)
         {
             _settingsService.SaveKeyBindings(command, keyBindings);
-            _trayProcessCommunicationService.UpdateToggleWindowKeyBindings();
+            _trayProcessCommunicationService.UpdateToggleWindowKeyBindingsAsync();
         }
 
-        private async Task RestoreDefaults()
+        // Requires UI thread
+        private async Task RestoreDefaultsAsync()
         {
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the default keybindings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            // ConfigureAwait(true) because we need to execute Initialize in the calling (UI) thread.
+            var result = await _dialogService.ShowMessageDialogAsync(I18N.Translate("PleaseConfirm"),
+                I18N.Translate("ConfirmRestoreKeybindings"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {

FluentTerminal.App.ViewModels/Settings/KeyBindingsViewModel.cs

@@ -1,6 +1,6 @@
 using FluentTerminal.App.Services;
 using FluentTerminal.Models;
-using GalaSoft.MvvmLight;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 
 namespace FluentTerminal.App.ViewModels.Settings
 {
-    public class KeyBindingsViewModel : ViewModelBase
+    public class KeyBindingsViewModel : ObservableObject
     {
         private readonly IDialogService _dialogService;
         private bool _editable;
@@ -37,26 +37,30 @@ namespace FluentTerminal.App.ViewModels.Settings
         public bool Editable
         {
             get => _editable;
-            set => Set(ref _editable, value);
+            set => SetProperty(ref _editable, value);
         }
 
         public ObservableCollection<KeyBindingViewModel> KeyBindings { get; } = new ObservableCollection<KeyBindingViewModel>();
 
-        public async Task ShowAddKeyBindingDialog()
+        // Requires UI thread
+        public async Task ShowAddKeyBindingDialogAsync()
         {
             var newKeyBinding = new KeyBindingViewModel(new KeyBinding { Command = Command }, _dialogService, this);
 
-            if (await newKeyBinding.Edit().ConfigureAwait(true))
+            // ConfigureAwait(true) because we need to execute Add method in the calling (UI) thread.
+            if (await newKeyBinding.EditAsync().ConfigureAwait(true))
             {
                 Add(newKeyBinding.Model);
             }
         }
 
+        // Requires UI thread
         public void Clear()
         {
             KeyBindings.Clear();
         }
 
+        // Requires UI thread
         public void Add(KeyBinding keyBinding)
         {
             var viewModel = new KeyBindingViewModel(keyBinding, _dialogService, this);

FluentTerminal.App.ViewModels/Settings/MousePageViewModel.cs

@@ -1,23 +1,20 @@
 using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
 using System.Threading.Tasks;
+using System.Windows.Input;
 
 namespace FluentTerminal.App.ViewModels.Settings
 {
-    public class MousePageViewModel : ViewModelBase
+    public class MousePageViewModel : ObservableObject
     {
         private readonly ISettingsService _settingsService;
         private readonly IDialogService _dialogService;
         private readonly IDefaultValueProvider _defaultValueProvider;
         private readonly ApplicationSettings _applicationSettings;
-        private bool _editingMouseRightClickAction;
-        private bool _editingMouseMiddleClickAction;
 
         public MousePageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider)
         {
@@ -26,7 +23,7 @@ namespace FluentTerminal.App.ViewModels.Settings
             _defaultValueProvider = defaultValueProvider;
             _applicationSettings = _settingsService.GetApplicationSettings();
 
-            RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
+            RestoreDefaultsCommand = new AsyncRelayCommand(RestoreDefaultsAsync);
         }
 
         public bool CopyOnSelect
@@ -38,7 +35,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 {
                     _applicationSettings.CopyOnSelect = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
                 }
             }
         }
@@ -48,16 +45,11 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _applicationSettings.MouseRightClickAction;
             set
             {
-                if (_applicationSettings.MouseRightClickAction != value && !_editingMouseRightClickAction)
+                if (_applicationSettings.MouseRightClickAction != value)
                 {
-                    _editingMouseRightClickAction = true;
                     _applicationSettings.MouseRightClickAction = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                    RaisePropertyChanged(nameof(MouseRightClickNoneIsSelected));
-                    RaisePropertyChanged(nameof(MouseRightClickContextMenuIsSelected));
-                    RaisePropertyChanged(nameof(MouseRightClickPasteIsSelected));
-                    _editingMouseRightClickAction = false;
+                    OnPropertyChanged();
                 }
             }
         }
@@ -65,19 +57,25 @@ namespace FluentTerminal.App.ViewModels.Settings
         public bool MouseRightClickNoneIsSelected
         {
             get => MouseRightClickAction == MouseAction.None;
-            set => MouseRightClickAction = MouseAction.None;
+            set { if (value) MouseRightClickAction = MouseAction.None; }
         }
 
         public bool MouseRightClickContextMenuIsSelected
         {
             get => MouseRightClickAction == MouseAction.ContextMenu;
-            set => MouseRightClickAction = MouseAction.ContextMenu;
+            set { if (value) MouseRightClickAction = MouseAction.ContextMenu; }
         }
 
         public bool MouseRightClickPasteIsSelected
         {
             get => MouseRightClickAction == MouseAction.Paste;
-            set => MouseRightClickAction = MouseAction.Paste;
+            set { if (value) MouseRightClickAction = MouseAction.Paste; }
+        }
+
+        public bool MouseRightClickCopySelectionOrPasteIsSelected
+        {
+            get => MouseRightClickAction == MouseAction.CopySelectionOrPaste;
+            set { if (value) MouseRightClickAction = MouseAction.CopySelectionOrPaste; }
         }
 
         public MouseAction MouseMiddleClickAction
@@ -85,16 +83,11 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _applicationSettings.MouseMiddleClickAction;
             set
             {
-                if (_applicationSettings.MouseMiddleClickAction != value && !_editingMouseMiddleClickAction)
+                if (_applicationSettings.MouseMiddleClickAction != value)
                 {
-                    _editingMouseMiddleClickAction = true;
                     _applicationSettings.MouseMiddleClickAction = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                    RaisePropertyChanged(nameof(MouseMiddleClickNoneIsSelected));
-                    RaisePropertyChanged(nameof(MouseMiddleClickContextMenuIsSelected));
-                    RaisePropertyChanged(nameof(MouseMiddleClickPasteIsSelected));
-                    _editingMouseMiddleClickAction = false;
+                    OnPropertyChanged();
                 }
             }
         }
@@ -102,26 +95,36 @@ namespace FluentTerminal.App.ViewModels.Settings
         public bool MouseMiddleClickNoneIsSelected
         {
             get => MouseMiddleClickAction == MouseAction.None;
-            set => MouseMiddleClickAction = MouseAction.None;
+            set { if (value) MouseMiddleClickAction = MouseAction.None; }
         }
 
         public bool MouseMiddleClickContextMenuIsSelected
         {
             get => MouseMiddleClickAction == MouseAction.ContextMenu;
-            set => MouseMiddleClickAction = MouseAction.ContextMenu;
+            set { if (value) MouseMiddleClickAction = MouseAction.ContextMenu; }
         }
 
         public bool MouseMiddleClickPasteIsSelected
         {
             get => MouseMiddleClickAction == MouseAction.Paste;
-            set => MouseMiddleClickAction = MouseAction.Paste;
+            set { if (value) MouseMiddleClickAction = MouseAction.Paste; }
         }
 
-        public RelayCommand RestoreDefaultsCommand { get; }
-
-        private async Task RestoreDefaults()
+        public bool MouseMiddleClickCopySelectionOrPasteIsSelected
         {
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the mouse settings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            get => MouseMiddleClickAction == MouseAction.CopySelectionOrPaste;
+            set { if (value) MouseMiddleClickAction = MouseAction.CopySelectionOrPaste; }
+        }
+
+        public ICommand RestoreDefaultsCommand { get; }
+
+        // Requires UI thread
+        private async Task RestoreDefaultsAsync()
+        {
+            // ConfigureAwait(true) because we're setting some view-model properties afterwards.
+            var result = await _dialogService.ShowMessageDialogAsync(I18N.Translate("PleaseConfirm"),
+                    I18N.Translate("ConfirmRestoreMouseSettings"), DialogButton.OK, DialogButton.Cancel)
+                .ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {

FluentTerminal.App.ViewModels/Settings/ProfilesPageViewModel.cs

@@ -1,15 +1,16 @@
 using FluentTerminal.App.Services;
 using FluentTerminal.Models;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
 using System;
 using System.Collections.ObjectModel;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System.Windows.Input;
 
 namespace FluentTerminal.App.ViewModels.Settings
 {
-    public class ProfilesPageViewModel : ViewModelBase
+    public class ProfilesPageViewModel : ObservableObject
     {
         private readonly IDefaultValueProvider _defaultValueProvider;
         private readonly IDialogService _dialogService;
@@ -79,9 +80,9 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        public RelayCommand CreateShellProfileCommand { get; }
+        public ICommand CreateShellProfileCommand { get; }
 
-        public RelayCommand<ShellProfileViewModel> CloneCommand { get; }
+        public ICommand CloneCommand { get; }
 
         private void CreateShellProfile()
         {
@@ -90,7 +91,8 @@ namespace FluentTerminal.App.ViewModels.Settings
                 Id = Guid.NewGuid(),
                 PreInstalled = false,
                 Name = "New profile",
-                KeyBindings = new List<KeyBinding>()
+                KeyBindings = new List<KeyBinding>(),
+                UseConPty = _settingsService.GetApplicationSettings().UseConPty
             };
 
             AddShellProfile(shellProfile);
@@ -98,20 +100,18 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         private void Clone(ShellProfileViewModel shellProfile)
         {
-            var cloned = new ShellProfile(shellProfile.Model)
-            {
-                Id = Guid.NewGuid(),
-                PreInstalled = false,
-                Name = $"Copy of {shellProfile.Name}"
-            };
+            var cloned = shellProfile.ProfileVm.Model.Clone();
+
+            cloned.Id = Guid.NewGuid();
+            cloned.PreInstalled = false;
+            cloned.Name = $"Copy of {shellProfile.Name}";
+            cloned.KeyBindings = new List<KeyBinding>();
 
             AddShellProfile(cloned);
         }
 
         private void AddShellProfile(ShellProfile shellProfile)
         {
-            _settingsService.SaveShellProfile(shellProfile, true);
-
             var viewModel = new ShellProfileViewModel(shellProfile, _settingsService, _dialogService, _fileSystemService, _applicationView, _defaultValueProvider, true);
             viewModel.EditCommand.Execute(null);
             viewModel.SetAsDefault += OnShellProfileSetAsDefault;
@@ -123,7 +123,7 @@ namespace FluentTerminal.App.ViewModels.Settings
         public ShellProfileViewModel SelectedShellProfile
         {
             get => _selectedShellProfile;
-            set => Set(ref _selectedShellProfile, value);
+            set => SetProperty(ref _selectedShellProfile, value);
         }
 
         public ObservableCollection<ShellProfileViewModel> ShellProfiles { get; } = new ObservableCollection<ShellProfileViewModel>();

FluentTerminal.App.ViewModels/Settings/SshProfilesPageViewModel.cs

@@ -0,0 +1,121 @@
+using FluentTerminal.App.Services;
+using FluentTerminal.Models;
+using System;
+using System.Collections.ObjectModel;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System.Windows.Input;
+
+namespace FluentTerminal.App.ViewModels.Settings
+{
+    public class SshProfilesPageViewModel: ObservableObject
+    {
+        private readonly IDialogService _dialogService;
+        private readonly ISettingsService _settingsService;
+        private readonly IFileSystemService _fileSystemService;
+        private SshProfileViewModel _selectedShellProfile;
+        private readonly IApplicationView _applicationView;
+        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
+        private readonly IApplicationDataContainer _historyContainer;
+
+        public SshProfilesPageViewModel(ISettingsService settingsService, IDialogService dialogService,
+            IFileSystemService fileSystemService, IApplicationView applicationView,
+            ITrayProcessCommunicationService trayProcessCommunicationService,
+            IApplicationDataContainer historyContainer)
+        {
+            _settingsService = settingsService;
+            _dialogService = dialogService;
+            _fileSystemService = fileSystemService;
+            _applicationView = applicationView;
+            _trayProcessCommunicationService = trayProcessCommunicationService;
+            _historyContainer = historyContainer;
+
+            CreateSshProfileCommand = new RelayCommand(CreateSshProfile);
+            CloneCommand = new RelayCommand<SshProfileViewModel>(Clone);
+
+            foreach (var sshProfile in _settingsService.GetSshProfiles())
+            {
+                var viewModel = new SshProfileViewModel(sshProfile, settingsService, dialogService, fileSystemService,
+                    applicationView, _trayProcessCommunicationService, historyContainer, false);
+                viewModel.Deleted += OnSshProfileDeleted;
+                SshProfiles.Add(viewModel);
+            }
+
+            if (SshProfiles.Count == 0)
+            {
+                CreateSshProfile();
+            }
+
+            SelectedSshProfile = SshProfiles.First();
+        }
+
+        private void OnSshProfileDeleted(object sender, EventArgs e)
+        {
+            if (sender is SshProfileViewModel sshProfile)
+            {
+                if (SelectedSshProfile == sshProfile)
+                {
+                    SelectedSshProfile = SshProfiles.First();
+                }
+                SshProfiles.Remove(sshProfile);
+                _settingsService.DeleteSshProfile(sshProfile.Id);
+            }
+        }
+
+        public ICommand CreateSshProfileCommand { get; }
+
+        public ICommand CloneCommand { get; }
+
+        public void CreateSshProfile()
+        {
+            var shellProfile = new SshProfile
+            {
+                Id = Guid.NewGuid(),
+                PreInstalled = false,
+                Name = "New SSH profile",
+                KeyBindings = new List<KeyBinding>(),
+                UseMosh = _settingsService.GetApplicationSettings().UseMoshByDefault,
+                RequestConPty = _settingsService.GetApplicationSettings().UseConPty
+            };
+
+            AddSshProfile(shellProfile);
+        }
+
+        private void Clone(SshProfileViewModel shellProfile)
+        {
+            var cloned = (SshProfile) shellProfile.ProfileVm.Model.Clone();
+
+            cloned.Id = Guid.NewGuid();
+            cloned.PreInstalled = false;
+            cloned.Name = $"Copy of {shellProfile.Name}";
+            cloned.KeyBindings = new List<KeyBinding>();
+
+            foreach (KeyBinding keyBinding in cloned.KeyBindings)
+            {
+                keyBinding.Command = cloned.Id.ToString();
+            }
+            AddSshProfile(cloned);
+        }
+
+        private void AddSshProfile(SshProfile sshProfile)
+        {
+            var viewModel = new SshProfileViewModel(sshProfile, _settingsService, _dialogService, _fileSystemService,
+                _applicationView, _trayProcessCommunicationService, _historyContainer, true);
+
+            viewModel.EditCommand.Execute(null);
+            viewModel.Deleted += OnSshProfileDeleted;
+            SshProfiles.Add(viewModel);
+            SelectedSshProfile = viewModel;
+        }
+
+        public SshProfileViewModel SelectedSshProfile
+        {
+            get => _selectedShellProfile;
+            set => SetProperty(ref _selectedShellProfile, value);
+        }
+
+        public ObservableCollection<SshProfileViewModel> SshProfiles { get; } = new ObservableCollection<SshProfileViewModel>();
+    }
+}

FluentTerminal.App.ViewModels/Settings/TerminalPageViewModel.cs

@@ -1,57 +1,58 @@
 using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.App.ViewModels.Utilities;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Windows.Input;
 
 namespace FluentTerminal.App.ViewModels.Settings
 {
-    public class TerminalPageViewModel : ViewModelBase
+    public class TerminalPageViewModel : ObservableObject
     {
         private readonly TerminalOptions _terminalOptions;
         private readonly ISettingsService _settingsService;
         private readonly IDialogService _dialogService;
         private readonly IDefaultValueProvider _defaultValueProvider;
-        private bool _isEditingCursorStyle;
-        private bool _isEditingScrollBarStyle;
 
         public bool BarIsSelected
         {
             get => CursorStyle == CursorStyle.Bar;
-            set => CursorStyle = CursorStyle.Bar;
+            set { if (value) CursorStyle = CursorStyle.Bar; }
         }
 
         public bool BlockIsSelected
         {
             get => CursorStyle == CursorStyle.Block;
-            set => CursorStyle = CursorStyle.Block;
+            set { if (value) CursorStyle = CursorStyle.Block; }
         }
 
         public bool UnderlineIsSelected
         {
             get => CursorStyle == CursorStyle.Underline;
-            set => CursorStyle = CursorStyle.Underline;
+            set { if (value) CursorStyle = CursorStyle.Underline; }
         }
 
         public bool HiddenIsSelected
         {
             get => ScrollBarStyle == ScrollBarStyle.Hidden;
-            set => ScrollBarStyle = ScrollBarStyle.Hidden;
+            set { if (value) ScrollBarStyle = ScrollBarStyle.Hidden; }
         }
 
         public bool AutoHidingIsSelected
         {
             get => ScrollBarStyle == ScrollBarStyle.AutoHiding;
-            set => ScrollBarStyle = ScrollBarStyle.AutoHiding;
+            set { if (value) ScrollBarStyle = ScrollBarStyle.AutoHiding; }
         }
 
         public bool VisibleIsSelected
         {
             get => ScrollBarStyle == ScrollBarStyle.Visible;
-            set => ScrollBarStyle = ScrollBarStyle.Visible;
+            set { if (value) ScrollBarStyle = ScrollBarStyle.Visible; }
         }
 
         public bool CursorBlink
@@ -63,7 +64,21 @@ namespace FluentTerminal.App.ViewModels.Settings
                 {
                     _terminalOptions.CursorBlink = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        public bool UseAcrylicBackground
+        {
+            get => _terminalOptions.UseAcrylicBackground;
+            set
+            {
+                if (_terminalOptions.UseAcrylicBackground != value)
+                {
+                    _terminalOptions.UseAcrylicBackground = value;
+                    _settingsService.SaveTerminalOptions(_terminalOptions);
+                    OnPropertyChanged();
                 }
             }
         }
@@ -77,7 +92,21 @@ namespace FluentTerminal.App.ViewModels.Settings
                 {
                     _terminalOptions.FontFamily = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        public int FontWeight
+        {
+            get => _terminalOptions.FontWeight;
+            set
+            {
+                if (_terminalOptions.FontWeight != value)
+                {
+                    _terminalOptions.FontWeight = value;
+                    _settingsService.SaveTerminalOptions(_terminalOptions);
+                    OnPropertyChanged();
                 }
             }
         }
@@ -91,7 +120,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 {
                     _terminalOptions.BackgroundOpacity = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
                 }
             }
         }
@@ -105,7 +134,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 {
                     _terminalOptions.Padding = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
                 }
             }
         }
@@ -115,7 +144,6 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _terminalOptions.ScrollBackLimit.ToString();
             set
             {
-                var oldValue = _terminalOptions.ScrollBackLimit;
                 if (uint.TryParse(value, out uint intValue))
                 {
                     if (intValue == uint.MinValue)
@@ -126,26 +154,27 @@ namespace FluentTerminal.App.ViewModels.Settings
                     {
                         _terminalOptions.ScrollBackLimit = intValue;
                         _settingsService.SaveTerminalOptions(_terminalOptions);
-                        RaisePropertyChanged();
+                        OnPropertyChanged();
                     }
                 }
                 else
                 {
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
                 }
             }
         }
 
-        public bool BoldText
+        public string WordSeparator
         {
-            get => _terminalOptions.BoldText;
+            get => WebViewSpecialCharEncoder.Decode(_terminalOptions.WordSeparator);
             set
             {
-                if (_terminalOptions.BoldText != value)
+                value = WebViewSpecialCharEncoder.Encode(value);
+                if (_terminalOptions.WordSeparator != value)
                 {
-                    _terminalOptions.BoldText = value;
+                    _terminalOptions.WordSeparator = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
                 }
             }
         }
@@ -161,30 +190,25 @@ namespace FluentTerminal.App.ViewModels.Settings
                 {
                     _terminalOptions.FontSize = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
                 }
             }
         }
 
         public IEnumerable<int> Sizes { get; }
 
-        public RelayCommand RestoreDefaultsCommand { get; }
+        public ICommand RestoreDefaultsCommand { get; }
 
         private CursorStyle CursorStyle
         {
             get => _terminalOptions.CursorStyle;
             set
             {
-                if (_terminalOptions.CursorStyle != value && !_isEditingCursorStyle)
+                if (_terminalOptions.CursorStyle != value)
                 {
-                    _isEditingCursorStyle = true;
                     _terminalOptions.CursorStyle = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
-                    RaisePropertyChanged();
-                    RaisePropertyChanged(nameof(BlockIsSelected));
-                    RaisePropertyChanged(nameof(BarIsSelected));
-                    RaisePropertyChanged(nameof(UnderlineIsSelected));
-                    _isEditingCursorStyle = false;
+                    OnPropertyChanged();
                 }
             }
         }
@@ -194,23 +218,22 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _terminalOptions.ScrollBarStyle;
             set
             {
-                if (_terminalOptions.ScrollBarStyle != value && !_isEditingScrollBarStyle)
+                if (_terminalOptions.ScrollBarStyle != value)
                 {
-                    _isEditingScrollBarStyle = true;
                     _terminalOptions.ScrollBarStyle = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
-                    RaisePropertyChanged();
-                    RaisePropertyChanged(nameof(HiddenIsSelected));
-                    RaisePropertyChanged(nameof(AutoHidingIsSelected));
-                    RaisePropertyChanged(nameof(VisibleIsSelected));
-                    _isEditingScrollBarStyle = false;
+                    OnPropertyChanged();
                 }
             }
         }
 
-        private async Task RestoreDefaults()
+        // Requires UI thread
+        private async Task RestoreDefaultsAsync()
         {
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the default terminal options?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            // ConfigureAwait(true) because we're setting some view-model properties afterwards.
+            var result = await _dialogService.ShowMessageDialogAsync(I18N.Translate("PleaseConfirm"),
+                    I18N.Translate("ConfirmRestoreTerminalOptions"), DialogButton.OK, DialogButton.Cancel)
+                .ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {
@@ -220,9 +243,10 @@ namespace FluentTerminal.App.ViewModels.Settings
                 ScrollBarStyle = defaults.ScrollBarStyle;
                 FontFamily = defaults.FontFamily;
                 FontSize = defaults.FontSize;
-                BoldText = defaults.BoldText;
+                FontWeight = defaults.FontWeight;
                 BackgroundOpacity = defaults.BackgroundOpacity;
                 ScrollBackLimit = defaults.ScrollBackLimit.ToString();
+                WordSeparator = defaults.WordSeparator;
             }
         }
 
@@ -232,10 +256,10 @@ namespace FluentTerminal.App.ViewModels.Settings
             _dialogService = dialogService;
             _defaultValueProvider = defaultValueProvider;
 
-            RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
+            RestoreDefaultsCommand = new AsyncRelayCommand(RestoreDefaultsAsync);
 
             Fonts = systemFontService.GetSystemFontFamilies().OrderBy(s => s.Name);
-            Sizes = Enumerable.Range(1, 72);
+            Sizes = Enumerable.Range(2, 72);
 
             _terminalOptions = _settingsService.GetTerminalOptions();
         }