Merge branch 'master' into Dev/NativeRenderer

* Load terminal options and add the inital scroll viewer

* Current Virtual Cavnas, problem with event handler calling the canvas on draw

.gitattributes

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

.github/workflows/main.yml

@@ -1,23 +0,0 @@
-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: warrenbuckley/Setup-MSBuild@v1
-    
-    - name: MSBuild
-      run: msbuild FluentTerminal.sln -t:build -p:Configuration=Debug -p:Platform=x64 -m -restore

.gitignore

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

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<IMessageDialog>, () => createKeyBindingDialog.Object, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ICustomCommandDialog>, Mock.Of<IAboutDialog>);
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, () => createKeyBindingDialog.Object, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
 
             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<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ICustomCommandDialog>, Mock.Of<IAboutDialog>);
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
 
-            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsync(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
+            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(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<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ICustomCommandDialog>, Mock.Of<IAboutDialog>);
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
 
-            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsync(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
+            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(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<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ICustomCommandDialog>, Mock.Of<IAboutDialog>);
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
 
-            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsync(title, content);
+            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content);
 
             showMessageDialogAsnyc.Should().Throw<ArgumentException>().And.ParamName.Should().Be("buttons");
         }
@@ -75,19 +75,30 @@ 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(() => messageDialog.Object, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ICustomCommandDialog>, Mock.Of<IAboutDialog>);
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, () => messageDialog.Object, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
 
-            dialogService.ShowMessageDialogAsync(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
+            dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
 
             messageDialog.Verify(x => x.ShowAsync(), Times.Once);
         }
+
+        [Fact]
+        public void ShowProfileSelectionDialogAsync_Default_UsesShellProfileSelectionDialog()
+        {
+            var shellProfileSelectionDialog = new Mock<IShellProfileSelectionDialog>();
+            var dialogService = new DialogService(() => shellProfileSelectionDialog.Object, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
+
+            dialogService.ShowProfileSelectionDialogAsync();
+
+            shellProfileSelectionDialog.Verify(x => x.SelectProfile(), Times.Once);
+        }
         
         [Fact]
         public void ShowInputDialogAsync_UsesIInputDialogSetTitle()
         {
             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>);
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, () => inputDialog.Object, Mock.Of<ISshConnectionInfoDialog>);
 
             dialogService.ShowInputDialogAsync(title);
 

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
@@ -11,11 +11,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.11.0" />
-    <PackageReference Include="FluentAssertions" Version="5.10.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="Moq" Version="4.13.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <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="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
@@ -34,11 +34,4 @@
     <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,41 +41,6 @@ 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

@@ -10,8 +10,6 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using FluentTerminal.Models.Messages;
-using GalaSoft.MvvmLight.Messaging;
 using Xunit;
 
 namespace FluentTerminal.App.Services.Test
@@ -38,8 +36,7 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(), 
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
 
             new SettingsService(defaultValueProvider.Object, applicationDataContainers);
@@ -61,7 +58,6 @@ 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>(),
@@ -90,7 +86,6 @@ 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);
@@ -116,7 +111,6 @@ 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);
@@ -140,7 +134,6 @@ 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);
@@ -162,13 +155,11 @@ 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);
-            Messenger.Default.Register<CurrentThemeChangedMessage>(this,
-                message => currentThemeChangedEventInvoked = true);
+            settingsService.CurrentThemeChanged += (s, e) => currentThemeChangedEventInvoked = true;
 
             settingsService.SaveCurrentThemeId(currentThemeId);
 
@@ -187,8 +178,7 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -213,12 +203,10 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = roamingSettings.Object,
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            Messenger.Default.Register<CurrentThemeChangedMessage>(this,
-                message => currentThemeChangedEventInvoked = true);
+            settingsService.CurrentThemeChanged += (s, e) => currentThemeChangedEventInvoked = true;
 
             settingsService.SaveTheme(theme);
 
@@ -237,8 +225,7 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -260,8 +247,7 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -284,8 +270,7 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -308,8 +293,7 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -332,8 +316,7 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -355,8 +338,7 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -378,12 +360,10 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            Messenger.Default.Register<TerminalOptionsChangedMessage>(this,
-                message => terminalOptionsChangedEventInvoked = true);
+            settingsService.TerminalOptionsChanged += (s, e) => terminalOptionsChangedEventInvoked = true;
 
             settingsService.SaveTerminalOptions(terminalOptions);
 
@@ -403,8 +383,7 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -426,8 +405,7 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -449,12 +427,10 @@ namespace FluentTerminal.App.Services.Test
                 KeyBindings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            Messenger.Default.Register<ApplicationSettingsChangedMessage>(this,
-                a => applicationSettingsChangedEventInvoked = true);
+            settingsService.ApplicationSettingsChanged += (s, e) => applicationSettingsChangedEventInvoked = true;
 
             settingsService.SaveApplicationSettings(applicationSettings);
 
@@ -477,8 +453,7 @@ namespace FluentTerminal.App.Services.Test
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -496,14 +471,17 @@ 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>(),
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
 
@@ -528,8 +506,7 @@ namespace FluentTerminal.App.Services.Test
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
@@ -552,12 +529,10 @@ namespace FluentTerminal.App.Services.Test
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            Messenger.Default.Register<KeyBindingsChangedMessage>(this,
-                message => keyBindingsChangedEventInvoked = true);
+            settingsService.KeyBindingsChanged += (s, e) => keyBindingsChangedEventInvoked = true;
 
             settingsService.SaveKeyBindings(command.ToString(), keyBindings);
 
@@ -575,8 +550,7 @@ namespace FluentTerminal.App.Services.Test
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
 
@@ -601,12 +575,10 @@ namespace FluentTerminal.App.Services.Test
                 RoamingSettings = Mock.Of<IApplicationDataContainer>(),
                 LocalSettings = Mock.Of<IApplicationDataContainer>(),
                 Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
-                SshProfiles = Mock.Of<IApplicationDataContainer>()
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            Messenger.Default.Register<KeyBindingsChangedMessage>(this,
-                message => keyBindingsChangedEventInvoked = true);
+            settingsService.KeyBindingsChanged += (s, e) => keyBindingsChangedEventInvoked = true;
 
             settingsService.ResetKeyBindings();
 
@@ -626,7 +598,6 @@ 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);
@@ -652,7 +623,6 @@ 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);
@@ -674,7 +644,6 @@ 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>(),
@@ -684,7 +653,7 @@ namespace FluentTerminal.App.Services.Test
 
             var result = settingsService.GetShellProfiles();
 
-            result.Select(p => p.EqualTo(shellProfiles.FirstOrDefault(x => x.Id == p.Id)).Should().BeTrue());
+            result.Should().BeEquivalentTo(shellProfiles);
             shellProfilesContainer.Verify(x => x.GetAll(), Times.Once);
         }
 
@@ -697,7 +666,6 @@ 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>(),
@@ -719,7 +687,6 @@ 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>(),
@@ -744,7 +711,6 @@ 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,
@@ -773,7 +739,6 @@ 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,7 +10,6 @@ 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
@@ -35,20 +34,20 @@ namespace FluentTerminal.App.Services.Test
             });
             var appServiceConnection = new Mock<IAppServiceConnection>();
             var response = _fixture.Create<CreateTerminalResponse>();
-            var responseMessage = new ValueSet
+            var responseMessage = new Dictionary<string, string>
             {
                 [MessageKeys.Type] = _fixture.Create<string>(),
                 [MessageKeys.Content] = JsonConvert.SerializeObject(response)
             };
-            appServiceConnection.Setup(x => x.SendMessageAsync(It.IsAny<ValueSet>())).Returns(Task.FromResult(responseMessage));
+            appServiceConnection.Setup(x => x.SendMessageAsync(It.IsAny<IDictionary<string, string>>())).Returns(Task.FromResult((IDictionary<string, string>)responseMessage));
             var terminalSize = _fixture.Create<TerminalSize>();
             var shellProfile = _fixture.Create<ShellProfile>();
             var sessionType = _fixture.Create<SessionType>();
-            var id = _fixture.Create<byte>();
+            var id = _fixture.Create<int>();
             var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
             trayProcessCommunicationService.Initialize(appServiceConnection.Object);
 
-            var result = await trayProcessCommunicationService.CreateTerminalAsync(id, terminalSize, shellProfile, sessionType);
+            var result = await trayProcessCommunicationService.CreateTerminal(id, terminalSize, shellProfile, sessionType);
 
             result.Should().BeEquivalentTo(response);
         }
@@ -56,7 +55,7 @@ namespace FluentTerminal.App.Services.Test
         [Fact]
         public async Task ResizeTerminal_Default_SendsResizeTerminalRequest()
         {
-            var terminalId = _fixture.Create<byte>();
+            var terminalId = _fixture.Create<int>();
             var terminalSize = _fixture.Create<TerminalSize>();
             var settingsService = new Mock<ISettingsService>();
             var keyBindings = _fixture.CreateMany<KeyBinding>(3);
@@ -68,15 +67,15 @@ namespace FluentTerminal.App.Services.Test
             var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
             trayProcessCommunicationService.Initialize(appServiceConnection.Object);
 
-            await trayProcessCommunicationService.ResizeTerminalAsync(terminalId, terminalSize);
+            await trayProcessCommunicationService.ResizeTerminal(terminalId, terminalSize);
 
-            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<ValueSet>(d => (byte)d[MessageKeys.Type] == (byte)MessageIdentifiers.ResizeTerminalRequest)), Times.Once);
+            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<IDictionary<string, string>>(d => d[MessageKeys.Type] == nameof(ResizeTerminalRequest))), Times.Once);
         }
 
         [Fact]
         public async Task Write_Default_SendsWriteDataRequest()
         {
-            var terminalId = _fixture.Create<byte>();
+            var terminalId = _fixture.Create<int>();
             var data = _fixture.Create<byte[]>();
             var settingsService = new Mock<ISettingsService>();
             var keyBindings = _fixture.CreateMany<KeyBinding>(3);
@@ -88,15 +87,15 @@ namespace FluentTerminal.App.Services.Test
             var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
             trayProcessCommunicationService.Initialize(appServiceConnection.Object);
 
-            await trayProcessCommunicationService.WriteAsync(terminalId, data);
+            await trayProcessCommunicationService.Write(terminalId, data);
 
-            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<ValueSet>(d => (byte)d[MessageKeys.Type] == Constants.TerminalBufferRequestIdentifier)), Times.Once);
+            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<IDictionary<string, string>>(d => d[MessageKeys.Type] == nameof(WriteDataRequest))), Times.Once);
         }
 
         [Fact]
         public async Task CloseTerminal_Default_SendsTerminalExitedRequest()
         {
-            var terminalId = _fixture.Create<byte>();
+            var terminalId = _fixture.Create<int>();
             var settingsService = new Mock<ISettingsService>();
             var keyBindings = _fixture.CreateMany<KeyBinding>(3);
             settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
@@ -107,21 +106,24 @@ namespace FluentTerminal.App.Services.Test
             var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
             trayProcessCommunicationService.Initialize(appServiceConnection.Object);
 
-            await trayProcessCommunicationService.CloseTerminalAsync(terminalId);
+            await trayProcessCommunicationService.CloseTerminal(terminalId);
 
-            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<ValueSet>(d => (byte)d[MessageKeys.Type] == (byte)MessageIdentifiers.TerminalExitedRequest)), Times.Once);
+            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<IDictionary<string, string>>(d => d[MessageKeys.Type] == nameof(TerminalExitedRequest))), Times.Once);
         }
 
         [Fact]
         public void OnMessageReceived_TerminalExitedRequest_InvokesTerminalExitedEvent()
         {
-            var request = new TerminalExitedRequest(_fixture.Create<byte>(), _fixture.Create<int>());
-
-            var receivedExitStatus = (TerminalExitStatus) null;
-
-            var message = new ValueSet
+            var terminalId = _fixture.Create<int>();
+            var receivedTerminalId = 0;
+            var terminalExitedEventCalled = false;
+            var request = new TerminalExitedRequest
             {
-                [MessageKeys.Type] = (byte) MessageIdentifiers.TerminalExitedRequest,
+                TerminalId = terminalId
+            };
+            var message = new Dictionary<string, string>
+            {
+                [MessageKeys.Type] = nameof(TerminalExitedRequest),
                 [MessageKeys.Content] = JsonConvert.SerializeObject(request)
             };
             var settingsService = new Mock<ISettingsService>();
@@ -133,29 +135,33 @@ namespace FluentTerminal.App.Services.Test
             var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
             var appServiceConnection = new Mock<IAppServiceConnection>();
             trayProcessCommunicationService.Initialize(appServiceConnection.Object);
-            trayProcessCommunicationService.TerminalExited += (s, status) =>
+            trayProcessCommunicationService.TerminalExited += (s, e) =>
             {
-                receivedExitStatus = status;
+                terminalExitedEventCalled = true;
+                receivedTerminalId = e;
             };
 
             appServiceConnection.Raise(x => x.MessageReceived += null, null, message);
 
-            receivedExitStatus.Should().NotBeNull();
-            receivedExitStatus.TerminalId.Should().Be(request.TerminalId);
-            receivedExitStatus.ExitCode.Should().Be(request.ExitCode);
+            terminalExitedEventCalled.Should().BeTrue();
+            receivedTerminalId.Should().Be(terminalId);
         }
 
         [Fact]
         public void OnMessageReceived_DisplayTerminalOutputRequest_InvokesCorrectOutputHandler()
         {
-            var terminalId = _fixture.Create<byte>();
+            var terminalId = _fixture.Create<int>();
             var output = _fixture.Create<byte[]>();
             var receivedOutput = default(byte[]);
-            var message = new ValueSet
+            var request = new DisplayTerminalOutputRequest
             {
-                [MessageKeys.Type] = Constants.TerminalBufferRequestIdentifier,
-                [MessageKeys.TerminalId] = terminalId,
-                [MessageKeys.Content] = output
+                TerminalId = terminalId,
+                Output = output
+            };
+            var message = new Dictionary<string, string>
+            {
+                [MessageKeys.Type] = nameof(DisplayTerminalOutputRequest),
+                [MessageKeys.Content] = JsonConvert.SerializeObject(request)
             };
             var settingsService = new Mock<ISettingsService>();
             var keyBindings = _fixture.CreateMany<KeyBinding>(3);

FluentTerminal.App.Services/Adapters/ApplicationDataContainerAdapter.cs

@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Windows.Storage;
-using FluentTerminal.App.Services.Utilities;
 
 namespace FluentTerminal.App.Services.Adapters
 {
@@ -21,11 +20,6 @@ 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);
@@ -57,8 +51,7 @@ namespace FluentTerminal.App.Services.Adapters
 
         public void WriteValueAsJson<T>(string name, T value)
         {
-            _applicationDataContainer.Values[name] = JsonConvert.SerializeObject(value,
-                PreserveDictionaryKeyCaseContractResolver.SerializerSettings);
+            _applicationDataContainer.Values[name] = JsonConvert.SerializeObject(value);
         }
     }
 }

FluentTerminal.App.Services/ApplicationDataContainers.cs

@@ -7,7 +7,5 @@
         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,11 +5,5 @@
         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

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

FluentTerminal.App.Services/Dialogs/ICustomCommandDialog.cs

@@ -1,10 +0,0 @@
-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

@@ -0,0 +1,12 @@
+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/ISshConnectionInfo.cs

@@ -0,0 +1,11 @@
+namespace FluentTerminal.App.Services.Dialogs
+{
+    public interface ISshConnectionInfo
+    {
+        string Host { get; set; }
+
+        ushort Port { get; set; }
+
+        string Username { get; set; }
+    }
+}

FluentTerminal.App.Services/Dialogs/ISshConnectionInfoDialog.cs

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

FluentTerminal.App.Services/EventArgs/NewTabRequestedEventArgs.cs

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

FluentTerminal.App.Services/Exceptions/SaveTextFileException.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-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,13 +6,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="PListNet" Version="3.0.0" />
-    <PackageReference Include="RestSharp" Version="106.10.1" />
-    <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
+    <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="System.Runtime.InteropServices.WindowsRuntime" Version="4.3.0" />
   </ItemGroup>
 

FluentTerminal.App.Services/IAcceleratorKeyValidator.cs

@@ -1,12 +0,0 @@
-using FluentTerminal.Models.Enums;
-
-namespace FluentTerminal.App.Services
-{
-    // This validator is needed because accelerator key has to be member of VirtualKey enum.
-    public interface IAcceleratorKeyValidator
-    {
-        bool Valid(int key);
-
-        bool Valid(ExtendedVirtualKey key);
-    }
-}

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<ValueSet> MessageReceived;
+        event EventHandler<IDictionary<string, string>> MessageReceived;
 
-        Task<ValueSet> SendMessageAsync(ValueSet message);
+        Task<IDictionary<string, string>> SendMessageAsync(IDictionary<string, string> message);
     }
 }

FluentTerminal.App.Services/IApplicationDataContainer.cs

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

FluentTerminal.App.Services/IApplicationLanguageService.cs

@@ -1,13 +0,0 @@
-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,7 +1,6 @@
 using FluentTerminal.App.Services.EventArgs;
 using System;
 using System.Threading.Tasks;
-using Windows.UI.Core;
 
 namespace FluentTerminal.App.Services
 {
@@ -15,13 +14,9 @@ namespace FluentTerminal.App.Services
         int Id { get; }
         string Title { get; set; }
 
-        Task ExecuteOnUiThreadAsync(Action action, CoreDispatcherPriority priority = CoreDispatcherPriority.Normal,
-            bool enforceNewSchedule = false);
+        Task RunOnDispatcherThread(Action action);
 
-        Task<T> ExecuteOnUiThreadAsync<T>(Func<T> func, CoreDispatcherPriority priority = CoreDispatcherPriority.Normal,
-            bool enforceNewSchedule = false);
-
-        Task<bool> TryCloseAsync();
+        Task<bool> TryClose();
 
         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> GetTextAsync();
+        Task<string> GetText();
 
         void SetText(string text);
     }

FluentTerminal.App.Services/ICommandHistoryService.cs

@@ -1,37 +0,0 @@
-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

@@ -1,27 +1,24 @@
 using FluentTerminal.Models;
 using System.Threading.Tasks;
+using FluentTerminal.App.Services.Dialogs;
 
 namespace FluentTerminal.App.Services
 {
     public enum DialogButton
     {
-        // ReSharper disable once InconsistentNaming
         OK,
         Cancel
     }
 
     public interface IDialogService
     {
-        Task<DialogButton> ShowMessageDialogAsync(string title, string content, params DialogButton[] buttons);
+        Task<DialogButton> ShowMessageDialogAsnyc(string title, string content, params DialogButton[] buttons);
+
+        Task<ShellProfile> ShowProfileSelectionDialogAsync();
 
         Task<KeyBinding> ShowCreateKeyBindingDialog();
-
         Task<string> ShowInputDialogAsync(string title);
 
-        Task<SshProfile> ShowSshConnectionInfoDialogAsync(SshProfile input = null);
-
-        Task<ShellProfile> ShowCustomCommandDialogAsync(ShellProfile input = null);
-
-        Task ShowAboutDialogAsync();
+        Task<ISshConnectionInfo> ShowSshConnectionInfoDialogAsync();
     }
 }

FluentTerminal.App.Services/IDispatcherTimer.cs

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

FluentTerminal.App.Services/IImageFileSystemService.cs

@@ -1,19 +0,0 @@
-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,6 +8,5 @@ namespace FluentTerminal.App.Services
 
         void SendCommand(string command);
         void DeregisterCommandHandler(string command);
-        void ClearCommandHandlers();
     }
 }

FluentTerminal.App.Services/ISettingsService.cs

@@ -6,8 +6,16 @@ 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();
@@ -16,28 +24,18 @@ 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

@@ -1,9 +0,0 @@
-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 DisableStartupTaskAsync();
-        Task<StartupTaskStatus> EnableStartupTaskAsync();
-        Task<StartupTaskStatus> GetStatusAsync();
+        Task DisableStartupTask();
+        Task<StartupTaskStatus> EnableStartupTask();
+        Task<StartupTaskStatus> GetStatus();
     }
 }

FluentTerminal.App.Services/IThemeParser.cs

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

FluentTerminal.App.Services/IUpdateService.cs

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

FluentTerminal.App.Services/Implementation/DefaultValueProvider.cs

@@ -1,10 +1,7 @@
-using FluentTerminal.App.Services.Utilities;
-using FluentTerminal.Models;
+using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using System;
 using System.Collections.Generic;
-using Windows.Foundation.Metadata;
-using Windows.Storage;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -12,14 +9,6 @@ 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,
@@ -27,23 +16,15 @@ 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,
-                UseMoshByDefault = true,
-                AutoFallbackToWindowsUsernameInLinks = true,
-                RTrimCopiedLines = true,
-                MuteTerminalBeeps = true,
-                EnableLogging = false,
-                PrintableOutputOnly = true,
-                LogDirectoryPath = logDirectoryPath,
-                UseConPty = true,
-                ShowTextCopied = false
+                ShowCustomTitleInTitlebar = true
             };
         }
 
@@ -57,6 +38,9 @@ namespace FluentTerminal.App.Services.Implementation
                     new KeyBinding
                     {
                         Command = nameof(Command.ToggleWindow),
+                        Ctrl = false,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.Scroll
                     }
                 };
@@ -68,6 +52,8 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.NextTab),
                         Ctrl = true,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.Tab
                     }
                 };
@@ -79,6 +65,7 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.PreviousTab),
                         Ctrl = true,
+                        Alt = false,
                         Shift = true,
                         Key = (int)ExtendedVirtualKey.Tab
                     }
@@ -98,20 +85,10 @@ namespace FluentTerminal.App.Services.Implementation
                     new KeyBinding
                     {
                         Command = command.ToString(),
-                        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
+                        Alt = false,
+                        Shift = false,
+                        Key = (int)ExtendedVirtualKey.Number1 + (command - Command.SwitchToTerm1)
                     }
                 };
 
@@ -122,59 +99,38 @@ 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:
+                case Command.NewRemoteTab:
                     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,
+                            Command = nameof(Command.NewRemoteTab),
+                            Ctrl = false,
                             Alt = true,
+                            Shift = false,
                             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>
                 {
@@ -182,6 +138,7 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.ChangeTabTitle),
                         Ctrl = true,
+                        Alt = false,
                         Shift = true,
                         Key = (int)ExtendedVirtualKey.R
                     }
@@ -194,7 +151,8 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.CloseTab),
                         Ctrl = true,
-                        Shift = true,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.W
                     }
                 };
@@ -206,6 +164,20 @@ 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
                     }
@@ -218,9 +190,9 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.ShowSettings),
                         Ctrl = true,
-                        Shift = true,
-                        // I've had to replace ExtendedVirtualKey.Comma because it isn't a member of VirtualKey enum, thus cannot be shown in menu.
-                        Key = (int)ExtendedVirtualKey.S
+                        Alt = false,
+                        Shift = false,
+                        Key = (int)ExtendedVirtualKey.Comma
                     }
                 };
 
@@ -231,7 +203,8 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.Copy),
                         Ctrl = true,
-                        Shift = true,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.C
                     }
                 };
@@ -243,7 +216,8 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.Paste),
                         Ctrl = true,
-                        Shift = true,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.V
                     }
                 };
@@ -256,7 +230,8 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.PasteWithoutNewlines),
                         Ctrl = true,
-                        Alt = true,
+                        Alt = false,
+                        Shift = true,
                         Key = (int)ExtendedVirtualKey.V
                     }
                 };
@@ -268,7 +243,8 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.Search),
                         Ctrl = true,
-                        Shift = true,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.F
                     }
                 };
@@ -279,13 +255,10 @@ namespace FluentTerminal.App.Services.Implementation
                     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
                     }
                 };
 
@@ -296,7 +269,8 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.SelectAll),
                         Ctrl = true,
-                        Shift = true,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.A
                     }
                 };
@@ -308,14 +282,14 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.Clear),
                         Ctrl = true,
-                        Alt = true,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.L
                     }
                 };
-
-                default:
-                    throw new InvalidOperationException($"Default keybindings for Command '{command}' are missing");
             }
+
+            return null;
         }
 
         public Guid GetDefaultShellProfileId()
@@ -330,7 +304,7 @@ namespace FluentTerminal.App.Services.Implementation
                 new TabTheme
                 {
                     Id = 0,
-                    Name = I18N.Translate("TabTheme.None"),
+                    Name = "None",
                     BackgroundOpacity = double.NaN,
                     BackgroundPointerOverOpacity = double.NaN,
                     BackgroundPressedOpacity = double.NaN,
@@ -341,42 +315,41 @@ namespace FluentTerminal.App.Services.Implementation
                 new TabTheme
                 {
                     Id = 1,
-                    Name = I18N.Translate("TabTheme.Red"),
+                    Name = "Red",
                     Color = "#E81123"
                 },
                 new TabTheme
                 {
                     Id = 2,
-                    Name = I18N.Translate("TabTheme.Green"),
+                    Name = "Green",
                     Color = "#10893E"
                 },
                 new TabTheme
                 {
                     Id = 3,
-                    Name = I18N.Translate("TabTheme.Blue"),
+                    Name = "Blue",
                     Color = "#0078D7"
                 },
                 new TabTheme
                 {
                     Id = 4,
-                    Name = I18N.Translate("TabTheme.Purple"),
+                    Name = "Purple",
                     Color = "#881798"
                 },
                 new TabTheme
                 {
                     Id = 5,
-                    Name = I18N.Translate("TabTheme.Orange"),
+                    Name = "Orange",
                     Color = "#FF8C00"
                 },
                 new TabTheme
                 {
                     Id = 6,
-                    Name = I18N.Translate("TabTheme.Teal"),
+                    Name = "Teal",
                     Color = "#00B7C3"
                 }
             };
         }
-
         public TerminalOptions GetDefaultTerminalOptions()
         {
             return new TerminalOptions
@@ -387,12 +360,10 @@ namespace FluentTerminal.App.Services.Implementation
                 ScrollBarStyle = ScrollBarStyle.Hidden,
                 FontFamily = "Consolas",
                 FontSize = 13,
-                FontWeight = 400,
+                BoldText = false,
                 BackgroundOpacity = 0.8,
                 Padding = 12,
-                ScrollBackLimit = 1000,
-                WordSeparator = " ()[]{}:;|│!&*<>@&quot;&squo;",
-                UseAcrylicBackground = true
+                ScrollBackLimit = 1000
             };
         }
 
@@ -409,17 +380,11 @@ 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,
-                    UseConPty = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8), // Windows 10 1903+
-                    UseBuffer = false,
-                    EnvironmentVariables = new Dictionary<string, string>
-                    {
-                        ["TERM"] = "xterm-256color"
-                    },
+                    LineEndingTranslation = LineEndingStyle.DoNotModify,
                     KeyBindings = new []
                     {
                         new KeyBinding
@@ -437,17 +402,11 @@ 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,
-                    UseConPty = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 7), // Windows 10 1809+
-                    UseBuffer = true,
-                    EnvironmentVariables = new Dictionary<string, string>
-                    {
-                        ["TERM"] = "xterm-256color"
-                    },
+                    LineEndingTranslation = LineEndingStyle.DoNotModify,
                     KeyBindings = new []
                     {
                         new KeyBinding
@@ -465,17 +424,11 @@ 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,
-                    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"
-                    },
+                    LineEndingTranslation = LineEndingStyle.DoNotModify,
                     KeyBindings = new []
                     {
                         new KeyBinding

FluentTerminal.App.Services/Implementation/DialogService.cs

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

FluentTerminal.App.Services/Implementation/FluentTerminalThemeParser.cs

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

FluentTerminal.App.Services/Implementation/ITermThemeParser.cs

@@ -7,7 +7,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Threading.Tasks;
-// ReSharper disable InconsistentNaming
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -15,7 +14,7 @@ namespace FluentTerminal.App.Services.Implementation
     {
         private const byte Opacity30Percent = 77;
 
-        public IEnumerable<string> SupportedFileTypes { get; } = new[] { ".itermcolors" };
+        public IEnumerable<string> SupportedFileTypes { get; } = new string[] { ".itermcolors" };
 
         private static class ITermThemeKeys
         {
@@ -37,7 +36,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";
@@ -52,7 +51,7 @@ namespace FluentTerminal.App.Services.Implementation
             public const string RedComponent = "Red Component";
         }
 
-        public Task<TerminalTheme> Parse(string fileName, Stream fileContent)
+        public async Task<TerminalTheme> Parse(string fileName, Stream fileContent)
         {
             if (string.IsNullOrWhiteSpace(fileName))
             {
@@ -66,13 +65,13 @@ namespace FluentTerminal.App.Services.Implementation
 
             var node = PList.Load(fileContent) as DictionaryNode ?? throw new ParseThemeException("Root node was not a dictionary.");
 
-            return Task.FromResult(new TerminalTheme
+            return new TerminalTheme
             {
                 Name = Path.GetFileNameWithoutExtension(fileName),
                 Colors = GetColors(node),
                 Id = Guid.NewGuid(),
                 PreInstalled = false
-            });
+            };
         }
 
         private TerminalColors GetColors(DictionaryNode themeDictionary)
@@ -84,8 +83,6 @@ 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]),
@@ -113,6 +110,8 @@ 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}";
@@ -134,30 +133,5 @@ 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,10 +42,5 @@ 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

@@ -1,94 +0,0 @@
-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,9 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using FluentTerminal.App.Services.Utilities;
-using FluentTerminal.Models.Messages;
-using GalaSoft.MvvmLight.Messaging;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -15,14 +12,12 @@ 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)
@@ -34,8 +29,6 @@ namespace FluentTerminal.App.Services.Implementation
             _themes = containers.Themes;
             _keyBindings = containers.KeyBindings;
             _shellProfiles = containers.ShellProfiles;
-            _sshProfiles = containers.SshProfiles;
-
 
             foreach (var theme in _defaultValueProvider.GetPreInstalledThemes())
             {
@@ -54,114 +47,25 @@ namespace FluentTerminal.App.Services.Implementation
             }
         }
 
-        public string ExportSettings()
-        {
-            var config = new
-            {
-                App = GetApplicationSettings(),
-                KeyBindings = GetCommandKeyBindings(),
-                TerminalOptions = GetTerminalOptions(),
-                Themes = new List<TerminalTheme>(),
-                Profiles = new List<ShellProfile>(),
-                SshProfiles = new List<SshProfile>()
-            };
+        public event EventHandler<ApplicationSettings> ApplicationSettingsChanged;
 
-            foreach (var theme in GetThemes().Where(x => !x.PreInstalled))
-            {
-                config.Themes.Add(theme);
-            }
+        public event EventHandler<TerminalTheme> ThemeAdded;
+        public event EventHandler<Guid> CurrentThemeChanged;
+        public event EventHandler<Guid> ThemeDeleted;
 
-            foreach (var profile in GetShellProfiles().Where(x => !x.PreInstalled))
-            {
-                config.Profiles.Add(profile);
-            }
+        public event EventHandler KeyBindingsChanged;
 
-            foreach (var profile in GetSshProfiles())
-            {
-                config.SshProfiles.Add(profile);
-            }
+        public event EventHandler<ShellProfile> ShellProfileAdded;
+        public event EventHandler<Guid> ShellProfileDeleted;
 
-            return JsonConvert.SerializeObject(config, PreserveDictionaryKeyCaseContractResolver.SerializerSettings);
-        }
-
-        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()
-            };
-
-            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);
-            }
-
-            // Can't create pre-installed profiles
-            foreach (var profile in config.Profiles.Where(x => !x.PreInstalled))
-            {
-                var existingProfile = GetShellProfile(profile.Id);
-                var isNew = existingProfile.EqualTo(default);
-
-                // You can only edit certain parts of preinstalled profiles
-                if (!isNew && existingProfile.PreInstalled)
-                {
-                    existingProfile.WorkingDirectory = profile.WorkingDirectory;
-                    existingProfile.Arguments = profile.Arguments;
-                    existingProfile.TabThemeId = profile.TabThemeId;
-                    existingProfile.TerminalThemeId = profile.TerminalThemeId;
-                    existingProfile.KeyBindings = profile.KeyBindings;
-                    SaveShellProfile(profile, isNew);
-                    continue;
-                }
-                SaveShellProfile(profile, isNew);
-            }
-
-            foreach (var profile in config.SshProfiles)
-            {
-                var existingProfile = GetSshProfile(profile.Id);
-                var isNew = existingProfile.EqualTo(default(SshProfile));
-
-                SaveSshProfile(profile, isNew);
-            }
-
-            SaveTerminalOptions(config.TerminalOptions);
-        }
+        public event EventHandler<TerminalOptions> TerminalOptionsChanged;
 
         public void DeleteShellProfile(Guid id)
         {
             _shellProfiles.Delete(id.ToString());
-            Messenger.Default.Send(new ShellProfileDeletedMessage(id));
+            ShellProfileDeleted?.Invoke(this, id);
         }
 
-        public void DeleteSshProfile(Guid id)
-        {
-            _sshProfiles.Delete(id.ToString());
-            Messenger.Default.Send(new ShellProfileDeletedMessage(id));
-            Messenger.Default.Send(new KeyBindingsChangedMessage());
-        }
-
-
         public void DeleteTheme(Guid id)
         {
             _themes.Delete(id.ToString());
@@ -175,7 +79,7 @@ namespace FluentTerminal.App.Services.Implementation
                 }
             }
 
-            Messenger.Default.Send(new ThemeDeletedMessage(id));
+            ThemeDeleted?.Invoke(this, id);
         }
 
         public ApplicationSettings GetApplicationSettings()
@@ -222,10 +126,6 @@ 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()
         {
@@ -249,43 +149,7 @@ namespace FluentTerminal.App.Services.Implementation
 
         public IEnumerable<ShellProfile> GetShellProfiles()
         {
-            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;
+            return _shellProfiles.GetAll().Select(x => JsonConvert.DeserializeObject<ShellProfile>((string)x)).ToList();
         }
 
         public IEnumerable<TabTheme> GetTabThemes()
@@ -315,43 +179,36 @@ namespace FluentTerminal.App.Services.Implementation
                 _keyBindings.WriteValueAsJson(command.ToString(), _defaultValueProvider.GetDefaultKeyBindings(command));
             }
 
-            Messenger.Default.Send(new KeyBindingsChangedMessage());
+            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
         }
 
         public void SaveApplicationSettings(ApplicationSettings applicationSettings)
         {
             _roamingSettings.WriteValueAsJson(nameof(ApplicationSettings), applicationSettings);
-            Messenger.Default.Send(new ApplicationSettingsChangedMessage(applicationSettings.Clone()));
-        }
-
-        public void NotifyApplicationSettingsChanged(ApplicationSettings applicationSettings)
-        {
-            Messenger.Default.Send(new ApplicationSettingsChangedMessage(applicationSettings.Clone()));
+            ApplicationSettingsChanged?.Invoke(this, applicationSettings);
         }
 
         public void SaveCurrentThemeId(Guid id)
         {
             _roamingSettings.SetValue(CurrentThemeKey, id);
 
-            Messenger.Default.Send(new CurrentThemeChangedMessage(id));
+            CurrentThemeChanged?.Invoke(this, id);
         }
 
         public void SaveDefaultShellProfileId(Guid id)
         {
             _localSettings.SetValue(DefaultShellProfileKey, id);
-
-            Messenger.Default.Send(new DefaultShellProfileChangedMessage(id));
         }
 
         public void SaveKeyBindings(string command, ICollection<KeyBinding> keyBindings)
         {
-            if (!Enum.TryParse<Command>(command, true, out var enumValue))
+            if (!Enum.IsDefined(typeof(Command), command))
             {
                 throw new InvalidOperationException();
             }
 
-            _keyBindings.WriteValueAsJson(enumValue.ToString(), keyBindings);
-            Messenger.Default.Send(new KeyBindingsChangedMessage());
+            _keyBindings.WriteValueAsJson(command.ToString(), keyBindings);
+            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
         }
 
         public void SaveShellProfile(ShellProfile shellProfile, bool newShell = false)
@@ -359,39 +216,18 @@ namespace FluentTerminal.App.Services.Implementation
             _shellProfiles.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile);
 
             // When saving the shell profile, we also need to update keybindings for everywhere.
-            Messenger.Default.Send(new KeyBindingsChangedMessage());
+            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
 
             if (newShell)
             {
-                Messenger.Default.Send(new ShellProfileAddedMessage(shellProfile));
-            }
-            else
-            {
-                Messenger.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.
-            Messenger.Default.Send(new KeyBindingsChangedMessage());
-
-            if (newShell)
-            {
-                Messenger.Default.Send(new ShellProfileAddedMessage(sshProfile));
-            }
-            else
-            {
-                Messenger.Default.Send(new ShellProfileChangedMessage(sshProfile));
+                ShellProfileAdded?.Invoke(this, shellProfile);
             }
         }
 
         public void SaveTerminalOptions(TerminalOptions terminalOptions)
         {
             _roamingSettings.WriteValueAsJson(nameof(TerminalOptions), terminalOptions);
-            Messenger.Default.Send(new TerminalOptionsChangedMessage(terminalOptions));
+            TerminalOptionsChanged?.Invoke(this, terminalOptions);
         }
 
         public void SaveTheme(TerminalTheme theme, bool newTheme = false)
@@ -400,12 +236,12 @@ namespace FluentTerminal.App.Services.Implementation
 
             if (theme.Id == GetCurrentThemeId())
             {
-                Messenger.Default.Send(new CurrentThemeChangedMessage(theme.Id));
+                CurrentThemeChanged?.Invoke(this, theme.Id);
             }
 
             if (newTheme)
             {
-                Messenger.Default.Send(new ThemeAddedMessage(theme));
+                ThemeAdded?.Invoke(this, theme);
             }
         }
     }

FluentTerminal.App.Services/Implementation/ShellProfileMigrationService.cs

@@ -1,32 +0,0 @@
-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 readonly IEnumerable<IThemeParser> _parsers;
+        private IEnumerable<IThemeParser> _parsers;
 
         public IEnumerable<string> SupportedFileTypes { get; }
 

FluentTerminal.App.Services/Implementation/TrayProcessCommunicationService.cs

@@ -1,5 +1,4 @@
-using FluentTerminal.App.Services.Exceptions;
-using FluentTerminal.Models;
+using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using FluentTerminal.Models.Requests;
 using FluentTerminal.Models.Responses;
@@ -7,138 +6,42 @@ 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<byte, Action<byte[]>> _terminalOutputHandlers;
-        // ReSharper disable once RedundantDefaultMemberInitializer
-        private byte _nextTerminalId = 0;
+        private readonly Dictionary<int, Action<byte[]>> _terminalOutputHandlers;
+        private int _nextTerminalId = 0;
 
-        public event EventHandler<TerminalExitStatus> TerminalExited;
+        public event EventHandler<int> TerminalExited;
 
         public TrayProcessCommunicationService(ISettingsService settingsService)
         {
             _settingsService = settingsService;
-            _terminalOutputHandlers = new Dictionary<byte, Action<byte[]>>();
+            _terminalOutputHandlers = new Dictionary<int, Action<byte[]>>();
         }
 
-        public byte GetNextTerminalId()
+        public int GetNextTerminalId()
         {
             return _nextTerminalId++;
         }
 
-        public async Task<string> GetUserNameAsync()
+        public async Task<GetAvailablePortResponse> GetAvailablePort()
         {
-            if (!string.IsNullOrEmpty(_userName))
-            {
-                // Returning the username from cache
-                return _userName;
-            }
+            var request = new GetAvailablePortRequest();
 
-            var response = await GetResponseAsync<StringValueResponse>(new GetUserNameRequest()).ConfigureAwait(false);
+            var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(request));
+            var response = JsonConvert.DeserializeObject<GetAvailablePortResponse>(responseMessage[MessageKeys.Content]);
 
-            if (response.Success)
-            {
-                _userName = response.Value;
-            }
+            Logger.Instance.Debug("Received GetAvailablePortResponse: {@response}", response);
 
-            return _userName;
+            return response;
         }
 
-        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> 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)
+        public async Task<CreateTerminalResponse> CreateTerminal(int id, TerminalSize size, ShellProfile shellProfile, SessionType sessionType)
         {
             var request = new CreateTerminalRequest
             {
@@ -150,151 +53,106 @@ namespace FluentTerminal.App.Services.Implementation
 
             Logger.Instance.Debug("Sending CreateTerminalRequest: {@request}", request);
 
-            var response = await GetResponseAsync<CreateTerminalResponse>(request).ConfigureAwait(false);
+            var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(request));
+            var response = JsonConvert.DeserializeObject<CreateTerminalResponse>(responseMessage[MessageKeys.Content]);
 
             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, object> e)
+        private void OnMessageReceived(object sender, IDictionary<string, string> e)
         {
-            var messageType = (byte)e[MessageKeys.Type];
+            var messageType = e[MessageKeys.Type];
             var messageContent = e[MessageKeys.Content];
 
-            switch (messageType)
+            if (messageType == nameof(DisplayTerminalOutputRequest))
             {
-                case Constants.TerminalBufferRequestIdentifier:
-                    var terminalId = (byte)e[MessageKeys.TerminalId];
+                var request = JsonConvert.DeserializeObject<DisplayTerminalOutputRequest>(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);
+                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);
 
-                    TerminalExited?.Invoke(this, request.ToStatus());
-                    break;
-                default:
-                    Logger.Instance.Error("Received unknown message type: {messageType}", messageType);
-                    break;
+                Logger.Instance.Debug("Received TerminalExitedRequest: {@request}", request);
+
+                TerminalExited?.Invoke(this, request.TerminalId);
             }
         }
 
-        public Task ResizeTerminalAsync(byte id, TerminalSize size)
+        public Task ResizeTerminal(int id, TerminalSize size)
         {
-            return _appServiceConnection.SendMessageAsync(CreateMessage(new ResizeTerminalRequest
-                {TerminalId = id, NewSize = size}));
+            var request = new ResizeTerminalRequest
+            {
+                TerminalId = id,
+                NewSize = size
+            };
+
+            return _appServiceConnection.SendMessageAsync(CreateMessage(request));
         }
 
-        public void SubscribeForTerminalOutput(byte terminalId, Action<byte[]> callback)
+        public void SubscribeForTerminalOutput(int terminalId, Action<byte[]> callback)
         {
             _terminalOutputHandlers[terminalId] = callback;
         }
 
-        public void UnsubscribeFromTerminalOutput(byte id)
-        {
-            if (_terminalOutputHandlers.ContainsKey(id))
-            {
-                _terminalOutputHandlers.Remove(id);
-            }
-        }
-
-        public Task UpdateToggleWindowKeyBindingsAsync()
+        public Task UpdateToggleWindowKeyBindings()
         {
             var keyBindings = _settingsService.GetCommandKeyBindings()[nameof(Command.ToggleWindow)];
 
-            return _appServiceConnection.SendMessageAsync(CreateMessage(new SetToggleWindowKeyBindingsRequest
-                {KeyBindings = keyBindings}));
-        }
-
-        public Task WriteAsync(byte id, byte[] data)
-        {
-            var message = new ValueSet
+            var request = new SetToggleWindowKeyBindingsRequest
             {
-                [MessageKeys.Type] = Constants.TerminalBufferRequestIdentifier,
-                [MessageKeys.TerminalId] = id,
-                [MessageKeys.Content] = data
+                KeyBindings = keyBindings
             };
 
-            return _appServiceConnection.SendMessageAsync(message);
+            return _appServiceConnection.SendMessageAsync(CreateMessage(request));
         }
 
-        public Task CloseTerminalAsync(byte terminalId)
+        public Task Write(int id, byte[] data)
         {
-            var request = new TerminalExitedRequest(terminalId, -1);
+            var request = new WriteDataRequest
+            {
+                TerminalId = id,
+                Data = data
+            };
+
+            return _appServiceConnection.SendMessageAsync(CreateMessage(request));
+        }
+
+        public Task CloseTerminal(int terminalId)
+        {
+            var request = new TerminalExitedRequest
+            {
+                TerminalId = terminalId
+            };
 
             Logger.Instance.Debug("Sending TerminalExitedRequest: {@request}", request);
 
             return _appServiceConnection.SendMessageAsync(CreateMessage(request));
         }
 
-        public async Task<string> GetCommandPathAsync(string command)
+        private IDictionary<string, string> CreateMessage(object content)
         {
-            if (string.IsNullOrWhiteSpace(command))
+            return new Dictionary<string, string>
             {
-                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]);
+                [MessageKeys.Type] = content.GetType().Name,
+                [MessageKeys.Content] = JsonConvert.SerializeObject(content)
+            };
         }
     }
 }

FluentTerminal.App.Services/Implementation/UpdateService.cs

@@ -17,9 +17,9 @@ namespace FluentTerminal.App.Services.Implementation
             _notificationService = notificationService;
         }
 
-        public async Task CheckForUpdateAsync(bool notifyNoUpdate = false)
+        public async Task CheckForUpdate(bool notifyNoUpdate = false)
         {
-            var latest = await GetLatestVersionAsync().ConfigureAwait(false);
+            var latest = await GetLatestVersionAsync();
             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.ExecuteAsync(restRequest).ConfigureAwait(false);
+            var restResponse = await restClient.ExecuteTaskAsync(restRequest);
             if (restResponse.IsSuccessful)
             {
                 dynamic restResponseData = JsonConvert.DeserializeObject(restResponse.Content);

FluentTerminal.App.Services/Logger.cs

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

FluentTerminal.App.Services/Terminal.cs

@@ -1,178 +1,144 @@
-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;
-        }
-
-        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; }
-
-        /// <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)
-        {
-            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);
-        }
-    }
+using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
+using FluentTerminal.Models.Responses;
+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<CreateTerminalResponse> 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);
+            }
+            return response;
+        }
+
+        public Task Write(byte[] data)
+        {
+            return _trayProcessCommunicationService.Write(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

@@ -1,25 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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 : PreserveDictionaryKeyCaseContractResolver
+    public class TerminalThemeContractResolver : DefaultContractResolver
     {
         protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
         {
@@ -24,4 +24,4 @@ namespace FluentTerminal.App.Services.Utilities
             return property;
         }
     }
-}
+}

FluentTerminal.App.ViewModels/DelayedHistorySaver.cs

@@ -1,101 +0,0 @@
-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

@@ -1,25 +0,0 @@
-using GalaSoft.MvvmLight;
-using System;
-
-namespace FluentTerminal.App.ViewModels
-{
-    public class EnvironmentVariableViewModel : ViewModelBase
-    {
-        private string _name;
-        private string _value;
-
-        public Guid Id { get; } = Guid.NewGuid();
-
-        public string Name
-        {
-            get => _name;
-            set => Set(ref _name, value);
-        }
-
-        public string Value
-        {
-            get => _value;
-            set => Set(ref _value, value);
-        }
-    }
-}

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

@@ -1,10 +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" />
   </ItemGroup>
 
@@ -13,11 +14,4 @@
     <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

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

FluentTerminal.App.ViewModels/ITerminalView.cs

@@ -1,20 +0,0 @@
-using System;
-using FluentTerminal.Models;
-using System.Threading.Tasks;
-
-namespace FluentTerminal.App.ViewModels
-{
-    public interface ITerminalView : IDisposable
-    {
-        Task ChangeThemeAsync(TerminalTheme theme);
-        Task ChangeKeyBindingsAsync();
-        Task ChangeOptionsAsync(TerminalOptions options);
-        Task InitializeAsync(TerminalViewModel viewModel);
-        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

@@ -35,7 +35,6 @@ namespace FluentTerminal.App.ViewModels.Infrastructure
             {
                 try
                 {
-                    // TODO: If we're using class field _isExecuting, maybe we should introduce some locking?
                     _isExecuting = true;
                     await _execute();
                 }

FluentTerminal.App.ViewModels/Infrastructure/IAsyncCommand.cs

@@ -12,7 +12,7 @@ namespace FluentTerminal.App.ViewModels.Infrastructure
         bool CanExecute();
     }
 
-    public interface IAsyncCommand<in T> : ICommand
+    public interface IAsyncCommand<T> : ICommand
     {
         Task ExecuteAsync(T parameter);
         bool CanExecute(T parameter);

FluentTerminal.App.ViewModels/MainViewModel.cs

@@ -1,22 +1,15 @@
-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 GalaSoft.MvvmLight.Command;
-using FluentTerminal.App.ViewModels.Infrastructure;
-using System.Windows.Input;
+using FluentTerminal.App.Services.Implementation;
 
 namespace FluentTerminal.App.ViewModels
 {
@@ -24,60 +17,46 @@ namespace FluentTerminal.App.ViewModels
     {
         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 readonly IAcceleratorKeyValidator _acceleratorKeyValidator;
+        private readonly IDefaultValueProvider _defaultValueProvider;
         private ApplicationSettings _applicationSettings;
-        private bool _useAcrylicBackground;
+        private string _background;
         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, IClipboardService clipboardService, ICommandHistoryService commandHistoryService, IAcceleratorKeyValidator acceleratorKeyValidator)
+        public MainViewModel(ISettingsService settingsService, ITrayProcessCommunicationService trayProcessCommunicationService, IDialogService dialogService, IKeyboardCommandService keyboardCommandService,
+            IApplicationView applicationView, IDispatcherTimer dispatcherTimer, IClipboardService clipboardService, IDefaultValueProvider defaultValueProvider)
         {
-            MessengerInstance.Register<ApplicationSettingsChangedMessage>(this, OnApplicationSettingsChanged);
-            MessengerInstance.Register<ShellProfileAddedMessage>(this, OnShellProfileAdded);
-            MessengerInstance.Register<ShellProfileDeletedMessage>(this, OnShellProfileDeleted);
-            MessengerInstance.Register<ShellProfileChangedMessage>(this, OnShellProfileChanged);
-            MessengerInstance.Register<DefaultShellProfileChangedMessage>(this, OnDefaultShellProfileChanged);
-            MessengerInstance.Register<TerminalOptionsChangedMessage>(this, OnTerminalOptionsChanged);
-            MessengerInstance.Register<CommandHistoryChangedMessage>(this, OnCommandHistoryChanged);
-            MessengerInstance.Register<KeyBindingsChangedMessage>(this, OnKeyBindingChanged);
-
             _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;
+            _defaultValueProvider = defaultValueProvider;
             _keyboardCommandService = keyboardCommandService;
-            _commandHistoryService = commandHistoryService;
-            _acceleratorKeyValidator = acceleratorKeyValidator;
-
-            _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.NewTab), () => AddTerminal());
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewRemoteTab), () => AddRemoteTerminal());
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ConfigurableNewTab), () => AddConfigurableTerminal());
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ChangeTabTitle), () => SelectedTerminal.EditTitle());
             _keyboardCommandService.RegisterCommandHandler(nameof(Command.CloseTab), CloseCurrentTab);
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.DuplicateTab), async () => await AddTabAsync(SelectedTerminal.ShellProfile.Clone()));
 
             // 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;
                 int tabNumber = i;
-                // ReSharper disable once InconsistentNaming
                 void handler() => SelectTabNumber(tabNumber);
                 _keyboardCommandService.RegisterCommandHandler(switchCmd.ToString(), handler);
             }
@@ -85,110 +64,46 @@ 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(), async () => await AddProfileByGuidAsync(profile.Id));
-            }
-
-            foreach (SshProfile profile in _settingsService.GetSshProfiles())
-            {
-                _keyboardCommandService.RegisterCommandHandler(profile.Id.ToString(), async () => await AddProfileByGuidAsync(profile.Id));
+                _keyboardCommandService.RegisterCommandHandler(profile.Id.ToString(), () => AddTerminal(profile.Id));
             }
 
             var currentTheme = _settingsService.GetCurrentTheme();
             var options = _settingsService.GetTerminalOptions();
-            UseAcrylicBackground = options.UseAcrylicBackground;
+            Background = currentTheme.Colors.Background;
             BackgroundOpacity = options.BackgroundOpacity;
             _applicationSettings = _settingsService.GetApplicationSettings();
             TabsPosition = _applicationSettings.TabsPosition;
 
-            AddDefaultTabCommand = new RelayCommand(async () => await AddDefaultProfileAsync(NewTerminalLocation.Tab));
+            AddTerminalCommand = new RelayCommand(() => AddTerminal());
+            ShowAboutCommand = new RelayCommand(ShowAbout);
+            ShowSettingsCommand = new RelayCommand(ShowSettings);
 
             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 RelayCommand(async () => await _dialogService.ShowAboutDialogAsync());
-            _quitCommand = new AsyncCommand(() => _trayProcessCommunicationService.QuitApplicationAsync());
-
-            _defaultProfile = _settingsService.GetDefaultShellProfile();
-
-            CreateMenuViewModel();
         }
 
-        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);
-
-            ApplicationView.CloseRequested -= OnCloseRequest;
-            ApplicationView.Closed -= OnClosed;
-            Terminals.CollectionChanged -= OnTerminalsCollectionChanged;
-
-            _keyboardCommandService.ClearCommandHandlers();
-
-            _applicationSettings = null;
-
-            AddDefaultTabCommand = null;
-
             Closed?.Invoke(this, e);
         }
 
-        private void OnShellProfileDeleted(ShellProfileDeletedMessage message)
+        private void OnShellProfileDeleted(object sender, Guid e)
         {
-            _keyboardCommandService.DeregisterCommandHandler(message.ProfileId.ToString());
-
-            UpdateDefaultShellProfile();
+            _keyboardCommandService.DeregisterCommandHandler(e.ToString());
         }
 
-        private void OnShellProfileChanged(ShellProfileChangedMessage message)
+        private void OnShellProfileAdded(object sender, ShellProfile e)
         {
-            UpdateDefaultShellProfile();
-        }
-
-        private void OnShellProfileAdded(ShellProfileAddedMessage message)
-        {
-            _keyboardCommandService.RegisterCommandHandler(message.ShellProfile.Id.ToString(),
-                async () => await AddProfileByGuidAsync(message.ShellProfile.Id));
-
-            UpdateDefaultShellProfile();
-        }
-
-        private void OnDefaultShellProfileChanged(DefaultShellProfileChangedMessage message)
-        {
-            UpdateDefaultShellProfile();
+            _keyboardCommandService.RegisterCommandHandler(e.Id.ToString(), () => AddTerminal(e.Id));
         }
 
         private void OnTerminalsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
@@ -203,21 +118,9 @@ namespace FluentTerminal.App.ViewModels
 
         public event EventHandler ShowSettingsRequested;
 
-        public event EventHandler ActivatedMv;
+        public event EventHandler ShowAboutRequested;
 
-        public event EventHandler<TerminalViewModel> TabTearedOff;
-
-        public void TearOffTab(TerminalViewModel model)
-        {
-            TabTearedOff?.Invoke(this, model);
-        }
-
-        public void FocusWindow()
-        {
-            ActivatedMv?.Invoke(this, EventArgs.Empty);
-        }
-
-        public RelayCommand AddDefaultTabCommand { get; private set; }
+        public RelayCommand AddTerminalCommand { get; }
 
         public string WindowTitle
         {
@@ -233,18 +136,18 @@ namespace FluentTerminal.App.ViewModels
 
         public bool ShowTabsOnTop
         {
-            get => TabsPosition == TabsPosition.Top;
+            get => TabsPosition == TabsPosition.Top && (Terminals.Count > 1 || _applicationSettings.AlwaysShowTabs);
         }
 
         public bool ShowTabsOnBottom
         {
-            get => TabsPosition == TabsPosition.Bottom;
+            get => TabsPosition == TabsPosition.Bottom && (Terminals.Count > 1 || _applicationSettings.AlwaysShowTabs);
         }
 
-        public bool UseAcrylicBackground
+        public string Background
         {
-            get => _useAcrylicBackground;
-            set => Set(ref _useAcrylicBackground, value);
+            get => _background;
+            set => Set(ref _background, value);
         }
 
         public double BackgroundOpacity
@@ -258,26 +161,33 @@ namespace FluentTerminal.App.ViewModels
             get => _selectedTerminal;
             set
             {
-                var oldValue = _selectedTerminal;
-
+                if (SelectedTerminal != null)
+                {
+                    _selectedTerminal.IsSelected = false;
+                }
                 if (Set(ref _selectedTerminal, value))
                 {
-                    if (oldValue != null)
+                    SelectedTerminal?.FocusTerminal();
+                    if (SelectedTerminal != null)
                     {
-                        oldValue.IsSelected = false;
-                    }
-
-                    if (_selectedTerminal != null)
-                    {
-                        _selectedTerminal.IsSelected = true;
-                        _selectedTerminal.FocusTerminal();
-
-                        SetWindowTitle(_selectedTerminal);
+                        SelectedTerminal.IsSelected = true;
+                        if (_applicationSettings.ShowCustomTitleInTitlebar)
+                        {
+                            WindowTitle = SelectedTerminal.TabTitle;
+                        }
+                        else
+                        {
+                            WindowTitle = SelectedTerminal.ShellTitle;
+                        }
                     }
                 }
             }
         }
 
+        public RelayCommand ShowAboutCommand { get; }
+
+        public RelayCommand ShowSettingsCommand { get; }
+
         public TabsPosition TabsPosition
         {
             get => _tabsPosition;
@@ -288,223 +198,163 @@ namespace FluentTerminal.App.ViewModels
 
         public IApplicationView ApplicationView { get; }
 
-        #region Launching terminal sessions
+        public Task AddConfigurableTerminal()
+        {
+            return ApplicationView.RunOnDispatcherThread(async () =>
+            {
+                var profile = await _dialogService.ShowProfileSelectionDialogAsync();
 
-        public Task AddDefaultProfileAsync(NewTerminalLocation location)
+                if (profile == null)
+                {
+                    if (Terminals.Count == 0)
+                    {
+                        await ApplicationView.TryClose();
+                    }
+
+                    return;
+                }
+
+                AddTerminal(profile);
+            });
+        }
+
+        public Task AddRemoteTerminal()
+        {
+            return ApplicationView.RunOnDispatcherThread(async () =>
+            {
+                var connectionInfo = await _dialogService.ShowSshConnectionInfoDialogAsync();
+
+                if (connectionInfo == null)
+                {
+                    if (Terminals.Count == 0)
+                    {
+                        await ApplicationView.TryClose();
+                    }
+
+                    return;
+                }
+
+                var profile = new ShellProfile
+                {
+                    Arguments = $"-p {connectionInfo.Port:#####} {connectionInfo.Username}@{connectionInfo.Host}",
+                    Location = @"C:\Windows\System32\OpenSSH\ssh.exe",
+                    WorkingDirectory = string.Empty,
+                    LineEndingTranslation = LineEndingStyle.DoNotModify,
+                };
+
+                AddTerminal(profile);
+            });
+        }
+
+        public void AddTerminal()
         {
             var profile = _settingsService.GetDefaultShellProfile();
-
-            return AddProfileAsync(profile, location);
+            AddTerminal(profile);
         }
 
-        private async Task AddSshProfileAsync(NewTerminalLocation location)
+        public void AddTerminal(Guid shellProfileId)
         {
-            var profile = await _dialogService.ShowSshConnectionInfoDialogAsync().ConfigureAwait(true);
-
-            await AddProfileAsync(profile, location).ConfigureAwait(false);
+            var profile = _settingsService.GetShellProfile(shellProfileId);
+            AddTerminal(profile);
         }
 
-        private async Task AddQuickLaunchProfileAsync(NewTerminalLocation location)
+        public void AddTerminal(ShellProfile profile)
         {
-            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(() =>
+            ApplicationView.RunOnDispatcherThread(() =>
             {
                 var terminal = new TerminalViewModel(_settingsService, _trayProcessCommunicationService, _dialogService, _keyboardCommandService,
-                    _applicationSettings, profile, ApplicationView, _clipboardService, terminalState);
+                    _applicationSettings, profile, ApplicationView, _dispatcherTimer, _clipboardService);
 
-                terminal.PropertyChanged += Terminal_PropertyChanged;
                 terminal.Closed += OnTerminalClosed;
-                terminal.CloseLeftTabsRequested += Terminal_CloseLeftTabsRequested;
-                terminal.CloseRightTabsRequested += Terminal_CloseRightTabsRequested;
-                terminal.CloseOtherTabsRequested += Terminal_CloseOtherTabsRequested;
-                terminal.DuplicateTabRequested += Terminal_DuplicateTabRequested;
-                Terminals.Insert(Math.Min(position, Terminals.Count), terminal);
+                terminal.ShellTitleChanged += Terminal_ShellTitleChanged;
+                terminal.CustomTitleChanged += Terminal_CustomTitleChanged;
+                Terminals.Add(terminal);
 
                 SelectedTerminal = terminal;
             });
         }
 
-        #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)
+        private void Terminal_CustomTitleChanged(object sender, string e)
         {
             if (sender is TerminalViewModel terminal)
             {
-                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 (terminal.IsSelected && _applicationSettings.ShowCustomTitleInTitlebar)
                 {
-                    Logger.Instance.Debug("Terminal with Id: {@id} closed.", t.Terminal.Id);
-                    return t.CloseCommand.ExecuteAsync();
-                })).ConfigureAwait(false);
+                    if (string.IsNullOrWhiteSpace(e))
+                    {
+                        WindowTitle = terminal.ShellTitle;
+                    }
+                    else
+                    {
+                        WindowTitle = e;
+                    }
+                }
             }
         }
 
-        private async void Terminal_CloseRightTabsRequested(object sender, EventArgs e)
+        private void Terminal_ShellTitleChanged(object sender, string e)
         {
-            if (sender is TerminalViewModel terminal)
+            if (sender is TerminalViewModel terminal && terminal.IsSelected && !_applicationSettings.ShowCustomTitleInTitlebar)
             {
-                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.CloseCommand.ExecuteAsync();
-                })).ConfigureAwait(false);
+                WindowTitle = e;
             }
         }
 
-        private async void Terminal_CloseLeftTabsRequested(object sender, EventArgs e)
+        public async Task CloseAllTerminals()
         {
-            if (sender is TerminalViewModel terminal)
+            foreach (var terminal in Terminals)
             {
-                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.CloseCommand.ExecuteAsync();
-                })).ConfigureAwait(false);
-            }
-        }
-
-        private Task CloseAllTerminalsAsync()
-        {
-            return Task.WhenAll(Terminals.Select(terminal =>
-            {
-                terminal.PropertyChanged -= Terminal_PropertyChanged;
                 terminal.Closed -= OnTerminalClosed;
-                terminal.CloseLeftTabsRequested -= Terminal_CloseLeftTabsRequested;
-                terminal.CloseRightTabsRequested -= Terminal_CloseRightTabsRequested;
-                terminal.CloseOtherTabsRequested -= Terminal_CloseOtherTabsRequested;
-                terminal.DuplicateTabRequested -= Terminal_DuplicateTabRequested;
-                return terminal.CloseAsync();
-            }));
+                terminal.ShellTitleChanged -= Terminal_ShellTitleChanged;
+                terminal.CustomTitleChanged -= Terminal_CustomTitleChanged;
+                await terminal.Close();
+            }
         }
 
         private void CloseCurrentTab()
         {
-            SelectedTerminal?.CloseCommand.ExecuteAsync();
+            SelectedTerminal?.CloseCommand.Execute(null);
         }
 
-        private void OnApplicationSettingsChanged(ApplicationSettingsChangedMessage message)
+        private void NewWindow(bool showProfileSelection)
         {
-            var updateMenu = _applicationSettings != null &&
-                             (_applicationSettings.TabWindowCascadingAppMenu !=
-                              message.ApplicationSettings.TabWindowCascadingAppMenu ||
-                              !message.ApplicationSettings.TabWindowCascadingAppMenu &&
-                              _applicationSettings.NewTerminalLocation !=
-                              message.ApplicationSettings.NewTerminalLocation);
-
-            _applicationSettings = message.ApplicationSettings;
-
-            SetWindowTitle(SelectedTerminal);
-
-            ApplicationView.ExecuteOnUiThreadAsync(() =>
+            var args = new NewWindowRequestedEventArgs
             {
-                TabsPosition = message.ApplicationSettings.TabsPosition;
+                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 (updateMenu)
-            {
-                ApplicationView.ExecuteOnUiThreadAsync(CreateMenuViewModel, CoreDispatcherPriority.Low, true);
-            }
+                if (e.ShowCustomTitleInTitlebar)
+                {
+                    WindowTitle = SelectedTerminal?.TabTitle;
+                }
+                else
+                {
+                    WindowTitle = SelectedTerminal?.ShellTitle;
+                }
+            });
         }
 
         private async Task OnCloseRequest(object sender, CancelableEventArgs e)
         {
             if (_applicationSettings.ConfirmClosingWindows)
             {
-                var result = await _dialogService.ShowMessageDialogAsync(I18N.Translate("PleaseConfirm"),
-                    I18N.Translate("ConfirmCloseWindow"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(false);
+                var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to close this window?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(false);
 
                 if (result == DialogButton.OK)
                 {
-                    await CloseAllTerminalsAsync().ConfigureAwait(false);
+                    await CloseAllTerminals();
                 }
                 else
                 {
@@ -513,62 +363,43 @@ namespace FluentTerminal.App.ViewModels
             }
             else
             {
-                await CloseAllTerminalsAsync().ConfigureAwait(false);
+                await CloseAllTerminals();
             }
         }
 
-        private void OnTerminalClosed(object sender, EventArgs e)
+        private async void OnCurrentThemeChanged(object sender, Guid e)
         {
-            if (!(sender is TerminalViewModel terminal))
+            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)
             {
-                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;
-
+                if (SelectedTerminal == terminal)
+                {
+                    SelectedTerminal = Terminals.LastOrDefault(t => t != terminal);
+                }
+                Logger.Instance.Debug("Terminal with Id: {@id} closed.", terminal.Terminal.Id);
                 Terminals.Remove(terminal);
 
                 if (Terminals.Count == 0)
                 {
-                    ApplicationView.TryCloseAsync();
+                    await ApplicationView.TryClose();
                 }
-                else if (wasSelected)
-                {
-                    SelectedTerminal = Terminals.LastOrDefault(t => t != terminal);
-                }
-            });
+            }
         }
 
-        private void OnTerminalOptionsChanged(TerminalOptionsChangedMessage message)
+        private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
         {
-            ApplicationView.ExecuteOnUiThreadAsync(() =>
+            await ApplicationView.RunOnDispatcherThread(() =>
             {
-                BackgroundOpacity = message.TerminalOptions.BackgroundOpacity;
-                UseAcrylicBackground = message.TerminalOptions.UseAcrylicBackground;
-            }, CoreDispatcherPriority.Low);
-        }
-
-        private void OnKeyBindingChanged(KeyBindingsChangedMessage message)
-        {
-            LoadKeyBindings();
-
-            ApplicationView.ExecuteOnUiThreadAsync(CreateMenuViewModel, CoreDispatcherPriority.Low, true);
-        }
-
-        private void OnCommandHistoryChanged(CommandHistoryChangedMessage message)
-        {
-            ApplicationView.ExecuteOnUiThreadAsync(CreateMenuViewModel, CoreDispatcherPriority.Low, true);
+                BackgroundOpacity = e.BackgroundOpacity;
+            });
         }
 
         private void SelectTabNumber(int tabNumber)
@@ -593,7 +424,12 @@ namespace FluentTerminal.App.ViewModels
             SelectedTerminal = Terminals[previousIndex];
         }
 
-        public void ShowSettings()
+        private void ShowAbout()
+        {
+            ShowAboutRequested?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void ShowSettings()
         {
             ShowSettingsRequested?.Invoke(this, EventArgs.Empty);
         }
@@ -602,219 +438,5 @@ 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 RelayCommand _newDefaultTabCommand;
-        private readonly RelayCommand _newDefaultWindowCommand;
-        private readonly RelayCommand _newRemoteTabCommand;
-        private readonly RelayCommand _newRemoteWindowCommand;
-        private readonly RelayCommand _newQuickLaunchTabCommand;
-        private readonly RelayCommand _newQuickLaunchWindowCommand;
-        private readonly RelayCommand _settingsCommand;
-        private readonly RelayCommand _aboutCommand;
-        private readonly ICommand _quitCommand;
-
-        public MenuViewModel AppMenuViewModel
-        {
-            get => _menuViewModel;
-            private set => Set(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 &&
-                _acceleratorKeyValidator.Valid(settingsKeyBinding.Key))
-            {
-                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 &&
-                    _acceleratorKeyValidator.Valid(tabKeyBindings.Key))
-                {
-                    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 &&
-                _acceleratorKeyValidator.Valid(remoteTabKeyBinding.Key))
-            {
-                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 &&
-                _acceleratorKeyValidator.Valid(quickTabKeyBinding.Key))
-            {
-                LoadKeyBindingsFromModel(quickLaunchItem, quickTabKeyBinding);
-            }
-            else
-            {
-                quickLaunchItem.KeyBinding = null;
-            }
-
-            items.Add(quickLaunchItem);
-        }
-
-        private ObservableCollection<MenuItemViewModel> GetRecentMenuItems() =>
-            new ObservableCollection<MenuItemViewModel>(_commandHistoryService
-                .GetHistoryRecentFirst(top: RecentItemsMaxCount).Select(CommandToMenuItem));
-
-        private MenuItemViewModel CommandToMenuItem(ExecutedCommand command)
-        {
-            var itemCommand = new RelayCommand(async () => await AddProfileAsync(command.ShellProfile),
-                keepTargetAlive: true);
-            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 (!_acceleratorKeyValidator.Valid(keyBinding.Key))
-            {
-                menuItemViewModel.KeyBinding = null;
-
-                return;
-            }
-
-            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

@@ -1,41 +0,0 @@
-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

@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-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

@@ -1,147 +0,0 @@
-using FluentTerminal.Models;
-using GalaSoft.MvvmLight;
-
-namespace FluentTerminal.App.ViewModels.Menu
-{
-    public class MenuItemKeyBindingViewModel : ViewModelBase
-    {
-        #region Properties
-
-        private int _key;
-
-        public int Key
-        {
-            get => _key;
-            set => Set(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 => Set(ref _keyModifiers, value);
-        }
-
-        private bool _ctrl;
-
-        public bool Ctrl
-        {
-            get => _ctrl;
-            set
-            {
-                if (Set(ref _ctrl, value))
-                {
-                    SetKeyModifiers();
-                }
-            }
-        }
-
-        private bool _alt;
-
-        public bool Alt
-        {
-            get => _alt;
-            set
-            {
-                if (Set(ref _alt, value))
-                {
-                    SetKeyModifiers();
-                }
-            }
-        }
-
-        private bool _shift;
-
-        public bool Shift
-        {
-            get => _shift;
-            set
-            {
-                if (Set(ref _shift, value))
-                {
-                    SetKeyModifiers();
-                }
-            }
-        }
-
-        private bool _windows;
-
-        public bool Windows
-        {
-            get => _windows;
-            set
-            {
-                if (Set(ref _windows, value))
-                {
-                    SetKeyModifiers();
-                }
-            }
-        }
-
-        #endregion Properties
-
-        #region Constructors
-
-        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)
-        {
-        }
-
-        #endregion Constructors
-
-        #region Methods
-
-        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;
-        }
-
-        #endregion Methods
-    }
-}

FluentTerminal.App.ViewModels/Menu/MenuItemViewModel.cs

@@ -1,46 +0,0 @@
-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 => Set(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

@@ -1,61 +0,0 @@
-using FluentTerminal.Models;
-using GalaSoft.MvvmLight;
-
-namespace FluentTerminal.App.ViewModels.Menu
-{
-    public class MenuItemViewModelBase : ViewModelBase
-    {
-        #region Properties
-
-        private string _text;
-
-        public string Text
-        {
-            get => _text;
-            set => Set(ref _text, value);
-        }
-
-        private string _description;
-
-        public string Description
-        {
-            get => _description;
-            set => Set(ref _description, value);
-        }
-
-        private Mdl2Icon _icon;
-
-        public Mdl2Icon Icon
-        {
-            get => _icon;
-            set => Set(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

@@ -1,39 +0,0 @@
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using GalaSoft.MvvmLight;
-
-namespace FluentTerminal.App.ViewModels.Menu
-{
-    public class MenuViewModel : ViewModelBase
-    {
-        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

@@ -1,28 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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

@@ -1,53 +0,0 @@
-using GalaSoft.MvvmLight;
-using System;
-using Windows.UI.Xaml;
-
-namespace FluentTerminal.App.ViewModels
-{
-    public class OverlayViewModel : ViewModelBase
-    {
-        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 => Set(ref _showOverlay, value);
-        }
-
-        public string OverlayContent
-        {
-            get => _overlayContent;
-            set => Set(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

@@ -1,258 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Threading.Tasks;
-using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
-using FluentTerminal.App.ViewModels.Infrastructure;
-using FluentTerminal.App.ViewModels.Profiles;
-using FluentTerminal.App.ViewModels.Settings;
-using FluentTerminal.Models;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
-
-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> : ViewModelBase 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 => Set(ref _inEditMode, value);
-        }
-
-        private string _name;
-
-        public string Name
-        {
-            get => _name;
-            set => Set(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 IAsyncCommand CancelEditCommand { get; }
-
-        public IAsyncCommand DeleteCommand { get; }
-
-        public RelayCommand EditCommand { get; }
-
-        public IAsyncCommand SaveChangesCommand { get; }
-
-        public IAsyncCommand 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 AsyncCommand(DeleteAsync, CanDelete);
-            EditCommand = new RelayCommand(Edit);
-            CancelEditCommand = new AsyncCommand(CancelEditAsync);
-            SaveChangesCommand = new AsyncCommand(SaveChangesAsync);
-            AddKeyboardShortcutCommand = new AsyncCommand(AddKeyboardShortcut);
-        }
-
-        #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 AddKeyboardShortcut()
-        {
-            return KeyBindings.ShowAddKeyBindingDialogAsync();
-        }
-
-        #endregion Methods
-    }
-}

FluentTerminal.App.ViewModels/Profiles/CommonProfileProviderViewModel.cs

@@ -1,150 +0,0 @@
-using System.Threading.Tasks;
-using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
-using FluentTerminal.App.ViewModels.Infrastructure;
-using FluentTerminal.Models;
-
-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 => Set(ref _location, value);
-        }
-
-        private string _workingDirectory;
-
-        public string WorkingDirectory
-        {
-            get => _workingDirectory;
-            set => Set(ref _workingDirectory, value);
-        }
-
-        private string _arguments;
-
-        public string Arguments
-        {
-            get => _arguments;
-            set => Set(ref _arguments, value);
-        }
-
-        #endregion Properties
-
-        #region Commands
-
-        public IAsyncCommand BrowseForCustomShellCommand { get; }
-
-        public IAsyncCommand 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 AsyncCommand(BrowseForCustomShell);
-            BrowseForWorkingDirectoryCommand = new AsyncCommand(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

@@ -1,384 +0,0 @@
-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 GalaSoft.MvvmLight;
-
-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 : ViewModelBase
-    {
-        #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 (Set(ref _selectedTabTheme, theme))
-                {
-                    _tabThemeId = theme.Id;
-                }
-            }
-        }
-
-        private int _tabThemeId;
-
-        public int TabThemeId
-        {
-            get => _tabThemeId;
-            set
-            {
-                if (Set(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 (Set(ref _selectedTerminalTheme, theme))
-                {
-                    _terminalThemeId = theme.Id;
-                }
-            }
-        }
-
-        private Guid _terminalThemeId;
-
-        public Guid TerminalThemeId
-        {
-            get => _terminalThemeId;
-            set
-            {
-                if (Set(ref _terminalThemeId, value))
-                {
-                    SelectedTerminalTheme = TerminalThemes.FirstOrDefault(t => t.Id.Equals(value));
-                }
-            }
-        }
-
-        private bool _useConPty;
-
-        public bool UseConPty
-        {
-            get => _useConPty;
-            set => Set(ref _useConPty, value);
-        }
-
-        private bool _useBuffer;
-
-        public bool UseBuffer
-        {
-            get => _useBuffer;
-            set => Set(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();
-
-            MessengerInstance.Register<ThemeAddedMessage>(this, OnThemeAdded);
-            MessengerInstance.Register<ThemeDeletedMessage>(this, OnThemeDeleted);
-
-            Initialize(Model);
-        }
-
-        #endregion Constructor
-
-        #region Methods
-
-        private void OnThemeDeleted(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);
-        }
-
-        private void OnThemeAdded(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

@@ -1,536 +0,0 @@
-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 FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
-using FluentTerminal.App.ViewModels.Infrastructure;
-using FluentTerminal.Models;
-
-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 => Set(ref _host, value);
-        }
-
-        private ushort _sshPort;
-
-        public ushort SshPort
-        {
-            get => _sshPort;
-            set => Set(ref _sshPort, value);
-        }
-
-        private string _username;
-
-        public string Username
-        {
-            get => _username;
-            set => Set(ref _username, value);
-        }
-
-        private string _identityFile;
-
-        public string IdentityFile
-        {
-            get => _identityFile;
-            set => Set(ref _identityFile, value);
-        }
-
-        private bool _useMosh;
-
-        public bool UseMosh
-        {
-            get => _useMosh;
-            set => Set(ref _useMosh, value);
-        }
-
-        private ushort _moshPortFrom;
-
-        public ushort MoshPortFrom
-        {
-            get => _moshPortFrom;
-            set => Set(ref _moshPortFrom, value);
-        }
-
-        private ushort _moshPortTo;
-
-        public ushort MoshPortTo
-        {
-            get => _moshPortTo;
-            set => Set(ref _moshPortTo, value);
-        }
-
-        #endregion Properties
-
-        #region Commands
-
-        public IAsyncCommand 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 AsyncCommand(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

@@ -1,16 +0,0 @@
-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,6 +1,7 @@
 using FluentTerminal.App.Services;
 using FluentTerminal.App.ViewModels.Infrastructure;
 using GalaSoft.MvvmLight;
+using System;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.ViewModels.Settings
@@ -8,16 +9,18 @@ namespace FluentTerminal.App.ViewModels.Settings
     public class AboutPageViewModel : ViewModelBase
     {
         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(IUpdateService updateService, IApplicationView applicationView)
+        public AboutPageViewModel(ISettingsService settingsService, IUpdateService updateService, IApplicationView applicationView)
         {
+            _settingsService = settingsService;
             _updateService = updateService;
             _applicationView = applicationView;
 
-            CheckForUpdatesCommand = new AsyncCommand(() => CheckForUpdateAsync(true));
+            CheckForUpdatesCommand = new AsyncCommand(() => CheckForUpdate(true));
         }
 
         public IAsyncCommand CheckForUpdatesCommand { get; }
@@ -27,7 +30,7 @@ namespace FluentTerminal.App.ViewModels.Settings
             get
             {
                 var version = _updateService.GetCurrentVersion();
-                return $"{version.Major}.{version.Minor}.{version.Build}.{version.Revision}";
+                return ConvertVersionToString(version);
             }
         }
 
@@ -58,16 +61,19 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         public Task OnNavigatedTo()
         {
-            return CheckForUpdateAsync(false);
+            return CheckForUpdate(false);
         }
 
-        private async Task CheckForUpdateAsync(bool notifyNoUpdate)
+        public async Task CheckForUpdate(bool notifyNoUpdate)
         {
-            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);
+            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);
         }
     }
 }

FluentTerminal.App.ViewModels/Settings/GeneralPageViewModel.cs

@@ -1,10 +1,8 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
-using FluentTerminal.App.ViewModels.Infrastructure;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
-using System.Collections.Generic;
+using GalaSoft.MvvmLight.Command;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.ViewModels.Settings
@@ -17,56 +15,57 @@ 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, IApplicationLanguageService applicationLanguageService,
-            ITrayProcessCommunicationService trayProcessCommunicationService, IFileSystemService fileSystemService)
+        public GeneralPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider, IStartupTaskService startupTaskService)
         {
             _settingsService = settingsService;
             _dialogService = dialogService;
             _defaultValueProvider = defaultValueProvider;
             _startupTaskService = startupTaskService;
-            _applicationLanguageService = applicationLanguageService;
-            _trayProcessCommunicationService = trayProcessCommunicationService;
-            _fileSystemService = fileSystemService;
 
             _applicationSettings = _settingsService.GetApplicationSettings();
 
-            RestoreDefaultsCommand = new AsyncCommand(RestoreDefaultsAsync);
-            BrowseLogDirectoryCommand = new AsyncCommand(BrowseLogDirectoryAsync);
+            RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
         }
 
-        public IEnumerable<string> Languages => _applicationLanguageService.Languages;
-
-        public bool NeedsToRestart
+        public async Task OnNavigatedTo()
         {
-            get => _needsToRestart;
-            set => Set(ref _needsToRestart, value);
+            var startupTaskStatus = await _startupTaskService.GetStatus();
+            SetStartupTaskPropertiesForStatus(startupTaskStatus);
         }
 
-        public string SelectedLanguage
+        public bool AlwaysShowTabs
         {
-            get => _applicationLanguageService.GetCurrentLanguage();
+            get => _applicationSettings.AlwaysShowTabs;
             set
             {
-                _applicationLanguageService.SetLanguage(value);
-                NeedsToRestart = true;
+                if (_applicationSettings.AlwaysShowTabs != value)
+                {
+                    _applicationSettings.AlwaysShowTabs = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
             }
         }
 
-        // Requires UI thread
-        public async Task OnNavigatedToAsync()
+        public bool AlwaysUseWinPty
         {
-            // ConfigureAwait(true) because we want to execute SetStartupTaskPropertiesForStatus from the calling (UI) thread.
-            var startupTaskStatus = await _startupTaskService.GetStatusAsync().ConfigureAwait(true);
-            SetStartupTaskPropertiesForStatus(startupTaskStatus);
+            get => _applicationSettings.AlwaysUseWinPty;
+            set
+            {
+                if (_applicationSettings.AlwaysUseWinPty != value)
+                {
+                    _applicationSettings.AlwaysUseWinPty = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
         }
 
         public bool ShowCustomTitleInTitlebar
@@ -120,123 +119,10 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        public bool UseMoshByDefault
-        {
-            get => _applicationSettings.UseMoshByDefault;
-            set
-            {
-                if (_applicationSettings.UseMoshByDefault != value)
-                {
-                    _applicationSettings.UseMoshByDefault = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public bool AutoFallbackToWindowsUsernameInLinks
-        {
-            get => _applicationSettings.AutoFallbackToWindowsUsernameInLinks;
-            set
-            {
-                if (_applicationSettings.AutoFallbackToWindowsUsernameInLinks != value)
-                {
-                    _applicationSettings.AutoFallbackToWindowsUsernameInLinks = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public bool RTrimCopiedLines
-        {
-            get => _applicationSettings.RTrimCopiedLines;
-            set
-            {
-                if (_applicationSettings.RTrimCopiedLines != value)
-                {
-                    _applicationSettings.RTrimCopiedLines = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public bool MuteTerminalBeeps
-        {
-            get => _applicationSettings.MuteTerminalBeeps;
-            set
-            {
-                if (_applicationSettings.MuteTerminalBeeps != value)
-                {
-                    _applicationSettings.MuteTerminalBeeps = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-
-                    _trayProcessCommunicationService.MuteTerminalAsync(value);
-                }
-            }
-        }
-        public bool EnableLogging
-        {
-            get => _applicationSettings.EnableLogging;
-            set
-            {
-                if (_applicationSettings.EnableLogging != value)
-                {
-                    _applicationSettings.EnableLogging = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public bool PrintableOutputOnly
-        {
-            get => _applicationSettings.PrintableOutputOnly;
-            set
-            {
-                if (_applicationSettings.PrintableOutputOnly != value)
-                {
-                    _applicationSettings.PrintableOutputOnly = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public string LogDirectoryPath
-        {
-            get => _applicationSettings.LogDirectoryPath;
-            set
-            {
-                if (_applicationSettings.LogDirectoryPath != value)
-                {
-                    _applicationSettings.LogDirectoryPath = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public bool UseConPty
-        {
-            get => _applicationSettings.UseConPty;
-            set
-            {
-                if (_applicationSettings.UseConPty != value)
-                {
-                    _applicationSettings.UseConPty = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
         public bool BottomIsSelected
         {
             get => TabsPosition == TabsPosition.Bottom;
-            set { if (value) TabsPosition = TabsPosition.Bottom; }
+            set => TabsPosition = TabsPosition.Bottom;
         }
 
         public bool CanEnableStartupTask
@@ -278,43 +164,31 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _applicationSettings.NewTerminalLocation;
             set
             {
-                if (_applicationSettings.NewTerminalLocation != value)
+                if (_applicationSettings.NewTerminalLocation != value && !_editingNewTerminalLocation)
                 {
+                    _editingNewTerminalLocation = true;
                     _applicationSettings.NewTerminalLocation = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
                     RaisePropertyChanged();
+                    RaisePropertyChanged(nameof(WindowIsSelected));
                     RaisePropertyChanged(nameof(TabIsSelected));
+                    _editingNewTerminalLocation = false;
                 }
             }
         }
 
-        public bool TabWindowCascadingAppMenu
-        {
-            get => _applicationSettings.TabWindowCascadingAppMenu;
-            set
-            {
-                if (_applicationSettings.TabWindowCascadingAppMenu != value)
-                {
-                    _applicationSettings.TabWindowCascadingAppMenu = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public IAsyncCommand RestoreDefaultsCommand { get; }
-
-        public IAsyncCommand BrowseLogDirectoryCommand { get; }
+        public RelayCommand RestoreDefaultsCommand { get; }
 
         public bool StartupTaskEnabled
         {
             get => _startupTaskEnabled;
             set
             {
-                if (Set(ref _startupTaskEnabled, value))
+                if (_startupTaskEnabled != value)
                 {
-                    // ReSharper disable once AssignmentIsFullyDiscarded
-                    _ = SetStartupTaskStateAsync(value);
+                    _startupTaskEnabled = value;
+                    RaisePropertyChanged(nameof(StartupTaskEnabled));
+                    SetStartupTaskState(value);
                 }
             }
         }
@@ -328,7 +202,7 @@ namespace FluentTerminal.App.ViewModels.Settings
         public bool TabIsSelected
         {
             get => NewTerminalLocation == NewTerminalLocation.Tab;
-            set => NewTerminalLocation = value ? NewTerminalLocation.Tab : NewTerminalLocation.Window;
+            set => NewTerminalLocation = NewTerminalLocation.Tab;
         }
 
         public TabsPosition TabsPosition
@@ -336,11 +210,15 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _applicationSettings.TabsPosition;
             set
             {
-                if (_applicationSettings.TabsPosition != value)
+                if (_applicationSettings.TabsPosition != value && !_editingTabsPosition)
                 {
+                    _editingTabsPosition = true;
                     _applicationSettings.TabsPosition = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
                     RaisePropertyChanged();
+                    RaisePropertyChanged(nameof(TopIsSelected));
+                    RaisePropertyChanged(nameof(BottomIsSelected));
+                    _editingTabsPosition = false;
                 }
             }
         }
@@ -348,7 +226,7 @@ namespace FluentTerminal.App.ViewModels.Settings
         public bool TopIsSelected
         {
             get => TabsPosition == TabsPosition.Top;
-            set { if (value) TabsPosition = TabsPosition.Top; }
+            set => TabsPosition = TabsPosition.Top;
         }
 
         public bool UnderlineSelectedTab
@@ -368,13 +246,13 @@ namespace FluentTerminal.App.ViewModels.Settings
         public bool BackgroundIsSelected
         {
             get => InactiveTabColorMode == InactiveTabColorMode.Background;
-            set { if (value) InactiveTabColorMode = InactiveTabColorMode.Background; }
+            set => InactiveTabColorMode = InactiveTabColorMode.Background;
         }
 
         public bool UnderlinedIsSelected
         {
             get => InactiveTabColorMode == InactiveTabColorMode.Underlined;
-            set { if (value) InactiveTabColorMode = InactiveTabColorMode.Underlined; }
+            set => InactiveTabColorMode = InactiveTabColorMode.Underlined;
         }
 
         public InactiveTabColorMode InactiveTabColorMode
@@ -382,36 +260,28 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _applicationSettings.InactiveTabColorMode;
             set
             {
-                if (_applicationSettings.InactiveTabColorMode != value)
+                if (_applicationSettings.InactiveTabColorMode != value && !_editingInactiveTabColorMode)
                 {
+                    _editingInactiveTabColorMode = true;
                     _applicationSettings.InactiveTabColorMode = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
                     RaisePropertyChanged();
+                    RaisePropertyChanged(nameof(BackgroundIsSelected));
+                    RaisePropertyChanged(nameof(UnderlinedIsSelected));
+                    _editingInactiveTabColorMode = false;
                 }
             }
         }
 
-        public bool ShowTextCopied
+        public bool WindowIsSelected
         {
-            get => _applicationSettings.ShowTextCopied;
-            set
-            {
-                if (_applicationSettings.ShowTextCopied != value)
-                {
-                    _applicationSettings.ShowTextCopied = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
+            get => NewTerminalLocation == NewTerminalLocation.Window;
+            set => NewTerminalLocation = NewTerminalLocation.Window;
         }
 
-        // Requires UI thread
-        private async Task RestoreDefaultsAsync()
+        private async Task RestoreDefaults()
         {
-            // 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);
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the general settings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {
@@ -421,22 +291,14 @@ 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)
@@ -455,53 +317,31 @@ namespace FluentTerminal.App.ViewModels.Settings
 
                 case StartupTaskStatus.DisabledByUser:
                     StartupTaskEnabled = false;
-                    StartupTaskErrorMessage = I18N.Translate("DisabledByUser");
+                    StartupTaskErrorMessage = "Disabled by user. Please reactivate it in the Startup tab of the Task Manager.";
                     CanEnableStartupTask = false;
                     break;
 
                 case StartupTaskStatus.DisabledByPolicy:
                     StartupTaskEnabled = false;
-                    StartupTaskErrorMessage = I18N.Translate("DisabledByPolicy");
-                    CanEnableStartupTask = false;
-                    break;
-
-                case StartupTaskStatus.EnabledByPolicy:
-                    StartupTaskEnabled = true;
-                    StartupTaskErrorMessage = I18N.TranslateWithFallback("EnabledByPolicy", "Enabled by policy.");
+                    StartupTaskErrorMessage = "Disabled by policy.";
                     CanEnableStartupTask = false;
                     break;
             }
         }
 
-        // Requires UI thread
-        private async Task SetStartupTaskStateAsync(bool enabled)
+        private async Task SetStartupTaskState(bool enabled)
         {
             StartupTaskStatus status;
             if (enabled)
             {
-                // ConfigureAwait(true) because we need to execute SetStartupTaskPropertiesForStatus in the calling (UI) thread.
-                status = await _startupTaskService.EnableStartupTaskAsync().ConfigureAwait(true);
+                status = await _startupTaskService.EnableStartupTask();
             }
             else
             {
-                // 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);
+                _startupTaskService.DisableStartupTask();
+                status = await _startupTaskService.GetStatus();
             }
             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,5 +1,4 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.App.ViewModels.Infrastructure;
 using FluentTerminal.Models;
 using GalaSoft.MvvmLight;
@@ -17,11 +16,10 @@ namespace FluentTerminal.App.ViewModels.Settings
             Model = keyBinding;
             Parent = parent;
             _dialogService = dialogService;
-            EditCommand = new AsyncCommand(EditAsync);
-            DeleteCommand = new AsyncCommand(DeleteAsync);
+            EditCommand = new AsyncCommand(Edit);
+            DeleteCommand = new AsyncCommand(Delete);
         }
 
-        // Needs to be triggered from the UI thread
         public event EventHandler Deleted;
 
         public event EventHandler Edited;
@@ -98,10 +96,8 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        // Requires UI thread
-        public async Task<bool> EditAsync()
+        public async Task<bool> Edit()
         {
-            // ConfigureAwait(true) because we're setting some view-model properties afterwards.
             var keyBinding = await _dialogService.ShowCreateKeyBindingDialog().ConfigureAwait(true);
 
             if (keyBinding != null)
@@ -120,12 +116,9 @@ namespace FluentTerminal.App.ViewModels.Settings
             return false;
         }
 
-        // Requires UI thread
-        private async Task DeleteAsync()
+        private async Task Delete()
         {
-            // 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);
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to delete this keybinding?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {

FluentTerminal.App.ViewModels/Settings/KeyBindingsPageViewModel.cs

@@ -14,17 +14,20 @@ namespace FluentTerminal.App.ViewModels.Settings
 {
     public class KeyBindingsPageViewModel : ViewModelBase
     {
+        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, ITrayProcessCommunicationService trayProcessCommunicationService)
+        public KeyBindingsPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider, ITrayProcessCommunicationService trayProcessCommunicationService)
         {
             _settingsService = settingsService;
             _dialogService = dialogService;
+            _defaultValueProvider = defaultValueProvider;
             _trayProcessCommunicationService = trayProcessCommunicationService;
-            RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaultsAsync().ConfigureAwait(false));
-            AddCommand = new RelayCommand<string>(async command => await AddAsync(command).ConfigureAwait(false));
+            RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
+            AddCommand = new RelayCommand<string>(async command => await Add(command).ConfigureAwait(false));
 
             Initialize(_settingsService.GetCommandKeyBindings());
         }
@@ -33,12 +36,12 @@ namespace FluentTerminal.App.ViewModels.Settings
         public ObservableCollection<KeyBindingsViewModel> KeyBindings { get; } = new ObservableCollection<KeyBindingsViewModel>();
         public RelayCommand RestoreDefaultsCommand { get; }
 
-        private Task AddAsync(string command)
+        private async Task Add(string command)
         {
-            return KeyBindings.First(k => k.Command == command).ShowAddKeyBindingDialogAsync();
+            var keyBinding = KeyBindings.FirstOrDefault(k => k.Command == command);
+            await keyBinding?.ShowAddKeyBindingDialog();
         }
 
-        // Requires UI thread
         private void ClearKeyBindings()
         {
             foreach (var keyBinding in KeyBindings)
@@ -49,16 +52,17 @@ 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, I18N.Translate($"{nameof(Command)}.{command}"), true);
-                foreach (var keyBinding in keyBindings[command.ToString()])
+                var viewModel = new KeyBindingsViewModel(command.ToString(), _dialogService, EnumHelper.GetEnumDescription(command), true);
+                foreach (var keyBinding in _keyBindings[command.ToString()])
                 {
                     viewModel.Add(keyBinding);
                 }
@@ -70,15 +74,12 @@ namespace FluentTerminal.App.ViewModels.Settings
         private void OnEdited(string command, ICollection<KeyBinding> keyBindings)
         {
             _settingsService.SaveKeyBindings(command, keyBindings);
-            _trayProcessCommunicationService.UpdateToggleWindowKeyBindingsAsync();
+            _trayProcessCommunicationService.UpdateToggleWindowKeyBindings();
         }
 
-        // Requires UI thread
-        private async Task RestoreDefaultsAsync()
+        private async Task RestoreDefaults()
         {
-            // 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);
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the default keybindings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {

FluentTerminal.App.ViewModels/Settings/KeyBindingsViewModel.cs

@@ -42,25 +42,21 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         public ObservableCollection<KeyBindingViewModel> KeyBindings { get; } = new ObservableCollection<KeyBindingViewModel>();
 
-        // Requires UI thread
-        public async Task ShowAddKeyBindingDialogAsync()
+        public async Task ShowAddKeyBindingDialog()
         {
             var newKeyBinding = new KeyBindingViewModel(new KeyBinding { Command = Command }, _dialogService, this);
 
-            // ConfigureAwait(true) because we need to execute Add method in the calling (UI) thread.
-            if (await newKeyBinding.EditAsync().ConfigureAwait(true))
+            if (await newKeyBinding.Edit().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,9 +1,11 @@
 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 System.Threading.Tasks;
 
 namespace FluentTerminal.App.ViewModels.Settings
@@ -14,6 +16,8 @@ namespace FluentTerminal.App.ViewModels.Settings
         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)
         {
@@ -22,7 +26,7 @@ namespace FluentTerminal.App.ViewModels.Settings
             _defaultValueProvider = defaultValueProvider;
             _applicationSettings = _settingsService.GetApplicationSettings();
 
-            RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaultsAsync().ConfigureAwait(false));
+            RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
         }
 
         public bool CopyOnSelect
@@ -44,11 +48,16 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _applicationSettings.MouseRightClickAction;
             set
             {
-                if (_applicationSettings.MouseRightClickAction != value)
+                if (_applicationSettings.MouseRightClickAction != value && !_editingMouseRightClickAction)
                 {
+                    _editingMouseRightClickAction = true;
                     _applicationSettings.MouseRightClickAction = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
                     RaisePropertyChanged();
+                    RaisePropertyChanged(nameof(MouseRightClickNoneIsSelected));
+                    RaisePropertyChanged(nameof(MouseRightClickContextMenuIsSelected));
+                    RaisePropertyChanged(nameof(MouseRightClickPasteIsSelected));
+                    _editingMouseRightClickAction = false;
                 }
             }
         }
@@ -56,25 +65,19 @@ namespace FluentTerminal.App.ViewModels.Settings
         public bool MouseRightClickNoneIsSelected
         {
             get => MouseRightClickAction == MouseAction.None;
-            set { if (value) MouseRightClickAction = MouseAction.None; }
+            set => MouseRightClickAction = MouseAction.None;
         }
 
         public bool MouseRightClickContextMenuIsSelected
         {
             get => MouseRightClickAction == MouseAction.ContextMenu;
-            set { if (value) MouseRightClickAction = MouseAction.ContextMenu; }
+            set => MouseRightClickAction = MouseAction.ContextMenu;
         }
 
         public bool MouseRightClickPasteIsSelected
         {
             get => MouseRightClickAction == MouseAction.Paste;
-            set { if (value) MouseRightClickAction = MouseAction.Paste; }
-        }
-
-        public bool MouseRightClickCopySelectionOrPasteIsSelected
-        {
-            get => MouseRightClickAction == MouseAction.CopySelectionOrPaste;
-            set { if (value) MouseRightClickAction = MouseAction.CopySelectionOrPaste; }
+            set => MouseRightClickAction = MouseAction.Paste;
         }
 
         public MouseAction MouseMiddleClickAction
@@ -82,11 +85,16 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _applicationSettings.MouseMiddleClickAction;
             set
             {
-                if (_applicationSettings.MouseMiddleClickAction != value)
+                if (_applicationSettings.MouseMiddleClickAction != value && !_editingMouseMiddleClickAction)
                 {
+                    _editingMouseMiddleClickAction = true;
                     _applicationSettings.MouseMiddleClickAction = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
                     RaisePropertyChanged();
+                    RaisePropertyChanged(nameof(MouseMiddleClickNoneIsSelected));
+                    RaisePropertyChanged(nameof(MouseMiddleClickContextMenuIsSelected));
+                    RaisePropertyChanged(nameof(MouseMiddleClickPasteIsSelected));
+                    _editingMouseMiddleClickAction = false;
                 }
             }
         }
@@ -94,36 +102,26 @@ namespace FluentTerminal.App.ViewModels.Settings
         public bool MouseMiddleClickNoneIsSelected
         {
             get => MouseMiddleClickAction == MouseAction.None;
-            set { if (value) MouseMiddleClickAction = MouseAction.None; }
+            set => MouseMiddleClickAction = MouseAction.None;
         }
 
         public bool MouseMiddleClickContextMenuIsSelected
         {
             get => MouseMiddleClickAction == MouseAction.ContextMenu;
-            set { if (value) MouseMiddleClickAction = MouseAction.ContextMenu; }
+            set => MouseMiddleClickAction = MouseAction.ContextMenu;
         }
 
         public bool MouseMiddleClickPasteIsSelected
         {
             get => MouseMiddleClickAction == MouseAction.Paste;
-            set { if (value) MouseMiddleClickAction = MouseAction.Paste; }
-        }
-
-        public bool MouseMiddleClickCopySelectionOrPasteIsSelected
-        {
-            get => MouseMiddleClickAction == MouseAction.CopySelectionOrPaste;
-            set { if (value) MouseMiddleClickAction = MouseAction.CopySelectionOrPaste; }
+            set => MouseMiddleClickAction = MouseAction.Paste;
         }
 
         public RelayCommand RestoreDefaultsCommand { get; }
 
-        // Requires UI thread
-        private async Task RestoreDefaultsAsync()
+        private async Task RestoreDefaults()
         {
-            // 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);
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the mouse settings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {

FluentTerminal.App.ViewModels/Settings/ProfilesPageViewModel.cs

@@ -90,8 +90,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 Id = Guid.NewGuid(),
                 PreInstalled = false,
                 Name = "New profile",
-                KeyBindings = new List<KeyBinding>(),
-                UseConPty = _settingsService.GetApplicationSettings().UseConPty
+                KeyBindings = new List<KeyBinding>()
             };
 
             AddShellProfile(shellProfile);
@@ -99,18 +98,20 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         private void Clone(ShellProfileViewModel shellProfile)
         {
-            var cloned = shellProfile.ProfileVm.Model.Clone();
-
-            cloned.Id = Guid.NewGuid();
-            cloned.PreInstalled = false;
-            cloned.Name = $"Copy of {shellProfile.Name}";
-            cloned.KeyBindings = new List<KeyBinding>();
+            var cloned = new ShellProfile(shellProfile.Model)
+            {
+                Id = Guid.NewGuid(),
+                PreInstalled = false,
+                Name = $"Copy of {shellProfile.Name}"
+            };
 
             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;

FluentTerminal.App.ViewModels/Settings/SshProfilesPageViewModel.cs

@@ -1,120 +0,0 @@
-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;
-
-namespace FluentTerminal.App.ViewModels.Settings
-{
-    public class SshProfilesPageViewModel: ViewModelBase
-    {
-        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 RelayCommand CreateSshProfileCommand { get; }
-
-        public RelayCommand<SshProfileViewModel> 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 => Set(ref _selectedShellProfile, value);
-        }
-
-        public ObservableCollection<SshProfileViewModel> SshProfiles { get; } = new ObservableCollection<SshProfileViewModel>();
-    }
-}

FluentTerminal.App.ViewModels/Settings/TerminalPageViewModel.cs

@@ -1,6 +1,4 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
-using FluentTerminal.App.ViewModels.Utilities;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
@@ -17,41 +15,43 @@ namespace FluentTerminal.App.ViewModels.Settings
         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 { if (value) CursorStyle = CursorStyle.Bar; }
+            set => CursorStyle = CursorStyle.Bar;
         }
 
         public bool BlockIsSelected
         {
             get => CursorStyle == CursorStyle.Block;
-            set { if (value) CursorStyle = CursorStyle.Block; }
+            set => CursorStyle = CursorStyle.Block;
         }
 
         public bool UnderlineIsSelected
         {
             get => CursorStyle == CursorStyle.Underline;
-            set { if (value) CursorStyle = CursorStyle.Underline; }
+            set => CursorStyle = CursorStyle.Underline;
         }
 
         public bool HiddenIsSelected
         {
             get => ScrollBarStyle == ScrollBarStyle.Hidden;
-            set { if (value) ScrollBarStyle = ScrollBarStyle.Hidden; }
+            set => ScrollBarStyle = ScrollBarStyle.Hidden;
         }
 
         public bool AutoHidingIsSelected
         {
             get => ScrollBarStyle == ScrollBarStyle.AutoHiding;
-            set { if (value) ScrollBarStyle = ScrollBarStyle.AutoHiding; }
+            set => ScrollBarStyle = ScrollBarStyle.AutoHiding;
         }
 
         public bool VisibleIsSelected
         {
             get => ScrollBarStyle == ScrollBarStyle.Visible;
-            set { if (value) ScrollBarStyle = ScrollBarStyle.Visible; }
+            set => ScrollBarStyle = ScrollBarStyle.Visible;
         }
 
         public bool CursorBlink
@@ -68,20 +68,6 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        public bool UseAcrylicBackground
-        {
-            get => _terminalOptions.UseAcrylicBackground;
-            set
-            {
-                if (_terminalOptions.UseAcrylicBackground != value)
-                {
-                    _terminalOptions.UseAcrylicBackground = value;
-                    _settingsService.SaveTerminalOptions(_terminalOptions);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
         public string FontFamily
         {
             get => _terminalOptions.FontFamily;
@@ -96,20 +82,6 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        public int FontWeight
-        {
-            get => _terminalOptions.FontWeight;
-            set
-            {
-                if (_terminalOptions.FontWeight != value)
-                {
-                    _terminalOptions.FontWeight = value;
-                    _settingsService.SaveTerminalOptions(_terminalOptions);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
         public double BackgroundOpacity
         {
             get => _terminalOptions.BackgroundOpacity;
@@ -143,6 +115,7 @@ 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)
@@ -163,15 +136,14 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        public string WordSeparator
+        public bool BoldText
         {
-            get => WebViewSpecialCharEncoder.Decode(_terminalOptions.WordSeparator);
+            get => _terminalOptions.BoldText;
             set
             {
-                value = WebViewSpecialCharEncoder.Encode(value);
-                if (_terminalOptions.WordSeparator != value)
+                if (_terminalOptions.BoldText != value)
                 {
-                    _terminalOptions.WordSeparator = value;
+                    _terminalOptions.BoldText = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
                     RaisePropertyChanged();
                 }
@@ -203,11 +175,16 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _terminalOptions.CursorStyle;
             set
             {
-                if (_terminalOptions.CursorStyle != value)
+                if (_terminalOptions.CursorStyle != value && !_isEditingCursorStyle)
                 {
+                    _isEditingCursorStyle = true;
                     _terminalOptions.CursorStyle = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
                     RaisePropertyChanged();
+                    RaisePropertyChanged(nameof(BlockIsSelected));
+                    RaisePropertyChanged(nameof(BarIsSelected));
+                    RaisePropertyChanged(nameof(UnderlineIsSelected));
+                    _isEditingCursorStyle = false;
                 }
             }
         }
@@ -217,22 +194,23 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _terminalOptions.ScrollBarStyle;
             set
             {
-                if (_terminalOptions.ScrollBarStyle != value)
+                if (_terminalOptions.ScrollBarStyle != value && !_isEditingScrollBarStyle)
                 {
+                    _isEditingScrollBarStyle = true;
                     _terminalOptions.ScrollBarStyle = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
                     RaisePropertyChanged();
+                    RaisePropertyChanged(nameof(HiddenIsSelected));
+                    RaisePropertyChanged(nameof(AutoHidingIsSelected));
+                    RaisePropertyChanged(nameof(VisibleIsSelected));
+                    _isEditingScrollBarStyle = false;
                 }
             }
         }
 
-        // Requires UI thread
-        private async Task RestoreDefaultsAsync()
+        private async Task RestoreDefaults()
         {
-            // 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);
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the default terminal options?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {
@@ -242,10 +220,9 @@ namespace FluentTerminal.App.ViewModels.Settings
                 ScrollBarStyle = defaults.ScrollBarStyle;
                 FontFamily = defaults.FontFamily;
                 FontSize = defaults.FontSize;
-                FontWeight = defaults.FontWeight;
+                BoldText = defaults.BoldText;
                 BackgroundOpacity = defaults.BackgroundOpacity;
                 ScrollBackLimit = defaults.ScrollBackLimit.ToString();
-                WordSeparator = defaults.WordSeparator;
             }
         }
 
@@ -255,10 +232,10 @@ namespace FluentTerminal.App.ViewModels.Settings
             _dialogService = dialogService;
             _defaultValueProvider = defaultValueProvider;
 
-            RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaultsAsync().ConfigureAwait(false));
+            RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
 
             Fonts = systemFontService.GetSystemFontFamilies().OrderBy(s => s.Name);
-            Sizes = Enumerable.Range(2, 72);
+            Sizes = Enumerable.Range(1, 72);
 
             _terminalOptions = _settingsService.GetTerminalOptions();
         }

FluentTerminal.App.ViewModels/Settings/ThemesPageViewModel.cs

@@ -1,14 +1,10 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
-using FluentTerminal.App.ViewModels.Infrastructure;
 using FluentTerminal.Models;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Threading.Tasks;
-using FluentTerminal.Models.Messages;
 
 namespace FluentTerminal.App.ViewModels.Settings
 {
@@ -21,38 +17,30 @@ namespace FluentTerminal.App.ViewModels.Settings
         private double _backgroundOpacity;
         private readonly IThemeParserFactory _themeParserFactory;
         private readonly IFileSystemService _fileSystemService;
-        private readonly IImageFileSystemService _imageFileSystemService;
 
         public event EventHandler<string> SelectedThemeBackgroundColorChanged;
-        public event EventHandler<ImageFile> SelectedThemeBackgroundImageChanged;
-        public event EventHandler<ThemeViewModel> SelectedThemeChanged;
 
-        public ThemesPageViewModel(ISettingsService settingsService,
-                                   IDialogService dialogService,
-                                   IDefaultValueProvider defaultValueProvider,
-                                   IThemeParserFactory themeParserFactory,
-                                   IFileSystemService fileSystemService,
-                                   IImageFileSystemService imageFileSystemService)
+        public ThemesPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider,
+            IThemeParserFactory themeParserFactory, IFileSystemService fileSystemService)
         {
             _settingsService = settingsService;
             _dialogService = dialogService;
             _defaultValueProvider = defaultValueProvider;
             _themeParserFactory = themeParserFactory;
             _fileSystemService = fileSystemService;
-            _imageFileSystemService = imageFileSystemService;
 
             CreateThemeCommand = new RelayCommand(CreateTheme);
-            ImportThemeCommand = new AsyncCommand(ImportThemeAsync);
+            ImportThemeCommand = new RelayCommand(ImportTheme);
             CloneCommand = new RelayCommand<ThemeViewModel>(CloneTheme);
 
-            MessengerInstance.Register<TerminalOptionsChangedMessage>(this, OnTerminalOptionsChanged);
+            _settingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
 
             BackgroundOpacity = _settingsService.GetTerminalOptions().BackgroundOpacity;
 
             var activeThemeId = _settingsService.GetCurrentThemeId();
             foreach (var theme in _settingsService.GetThemes())
             {
-                var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, _fileSystemService, _imageFileSystemService, false);
+                var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, fileSystemService, false);
                 viewModel.Activated += OnThemeActivated;
                 viewModel.Deleted += OnThemeDeleted;
 
@@ -67,7 +55,7 @@ namespace FluentTerminal.App.ViewModels.Settings
         }
 
         public RelayCommand CreateThemeCommand { get; }
-        public IAsyncCommand ImportThemeCommand { get; }
+        public RelayCommand ImportThemeCommand { get; }
         public RelayCommand<ThemeViewModel> CloneCommand { get; set; }
 
         public double BackgroundOpacity
@@ -84,17 +72,11 @@ namespace FluentTerminal.App.ViewModels.Settings
                 if (_selectedTheme != null)
                 {
                     _selectedTheme.BackgroundChanged -= OnSelectedThemeBackgroundChanged;
-                    _selectedTheme.BackgroundImageChanged -= OnSelectedThemeBackgroundImageChanged;
                 }
-
                 Set(ref _selectedTheme, value);
-                SelectedThemeChanged?.Invoke(this, _selectedTheme);
-
                 if (value != null)
                 {
-                    _selectedTheme.BackgroundOpacity = BackgroundOpacity;
                     value.BackgroundChanged += OnSelectedThemeBackgroundChanged;
-                    value.BackgroundImageChanged += OnSelectedThemeBackgroundImageChanged;
                 }
             }
         }
@@ -127,49 +109,28 @@ namespace FluentTerminal.App.ViewModels.Settings
             AddTheme(theme);
         }
 
-        // Requires UI thread
-        private async Task ImportThemeAsync()
+        private async void ImportTheme()
         {
-            // ConfigureAwait(true) because we need to execute AddTheme method in the calling (UI) thread.
-            var file = await _fileSystemService.OpenFileAsync(_themeParserFactory.SupportedFileTypes)
-                .ConfigureAwait(true);
-
+            var file = await _fileSystemService.OpenFile(_themeParserFactory.SupportedFileTypes).ConfigureAwait(true);
             if (file != null)
             {
                 var parser = _themeParserFactory.GetParser(file.FileType);
 
                 if (parser == null)
                 {
-                    await _dialogService.ShowMessageDialogAsync(I18N.Translate("ImportThemeFailed"),
-                        I18N.Translate("NoSuitableParserFound"), DialogButton.OK).ConfigureAwait(false);
-
+                    await _dialogService.ShowMessageDialogAsnyc("Import theme failed", "No suitable parser found", DialogButton.OK).ConfigureAwait(false);
                     return;
                 }
 
                 try
                 {
-                    // ConfigureAwait(true) because we need to execute AddTheme method in the calling (UI) thread.
-                    var exportedTheme = await parser.Import(file.Name, file.Content).ConfigureAwait(true);
+                    var theme = await parser.Parse(file.Name, file.Content).ConfigureAwait(true);
 
-                    if (!string.IsNullOrWhiteSpace(exportedTheme.EncodedImage))
-                    {
-                        // ConfigureAwait(true) because we need to execute AddTheme method in the calling (UI) thread.
-                        var importedImage = await _imageFileSystemService
-                            .ImportThemeImageAsync(exportedTheme.BackgroundImage, exportedTheme.EncodedImage)
-                            .ConfigureAwait(true);
-
-                        exportedTheme.BackgroundImage = importedImage;
-                    }
-
-                    var terminalTheme = new TerminalTheme(exportedTheme);
-
-                    AddTheme(terminalTheme);
+                    AddTheme(theme);
                 }
                 catch (Exception exception)
                 {
-                    await _dialogService
-                        .ShowMessageDialogAsync(I18N.Translate("ImportThemeFailed"), exception.Message, DialogButton.OK)
-                        .ConfigureAwait(false);
+                    await _dialogService.ShowMessageDialogAsnyc("Import theme failed", exception.Message, DialogButton.OK).ConfigureAwait(false);
                 }
             }
         }
@@ -178,7 +139,7 @@ namespace FluentTerminal.App.ViewModels.Settings
         {
             _settingsService.SaveTheme(theme, true);
 
-            var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, _fileSystemService, _imageFileSystemService, true);
+            var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, _fileSystemService, true);
             viewModel.EditCommand.Execute(null);
             viewModel.Activated += OnThemeActivated;
             viewModel.Deleted += OnThemeDeleted;
@@ -218,19 +179,14 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        private void OnTerminalOptionsChanged(TerminalOptionsChangedMessage message)
+        private void OnTerminalOptionsChanged(object sender, TerminalOptions e)
         {
-            BackgroundOpacity = message.TerminalOptions.BackgroundOpacity;
+            BackgroundOpacity = e.BackgroundOpacity;
         }
 
         private void OnSelectedThemeBackgroundChanged(object sender, string e)
         {
             SelectedThemeBackgroundColorChanged?.Invoke(this, e);
         }
-
-        private void OnSelectedThemeBackgroundImageChanged(object sender, ImageFile e)
-        {
-            SelectedThemeBackgroundImageChanged?.Invoke(this, e);
-        }
     }
 }

FluentTerminal.App.ViewModels/SettingsViewModel.cs

@@ -9,29 +9,32 @@ namespace FluentTerminal.App.ViewModels
     {
         public SettingsViewModel(ISettingsService settingsService, IDefaultValueProvider defaultValueProvider, IDialogService dialogService,
             ITrayProcessCommunicationService trayProcessCommunicationService, IThemeParserFactory themeParserFactory, ISystemFontService systemFontService,
-            IFileSystemService fileSystemService, IStartupTaskService startupTaskService, IApplicationView applicationView,
-            IApplicationLanguageService applicationLanguageService, ApplicationDataContainers containers,
-            IImageFileSystemService imageFileSystemService)
+            IFileSystemService fileSystemService, IStartupTaskService startupTaskService, IUpdateService updateService, IApplicationView applicationView)
         {
-            KeyBindings = new KeyBindingsPageViewModel(settingsService, dialogService, trayProcessCommunicationService);
-            General = new GeneralPageViewModel(settingsService, dialogService, defaultValueProvider, startupTaskService, applicationLanguageService, trayProcessCommunicationService, fileSystemService);
-            Profiles = new ProfilesPageViewModel(settingsService, dialogService, defaultValueProvider, fileSystemService, applicationView);
+            About = new AboutPageViewModel(settingsService, updateService, applicationView);
+            KeyBindings = new KeyBindingsPageViewModel(settingsService, dialogService, defaultValueProvider, trayProcessCommunicationService);
+            General = new GeneralPageViewModel(settingsService, dialogService, defaultValueProvider, startupTaskService);
+            Shell = new ProfilesPageViewModel(settingsService, dialogService, defaultValueProvider, fileSystemService, applicationView);
             Terminal = new TerminalPageViewModel(settingsService, dialogService, defaultValueProvider, systemFontService);
-            Themes = new ThemesPageViewModel(settingsService, dialogService, defaultValueProvider, themeParserFactory, fileSystemService, imageFileSystemService);
+            Themes = new ThemesPageViewModel(settingsService, dialogService, defaultValueProvider, themeParserFactory, fileSystemService);
             Mouse = new MousePageViewModel(settingsService, dialogService, defaultValueProvider);
-            SshProfiles = new SshProfilesPageViewModel(settingsService, dialogService, fileSystemService,
-                applicationView, trayProcessCommunicationService, containers.HistoryContainer);
         }
 
         public event EventHandler Closed;
+        public event EventHandler AboutPageRequested;
 
         public GeneralPageViewModel General { get; }
         public KeyBindingsPageViewModel KeyBindings { get; }
-        public ProfilesPageViewModel Profiles { get; }
+        public ProfilesPageViewModel Shell { get; }
         public TerminalPageViewModel Terminal { get; }
         public ThemesPageViewModel Themes { get; }
         public MousePageViewModel Mouse { get; }
-        public SshProfilesPageViewModel SshProfiles { get; }
+        public AboutPageViewModel About { get; }
+
+        public void NavigateToAboutPage()
+        {
+            AboutPageRequested?.Invoke(this, EventArgs.Empty);
+        }
 
         public void Close()
         {

FluentTerminal.App.ViewModels/ShellProfileViewModel.cs

@@ -1,29 +1,152 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.App.ViewModels.Infrastructure;
+using FluentTerminal.App.ViewModels.Settings;
 using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
+using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
 using System;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
-using FluentTerminal.App.ViewModels.Profiles;
 
 namespace FluentTerminal.App.ViewModels
 {
-    /// <summary>
-    /// Extends <see cref="ProfileViewModelBase{T}"/>, and implements only "Set as default" logic.
-    /// </summary>
-    public class ShellProfileViewModel : ProfileViewModelBase<CommonProfileProviderViewModel>
+    public class ShellProfileViewModel : ViewModelBase
     {
-        #region Fields
-
+        private readonly IDialogService _dialogService;
+        private readonly IFileSystemService _fileSystemService;
+        private readonly ISettingsService _settingsService;
+        private string _arguments;
+        private ShellProfile _fallbackProfile;
+        private bool _inEditMode;
+        private bool _isDefault;
+        private string _location;
+        private LineEndingStyle _lineEndingStyle;
+        private string _name;
+        private bool _isNew;
+        private TabTheme _selectedTabTheme;
+        private TerminalTheme _selectedTerminalTheme;
+        private string _workingDirectory;
+        private readonly IApplicationView _applicationView;
         private readonly IDefaultValueProvider _defaultValueProvider;
 
-        #endregion Fields
+        public ShellProfileViewModel(ShellProfile shellProfile, ISettingsService settingsService, IDialogService dialogService, IFileSystemService fileSystemService, IApplicationView applicationView, IDefaultValueProvider defaultValueProvider, Boolean isNew)
+        {
+            Model = shellProfile;
+            _settingsService = settingsService;
+            _dialogService = dialogService;
+            _fileSystemService = fileSystemService;
+            _applicationView = applicationView;
+            _defaultValueProvider = defaultValueProvider;
+            _isNew = isNew;
 
-        #region Properties
+            _settingsService.ThemeAdded += OnThemeAdded;
+            _settingsService.ThemeDeleted += OnThemeDeleted;
 
-        private bool _isDefault;
+            TabThemes = new ObservableCollection<TabTheme>(settingsService.GetTabThemes());
+
+            TerminalThemes = new ObservableCollection<TerminalTheme>();
+            TerminalThemes.Add(new TerminalTheme
+            {
+                Id = Guid.Empty,
+                Name = "Default"
+            });
+            foreach (var theme in _settingsService.GetThemes())
+            {
+                TerminalThemes.Add(theme);
+            }
+
+            KeyBindings = new KeyBindingsViewModel(shellProfile.Id.ToString(), _dialogService, string.Empty, false);
+
+            InitializeViewModelProperties(shellProfile);
+
+            SetDefaultCommand = new RelayCommand(SetDefault);
+            DeleteCommand = new AsyncCommand(Delete, CanDelete);
+            EditCommand = new RelayCommand(Edit);
+            CancelEditCommand = new AsyncCommand(CancelEdit);
+            SaveChangesCommand = new RelayCommand(SaveChanges);
+            AddKeyboardShortcutCommand = new AsyncCommand(AddKeyboardShortcut);
+            BrowseForCustomShellCommand = new AsyncCommand(BrowseForCustomShell);
+            BrowseForWorkingDirectoryCommand = new AsyncCommand(BrowseForWorkingDirectory);
+            RestoreDefaultsCommand = new AsyncCommand(RestoreDefaults);
+        }
+
+        private void InitializeViewModelProperties(ShellProfile shellProfile)
+        {
+            SelectedTerminalTheme = TerminalThemes.FirstOrDefault(t => t.Id == shellProfile.TerminalThemeId);
+            Id = shellProfile.Id;
+            Name = shellProfile.Name;
+            Arguments = shellProfile.Arguments;
+            Location = shellProfile.Location;
+            WorkingDirectory = shellProfile.WorkingDirectory;
+            SelectedTabTheme = TabThemes.FirstOrDefault(t => t.Id == shellProfile.TabThemeId);
+            PreInstalled = shellProfile.PreInstalled;
+            LineEndingStyle = shellProfile.LineEndingTranslation;
+
+            KeyBindings.Clear();
+            foreach (var keyBinding in shellProfile.KeyBindings.Select(x => new KeyBinding(x)).ToList())
+            {
+                KeyBindings.Add(keyBinding);
+            }
+        }
+
+        private void OnThemeAdded(object sender, TerminalTheme e)
+        {
+            _applicationView.RunOnDispatcherThread(() =>
+            {
+                TerminalThemes.Add(e);
+            });
+        }
+
+        private void OnThemeDeleted(object sender, Guid e)
+        {
+            if (SelectedTerminalTheme.Id == e)
+            {
+                _applicationView.RunOnDispatcherThread(() =>
+                {
+                    SelectedTerminalTheme = TerminalThemes.FirstOrDefault(x => x.Id == Guid.Empty);
+                    Model.TerminalThemeId = Guid.Empty;
+                    if (_fallbackProfile != null)
+                    {
+                        _fallbackProfile.TerminalThemeId = Guid.Empty;
+                    }
+                });
+            }
+        }
+
+        public event EventHandler Deleted;
+        public event EventHandler SetAsDefault;
+
+        public IAsyncCommand BrowseForCustomShellCommand { get; }
+        public IAsyncCommand BrowseForWorkingDirectoryCommand { get; }
+        public IAsyncCommand CancelEditCommand { get; }
+        public IAsyncCommand DeleteCommand { get; }
+        public RelayCommand EditCommand { get; }
+        public RelayCommand SaveChangesCommand { get; }
+        public RelayCommand SetDefaultCommand { get; }
+        public IAsyncCommand RestoreDefaultsCommand { get; }
+        public IAsyncCommand AddKeyboardShortcutCommand { get; }
+        public ObservableCollection<TabTheme> TabThemes { get; }
+        public KeyBindingsViewModel KeyBindings { get; }
+
+        public ObservableCollection<TerminalTheme> TerminalThemes { get; }
+        public ShellProfile Model { get; private set; }
+        public bool PreInstalled { get; private set; }
+
+        public string Arguments
+        {
+            get => _arguments;
+            set => Set(ref _arguments, value);
+        }
+
+        public Guid Id { get; private set; }
+
+        public bool InEditMode
+        {
+            get => _inEditMode;
+            set => Set(ref _inEditMode, value);
+        }
 
         public bool IsDefault
         {
@@ -31,81 +154,223 @@ namespace FluentTerminal.App.ViewModels
             set => Set(ref _isDefault, value);
         }
 
-        #endregion Properties
-
-        #region Events
-
-        public event EventHandler SetAsDefault;
-
-        #endregion Events
-
-        #region Commands
-
-        public RelayCommand SetDefaultCommand { get; }
-
-        public IAsyncCommand RestoreDefaultsCommand { get; }
-
-        #endregion Commands
-
-        #region Constrcutor
-
-        public ShellProfileViewModel(ShellProfile shellProfile, ISettingsService settingsService,
-            IDialogService dialogService, IFileSystemService fileSystemService, IApplicationView applicationView,
-            IDefaultValueProvider defaultValueProvider, bool isNew) : base(shellProfile, settingsService, dialogService,
-            isNew)
+        public string Location
         {
-            _defaultValueProvider = defaultValueProvider;
-
-            ProfileVm = new CommonProfileProviderViewModel(settingsService, applicationView, fileSystemService,
-                shellProfile);
-
-            SetDefaultCommand = new RelayCommand(SetDefault);
-            RestoreDefaultsCommand = new AsyncCommand(RestoreDefaultsAsync);
+            get => _location;
+            set => Set(ref _location, value);
         }
 
-        #endregion Constrcutor
-
-        #region Methods
-
-        // Requires UI thread
-        private async Task RestoreDefaultsAsync()
+        public string Name
         {
-            if (InEditMode || !ProfileVm.PreInstalled)
+            get => _name;
+            set => Set(ref _name, value);
+        }
+
+        public TabTheme SelectedTabTheme
+        {
+            get => _selectedTabTheme;
+            set
+            {
+                if (value != null)
+                {
+                    Set(ref _selectedTabTheme, value);
+                }
+            }
+        }
+
+        public TerminalTheme SelectedTerminalTheme
+        {
+            get => _selectedTerminalTheme;
+            set
+            {
+                if (value != null)
+                {
+                    Set(ref _selectedTerminalTheme, value);
+                }
+            }
+        }
+
+        public string WorkingDirectory
+        {
+            get => _workingDirectory;
+            set => Set(ref _workingDirectory, value);
+        }
+
+        public LineEndingStyle LineEndingStyle
+        {
+            get => _lineEndingStyle;
+            set => Set(ref _lineEndingStyle, value);
+        }
+
+        public bool DoNotModifyIsSelected
+        {
+            get => LineEndingStyle == LineEndingStyle.DoNotModify;
+            set { if (value) LineEndingStyle = LineEndingStyle.DoNotModify; }
+        }
+
+        public bool ToCRLFIsSelected
+        {
+            get => LineEndingStyle == LineEndingStyle.ToCRLF;
+            set { if (value) LineEndingStyle = LineEndingStyle.ToCRLF; }
+        }
+
+        public bool ToLFIsSelected
+        {
+            get => LineEndingStyle == LineEndingStyle.ToLF;
+            set { if (value) LineEndingStyle = LineEndingStyle.ToLF; }
+        }
+
+        public bool ToCRIsSelected
+        {
+            get => LineEndingStyle == LineEndingStyle.ToCR;
+            set { if (value) LineEndingStyle = LineEndingStyle.ToCR; }
+        }
+
+        public void SaveChanges()
+        {
+            Model.Arguments = Arguments;
+            Model.Location = Location;
+            Model.Name = Name;
+            Model.WorkingDirectory = WorkingDirectory;
+            Model.TabThemeId = SelectedTabTheme.Id;
+            Model.TerminalThemeId = SelectedTerminalTheme.Id;
+            Model.LineEndingTranslation = _lineEndingStyle;
+            Model.KeyBindings = KeyBindings.KeyBindings.Select(x => x.Model).ToList();
+            _settingsService.SaveShellProfile(Model);
+
+            KeyBindings.Editable = false;
+            InEditMode = false;
+            _isNew = false;
+        }
+
+        private async Task RestoreDefaults()
+        {
+            if (InEditMode || !PreInstalled)
             {
                 throw new InvalidOperationException();
             }
 
-            // ConfigureAwait(true) because we need to execute Initialize method in the calling (UI) thread.
-            var result = await DialogService.ShowMessageDialogAsync(I18N.Translate("PleaseConfirm"),
-                I18N.Translate("ConfirmRestoreProfile"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore this profile?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {
-                var profile = _defaultValueProvider.GetPreinstalledShellProfiles().FirstOrDefault(x => x.Id.Equals(Id));
-
-                if (profile == null)
-                {
-                    // Should not happen ever, but...
-                    return;
-                }
-
-                ProfileVm.Model = profile;
-                Initialize(profile);
-
-                SettingsService.SaveShellProfile(profile);
+                Model = _defaultValueProvider.GetPreinstalledShellProfiles().FirstOrDefault(x => x.Id == Model.Id);
+                InitializeViewModelProperties(Model);
+                _settingsService.SaveShellProfile(Model);
             }
         }
 
-        protected override bool CanDelete()
+        public Task AddKeyboardShortcut()
         {
-            return !ProfileVm.PreInstalled;
+            return KeyBindings.ShowAddKeyBindingDialog();
+        }
+
+        private async Task BrowseForCustomShell()
+        {
+            var file = await _fileSystemService.OpenFile(new[] { ".exe" }).ConfigureAwait(true);
+            if (file != null)
+            {
+                Location = file.Path;
+            }
+        }
+
+        private async Task BrowseForWorkingDirectory()
+        {
+            var directory = await _fileSystemService.BrowseForDirectory().ConfigureAwait(true);
+            if (directory != null)
+            {
+                WorkingDirectory = directory;
+            }
+        }
+
+        private async Task CancelEdit()
+        {
+            if (_isNew)
+            {
+                await Delete();
+            }
+            else
+            {
+                ShellProfile changedProfile = new ShellProfile
+                {
+                    Arguments = Arguments,
+                    Location = Location,
+                    Name = Name,
+                    WorkingDirectory = WorkingDirectory,
+                    TabThemeId = SelectedTabTheme.Id,
+                    TerminalThemeId = SelectedTerminalTheme.Id,
+                    LineEndingTranslation = _lineEndingStyle,
+                    KeyBindings = KeyBindings.KeyBindings.Select(x => x.Model).ToList()
+                };
+
+                if (!_fallbackProfile.Equals(changedProfile))
+                {
+                    var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to discard all changes?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+
+                    if (result == DialogButton.OK)
+                    {
+                        Arguments = _fallbackProfile.Arguments;
+                        Location = _fallbackProfile.Location;
+                        Name = _fallbackProfile.Name;
+                        WorkingDirectory = _fallbackProfile.WorkingDirectory;
+                        LineEndingStyle = _fallbackProfile.LineEndingTranslation;
+                        SelectedTerminalTheme = TerminalThemes.FirstOrDefault(t => t.Id == _fallbackProfile.TerminalThemeId);
+                        SelectedTabTheme = TabThemes.FirstOrDefault(t => t.Id == _fallbackProfile.TabThemeId);
+
+                        KeyBindings.KeyBindings.Clear();
+                        foreach (var keyBinding in Model.KeyBindings.Select(x => new KeyBinding(x)).ToList())
+                        {
+                            KeyBindings.Add(keyBinding);
+                        }
+
+                        KeyBindings.Editable = false;
+                        InEditMode = false;
+                    }
+                }
+                else
+                {
+                    KeyBindings.Editable = false;
+                    InEditMode = false;
+                }
+            }
+        }
+
+        private bool CanDelete()
+        {
+            return !Model.PreInstalled;
+        }
+
+        private async Task Delete()
+        {
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to delete this theme?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+
+            if (result == DialogButton.OK)
+            {
+                Deleted?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        private void Edit()
+        {
+            // todo write copy ctor
+            _fallbackProfile = new ShellProfile
+            {
+                Arguments = Model.Arguments,
+                LineEndingTranslation = Model.LineEndingTranslation,
+                Location = Model.Location,
+                Name = Model.Name,
+                WorkingDirectory = Model.WorkingDirectory,
+                TabThemeId = Model.TabThemeId,
+                TerminalThemeId = Model.TerminalThemeId
+            };
+
+            KeyBindings.Editable = true;
+            InEditMode = true;
         }
 
         private void SetDefault()
         {
             SetAsDefault?.Invoke(this, EventArgs.Empty);
         }
-
-        #endregion Methods
     }
 }

FluentTerminal.App.ViewModels/SshConnectionInfoViewModel.cs

@@ -0,0 +1,32 @@
+using FluentTerminal.App.Services.Dialogs;
+using GalaSoft.MvvmLight;
+
+namespace FluentTerminal.App.ViewModels
+{
+    public class SshConnectionInfoViewModel : ViewModelBase, ISshConnectionInfo
+    {
+        private string _host = string.Empty;
+
+        public string Host
+        {
+            get => _host;
+            set => Set(ref _host, value);
+        }
+
+        private ushort _port = 22;
+
+        public ushort Port
+        {
+            get => _port;
+            set => Set(ref _port, value);
+        }
+
+        private string _username = string.Empty;
+
+        public string Username
+        {
+            get => _username;
+            set => Set(ref _username, value);
+        }
+    }
+}

FluentTerminal.App.ViewModels/SshProfileViewModel.cs

@@ -1,36 +0,0 @@
-using FluentTerminal.App.Services;
-using FluentTerminal.App.ViewModels.Profiles;
-using FluentTerminal.Models;
-
-namespace FluentTerminal.App.ViewModels
-{
-    /// <summary>
-    /// Extends <see cref="ProfileViewModelBase{T}"/>, and doesn't implement any additional logic because in
-    /// case of SSH profiles no additional logic is needed.
-    /// </summary>
-    public class SshProfileViewModel : ProfileViewModelBase<SshConnectViewModel>
-    {
-        #region Constructor
-
-        public SshProfileViewModel(SshProfile sshProfile, ISettingsService settingsService,
-            IDialogService dialogService, IFileSystemService fileSystemService, IApplicationView applicationView,
-            ITrayProcessCommunicationService trayProcessCommunicationService,
-            IApplicationDataContainer historyContainer, bool isNew) : base(sshProfile, settingsService, dialogService,
-            isNew)
-        {
-            ProfileVm = new SshConnectViewModel(settingsService, applicationView, trayProcessCommunicationService,
-                fileSystemService, sshProfile);
-        }
-
-        #endregion Constructor
-
-        #region Methods
-
-        protected override bool CanDelete()
-        {
-            return true;
-        }
-
-        #endregion Methods
-    }
-}

FluentTerminal.App.ViewModels/TabThemeViewModel.cs

@@ -1,31 +0,0 @@
-using FluentTerminal.Models;
-using GalaSoft.MvvmLight;
-
-namespace FluentTerminal.App.ViewModels
-{
-    public class TabThemeViewModel : ViewModelBase
-    {
-        private bool _isSelected;
-
-        public TabThemeViewModel(TabTheme theme, TerminalViewModel terminal)
-        {
-            Theme = theme;
-            Terminal = terminal;
-        }
-
-        public bool IsSelected
-        {
-            get => _isSelected;
-            set
-            {
-                if (Set(ref _isSelected, value) && value)
-                {
-                    Terminal.TabTheme = this;
-                }
-            }
-        }
-
-        public TabTheme Theme { get; }
-        public TerminalViewModel Terminal { get; }
-    }
-}

FluentTerminal.App.ViewModels/TerminalViewModel.cs

@@ -1,134 +1,42 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.App.ViewModels.Infrastructure;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
-using Newtonsoft.Json;
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Text.RegularExpressions;
+using System.Text;
 using System.Threading.Tasks;
-using Windows.UI.Core;
-using FluentTerminal.Models.Messages;
-using System.Windows.Input;
-using FluentTerminal.App.ViewModels.Menu;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml;
-using System.Collections.Generic;
 
 namespace FluentTerminal.App.ViewModels
 {
     public class TerminalViewModel : ViewModelBase
     {
-        #region Static
-
-        private static readonly Regex SshTitleRx = new Regex(@"^\w+@\S+:", RegexOptions.Compiled);
-
-        #endregion Static
-
-        #region Serialize terminal state
-
-        private class TerminalState
-        {
-            public bool HasCustomTitle { get; set; }
-            public string ShellTitle { get; set; }
-            public string TabTitle { get; set; }
-            public TerminalTheme TerminalTheme { get; set; }
-            public int TabThemeId { get; set; }
-            public bool ShowSearchPanel { get; set; }
-            public string SearchText { get; set; }
-            public bool SearchMatchCase { get; set; }
-            public bool SearchWholeWord { get; set; }
-            public bool SearchWithRegex { get; set; }
-            public string XtermBufferState { get; set; }
-            public byte TerminalId { get; set; }
-            public ShellProfile ShellProfile { get; set; }
-        }
-
-        public async Task<string> SerializeAsync()
-        {
-            TerminalState state = new TerminalState
-            {
-                HasCustomTitle = _hasCustomTitle,
-                ShellTitle = ShellTitle,
-                TabTitle = TabTitle,
-                TerminalTheme = TerminalTheme,
-                TabThemeId = TabTheme.Theme.Id,
-                ShowSearchPanel = ShowSearchPanel,
-                SearchText = SearchText,
-                SearchMatchCase = SearchMatchCase,
-                SearchWholeWord = SearchWholeWord,
-                SearchWithRegex = SearchWithRegex,
-                XtermBufferState = await SerializeXtermStateAsync().ConfigureAwait(false),
-                TerminalId = Terminal.Id,
-                ShellProfile = ShellProfile
-            };
-
-            return JsonConvert.SerializeObject(state);
-        }
-
-        public void Restore(string data)
-        {
-            TerminalState state = JsonConvert.DeserializeObject<TerminalState>(data);
-            if (state != null)
-            {
-                _hasCustomTitle = state.HasCustomTitle;
-                ShellTitle = state.ShellTitle;
-                TabTitle = state.TabTitle;
-                TerminalTheme = state.TerminalTheme;
-                TabTheme = TabThemes.FirstOrDefault(t => t.Theme.Id == state.TabThemeId);
-                ShowSearchPanel = state.ShowSearchPanel;
-                SearchText = state.SearchText;
-                SearchMatchCase = state.SearchMatchCase;
-                SearchWholeWord = state.SearchWholeWord;
-                SearchWithRegex = state.SearchWithRegex;
-                XtermBufferState = state.XtermBufferState;
-                _terminalId = state.TerminalId;
-                ShellProfile = state.ShellProfile;
-
-                TabTheme.IsSelected = true;
-            }
-        }
-
-        #endregion Serialize terminal state
-
         private readonly IKeyboardCommandService _keyboardCommandService;
+        private readonly IDispatcherTimer _resizeOverlayTimer;
         private bool _isSelected;
-        private bool _isHovered;
         private bool _hasNewOutput;
-        private bool _hasExitedWithError;
+        private string _resizeOverlayContent;
         private string _searchText;
+        private bool _showResizeOverlay;
         private bool _showSearchPanel;
-        private bool _searchMatchCase;
-        private bool _searchWholeWord;
-        private bool _searchWithRegex;
-        private TabThemeViewModel _tabTheme;
+        private TabTheme _tabTheme;
         private TerminalTheme _terminalTheme;
-        private TerminalOptions _terminalOptions;
         private string _tabTitle;
         private string _shellTitle;
         private bool _hasCustomTitle;
-        private byte? _terminalId;
-        private bool _hasSelection;
-        private string _hoveredUri;
-        private MenuViewModel _contextMenu;
-        private MenuViewModel _tabContextMenu;
 
         public TerminalViewModel(ISettingsService settingsService, ITrayProcessCommunicationService trayProcessCommunicationService, IDialogService dialogService,
             IKeyboardCommandService keyboardCommandService, ApplicationSettings applicationSettings, ShellProfile shellProfile,
-            IApplicationView applicationView, IClipboardService clipboardService, string terminalState = null)
+            IApplicationView applicationView, IDispatcherTimer dispatcherTimer, IClipboardService clipboardService)
         {
-            MessengerInstance.Register<ApplicationSettingsChangedMessage>(this, OnApplicationSettingsChanged);
-            MessengerInstance.Register<CurrentThemeChangedMessage>(this, OnCurrentThemeChanged);
-            MessengerInstance.Register<TerminalOptionsChangedMessage>(this, OnTerminalOptionsChanged);
-            MessengerInstance.Register<KeyBindingsChangedMessage>(this, OnKeyBindingsChanged);
-
             SettingsService = settingsService;
-
-            _terminalOptions = SettingsService.GetTerminalOptions();
+            SettingsService.CurrentThemeChanged += OnCurrentThemeChanged;
+            SettingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
+            SettingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
+            SettingsService.KeyBindingsChanged += OnKeyBindingsChanged;
 
             TrayProcessCommunicationService = trayProcessCommunicationService;
 
@@ -141,77 +49,38 @@ namespace FluentTerminal.App.ViewModels
             ShellProfile = shellProfile;
             TerminalTheme = shellProfile.TerminalThemeId == Guid.Empty ? SettingsService.GetCurrentTheme() : SettingsService.GetTheme(shellProfile.TerminalThemeId);
 
-            TabThemes = new ObservableCollection<TabThemeViewModel>(SettingsService.GetTabThemes().Select(theme => new TabThemeViewModel(theme, this)));
-            CloseCommand = new AsyncCommand(TryCloseAsync, CanExecuteCommand);
-            CloseLeftTabsCommand = new RelayCommand(CloseLeftTabs, CanExecuteCommand);
-            CloseRightTabsCommand = new RelayCommand(CloseRightTabs, CanExecuteCommand);
-            CloseOtherTabsCommand = new RelayCommand(CloseOtherTabs, CanExecuteCommand);
-            FindNextCommand = new RelayCommand(FindNext, CanExecuteCommand);
-            FindPreviousCommand = new RelayCommand(FindPrevious, CanExecuteCommand);
-            CloseSearchPanelCommand = new RelayCommand(CloseSearchPanel, CanExecuteCommand);
-            EditTitleCommand = new AsyncCommand(EditTitleAsync, CanExecuteCommand);
-            DuplicateTabCommand = new RelayCommand(DuplicateTab, CanExecuteCommand);
-            CopyCommand = new AsyncCommand(Copy, () => HasSelection);
-            PasteCommand = new AsyncCommand(Paste);
-            CopyLinkCommand = new AsyncCommand(() => CopyTextAsync(HoveredUri), () => !string.IsNullOrWhiteSpace(HoveredUri));
-            ShowSearchPanelCommand = new RelayCommand(() => ShowSearchPanel = true, () => !ShowSearchPanel);
+            TabThemes = new ObservableCollection<TabTheme>(SettingsService.GetTabThemes());
+            TabTheme = TabThemes.FirstOrDefault(t => t.Id == ShellProfile.TabThemeId);
 
-            if (!string.IsNullOrEmpty(terminalState))
-            {
-                Restore(terminalState);
-            }
-            else
-            {
-                var defaultTabTheme = TabThemes.FirstOrDefault(t => t.Theme.Id == ShellProfile.TabThemeId);
-                defaultTabTheme.IsSelected = true;
-            }
+            _resizeOverlayTimer = dispatcherTimer;
+            _resizeOverlayTimer.Interval = new TimeSpan(0, 0, 2);
+            _resizeOverlayTimer.Tick += OnResizeOverlayTimerFinished;
 
-            Terminal = new Terminal(TrayProcessCommunicationService, _terminalId);
+            CloseCommand = new RelayCommand(async () => await TryClose().ConfigureAwait(false));
+            FindNextCommand = new RelayCommand(FindNext);
+            FindPreviousCommand = new RelayCommand(FindPrevious);
+            CloseSearchPanelCommand = new RelayCommand(CloseSearchPanel);
+            SelectTabThemeCommand = new RelayCommand<string>(SelectTabTheme);
+            EditTitleCommand = new AsyncCommand(EditTitle);
+
+            Terminal = new Terminal(TrayProcessCommunicationService);
             Terminal.KeyboardCommandReceived += Terminal_KeyboardCommandReceived;
             Terminal.OutputReceived += Terminal_OutputReceived;
             Terminal.SizeChanged += Terminal_SizeChanged;
             Terminal.TitleChanged += Terminal_TitleChanged;
-            Terminal.Exited += Terminal_Exited;
             Terminal.Closed += Terminal_Closed;
-
-            ContextMenu = BuidContextMenu();
-            TabContextMenu = BuildTabContextMenu();
-        }
-
-        public MenuViewModel ContextMenu
-        {
-            get => _contextMenu;
-            set => Set(ref _contextMenu, value);
-        }
-
-        public MenuViewModel TabContextMenu
-        {
-            get => _tabContextMenu;
-            set => Set(ref _tabContextMenu, value);
-        }
-
-        private bool _disposalRequested;
-
-        public void DisposalPrepare()
-        {
-            _disposalRequested = true;
-            CloseCommand = null;
-            TerminalView.DisposalPrepare();
-            TerminalView = null;
-            Terminal = null;
-            Overlay = null;
         }
 
         public event EventHandler Activated;
         public event EventHandler Closed;
-        public event EventHandler<SearchRequest> FindNextRequested;
-        public event EventHandler<SearchRequest> FindPreviousRequested;
+        public event EventHandler<string> FindNextRequested;
+        public event EventHandler<string> FindPreviousRequested;
+        public event EventHandler KeyBindingsChanged;
+        public event EventHandler<TerminalOptions> OptionsChanged;
         public event EventHandler SearchStarted;
         public event EventHandler<TerminalTheme> ThemeChanged;
-        public event EventHandler CloseLeftTabsRequested;
-        public event EventHandler CloseRightTabsRequested;
-        public event EventHandler CloseOtherTabsRequested;
-        public event EventHandler DuplicateTabRequested;
+        public event EventHandler<string> ShellTitleChanged;
+        public event EventHandler<string> CustomTitleChanged;
 
         public ApplicationSettings ApplicationSettings { get; private set; }
 
@@ -222,21 +91,13 @@ namespace FluentTerminal.App.ViewModels
             // The effective background theme depends on whether it is selected (use the theme), or if it is inactive
             // (if we're set to underline inactive tabs, use the null theme).
             get => IsSelected || (!IsSelected && ApplicationSettings.InactiveTabColorMode == InactiveTabColorMode.Background) ?
-                _tabTheme?.Theme :
+                _tabTheme :
                 SettingsService.GetTabThemes().FirstOrDefault(t => t.Color == null);
         }
 
         public IClipboardService ClipboardService { get; }
 
-        public string XtermBufferState { get; private set; }
-
-        public AsyncCommand CloseCommand { get; private set; }
-
-        public RelayCommand CloseRightTabsCommand { get; }
-
-        public RelayCommand CloseLeftTabsCommand { get; }
-
-        public RelayCommand CloseOtherTabsCommand { get; }
+        public RelayCommand CloseCommand { get; }
 
         public RelayCommand CloseSearchPanelCommand { get; }
 
@@ -248,18 +109,6 @@ namespace FluentTerminal.App.ViewModels
 
         public RelayCommand FindPreviousCommand { get; }
 
-        public RelayCommand DuplicateTabCommand { get; }
-
-        public ICommand CopyLinkCommand { get; private set; }
-
-        public ICommand CopyCommand { get; private set; }
-
-        public ICommand PasteCommand { get; private set; }
-
-        public ICommand ShowSearchPanelCommand { get; private set; }
-
-        public double BackgroundOpacity => _terminalOptions?.BackgroundOpacity ?? 1.0;
-
         public bool IsSelected
         {
             get => _isSelected;
@@ -269,57 +118,16 @@ namespace FluentTerminal.App.ViewModels
                 {
                     if (IsSelected)
                     {
-                        _keyboardCommandService.RegisterCommandHandler(nameof(Command.Search), () => ShowSearchPanel = !ShowSearchPanel);
                         HasNewOutput = false;
                     }
-                    else
-                    {
-                        _keyboardCommandService.DeregisterCommandHandler(nameof(Command.Search));
-                    }
                     RaisePropertyChanged(nameof(IsUnderlined));
                     RaisePropertyChanged(nameof(BackgroundTabTheme));
-                    RaisePropertyChanged(nameof(ShowCloseButton));
                 }
             }
         }
 
-        public bool HasSelection
-        {
-            get => _hasSelection;
-            set => Set(ref _hasSelection, value);
-        }
-
-        public string HoveredUri
-        {
-            get => _hoveredUri;
-            set
-            {
-                if (Set(ref _hoveredUri, value))
-                {
-                    ContextMenu = BuidContextMenu();
-                }
-            }
-        }
-
-        public bool IsHovered
-        {
-            get => _isHovered;
-            set
-            {
-                if (Set(ref _isHovered, value))
-                {
-                    RaisePropertyChanged(nameof(ShowCloseButton));
-                }
-            }
-        }
-
-        public bool ShowCloseButton
-        {
-            get => IsHovered || IsSelected;
-        }
-
         public bool IsUnderlined => (IsSelected && ApplicationSettings.UnderlineSelectedTab) ||
-            (!IsSelected && ApplicationSettings.InactiveTabColorMode == InactiveTabColorMode.Underlined && TabTheme.Theme.Color != null);
+            (!IsSelected && ApplicationSettings.InactiveTabColorMode == InactiveTabColorMode.Underlined && TabTheme.Color != null);
 
         public bool HasNewOutput
         {
@@ -327,16 +135,10 @@ namespace FluentTerminal.App.ViewModels
             set => Set(ref _hasNewOutput, value);
         }
 
-        public bool HasExitedWithError
+        public string ResizeOverlayContent
         {
-            get => _hasExitedWithError;
-            set
-            {
-                if (Set(ref _hasExitedWithError, value) && value)
-                {
-                    HasNewOutput = false;
-                }
-            }
+            get => _resizeOverlayContent;
+            set => Set(ref _resizeOverlayContent, value);
         }
 
         public string SearchText
@@ -345,27 +147,28 @@ namespace FluentTerminal.App.ViewModels
             set => Set(ref _searchText, value);
         }
 
-        public bool SearchMatchCase
-        {
-            get => _searchMatchCase;
-            set => Set(ref _searchMatchCase, value);
-        }
-
-        public bool SearchWholeWord
-        {
-            get => _searchWholeWord;
-            set => Set(ref _searchWholeWord, value);
-        }
-
-        public bool SearchWithRegex
-        {
-            get => _searchWithRegex;
-            set => Set(ref _searchWithRegex, value);
-        }
+        public RelayCommand<string> SelectTabThemeCommand { get; }
 
         public ISettingsService SettingsService { get; }
 
-        public ShellProfile ShellProfile { get; private set; }
+        public ShellProfile ShellProfile { get; }
+
+        public bool ShowResizeOverlay
+        {
+            get => _showResizeOverlay;
+            set
+            {
+                Set(ref _showResizeOverlay, value);
+                if (value)
+                {
+                    if (_resizeOverlayTimer.IsEnabled)
+                    {
+                        _resizeOverlayTimer.Stop();
+                    }
+                    _resizeOverlayTimer.Start();
+                }
+            }
+        }
 
         public bool ShowSearchPanel
         {
@@ -373,7 +176,7 @@ namespace FluentTerminal.App.ViewModels
             set => Set(ref _showSearchPanel, value);
         }
 
-        public TabThemeViewModel TabTheme
+        public TabTheme TabTheme
         {
             get => _tabTheme;
             set
@@ -384,47 +187,25 @@ namespace FluentTerminal.App.ViewModels
             }
         }
 
-        public ObservableCollection<TabThemeViewModel> TabThemes { get; }
+        public ObservableCollection<TabTheme> TabThemes { get; }
 
         public Terminal Terminal { get; private set; }
 
-        public OverlayViewModel Overlay { get; set; }
-
         public TerminalTheme TerminalTheme
         {
             get => _terminalTheme;
             set => Set(ref _terminalTheme, value);
         }
 
-        public bool Initialized { get; set; }
-
         public string TabTitle
         {
             get => _tabTitle;
             set
             {
-                var title = value?.Trim() ?? string.Empty;
-
-                if (ShellProfile is SshProfile)
+                if (Set(ref _tabTitle, value))
                 {
-                    // For SshProfile we are adjusting title.
-                    if (title.Equals("ssh", StringComparison.OrdinalIgnoreCase) ||
-                        title.EndsWith("\\ssh.exe", StringComparison.OrdinalIgnoreCase))
-                    {
-                        title = $"[ssh] {I18N.Translate("Authenticate")}";
-                    }
-                    else if (title.Equals("mosh", StringComparison.OrdinalIgnoreCase) ||
-                             title.EndsWith("\\mosh.exe", StringComparison.OrdinalIgnoreCase))
-                    {
-                        title = $"[mosh] {I18N.Translate("Authenticate")}";
-                    }
-                    else if (SshTitleRx.IsMatch(title))
-                    {
-                        title = $"[ssh] {title}";
-                    }
+                    CustomTitleChanged?.Invoke(this, value);
                 }
-
-                Set(ref _tabTitle, title);
             }
         }
 
@@ -442,32 +223,23 @@ namespace FluentTerminal.App.ViewModels
 
         public ITrayProcessCommunicationService TrayProcessCommunicationService { get; }
 
-        public Task CloseAsync()
+        public Task Close()
         {
-            MessengerInstance.Unregister(this);
-
-            return Terminal.CloseAsync();
+            SettingsService.CurrentThemeChanged -= OnCurrentThemeChanged;
+            SettingsService.TerminalOptionsChanged -= OnTerminalOptionsChanged;
+            SettingsService.ApplicationSettingsChanged -= OnApplicationSettingsChanged;
+            SettingsService.KeyBindingsChanged -= OnKeyBindingsChanged;
+            return Terminal.Close();
         }
 
-        public Task CopyTextAsync(string text)
+        public void CopyText(string text)
         {
-            return ApplicationView.ExecuteOnUiThreadAsync(() =>
-            {
-                ClipboardService.SetText(text);
-
-                if (ApplicationSettings.ShowTextCopied)
-                {
-                    Overlay.Show(I18N.Translate("TextCopied"));
-                }
-            });
+            ClipboardService.SetText(text);
         }
 
-        // Requires UI thread
-        public async Task EditTitleAsync()
+        public async Task EditTitle()
         {
-            // ConfigureAwait(true) because we're setting some view-model properties afterwards.
-            var result = await DialogService.ShowInputDialogAsync(I18N.Translate("EditTitleString"))
-                .ConfigureAwait(true);
+            var result = await DialogService.ShowInputDialogAsync("Edit Title");
             if (result != null)
             {
                 if (string.IsNullOrWhiteSpace(result))
@@ -495,123 +267,64 @@ namespace FluentTerminal.App.ViewModels
             FocusTerminal();
         }
 
-        private bool CanExecuteCommand<T>(T a)
-        {
-            return CanExecuteCommand();
-        }
-
-        private bool CanExecuteCommand()
-        {
-            return Initialized && !_disposalRequested;
-        }
-
-        private void CloseLeftTabs()
-        {
-            CloseLeftTabsRequested?.Invoke(this, EventArgs.Empty);
-        }
-
-        private void CloseRightTabs()
-        {
-            CloseRightTabsRequested?.Invoke(this, EventArgs.Empty);
-        }
-
-        private void CloseOtherTabs()
-        {
-            CloseOtherTabsRequested?.Invoke(this, EventArgs.Empty);
-        }
-
         private void FindNext()
         {
-            FindNextRequested?.Invoke(this, new SearchRequest { MatchCase = SearchMatchCase, Regex = SearchWithRegex, Term = SearchText, WholeWord = SearchWholeWord });
-        }
-
-        public ITerminalView TerminalView { get; set; }
-
-        private Task<string> SerializeXtermStateAsync()
-        {
-            return TerminalView?.SerializeXtermStateAsync() ?? Task.FromResult(string.Empty);
+            FindNextRequested?.Invoke(this, SearchText);
         }
 
         private void FindPrevious()
         {
-            FindPreviousRequested?.Invoke(this, new SearchRequest { MatchCase = SearchMatchCase, Regex = SearchWithRegex, Term = SearchText, WholeWord = SearchWholeWord });
+            FindPreviousRequested?.Invoke(this, SearchText);
         }
 
-        private void DuplicateTab()
+        private async void OnApplicationSettingsChanged(object sender, ApplicationSettings e)
         {
-            DuplicateTabRequested?.Invoke(this, EventArgs.Empty);
-        }
-
-        private void OnApplicationSettingsChanged(ApplicationSettingsChangedMessage message)
-        {
-            ApplicationSettings = message.ApplicationSettings;
-
-            ApplicationView.ExecuteOnUiThreadAsync(() =>
+            await ApplicationView.RunOnDispatcherThread(() =>
             {
+                ApplicationSettings = e;
                 RaisePropertyChanged(nameof(IsUnderlined));
                 RaisePropertyChanged(nameof(BackgroundTabTheme));
             });
         }
 
-        private void OnCurrentThemeChanged(CurrentThemeChangedMessage message)
+        private async void OnCurrentThemeChanged(object sender, Guid e)
         {
-            // only change theme if not overwritten by profile
-            if (ShellProfile.TerminalThemeId == Guid.Empty)
+            await ApplicationView.RunOnDispatcherThread(() =>
             {
-                var currentTheme = SettingsService.GetTheme(message.ThemeId);
-
-                ApplicationView.ExecuteOnUiThreadAsync(() =>
+                // only change theme if not overwritten by profile
+                if (ShellProfile.TerminalThemeId == Guid.Empty)
                 {
+                    var currentTheme = SettingsService.GetTheme(e);
                     TerminalTheme = currentTheme;
                     ThemeChanged?.Invoke(this, currentTheme);
-                });
-            }
-        }
-
-        private void OnTerminalOptionsChanged(TerminalOptionsChangedMessage message)
-        {
-            _terminalOptions = message.TerminalOptions;
-            ApplicationView.ExecuteOnUiThreadAsync(() => RaisePropertyChanged(nameof(BackgroundOpacity)), CoreDispatcherPriority.Low);
-        }
-
-        private void OnKeyBindingsChanged(KeyBindingsChangedMessage message)
-        {
-            ApplicationView.ExecuteOnUiThreadAsync(() =>
-            {
-                var contextMenu = BuidContextMenu();
-                if (!contextMenu.EquivalentTo(ContextMenu))
-                {
-                    ContextMenu = contextMenu;
                 }
-
-                var tabContextMenu = BuildTabContextMenu();
-                if (!tabContextMenu.EquivalentTo(TabContextMenu))
-                {
-                    TabContextMenu = tabContextMenu;
-                }
-
-            }, CoreDispatcherPriority.Low, true);
+            });
         }
 
-        private void Terminal_Exited(object sender, int exitCode)
+        private async void OnKeyBindingsChanged(object sender, EventArgs e)
         {
-            if (ShellProfile?.Tag is ISessionSuccessTracker tracker && exitCode != 0)
-            {
-                tracker.SetInvalid();
-            }
+            await ApplicationView.RunOnDispatcherThread(() => KeyBindingsChanged?.Invoke(this, EventArgs.Empty));
+        }
 
-            ApplicationView.ExecuteOnUiThreadAsync(() => HasExitedWithError = exitCode > 0);
+        private void OnResizeOverlayTimerFinished(object sender, object e)
+        {
+            _resizeOverlayTimer.Stop();
+            ShowResizeOverlay = false;
+        }
+
+        private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
+        {
+            await ApplicationView.RunOnDispatcherThread(() => OptionsChanged?.Invoke(this, e));
+        }
+
+        private void SelectTabTheme(string name)
+        {
+            TabTheme = TabThemes.FirstOrDefault(t => t.Name == name);
         }
 
         private void Terminal_Closed(object sender, EventArgs e)
         {
-            Closed?.Invoke(this, EventArgs.Empty);
-            Terminal.KeyboardCommandReceived -= Terminal_KeyboardCommandReceived;
-            Terminal.OutputReceived -= Terminal_OutputReceived;
-            Terminal.SizeChanged -= Terminal_SizeChanged;
-            Terminal.TitleChanged -= Terminal_TitleChanged;
-            Terminal.Exited -= Terminal_Exited;
-            Terminal.Closed -= Terminal_Closed;
+            ApplicationView.RunOnDispatcherThread(() => Closed?.Invoke(this, EventArgs.Empty));
         }
 
         private async void Terminal_KeyboardCommandReceived(object sender, string e)
@@ -620,200 +333,80 @@ namespace FluentTerminal.App.ViewModels
             {
                 case nameof(Command.Copy):
                     {
-                        await Copy().ConfigureAwait(false);
-                        return;
+                        var selection = await Terminal.GetSelectedText().ConfigureAwait(true);
+                        ClipboardService.SetText(selection);
+                        break;
                     }
                 case nameof(Command.Paste):
                     {
-                        await Paste().ConfigureAwait(false);
-                        return;
+                        string content = await ClipboardService.GetText().ConfigureAwait(true);
+                        if (content != null)
+                        {
+                            content = ShellProfile.TranslateLineEndings(content);
+                            await Terminal.Write(Encoding.UTF8.GetBytes(content)).ConfigureAwait(true);
+                        }
+                        break;
                     }
                 case nameof(Command.PasteWithoutNewlines):
                     {
-                        string content = await ClipboardService.GetTextAsync().ConfigureAwait(false);
+                        string content = await ClipboardService.GetText().ConfigureAwait(true);
                         if (content != null)
                         {
                             content = ShellProfile.NewlinePattern.Replace(content, string.Empty);
-                            TerminalView.Paste(content);
+                            await Terminal.Write(Encoding.UTF8.GetBytes(content)).ConfigureAwait(true);
                         }
-                        return;
+                        break;
                     }
                 case nameof(Command.Search):
                     {
-                        await ApplicationView.ExecuteOnUiThreadAsync(() =>
+                        ShowSearchPanel = !ShowSearchPanel;
+                        if (ShowSearchPanel)
                         {
-                            ShowSearchPanel = !ShowSearchPanel;
-                            if (ShowSearchPanel)
-                            {
-                                SearchStarted?.Invoke(this, EventArgs.Empty);
-                            }
-                        }).ConfigureAwait(false);
-                        return;
+                            SearchStarted?.Invoke(this, EventArgs.Empty);
+                        }
+                        break;
                     }
                 default:
                     {
-                        await ApplicationView.ExecuteOnUiThreadAsync(() => _keyboardCommandService.SendCommand(e))
-                            .ConfigureAwait(false);
-                        return;
+                        _keyboardCommandService.SendCommand(e);
+                        break;
                     }
             }
         }
 
         private void Terminal_OutputReceived(object sender, byte[] e)
         {
-            if (ShellProfile?.Tag is ISessionSuccessTracker tracker)
-            {
-                tracker.SetOutputReceived();
-            }
-
             if (!IsSelected && ApplicationSettings.ShowNewOutputIndicator)
             {
-                ApplicationView.ExecuteOnUiThreadAsync(() => HasNewOutput = true);
+                ApplicationView.RunOnDispatcherThread(() => HasNewOutput = true);
             }
         }
 
         private void Terminal_SizeChanged(object sender, TerminalSize e)
         {
-            ApplicationView.ExecuteOnUiThreadAsync(() => Overlay.Show($"{e.Columns} x {e.Rows}"));
+            ResizeOverlayContent = $"{e.Columns} x {e.Rows}";
+            ShowResizeOverlay = true;
         }
 
         private void Terminal_TitleChanged(object sender, string e)
         {
-            ApplicationView.ExecuteOnUiThreadAsync(() => ShellTitle = e);
+            ShellTitle = e;
+            ShellTitleChanged?.Invoke(this, e);
         }
 
-        private async Task TryCloseAsync()
+        private async Task TryClose()
         {
-            if (ShellProfile?.Tag is ISessionSuccessTracker tracker)
+            if (ApplicationSettings.ConfirmClosingTabs)
             {
-                tracker.SetInvalid();
+                var result = await DialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to close this tab?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+
+                if (result == DialogButton.Cancel)
+                {
+                    return;
+                }
             }
 
-            if (!ApplicationSettings.ConfirmClosingTabs || await DialogService
-                    .ShowMessageDialogAsync(I18N.Translate("PleaseConfirm"),
-                        string.Format(I18N.Translate("ConfirmCloseTab"), ShellTitle), DialogButton.OK,
-                        DialogButton.Cancel).ConfigureAwait(false) == DialogButton.OK)
-            {
-                await CloseAsync().ConfigureAwait(false);
-            }
-        }
-
-        private async Task Copy()
-        {
-            var selection = await Terminal.GetSelectedText().ConfigureAwait(false);
-            await CopyTextAsync(selection).ConfigureAwait(false);
-        }
-
-        private async Task Paste()
-        {
-            var content = await ClipboardService.GetTextAsync().ConfigureAwait(false);
-            if (content != null)
-            {
-                TerminalView.Paste(content);
-            }
-        }
-
-        private MenuViewModel BuidContextMenu()
-        {
-            var commandKeyBindings = SettingsService.GetCommandKeyBindings();
-            var contextMenu = new MenuViewModel();
-
-            if (!string.IsNullOrWhiteSpace(HoveredUri))
-            {
-                var copyLink = new MenuItemViewModel(I18N.Translate("CopyLink"), CopyLinkCommand, icon: Mdl2Icon.Link());
-                contextMenu.Items.Add(copyLink);
-                contextMenu.Items.Add(new SeparatorMenuItemViewModel());
-            }
-
-            var copy = new MenuItemViewModel(I18N.Translate("Command.Copy"), CopyCommand, icon: Mdl2Icon.Copy());
-            AddKeyBindings(copy, Command.Copy, commandKeyBindings);
-            contextMenu.Items.Add(copy);
-
-            var paste = new MenuItemViewModel(I18N.Translate("Command.Paste"), PasteCommand, icon: Mdl2Icon.Paste());
-            AddKeyBindings(paste, Command.Paste, commandKeyBindings);
-            contextMenu.Items.Add(paste);
-
-            contextMenu.Items.Add(new SeparatorMenuItemViewModel());
-
-            var editTitle = new MenuItemViewModel(I18N.Translate("EditTitle.Text"), EditTitleCommand, icon: Mdl2Icon.Edit());
-            AddKeyBindings(editTitle, Command.ChangeTabTitle, commandKeyBindings);
-            contextMenu.Items.Add(editTitle);
-
-            var search = new MenuItemViewModel(I18N.Translate("Search.Text"), ShowSearchPanelCommand, icon: Mdl2Icon.Search());
-            AddKeyBindings(search, Command.Search, commandKeyBindings);
-            contextMenu.Items.Add(search);
-
-            contextMenu.Items.Add(new SeparatorMenuItemViewModel());
-
-            var duplicate = new MenuItemViewModel(I18N.Translate("Command.DuplicateTab"), DuplicateTabCommand);
-            AddKeyBindings(duplicate, Command.DuplicateTab, commandKeyBindings);
-            contextMenu.Items.Add(duplicate);
-
-            contextMenu.Items.Add(new SeparatorMenuItemViewModel());
-
-            var close = new MenuItemViewModel(I18N.Translate("Close"), CloseCommand, icon: Mdl2Icon.Cancel());
-            AddKeyBindings(close, Command.CloseTab, commandKeyBindings);
-            contextMenu.Items.Add(close);
-
-            return contextMenu;
-        }
-
-        private MenuViewModel BuildTabContextMenu()
-        {
-            var commandKeyBindings = SettingsService.GetCommandKeyBindings();
-            var contextMenu = new MenuViewModel();
-
-            RadioMenuItemViewModel createTabColorItem(TabThemeViewModel tabTheme)
-            {
-                //todo localise name
-                var icon = tabTheme.Theme.Id == 0 ? Mdl2Icon.PaginationDotOutline10() : Mdl2Icon.PaginationDotSolid10(tabTheme.Theme.Color);
-                return new RadioMenuItemViewModel(I18N.Translate($"TabTheme.{tabTheme.Theme.Name}"),  $"{Terminal.Id}_tabTheme", tabTheme, bindingPath: nameof(TabThemeViewModel.IsSelected) , icon: icon);
-            }
-
-            var tabColor = new ExpandableMenuItemViewModel(I18N.Translate("Color.Text"));
-
-            foreach (var tabTheme in TabThemes)
-            {
-                tabColor.SubItems.Add(createTabColorItem(tabTheme));
-            }
-
-            contextMenu.Items.Add(tabColor);
-
-            var editTitle = new MenuItemViewModel(I18N.Translate("EditTitle.Text"), EditTitleCommand, icon: Mdl2Icon.Edit());
-            AddKeyBindings(editTitle, Command.ChangeTabTitle, commandKeyBindings);
-            contextMenu.Items.Add(editTitle);
-
-            contextMenu.Items.Add(new SeparatorMenuItemViewModel());
-
-            var duplicate = new MenuItemViewModel(I18N.Translate("Command.DuplicateTab"), DuplicateTabCommand);
-            AddKeyBindings(duplicate, Command.DuplicateTab, commandKeyBindings);
-            contextMenu.Items.Add(duplicate);
-
-            contextMenu.Items.Add(new SeparatorMenuItemViewModel());
-
-            var closeLeft = new MenuItemViewModel(I18N.Translate("CloseLeft.Text"), CloseLeftTabsCommand);
-            contextMenu.Items.Add(closeLeft);
-
-            var closeRight = new MenuItemViewModel(I18N.Translate("CloseRight.Text"), CloseRightTabsCommand);
-            contextMenu.Items.Add(closeRight);
-
-            var closeOther = new MenuItemViewModel(I18N.Translate("CloseOther.Text"), CloseOtherTabsCommand);
-            contextMenu.Items.Add(closeOther);
-
-            var close = new MenuItemViewModel(I18N.Translate("Close"), CloseCommand, icon: Mdl2Icon.Cancel());
-            AddKeyBindings(close, Command.CloseTab, commandKeyBindings);
-            contextMenu.Items.Add(close);
-
-            return contextMenu;
-        }
-
-        private void AddKeyBindings(MenuItemViewModel menuItem, Command command, IDictionary<string, ICollection<KeyBinding>> commandKeyBindings)
-        {
-            var keyBindings = commandKeyBindings[command.ToString()];
-            if (keyBindings?.Any() == true)
-            {
-                menuItem.KeyBinding = new MenuItemKeyBindingViewModel(keyBindings.First());
-            }
+            await Close().ConfigureAwait(true);
         }
     }
 }

FluentTerminal.App.ViewModels/ThemeViewModel.cs

@@ -1,13 +1,11 @@
 using FluentTerminal.App.Services;
 using FluentTerminal.App.Services.Utilities;
-using FluentTerminal.App.ViewModels.Infrastructure;
 using FluentTerminal.Models;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
 using Newtonsoft.Json;
 using System;
 using System.Threading.Tasks;
-using System.Windows.Input;
 
 namespace FluentTerminal.App.ViewModels
 {
@@ -43,25 +41,16 @@ namespace FluentTerminal.App.ViewModels
         private string _selection;
         private string _white;
         private string _yellow;
-        private ImageFile _backgroundThemeFile;
         private readonly IFileSystemService _fileSystemService;
-        private readonly IImageFileSystemService _imageFileSystemService;
 
         public event EventHandler<string> BackgroundChanged;
-        public event EventHandler<ImageFile> BackgroundImageChanged;
 
-        public ThemeViewModel(TerminalTheme theme,
-                              ISettingsService settingsService,
-                              IDialogService dialogService,
-                              IFileSystemService fileSystemService,
-                              IImageFileSystemService imageFileSystemService,
-                              bool isNew)
+        public ThemeViewModel(TerminalTheme theme, ISettingsService settingsService, IDialogService dialogService, IFileSystemService fileSystemService, bool isNew)
         {
             Model = theme;
             _settingsService = settingsService;
             _dialogService = dialogService;
             _fileSystemService = fileSystemService;
-            _imageFileSystemService = imageFileSystemService;
             _isNew = isNew;
 
             Name = Model.Name;
@@ -92,16 +81,12 @@ namespace FluentTerminal.App.ViewModels
             CursorAccent = Model.Colors.CursorAccent;
             Selection = Model.Colors.Selection;
 
-            BackgroundThemeFile = Model.BackgroundImage;
-
             SetActiveCommand = new RelayCommand(SetActive);
-            DeleteCommand = new AsyncCommand(DeleteAsync, NotPreInstalled);
+            DeleteCommand = new RelayCommand(async () => await Delete().ConfigureAwait(false), NotPreInstalled);
             EditCommand = new RelayCommand(Edit, NotPreInstalled);
-            CancelEditCommand = new AsyncCommand(CancelEditAsync);
-            SaveChangesCommand = new AsyncCommand(SaveChangesAsync);
-            ExportCommand = new AsyncCommand(Export, NotPreInstalled);
-            ChooseBackgroundImageCommand = new AsyncCommand(ChooseBackgroundImageAsync, NotPreInstalled);
-            DeleteBackgroundImageCommand = new AsyncCommand(DeleteBackgroundImageAsync, NotPreInstalled);
+            CancelEditCommand = new RelayCommand(async () => await CancelEdit().ConfigureAwait(false));
+            SaveChangesCommand = new RelayCommand(SaveChanges);
+            ExportCommand = new RelayCommand(async () => await Export().ConfigureAwait(false), NotPreInstalled);
         }
 
         public event EventHandler Activated;
@@ -192,7 +177,7 @@ namespace FluentTerminal.App.ViewModels
             set => Set(ref _brightYellow, value);
         }
 
-        public ICommand CancelEditCommand { get; }
+        public RelayCommand CancelEditCommand { get; }
 
         public string Cursor
         {
@@ -212,9 +197,9 @@ namespace FluentTerminal.App.ViewModels
             set => Set(ref _cyan, value);
         }
 
-        public ICommand DeleteCommand { get; }
-        public ICommand EditCommand { get; }
-        public ICommand ExportCommand { get; }
+        public RelayCommand DeleteCommand { get; }
+        public RelayCommand EditCommand { get; }
+        public RelayCommand ExportCommand { get; }
 
         public string Foreground
         {
@@ -260,7 +245,7 @@ namespace FluentTerminal.App.ViewModels
             set => Set(ref _red, value);
         }
 
-        public ICommand SaveChangesCommand { get; }
+        public RelayCommand SaveChangesCommand { get; }
 
         public string Selection
         {
@@ -268,7 +253,7 @@ namespace FluentTerminal.App.ViewModels
             set => Set(ref _selection, value);
         }
 
-        public ICommand SetActiveCommand { get; }
+        public RelayCommand SetActiveCommand { get; }
 
         public string White
         {
@@ -282,22 +267,7 @@ namespace FluentTerminal.App.ViewModels
             set => Set(ref _yellow, value);
         }
 
-        public ImageFile BackgroundThemeFile
-        {
-            get => _backgroundThemeFile;
-            set
-            {
-                Set(ref _backgroundThemeFile, value);
-                BackgroundImageChanged?.Invoke(this, value);
-            }
-        }
-
-        public ICommand ChooseBackgroundImageCommand { get; }
-
-        public ICommand DeleteBackgroundImageCommand { get; }
-
-        // Requires UI thread
-        private async Task SaveChangesAsync()
+        public void SaveChanges()
         {
             Model.Name = Name;
             Model.Author = Author;
@@ -326,114 +296,92 @@ namespace FluentTerminal.App.ViewModels
             Model.Colors.CursorAccent = CursorAccent;
             Model.Colors.Selection = Selection;
 
-            if (Model.BackgroundImage != null &&
-               BackgroundThemeFile != Model?.BackgroundImage)
-            {
-                // ConfigureAwait(true) because we're setting some view-model properties afterwards.
-                await _imageFileSystemService
-                    .RemoveImportedImageAsync($"{Model.BackgroundImage?.Name}{Model.BackgroundImage?.FileType}")
-                    .ConfigureAwait(true);
-            }
-
-            // ConfigureAwait(true) because we're setting some view-model properties afterwards.
-            BackgroundThemeFile = await SaveBackgroundImageAsync().ConfigureAwait(true);
-
-            Model.BackgroundImage = BackgroundThemeFile;
-
             _settingsService.SaveTheme(Model);
 
             InEditMode = false;
             _isNew = false;
         }
 
-        // Requires UI thread
-        private async Task CancelEditAsync()
+        private async Task CancelEdit()
         {
             if (_isNew)
             {
-                await DeleteAsync().ConfigureAwait(false);
-
-                return;
-            }
-
-            TerminalTheme changedTheme = new TerminalTheme()
-            {
-                Name = Name,
-                Author = Author,
-                BackgroundImage = BackgroundThemeFile,
-                Colors = new TerminalColors()
-                {
-                    Black = Black,
-                    Red = Red,
-                    Green = Green,
-                    Yellow = Yellow,
-                    Blue = Blue,
-                    Magenta = Magenta,
-                    Cyan = Cyan,
-                    White = White,
-
-                    BrightBlack = BrightBlack,
-                    BrightRed = BrightRed,
-                    BrightGreen = BrightGreen,
-                    BrightYellow = BrightYellow,
-                    BrightBlue = BrightBlue,
-                    BrightMagenta = BrightMagenta,
-                    BrightCyan = BrightCyan,
-                    BrightWhite = BrightWhite,
-
-                    Background = Background,
-                    Foreground = Foreground,
-                    Cursor = Cursor,
-                    CursorAccent = CursorAccent,
-                    Selection = Selection
-                }
-            };
-
-            if (!_fallbackTheme.Equals(changedTheme))
-            {
-                // ConfigureAwait(true) because we're setting some view-model properties afterwards.
-                var result = await _dialogService.ShowMessageDialogAsync(I18N.Translate("PleaseConfirm"),
-                    I18N.Translate("ConfirmDiscardChanges"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
-
-                if (result == DialogButton.OK)
-                {
-                    Black = _fallbackTheme.Colors.Black;
-                    Red = _fallbackTheme.Colors.Red;
-                    Green = _fallbackTheme.Colors.Green;
-                    Yellow = _fallbackTheme.Colors.Yellow;
-                    Blue = _fallbackTheme.Colors.Blue;
-                    Magenta = _fallbackTheme.Colors.Magenta;
-                    Cyan = _fallbackTheme.Colors.Cyan;
-                    White = _fallbackTheme.Colors.White;
-
-                    BrightBlack = _fallbackTheme.Colors.BrightBlack;
-                    BrightRed = _fallbackTheme.Colors.BrightRed;
-                    BrightGreen = _fallbackTheme.Colors.BrightGreen;
-                    BrightYellow = _fallbackTheme.Colors.BrightYellow;
-                    BrightBlue = _fallbackTheme.Colors.BrightBlue;
-                    BrightMagenta = _fallbackTheme.Colors.BrightMagenta;
-                    BrightCyan = _fallbackTheme.Colors.BrightCyan;
-                    BrightWhite = _fallbackTheme.Colors.BrightWhite;
-
-                    Background = _fallbackTheme.Colors.Background;
-                    Foreground = _fallbackTheme.Colors.Foreground;
-                    Cursor = _fallbackTheme.Colors.Cursor;
-                    CursorAccent = _fallbackTheme.Colors.CursorAccent;
-                    Selection = _fallbackTheme.Colors.Selection;
-
-                    Name = _fallbackTheme.Name;
-                    Author = _fallbackTheme.Author;
-
-                    BackgroundThemeFile = _fallbackTheme.BackgroundImage;
-
-                    InEditMode = false;
-
-                    await _imageFileSystemService.RemoveTemporaryBackgroundThemeImageAsync().ConfigureAwait(false);
-                }
+                await Delete();
             }
             else
             {
-                InEditMode = false;
+                TerminalTheme changedTheme = new TerminalTheme()
+                {
+                    Name = Name,
+                    Author = Author,
+                    Colors = new TerminalColors()
+                    {
+                        Black = Black,
+                        Red = Red,
+                        Green = Green,
+                        Yellow = Yellow,
+                        Blue = Blue,
+                        Magenta = Magenta,
+                        Cyan = Cyan,
+                        White = White,
+
+                        BrightBlack = BrightBlack,
+                        BrightRed = BrightRed,
+                        BrightGreen = BrightGreen,
+                        BrightYellow = BrightYellow,
+                        BrightBlue = BrightBlue,
+                        BrightMagenta = BrightMagenta,
+                        BrightCyan = BrightCyan,
+                        BrightWhite = BrightWhite,
+
+                        Background = Background,
+                        Foreground = Foreground,
+                        Cursor = Cursor,
+                        CursorAccent = CursorAccent,
+                        Selection = Selection
+                    }
+                };
+
+                if (!_fallbackTheme.Equals(changedTheme))
+                {
+                    var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to discard all changes?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+
+                    if (result == DialogButton.OK)
+                    {
+                        Black = _fallbackTheme.Colors.Black;
+                        Red = _fallbackTheme.Colors.Red;
+                        Green = _fallbackTheme.Colors.Green;
+                        Yellow = _fallbackTheme.Colors.Yellow;
+                        Blue = _fallbackTheme.Colors.Blue;
+                        Magenta = _fallbackTheme.Colors.Magenta;
+                        Cyan = _fallbackTheme.Colors.Cyan;
+                        White = _fallbackTheme.Colors.White;
+
+                        BrightBlack = _fallbackTheme.Colors.BrightBlack;
+                        BrightRed = _fallbackTheme.Colors.BrightRed;
+                        BrightGreen = _fallbackTheme.Colors.BrightGreen;
+                        BrightYellow = _fallbackTheme.Colors.BrightYellow;
+                        BrightBlue = _fallbackTheme.Colors.BrightBlue;
+                        BrightMagenta = _fallbackTheme.Colors.BrightMagenta;
+                        BrightCyan = _fallbackTheme.Colors.BrightCyan;
+                        BrightWhite = _fallbackTheme.Colors.BrightWhite;
+
+                        Background = _fallbackTheme.Colors.Background;
+                        Foreground = _fallbackTheme.Colors.Foreground;
+                        Cursor = _fallbackTheme.Colors.Cursor;
+                        CursorAccent = _fallbackTheme.Colors.CursorAccent;
+                        Selection = _fallbackTheme.Colors.Selection;
+
+                        Name = _fallbackTheme.Name;
+                        Author = _fallbackTheme.Author;
+
+                        InEditMode = false;
+                    }
+                }
+                else
+                {
+                    InEditMode = false;
+                }
             }
         }
 
@@ -442,38 +390,16 @@ namespace FluentTerminal.App.ViewModels
             return !Model.PreInstalled;
         }
 
-        // Requires UI thread
-        private async Task DeleteAsync()
+        private async Task Delete()
         {
-            // ConfigureAwait(true) because we need to trigger Deleted event in the calling (UI) thread.
-            var result = await _dialogService.ShowMessageDialogAsync(I18N.Translate("PleaseConfirm"),
-                I18N.Translate("ConfirmDeleteTheme"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to delete this theme?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {
-                // ConfigureAwait(true) because we need to trigger Deleted event in the calling (UI) thread.
-                await DeleteBackgroundImageIfExistsAsync().ConfigureAwait(true);
-                // ConfigureAwait(true) because we need to trigger Deleted event in the calling (UI) thread.
-                await _imageFileSystemService.RemoveTemporaryBackgroundThemeImageAsync().ConfigureAwait(true);
-
                 Deleted?.Invoke(this, EventArgs.Empty);
             }
         }
 
-        // Requires UI thread
-        private async Task DeleteBackgroundImageAsync()
-        {
-            // ConfigureAwait(true) because we're setting some view-model properties afterwards.
-            var result = await _dialogService.ShowMessageDialogAsync(I18N.Translate("PleaseConfirm"),
-                    I18N.Translate("ConfirmDeleteBackgroundImage"), DialogButton.OK, DialogButton.Cancel)
-                .ConfigureAwait(true);
-
-            if (result == DialogButton.OK)
-            {
-                BackgroundThemeFile = null;
-            }
-        }
-
         private void Edit()
         {
             _fallbackTheme = new TerminalTheme(Model);
@@ -487,60 +413,8 @@ namespace FluentTerminal.App.ViewModels
 
         private Task Export()
         {
-            var encodedImage = _imageFileSystemService.EncodeImage(BackgroundThemeFile);
-            var exportedTheme = new ExportedTerminalTheme(Model, encodedImage);
-            var content = JsonConvert.SerializeObject(exportedTheme, Formatting.Indented, new JsonSerializerSettings { ContractResolver = new TerminalThemeContractResolver() });
-            return _fileSystemService.SaveTextFileAsync(Name, "Fluent Terminal Theme", ".flutecolors", content);
-        }
-
-        private async Task<ImageFile> SaveBackgroundImageAsync()
-        {
-            if (BackgroundThemeFile == null)
-            {
-                return BackgroundThemeFile;
-            }
-
-            if (BackgroundThemeFile == Model.BackgroundImage)
-            {
-                return BackgroundThemeFile;
-            }
-
-            var importedBackgroundThemeFile =
-                await _fileSystemService.SaveImageInRoamingAsync(BackgroundThemeFile).ConfigureAwait(false);
-
-            await _imageFileSystemService.RemoveTemporaryBackgroundThemeImageAsync().ConfigureAwait(false);
-
-            return importedBackgroundThemeFile;
-        }
-
-        // Requires UI thread
-        private async Task ChooseBackgroundImageAsync()
-        {
-            // ConfigureAwait(true) because we're setting some view-model properties afterwards.
-            var chosenImage = await _imageFileSystemService
-                .ImportTemporaryImageFileAsync(new[] {".jpeg", ".png", ".jpg"}).ConfigureAwait(true);
-
-            if(chosenImage != null)
-            {
-                BackgroundThemeFile = chosenImage;
-            }
-        }
-
-        // Requires UI thread
-        private async Task DeleteBackgroundImageIfExistsAsync()
-        {
-            if (BackgroundThemeFile != null)
-            {
-                var imageFile = Model.BackgroundImage;
-
-                BackgroundThemeFile = null;
-
-                if (imageFile != null)
-                {
-                    await _imageFileSystemService.RemoveImportedImageAsync($"{imageFile.Name}{imageFile.FileType}")
-                        .ConfigureAwait(false);
-                }
-            }
+            var content = JsonConvert.SerializeObject(Model, Formatting.Indented, new JsonSerializerSettings { ContractResolver = new TerminalThemeContractResolver() });
+            return _fileSystemService.SaveTextFile(Name, "Fluent Terminal Theme", ".flutecolors", content);
         }
     }
 }

FluentTerminal.App.ViewModels/Utilities/WebViewSpecialCharEncoder.cs

@@ -1,15 +0,0 @@
-namespace FluentTerminal.App.ViewModels.Utilities
-{
-    public static class WebViewSpecialCharEncoder
-    {
-        public static string Encode(string value)
-        {
-            return value.Replace("\"", """).Replace("'", "&squo;").Replace("\\", "\");
-        }
-
-        public static string Decode(string value)
-        {
-            return value.Replace(""", "\"").Replace("&squo;", "'").Replace("\", "\\");
-        }
-    }
-}

FluentTerminal.App/Actions/FocusAction.cs

@@ -1,26 +0,0 @@
-using Microsoft.Xaml.Interactivity;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace FluentTerminal.App.Actions
-{
-    public class FocusAction : DependencyObject, IAction
-    {
-        public object Execute(object sender, object parameter)
-        {
-            var control = TargetObject ?? sender as Control;
-            control?.Focus(FocusState.Programmatic);
-
-            return null;
-        }
-
-        public Control TargetObject
-        {
-            get { return (Control)GetValue(TargetObjectProperty); }
-            set { SetValue(TargetObjectProperty, value); }
-        }
-
-        public static readonly DependencyProperty TargetObjectProperty =
-            DependencyProperty.Register(nameof(TargetObject), typeof(Control), typeof(FocusAction), new PropertyMetadata(null));
-    }
-}