Merge branch 'master' into Dev/NativeRenderer

* Read whole terminal frame at once to avoid console data append glitches

* Simplify calculation logic with Math.Max

Explorer Context Menu Integration/Install.bat

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

FluentTerminal.App.Services.Test/DialogServiceTests.cs

@@ -23,7 +23,7 @@ namespace FluentTerminal.App.Services.Test
         public void ShowCreateKeyBindingDialog_Default_UsesCreateKeyBindingDialog()
         {
             var createKeyBindingDialog = new Mock<ICreateKeyBindingDialog>();
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, () => createKeyBindingDialog.Object);
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, () => createKeyBindingDialog.Object, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
 
             dialogService.ShowCreateKeyBindingDialog();
 
@@ -36,7 +36,7 @@ namespace FluentTerminal.App.Services.Test
             var title = string.Empty;
             var content = _fixture.Create<string>();
             var buttons = _fixture.CreateMany<DialogButton>(2);
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>);
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
 
             Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
 
@@ -49,7 +49,7 @@ namespace FluentTerminal.App.Services.Test
             var title = _fixture.Create<string>();
             var content = string.Empty;
             var buttons = _fixture.CreateMany<DialogButton>(2);
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>);
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
 
             Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
 
@@ -61,7 +61,7 @@ namespace FluentTerminal.App.Services.Test
         {
             var title = _fixture.Create<string>();
             var content = _fixture.Create<string>();
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>);
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
 
             Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content);
 
@@ -75,7 +75,7 @@ namespace FluentTerminal.App.Services.Test
             var content = _fixture.Create<string>();
             var buttons = _fixture.CreateMany<DialogButton>(2);
             var messageDialog = new Mock<IMessageDialog>();
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, () => messageDialog.Object, Mock.Of<ICreateKeyBindingDialog>);
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, () => messageDialog.Object, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
 
             dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
 
@@ -86,11 +86,24 @@ namespace FluentTerminal.App.Services.Test
         public void ShowProfileSelectionDialogAsync_Default_UsesShellProfileSelectionDialog()
         {
             var shellProfileSelectionDialog = new Mock<IShellProfileSelectionDialog>();
-            var dialogService = new DialogService(() => shellProfileSelectionDialog.Object, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>);
+            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<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, () => inputDialog.Object, Mock.Of<ISshConnectionInfoDialog>);
+
+            dialogService.ShowInputDialogAsync(title);
+
+            inputDialog.Verify(x => x.SetTitle(title), Times.Once);
+            inputDialog.Verify(x => x.GetInput(), Times.Once);
+        }
     }
-}
+}

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

@@ -11,13 +11,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.4.0" />
-    <PackageReference Include="FluentAssertions" Version="5.4.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
-    <PackageReference Include="Moq" Version="4.8.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <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>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

FluentTerminal.App.Services.Test/KeyboardCommandServiceTests.cs

@@ -20,7 +20,7 @@ namespace FluentTerminal.App.Services.Test
         [Fact]
         public void RegisterCommandHandler_HandlerIsNull_ThrowsArgumentNullException()
         {
-            var command = (Command)new Random().Next(1, Enum.GetValues(typeof(Command)).Length);
+            var command = ((Command)new Random().Next(1, Enum.GetValues(typeof(Command)).Length)).ToString();
             Action handler = null;
             var keyboardCommandService = new KeyboardCommandService();
 
@@ -32,7 +32,7 @@ namespace FluentTerminal.App.Services.Test
         [Fact]
         public void RegisterCommandHandler_CommandAlreadyRegisted_ThrowsInvalidOperationException()
         {
-            var command = (Command)new Random().Next(1, Enum.GetValues(typeof(Command)).Length);
+            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);
@@ -45,7 +45,7 @@ namespace FluentTerminal.App.Services.Test
         [Fact]
         public void SendCommand_CommandIsRegistered_HandlerGetsInvoked()
         {
-            var command = (Command)new Random().Next(1, Enum.GetValues(typeof(Command)).Length);
+            var command = ((Command)new Random().Next(1, Enum.GetValues(typeof(Command)).Length)).ToString();
             var handlerCalled = false;
             var keyboardCommandService = new KeyboardCommandService();
             keyboardCommandService.RegisterCommandHandler(command, () => handlerCalled = true);
@@ -58,12 +58,23 @@ namespace FluentTerminal.App.Services.Test
         [Fact]
         public void SendCommand_CommandIsNotRegisted_KeyNotFoundExceptionIsThrown()
         {
-            var command = (Command)new Random().Next(1, Enum.GetValues(typeof(Command)).Length);
+            var command = ((Command)new Random().Next(1, Enum.GetValues(typeof(Command)).Length)).ToString();
             var keyboardCommandService = new KeyboardCommandService();
 
             Action invoke = () => keyboardCommandService.SendCommand(command);
 
             invoke.Should().Throw<KeyNotFoundException>();
         }
+        
+        [Fact]
+        public void SendCommand_CommandIsToggleWindow_ShouldNotThrow()
+        {
+            var command = nameof(Command.ToggleWindow);
+            var keyboardCommandService = new KeyboardCommandService();
+
+            Action invoke = () => keyboardCommandService.SendCommand(command);
+
+            invoke.Should().NotThrow();
+        }
     }
-}
+}

FluentTerminal.App.Services.Test/SettingsServiceTests.cs

@@ -1,6 +1,7 @@
 using AutoFixture;
 using FluentAssertions;
 using FluentTerminal.App.Services.Implementation;
+using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using Moq;
@@ -439,12 +440,12 @@ namespace FluentTerminal.App.Services.Test
         [Fact]
         public void GetKeyBindings_KeyBindingsInKeyBindingsContainer_ReturnsKeyBindingsFromKeyBindingsContainer()
         {
-            var keyBindings = _fixture.CreateMany<KeyBinding>(5);
+            var commands = _fixture.CreateMany<Command>(5);
             var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
             var keyBindingsContainer = new Mock<IApplicationDataContainer>();
-            foreach (var keyBinding in keyBindings)
+            foreach (var command in commands)
             {
-                keyBindingsContainer.Setup(x => x.ReadValueFromJson<Collection<KeyBinding>>(keyBinding.Command.ToString(), null)).Returns(new Collection<KeyBinding> { keyBinding });
+                keyBindingsContainer.Setup(x => x.ReadValueFromJson<Collection<KeyBinding>>(command.ToString(), null)).Returns(new Collection<KeyBinding> { });
             }
             var applicationDataContainers = new ApplicationDataContainers
             {
@@ -456,23 +457,23 @@ namespace FluentTerminal.App.Services.Test
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
-            var result = settingsService.GetKeyBindings();
+            var result = settingsService.GetCommandKeyBindings();
 
-            foreach (var keyBinding in keyBindings)
+            foreach (var command in commands)
             {
-                keyBindingsContainer.Verify(x => x.ReadValueFromJson<Collection<KeyBinding>>(keyBinding.Command.ToString(), null), Times.Once);
+                keyBindingsContainer.Verify(x => x.ReadValueFromJson<Collection<KeyBinding>>(command.ToString(), null), Times.Once);
             }
         }
 
         [Fact]
         public void GetKeyBindings_KeyBindingsNotInKeyBindingsContainer_ReturnsKeyBindingsFromDefaultValueProvider()
         {
-            var keyBindings = _fixture.CreateMany<KeyBinding>(5);
+            var commands = _fixture.CreateMany<Command>(5);
             var defaultValueProvider = new Mock<IDefaultValueProvider>();
             var keyBindingsContainer = new Mock<IApplicationDataContainer>();
-            foreach (var keyBinding in keyBindings)
+            foreach (var command in commands)
             {
-                keyBindingsContainer.Setup(x => x.ReadValueFromJson<Collection<KeyBinding>>(keyBinding.Command.ToString(), null)).Returns(new Collection<KeyBinding> { keyBinding });
+                keyBindingsContainer.Setup(x => x.ReadValueFromJson<Collection<KeyBinding>>(EnumHelper.GetEnumDescription(command), null)).Returns(new Collection<KeyBinding> { });
             }
             var applicationDataContainers = new ApplicationDataContainers
             {
@@ -484,14 +485,10 @@ namespace FluentTerminal.App.Services.Test
             };
             var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
 
-            var result = settingsService.GetKeyBindings();
+            var result = settingsService.GetCommandKeyBindings();
 
             foreach (Command command in Enum.GetValues(typeof(Command)))
             {
-                if (keyBindings.Select(x => x.Command).Contains(command))
-                {
-                    continue;
-                }
                 defaultValueProvider.Verify(x => x.GetDefaultKeyBindings(command), Times.Once);
             }
         }
@@ -513,7 +510,7 @@ namespace FluentTerminal.App.Services.Test
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
 
-            settingsService.SaveKeyBindings(command, keyBindings);
+            settingsService.SaveKeyBindings(command.ToString(), keyBindings);
 
             keyBindingsContainer.Verify(x => x.WriteValueAsJson(command.ToString(), keyBindings), Times.Once);
         }
@@ -537,7 +534,7 @@ namespace FluentTerminal.App.Services.Test
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
             settingsService.KeyBindingsChanged += (s, e) => keyBindingsChangedEventInvoked = true;
 
-            settingsService.SaveKeyBindings(command, keyBindings);
+            settingsService.SaveKeyBindings(command.ToString(), keyBindings);
 
             keyBindingsChangedEventInvoked.Should().BeTrue();
         }

FluentTerminal.App.Services.Test/TrayProcessCommunicationServiceTests.cs

@@ -28,9 +28,9 @@ namespace FluentTerminal.App.Services.Test
         {
             var settingsService = new Mock<ISettingsService>();
             var keyBindings = _fixture.CreateMany<KeyBinding>(3);
-            settingsService.Setup(x => x.GetKeyBindings()).Returns(new Dictionary<Command, ICollection<KeyBinding>>
+            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
             {
-                [Command.ToggleWindow] = keyBindings.ToList()
+                [nameof(Command.ToggleWindow)] = keyBindings.ToList()
             });
             var appServiceConnection = new Mock<IAppServiceConnection>();
             var response = _fixture.Create<CreateTerminalResponse>();
@@ -42,10 +42,12 @@ namespace FluentTerminal.App.Services.Test
             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<int>();
             var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
             trayProcessCommunicationService.Initialize(appServiceConnection.Object);
 
-            var result = await trayProcessCommunicationService.CreateTerminal(terminalSize, shellProfile);
+            var result = await trayProcessCommunicationService.CreateTerminal(id, terminalSize, shellProfile, sessionType);
 
             result.Should().BeEquivalentTo(response);
         }
@@ -57,9 +59,9 @@ namespace FluentTerminal.App.Services.Test
             var terminalSize = _fixture.Create<TerminalSize>();
             var settingsService = new Mock<ISettingsService>();
             var keyBindings = _fixture.CreateMany<KeyBinding>(3);
-            settingsService.Setup(x => x.GetKeyBindings()).Returns(new Dictionary<Command, ICollection<KeyBinding>>
+            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
             {
-                [Command.ToggleWindow] = keyBindings.ToList()
+                [nameof(Command.ToggleWindow)] = keyBindings.ToList()
             });
             var appServiceConnection = new Mock<IAppServiceConnection>();
             var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
@@ -71,23 +73,23 @@ namespace FluentTerminal.App.Services.Test
         }
 
         [Fact]
-        public async Task WriteText_Default_SendsWriteTextRequest()
+        public async Task Write_Default_SendsWriteDataRequest()
         {
             var terminalId = _fixture.Create<int>();
-            var text = _fixture.Create<string>();
+            var data = _fixture.Create<byte[]>();
             var settingsService = new Mock<ISettingsService>();
             var keyBindings = _fixture.CreateMany<KeyBinding>(3);
-            settingsService.Setup(x => x.GetKeyBindings()).Returns(new Dictionary<Command, ICollection<KeyBinding>>
+            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
             {
-                [Command.ToggleWindow] = keyBindings.ToList()
+                [nameof(Command.ToggleWindow)] = keyBindings.ToList()
             });
             var appServiceConnection = new Mock<IAppServiceConnection>();
             var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
             trayProcessCommunicationService.Initialize(appServiceConnection.Object);
 
-            await trayProcessCommunicationService.WriteText(terminalId, text);
+            await trayProcessCommunicationService.Write(terminalId, data);
 
-            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<IDictionary<string, string>>(d => d[MessageKeys.Type] == nameof(WriteTextRequest))), Times.Once);
+            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<IDictionary<string, string>>(d => d[MessageKeys.Type] == nameof(WriteDataRequest))), Times.Once);
         }
 
         [Fact]
@@ -96,9 +98,9 @@ namespace FluentTerminal.App.Services.Test
             var terminalId = _fixture.Create<int>();
             var settingsService = new Mock<ISettingsService>();
             var keyBindings = _fixture.CreateMany<KeyBinding>(3);
-            settingsService.Setup(x => x.GetKeyBindings()).Returns(new Dictionary<Command, ICollection<KeyBinding>>
+            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
             {
-                [Command.ToggleWindow] = keyBindings.ToList()
+                [nameof(Command.ToggleWindow)] = keyBindings.ToList()
             });
             var appServiceConnection = new Mock<IAppServiceConnection>();
             var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
@@ -126,9 +128,9 @@ namespace FluentTerminal.App.Services.Test
             };
             var settingsService = new Mock<ISettingsService>();
             var keyBindings = _fixture.CreateMany<KeyBinding>(3);
-            settingsService.Setup(x => x.GetKeyBindings()).Returns(new Dictionary<Command, ICollection<KeyBinding>>
+            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
             {
-                [Command.ToggleWindow] = keyBindings.ToList()
+                [nameof(Command.ToggleWindow)] = keyBindings.ToList()
             });
             var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
             var appServiceConnection = new Mock<IAppServiceConnection>();
@@ -149,8 +151,8 @@ namespace FluentTerminal.App.Services.Test
         public void OnMessageReceived_DisplayTerminalOutputRequest_InvokesCorrectOutputHandler()
         {
             var terminalId = _fixture.Create<int>();
-            var output = _fixture.Create<string>();
-            var receivedOutput = string.Empty;
+            var output = _fixture.Create<byte[]>();
+            var receivedOutput = default(byte[]);
             var request = new DisplayTerminalOutputRequest
             {
                 TerminalId = terminalId,
@@ -163,9 +165,9 @@ namespace FluentTerminal.App.Services.Test
             };
             var settingsService = new Mock<ISettingsService>();
             var keyBindings = _fixture.CreateMany<KeyBinding>(3);
-            settingsService.Setup(x => x.GetKeyBindings()).Returns(new Dictionary<Command, ICollection<KeyBinding>>
+            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
             {
-                [Command.ToggleWindow] = keyBindings.ToList()
+                [nameof(Command.ToggleWindow)] = keyBindings.ToList()
             });
             var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
             var appServiceConnection = new Mock<IAppServiceConnection>();
@@ -177,7 +179,7 @@ namespace FluentTerminal.App.Services.Test
 
             appServiceConnection.Raise(x => x.MessageReceived += null, null, message);
 
-            receivedOutput.Should().Be(output);
+            receivedOutput.Should().BeEquivalentTo(output);
         }
     }
 }

FluentTerminal.App.Services/Dialogs/IInputDialog.cs

@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Services.Dialogs
+{
+    public interface IInputDialog
+    {
+        void SetTitle(string title);
+        Task<string> GetInput();
+    }
+}

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

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

FluentTerminal.App.Services/EventArgs/NewWindowRequestedEventArgs.cs

@@ -0,0 +1,7 @@
+namespace FluentTerminal.App.Services.EventArgs
+{
+    public class NewWindowRequestedEventArgs : System.EventArgs
+    {
+        public bool ShowProfileSelection { get; set; }
+    }
+}

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

@@ -6,8 +6,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <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>
 
   <ItemGroup>

FluentTerminal.App.Services/IApplicationView.cs

@@ -9,7 +9,9 @@ namespace FluentTerminal.App.Services
     public interface IApplicationView
     {
         event CloseRequestedHandler CloseRequested;
+        event EventHandler Closed;
 
+        int Id { get; }
         string Title { get; set; }
 
         Task RunOnDispatcherThread(Action action);
@@ -17,5 +19,6 @@ namespace FluentTerminal.App.Services
         Task<bool> TryClose();
 
         bool ToggleFullScreen();
+        bool IsApiContractPresent(string api, ushort version);
     }
 }

FluentTerminal.App.Services/IDialogService.cs

@@ -1,5 +1,6 @@
 using FluentTerminal.Models;
 using System.Threading.Tasks;
+using FluentTerminal.App.Services.Dialogs;
 
 namespace FluentTerminal.App.Services
 {
@@ -16,5 +17,8 @@ namespace FluentTerminal.App.Services
         Task<ShellProfile> ShowProfileSelectionDialogAsync();
 
         Task<KeyBinding> ShowCreateKeyBindingDialog();
+        Task<string> ShowInputDialogAsync(string title);
+
+        Task<ISshConnectionInfo> ShowSshConnectionInfoDialogAsync();
     }
 }

FluentTerminal.App.Services/IKeyboardCommandService.cs

@@ -1,12 +1,12 @@
-using FluentTerminal.Models.Enums;
-using System;
+using System;
 
 namespace FluentTerminal.App.Services
 {
     public interface IKeyboardCommandService
     {
-        void RegisterCommandHandler(Command command, Action handler);
+        void RegisterCommandHandler(string command, Action handler);
 
-        void SendCommand(Command command);
+        void SendCommand(string command);
+        void DeregisterCommandHandler(string command);
     }
 }

FluentTerminal.App.Services/INotificationService.cs

@@ -0,0 +1,7 @@
+namespace FluentTerminal.App.Services
+{
+    public interface INotificationService
+    {
+        void ShowNotification(string title, string content, string url = null);
+    }
+}

FluentTerminal.App.Services/ISettingsService.cs

@@ -1,5 +1,4 @@
 using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
 using System;
 using System.Collections.Generic;
 
@@ -10,7 +9,12 @@ namespace FluentTerminal.App.Services
         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 DeleteTheme(Guid id);
         ApplicationSettings GetApplicationSettings();
@@ -18,7 +22,7 @@ namespace FluentTerminal.App.Services
         Guid GetCurrentThemeId();
         ShellProfile GetDefaultShellProfile();
         Guid GetDefaultShellProfileId();
-        IDictionary<Command, ICollection<KeyBinding>> GetKeyBindings();
+        IDictionary<string, ICollection<KeyBinding>> GetCommandKeyBindings();
         IEnumerable<ShellProfile> GetShellProfiles();
         IEnumerable<TabTheme> GetTabThemes();
         TerminalOptions GetTerminalOptions();
@@ -28,9 +32,10 @@ namespace FluentTerminal.App.Services
         void SaveApplicationSettings(ApplicationSettings applicationSettings);
         void SaveCurrentThemeId(Guid id);
         void SaveDefaultShellProfileId(Guid id);
-        void SaveKeyBindings(Command command, ICollection<KeyBinding> keyBindings);
-        void SaveShellProfile(ShellProfile shellProfile);
+        void SaveKeyBindings(string command, ICollection<KeyBinding> keyBindings);
+        void SaveShellProfile(ShellProfile shellProfile, bool newShell = false);
         void SaveTerminalOptions(TerminalOptions terminalOptions);
-        void SaveTheme(TerminalTheme theme);
+        void SaveTheme(TerminalTheme theme, bool newTheme = false);
+        ShellProfile GetShellProfile(Guid id);
     }
 }

FluentTerminal.App.Services/ISystemFontService.cs

@@ -1,9 +1,10 @@
-using System.Collections.Generic;
+using FluentTerminal.Models;
+using System.Collections.Generic;
 
 namespace FluentTerminal.App.Services
 {
     public interface ISystemFontService
     {
-        IEnumerable<string> GetSystemFontFamilies();
+        IEnumerable<FontInfo> GetSystemFontFamilies();
     }
 }

FluentTerminal.App.Services/ITerminalView.cs

@@ -1,39 +0,0 @@
-using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace FluentTerminal.App.Services
-{
-    public interface ITerminalView
-    {
-        event EventHandler<TerminalSize> TerminalSizeChanged;
-
-        event EventHandler<string> TerminalTitleChanged;
-
-        event EventHandler<Command> KeyboardCommandReceived;
-
-        Task ChangeTheme(TerminalColors theme);
-
-        Task ChangeOptions(TerminalOptions options);
-
-        Task ChangeKeyBindings(IEnumerable<KeyBinding> keyBindings);
-
-        Task<TerminalSize> CreateTerminal(TerminalOptions options, TerminalColors theme, IEnumerable<KeyBinding> keyBindings);
-
-        Task ConnectToSocket(string url);
-
-        void Close();
-
-        Task FocusTerminal();
-
-        Task<string> GetSelection();
-
-        Task FindNext(string searchText);
-
-        Task FindPrevious(string searchText);
-
-        void FocusSearchTextBox();
-    }
-}

FluentTerminal.App.Services/ITrayProcessCommunicationService.cs

@@ -1,4 +1,5 @@
 using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
 using FluentTerminal.Models.Responses;
 using System;
 using System.Threading.Tasks;
@@ -11,16 +12,18 @@ namespace FluentTerminal.App.Services
 
         void Initialize(IAppServiceConnection appServiceConnection);
 
-        Task<CreateTerminalResponse> CreateTerminal(TerminalSize size, ShellProfile shellProfile);
+        Task<CreateTerminalResponse> CreateTerminal(int id, TerminalSize size, ShellProfile shellProfile, SessionType sessionType);
 
         Task ResizeTerminal(int id, TerminalSize size);
 
         Task UpdateToggleWindowKeyBindings();
 
-        Task WriteText(int terminalId, string text);
+        Task Write(int terminalId, byte[] data);
 
-        void SubscribeForTerminalOutput(int terminalId, Action<string> callback);
+        void SubscribeForTerminalOutput(int terminalId, Action<byte[]> callback);
 
         Task CloseTerminal(int terminalId);
+        Task<GetAvailablePortResponse> GetAvailablePort();
+        int GetNextTerminalId();
     }
 }

FluentTerminal.App.Services/IUpdateService.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Services
+{
+    public interface IUpdateService
+    {
+        Task CheckForUpdate(bool notifyNoUpdate = false);
+        Version GetCurrentVersion();
+        Task<Version> GetLatestVersionAsync();
+    }
+}

FluentTerminal.App.Services/Implementation/DefaultValueProvider.cs

@@ -21,7 +21,10 @@ namespace FluentTerminal.App.Services.Implementation
                 MouseMiddleClickAction = MouseAction.None,
                 MouseRightClickAction = MouseAction.ContextMenu,
                 AlwaysShowTabs = false,
-                ShowNewOutputIndicator = false
+                AlwaysUseWinPty = true,
+                ShowNewOutputIndicator = false,
+                EnableTrayIcon = true,
+                ShowCustomTitleInTitlebar = true
             };
         }
 
@@ -34,7 +37,7 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     new KeyBinding
                     {
-                        Command = Command.ToggleWindow,
+                        Command = nameof(Command.ToggleWindow),
                         Ctrl = false,
                         Alt = false,
                         Shift = false,
@@ -47,7 +50,7 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     new KeyBinding
                     {
-                        Command = Command.NextTab,
+                        Command = nameof(Command.NextTab),
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -60,7 +63,7 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     new KeyBinding
                     {
-                        Command = Command.PreviousTab,
+                        Command = nameof(Command.PreviousTab),
                         Ctrl = true,
                         Alt = false,
                         Shift = true,
@@ -81,7 +84,7 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     new KeyBinding
                     {
-                        Command = command,
+                        Command = command.ToString(),
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -94,7 +97,7 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     new KeyBinding
                     {
-                        Command = Command.NewTab,
+                        Command = nameof(Command.NewTab),
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -107,7 +110,7 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     new KeyBinding
                     {
-                        Command = Command.ConfigurableNewTab,
+                        Command = nameof(Command.ConfigurableNewTab),
                         Ctrl = true,
                         Alt = false,
                         Shift = true,
@@ -115,12 +118,38 @@ namespace FluentTerminal.App.Services.Implementation
                     }
                 };
 
+                case Command.NewRemoteTab:
+                    return new List<KeyBinding>
+                    {
+                        new KeyBinding
+                        {
+                            Command = nameof(Command.NewRemoteTab),
+                            Ctrl = false,
+                            Alt = true,
+                            Shift = false,
+                            Key = (int)ExtendedVirtualKey.T
+                        }
+                    };
+
+                case Command.ChangeTabTitle:
+                    return new List<KeyBinding>
+                {
+                    new KeyBinding
+                    {
+                        Command = nameof(Command.ChangeTabTitle),
+                        Ctrl = true,
+                        Alt = false,
+                        Shift = true,
+                        Key = (int)ExtendedVirtualKey.R
+                    }
+                };
+
                 case Command.CloseTab:
                     return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = Command.CloseTab,
+                        Command = nameof(Command.CloseTab),
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -133,7 +162,7 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     new KeyBinding
                     {
-                        Command = Command.NewWindow,
+                        Command = nameof(Command.NewWindow),
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -141,12 +170,25 @@ namespace FluentTerminal.App.Services.Implementation
                     }
                 };
 
+                case Command.ConfigurableNewWindow:
+                    return new List<KeyBinding>
+                {
+                    new KeyBinding
+                    {
+                        Command = nameof(Command.ConfigurableNewWindow),
+                        Ctrl = true,
+                        Alt = false,
+                        Shift = true,
+                        Key = (int)ExtendedVirtualKey.N
+                    }
+                };
+
                 case Command.ShowSettings:
                     return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = Command.ShowSettings,
+                        Command = nameof(Command.ShowSettings),
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -159,7 +201,7 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     new KeyBinding
                     {
-                        Command = Command.Copy,
+                        Command = nameof(Command.Copy),
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -172,7 +214,7 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     new KeyBinding
                     {
-                        Command = Command.Paste,
+                        Command = nameof(Command.Paste),
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -180,12 +222,26 @@ namespace FluentTerminal.App.Services.Implementation
                     }
                 };
 
+
+                case Command.PasteWithoutNewlines:
+                    return new List<KeyBinding>
+                {
+                    new KeyBinding
+                    {
+                        Command = nameof(Command.PasteWithoutNewlines),
+                        Ctrl = true,
+                        Alt = false,
+                        Shift = true,
+                        Key = (int)ExtendedVirtualKey.V
+                    }
+                };
+
                 case Command.Search:
                     return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = Command.Search,
+                        Command = nameof(Command.Search),
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -198,7 +254,7 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     new KeyBinding
                     {
-                        Command = Command.ToggleFullScreen,
+                        Command = nameof(Command.ToggleFullScreen),
                         Ctrl = false,
                         Alt = true,
                         Shift = false,
@@ -211,7 +267,7 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     new KeyBinding
                     {
-                        Command = Command.SelectAll,
+                        Command = nameof(Command.SelectAll),
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -224,7 +280,7 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     new KeyBinding
                     {
-                        Command = Command.Clear,
+                        Command = nameof(Command.Clear),
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -304,7 +360,9 @@ namespace FluentTerminal.App.Services.Implementation
                 ScrollBarStyle = ScrollBarStyle.Hidden,
                 FontFamily = "Consolas",
                 FontSize = 13,
+                BoldText = false,
                 BackgroundOpacity = 0.8,
+                Padding = 12,
                 ScrollBackLimit = 1000
             };
         }
@@ -325,7 +383,20 @@ namespace FluentTerminal.App.Services.Implementation
                     Arguments = string.Empty,
                     Location = @"C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe",
                     PreInstalled = true,
-                    WorkingDirectory = string.Empty
+                    WorkingDirectory = string.Empty,
+                    LineEndingTranslation = LineEndingStyle.DoNotModify,
+                    KeyBindings = new []
+                    {
+                        new KeyBinding
+                        {
+                            Command = GetDefaultShellProfileId().ToString(),
+                            Ctrl=true,
+                            Alt=true,
+                            Shift=false,
+                            Meta=false,
+                            Key=(int)ExtendedVirtualKey.Number1
+                        }
+                    }
                 },
                 new ShellProfile
                 {
@@ -334,7 +405,20 @@ namespace FluentTerminal.App.Services.Implementation
                     Arguments = string.Empty,
                     Location = @"C:\Windows\System32\cmd.exe",
                     PreInstalled = true,
-                    WorkingDirectory = string.Empty
+                    WorkingDirectory = string.Empty,
+                    LineEndingTranslation = LineEndingStyle.DoNotModify,
+                    KeyBindings = new []
+                    {
+                        new KeyBinding
+                        {
+                            Command = "ab942a61-7673-4755-9bd8-765aff91d9a3",
+                            Ctrl=true,
+                            Alt=true,
+                            Shift=false,
+                            Meta=false,
+                            Key=(int)ExtendedVirtualKey.Number2
+                        }
+                    }
                 },
                 new ShellProfile
                 {
@@ -343,7 +427,20 @@ namespace FluentTerminal.App.Services.Implementation
                     Arguments = string.Empty,
                     Location = @"C:\windows\system32\wsl.exe",
                     PreInstalled = true,
-                    WorkingDirectory = string.Empty
+                    WorkingDirectory = string.Empty,
+                    LineEndingTranslation = LineEndingStyle.DoNotModify,
+                    KeyBindings = new []
+                    {
+                        new KeyBinding
+                        {
+                            Command = "e5785ad6-584f-40cb-bdcd-d5b3b3953e7f",
+                            Ctrl=true,
+                            Alt=true,
+                            Shift=false,
+                            Meta=false,
+                            Key=(int)ExtendedVirtualKey.Number3
+                        }
+                    }
                 }
             };
         }
@@ -494,18 +591,18 @@ namespace FluentTerminal.App.Services.Implementation
                     Black = "#300A24",
                     Red = "#CC0000",
                     Green = "#4E9A06",
-                    Yellow = "#06989A",
+                    Yellow = "#C4A000",
                     Blue = "#3465A4",
                     Magenta = "#75507B",
-                    Cyan = "#C4A000",
+                    Cyan = "#06989A",
                     White = "#D3D7CF",
                     BrightBlack = "#554E53",
                     BrightRed = "#EF2929",
                     BrightGreen = "#8AE234",
-                    BrightYellow = "#34E2E2",
+                    BrightYellow = "#FCE94F",
                     BrightBlue = "#729FCF",
                     BrightMagenta = "#AD7FA8",
-                    BrightCyan = "#FCE94F",
+                    BrightCyan = "#34E2E2",
                     BrightWhite = "#EEEEEE"
                 }
             };
@@ -513,4 +610,4 @@ namespace FluentTerminal.App.Services.Implementation
             return new[] { defaultXterm, powerShell, homebrew, tomorrow, ubuntu };
         }
     }
-}
+}

FluentTerminal.App.Services/Implementation/DialogService.cs

@@ -10,12 +10,18 @@ namespace FluentTerminal.App.Services.Implementation
         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;
 
-        public DialogService(Func<IShellProfileSelectionDialog> shellProfileSelectionDialogFactory, Func<IMessageDialog> messageDialogFactory, Func<ICreateKeyBindingDialog> createKeyBindingDialogFactory)
+        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;
         }
 
         public Task<KeyBinding> ShowCreateKeyBindingDialog()
@@ -54,11 +60,22 @@ namespace FluentTerminal.App.Services.Implementation
             return dialog.ShowAsync();
         }
 
+        public Task<string> ShowInputDialogAsync(string title)
+        {
+            var dialog = _inputDialogFactory.Invoke();
+            dialog.SetTitle(title);
+
+            return dialog.GetInput();
+        }
+
         public Task<ShellProfile> ShowProfileSelectionDialogAsync()
         {
             var dialog = _shellProfileSelectionDialogFactory();
 
             return dialog.SelectProfile();
         }
+
+        public Task<ISshConnectionInfo> ShowSshConnectionInfoDialogAsync() =>
+            _sshConnectionInfoDialogFactory().GetSshConnectionInfoAsync();
     }
 }

FluentTerminal.App.Services/Implementation/KeyboardCommandService.cs

@@ -1,38 +1,46 @@
-using FluentTerminal.Models.Enums;
-using System;
-using System.Collections.Generic;
-
-namespace FluentTerminal.App.Services.Implementation
-{
-    public class KeyboardCommandService : IKeyboardCommandService
-    {
-        private readonly Dictionary<Command, Action> _commandHandlers = new Dictionary<Command, Action>();
-
-        public void RegisterCommandHandler(Command command, Action handler)
-        {
-            if (_commandHandlers.ContainsKey(command))
-            {
-                throw new InvalidOperationException("command already registered");
-            }
-
-            _commandHandlers[command] = handler ?? throw new ArgumentNullException(nameof(handler));
-        }
-
-        public void SendCommand(Command command)
-        {
-            if (_commandHandlers.TryGetValue(command, out Action handler))
-            {
-                handler.Invoke();
-                return;
-            }
-
+using FluentTerminal.Models.Enums;
+using System;
+using System.Collections.Generic;
+
+namespace FluentTerminal.App.Services.Implementation
+{
+    public class KeyboardCommandService : IKeyboardCommandService
+    {
+        private readonly Dictionary<string, Action> _commandHandlers = new Dictionary<string, Action>();
+
+        public void RegisterCommandHandler(string command, Action handler)
+        {
+            if (_commandHandlers.ContainsKey(command))
+            {
+                throw new InvalidOperationException("command already registered");
+            }
+
+            _commandHandlers[command] = handler ?? throw new ArgumentNullException(nameof(handler));
+        }
+
+        public void DeregisterCommandHandler(string command)
+        {
+            if (_commandHandlers.ContainsKey(command))
+            {
+                _commandHandlers.Remove(command);
+            }
+        }
+
+        public void SendCommand(string command)
+        {
+            if (_commandHandlers.TryGetValue(command, out Action handler))
+            {
+                handler.Invoke();
+                return;
+            }
+
             // already registered by SystemTray's ToggleWindowService
-            if (command == Command.ToggleWindow)
+            if (command == nameof(Command.ToggleWindow))
             {
                 return;
-            }
-
-            throw new KeyNotFoundException($"No handler registered for command: {command}");
-        }
-    }
+            }
+
+            throw new KeyNotFoundException($"No handler registered for command: {command}");
+        }
+    }
 }

FluentTerminal.App.Services/Implementation/NotificationService.cs

@@ -2,9 +2,9 @@
 using Windows.Data.Xml.Dom;
 using Windows.UI.Notifications;
 
-namespace FluentTerminal.SystemTray.Services
+namespace FluentTerminal.App.Services.Implementation
 {
-    public class NotificationService
+    public class NotificationService : INotificationService
     {
         public void ShowNotification(string title, string content, string url = null)
         {

FluentTerminal.App.Services/Implementation/SettingsService.cs

@@ -19,6 +19,7 @@ namespace FluentTerminal.App.Services.Implementation
         private readonly IApplicationDataContainer _roamingSettings;
         private readonly IApplicationDataContainer _shellProfiles;
         private readonly IApplicationDataContainer _themes;
+
         public SettingsService(IDefaultValueProvider defaultValueProvider, ApplicationDataContainers containers)
         {
             _defaultValueProvider = defaultValueProvider;
@@ -48,19 +49,37 @@ namespace FluentTerminal.App.Services.Implementation
 
         public event EventHandler<ApplicationSettings> ApplicationSettingsChanged;
 
+        public event EventHandler<TerminalTheme> ThemeAdded;
         public event EventHandler<Guid> CurrentThemeChanged;
+        public event EventHandler<Guid> ThemeDeleted;
 
         public event EventHandler KeyBindingsChanged;
 
+        public event EventHandler<ShellProfile> ShellProfileAdded;
+        public event EventHandler<Guid> ShellProfileDeleted;
+
         public event EventHandler<TerminalOptions> TerminalOptionsChanged;
+
         public void DeleteShellProfile(Guid id)
         {
             _shellProfiles.Delete(id.ToString());
+            ShellProfileDeleted?.Invoke(this, id);
         }
 
         public void DeleteTheme(Guid id)
         {
             _themes.Delete(id.ToString());
+
+            foreach (var profile in GetShellProfiles())
+            {
+                if (profile.TerminalThemeId == id)
+                {
+                    profile.TerminalThemeId = Guid.Empty;
+                    SaveShellProfile(profile);
+                }
+            }
+
+            ThemeDeleted?.Invoke(this, id);
         }
 
         public ApplicationSettings GetApplicationSettings()
@@ -117,14 +136,14 @@ namespace FluentTerminal.App.Services.Implementation
             return _defaultValueProvider.GetDefaultShellProfileId();
         }
 
-        public IDictionary<Command, ICollection<KeyBinding>> GetKeyBindings()
+        public IDictionary<string, ICollection<KeyBinding>> GetCommandKeyBindings()
         {
-            var keyBindings = new Dictionary<Command, ICollection<KeyBinding>>();
+            var keyBindings = new Dictionary<string, ICollection<KeyBinding>>();
+
             foreach (Command command in Enum.GetValues(typeof(Command)))
             {
-                keyBindings.Add(command, _keyBindings.ReadValueFromJson<Collection<KeyBinding>>(command.ToString(), null) ?? _defaultValueProvider.GetDefaultKeyBindings(command));
+                keyBindings.Add(command.ToString(), _keyBindings.ReadValueFromJson<Collection<KeyBinding>>(command.ToString(), null) ?? _defaultValueProvider.GetDefaultKeyBindings(command));
             }
-
             return keyBindings;
         }
 
@@ -181,15 +200,28 @@ namespace FluentTerminal.App.Services.Implementation
             _localSettings.SetValue(DefaultShellProfileKey, id);
         }
 
-        public void SaveKeyBindings(Command command, ICollection<KeyBinding> keyBindings)
+        public void SaveKeyBindings(string command, ICollection<KeyBinding> keyBindings)
         {
+            if (!Enum.IsDefined(typeof(Command), command))
+            {
+                throw new InvalidOperationException();
+            }
+
             _keyBindings.WriteValueAsJson(command.ToString(), keyBindings);
             KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
         }
 
-        public void SaveShellProfile(ShellProfile shellProfile)
+        public void SaveShellProfile(ShellProfile shellProfile, bool newShell = false)
         {
             _shellProfiles.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile);
+
+            // When saving the shell profile, we also need to update keybindings for everywhere.
+            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
+
+            if (newShell)
+            {
+                ShellProfileAdded?.Invoke(this, shellProfile);
+            }
         }
 
         public void SaveTerminalOptions(TerminalOptions terminalOptions)
@@ -198,7 +230,7 @@ namespace FluentTerminal.App.Services.Implementation
             TerminalOptionsChanged?.Invoke(this, terminalOptions);
         }
 
-        public void SaveTheme(TerminalTheme theme)
+        public void SaveTheme(TerminalTheme theme, bool newTheme = false)
         {
             _themes.WriteValueAsJson(theme.Id.ToString(), theme);
 
@@ -206,6 +238,11 @@ namespace FluentTerminal.App.Services.Implementation
             {
                 CurrentThemeChanged?.Invoke(this, theme.Id);
             }
+
+            if (newTheme)
+            {
+                ThemeAdded?.Invoke(this, theme);
+            }
         }
     }
 }

FluentTerminal.App.Services/Implementation/TrayProcessCommunicationService.cs

@@ -5,7 +5,6 @@ using FluentTerminal.Models.Responses;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.Services.Implementation
@@ -14,27 +13,52 @@ namespace FluentTerminal.App.Services.Implementation
     {
         private readonly ISettingsService _settingsService;
         private IAppServiceConnection _appServiceConnection;
-        private Dictionary<int, Action<string>> _terminalOutputHandlers;
+        private readonly Dictionary<int, Action<byte[]>> _terminalOutputHandlers;
+        private int _nextTerminalId = 0;
 
         public event EventHandler<int> TerminalExited;
 
         public TrayProcessCommunicationService(ISettingsService settingsService)
         {
             _settingsService = settingsService;
-            _terminalOutputHandlers = new Dictionary<int, Action<string>>();
+            _terminalOutputHandlers = new Dictionary<int, Action<byte[]>>();
         }
 
-        public async Task<CreateTerminalResponse> CreateTerminal(TerminalSize size, ShellProfile shellProfile)
+        public int GetNextTerminalId()
+        {
+            return _nextTerminalId++;
+        }
+
+        public async Task<GetAvailablePortResponse> GetAvailablePort()
+        {
+            var request = new GetAvailablePortRequest();
+
+            var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(request));
+            var response = JsonConvert.DeserializeObject<GetAvailablePortResponse>(responseMessage[MessageKeys.Content]);
+
+            Logger.Instance.Debug("Received GetAvailablePortResponse: {@response}", response);
+
+            return response;
+        }
+
+        public async Task<CreateTerminalResponse> CreateTerminal(int id, TerminalSize size, ShellProfile shellProfile, SessionType sessionType)
         {
             var request = new CreateTerminalRequest
             {
+                Id = id,
                 Size = size,
-                Profile = shellProfile
+                Profile = shellProfile,
+                SessionType = sessionType
             };
 
-            var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(request));
+            Logger.Instance.Debug("Sending CreateTerminalRequest: {@request}", request);
 
-            return JsonConvert.DeserializeObject<CreateTerminalResponse>(responseMessage[MessageKeys.Content]);
+            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 void Initialize(IAppServiceConnection appServiceConnection)
@@ -58,13 +82,15 @@ namespace FluentTerminal.App.Services.Implementation
                 }
                 else
                 {
-                    Debug.WriteLine("output was not handled: " + request.Output);
+                    Logger.Instance.Error("Received output for unknown terminal Id {id}", request.TerminalId);
                 }
             }
             else if (messageType == nameof(TerminalExitedRequest))
             {
                 var request = JsonConvert.DeserializeObject<TerminalExitedRequest>(messageContent);
 
+                Logger.Instance.Debug("Received TerminalExitedRequest: {@request}", request);
+
                 TerminalExited?.Invoke(this, request.TerminalId);
             }
         }
@@ -80,14 +106,14 @@ namespace FluentTerminal.App.Services.Implementation
             return _appServiceConnection.SendMessageAsync(CreateMessage(request));
         }
 
-        public void SubscribeForTerminalOutput(int terminalId, Action<string> callback)
+        public void SubscribeForTerminalOutput(int terminalId, Action<byte[]> callback)
         {
             _terminalOutputHandlers[terminalId] = callback;
         }
 
         public Task UpdateToggleWindowKeyBindings()
         {
-            var keyBindings = _settingsService.GetKeyBindings()[Command.ToggleWindow];
+            var keyBindings = _settingsService.GetCommandKeyBindings()[nameof(Command.ToggleWindow)];
 
             var request = new SetToggleWindowKeyBindingsRequest
             {
@@ -97,12 +123,12 @@ namespace FluentTerminal.App.Services.Implementation
             return _appServiceConnection.SendMessageAsync(CreateMessage(request));
         }
 
-        public Task WriteText(int id, string text)
+        public Task Write(int id, byte[] data)
         {
-            var request = new WriteTextRequest
+            var request = new WriteDataRequest
             {
                 TerminalId = id,
-                Text = text
+                Data = data
             };
 
             return _appServiceConnection.SendMessageAsync(CreateMessage(request));
@@ -115,6 +141,8 @@ namespace FluentTerminal.App.Services.Implementation
                 TerminalId = terminalId
             };
 
+            Logger.Instance.Debug("Sending TerminalExitedRequest: {@request}", request);
+
             return _appServiceConnection.SendMessageAsync(CreateMessage(request));
         }
 

FluentTerminal.App.Services/Implementation/UpdateService.cs

@@ -0,0 +1,56 @@
+using System;
+using Windows.ApplicationModel;
+using Newtonsoft.Json;
+using RestSharp;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Services.Implementation
+{
+    public class UpdateService : IUpdateService
+    {
+        private const string apiEndpoint = "https://api.github.com";
+
+        private readonly INotificationService _notificationService;
+
+        public UpdateService(INotificationService notificationService)
+        {
+            _notificationService = notificationService;
+        }
+
+        public async Task CheckForUpdate(bool notifyNoUpdate = false)
+        {
+            var latest = await GetLatestVersionAsync();
+            if (latest > GetCurrentVersion())
+            {
+                _notificationService.ShowNotification("Update available",
+                    "Click to open the releases page.", "https://github.com/felixse/FluentTerminal/releases");
+            }
+            else if (notifyNoUpdate)
+            {
+                _notificationService.ShowNotification("No update available", "You're up to date!");
+            }
+        }
+
+        public Version GetCurrentVersion()
+        {
+            var currentVersion = Package.Current.Id.Version;
+            return new Version(currentVersion.Major, currentVersion.Minor, currentVersion.Build, currentVersion.Revision);
+        }
+
+        public async Task<Version> GetLatestVersionAsync()
+        {
+            var restClient = new RestClient(apiEndpoint);
+            var restRequest = new RestRequest("/repos/felixse/fluentterminal/releases", Method.GET);
+
+            var restResponse = await restClient.ExecuteTaskAsync(restRequest);
+            if (restResponse.IsSuccessful)
+            {
+                dynamic restResponseData = JsonConvert.DeserializeObject(restResponse.Content);
+                string tag = restResponseData[0].tag_name;
+                var latestVersion = new Version(tag);
+                return new Version(latestVersion.Major, latestVersion.Minor, latestVersion.Build, latestVersion.Revision);
+            }
+            return new Version(0, 0, 0, 0);
+        }
+    }
+}

FluentTerminal.App.Services/Logger.cs

@@ -0,0 +1,66 @@
+using Serilog;
+using Serilog.Events;
+using System;
+
+namespace FluentTerminal.App.Services
+{
+    public sealed class Logger
+    {
+        public enum LogLevel
+        {
+            Verbose = 0,
+            Debug = 1,
+            Information = 2,
+            Warning = 3,
+            Error = 4,
+            Fatal = 5
+        }
+
+        public class Configuration
+        {
+            public LogLevel LogLevel { get; set; } = LogLevel.Error;
+        }
+
+        public static Logger Instance { get; } = new Logger();
+
+        private Logger()
+        {
+
+        }
+
+        public void Initialize(string filePath, Configuration configuration)
+        {
+            Log.Logger = new LoggerConfiguration()
+            .WriteTo.Async(a => a.File(filePath, rollingInterval: RollingInterval.Day, retainedFileCountLimit: 7))
+            .MinimumLevel.Is((LogEventLevel)configuration.LogLevel)
+            .CreateLogger();
+
+            Log.Information("Initialized");
+        }
+
+        public void Debug(string text, params object[] propertyValues)
+        {
+            Log.Debug(text, propertyValues, propertyValues);
+        }
+
+        public void Information(string text, params object[] propertyValues)
+        {
+            Log.Information(text, propertyValues);
+        }
+
+        public void Warning(string text, params object[] propertyValues)
+        {
+            Log.Warning(text, propertyValues);
+        }
+
+        public void Error(string text, params object[] propertyValues)
+        {
+            Log.Error(text, propertyValues);
+        }
+
+        public void Error(Exception exception, string text, params object[] propertyValues)
+        {
+            Log.Error(exception, text, propertyValues);
+        }
+    }
+}

FluentTerminal.App.Services/Terminal.cs

@@ -0,0 +1,144 @@
+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.ViewModels/FluentTerminal.App.ViewModels.csproj

@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Fleck" Version="1.0.3" />
-    <PackageReference Include="MvvmLightLibs" Version="5.4.1" />
+    <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
   </ItemGroup>
 
   <ItemGroup>

FluentTerminal.App.ViewModels/MainViewModel.cs

@@ -9,55 +9,72 @@ using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
 using System.Threading.Tasks;
+using FluentTerminal.App.Services.Implementation;
 
 namespace FluentTerminal.App.ViewModels
 {
     public class MainViewModel : ViewModelBase
     {
-        private readonly IApplicationView _applicationView;
         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 IDefaultValueProvider _defaultValueProvider;
         private ApplicationSettings _applicationSettings;
         private string _background;
         private double _backgroundOpacity;
         private TerminalViewModel _selectedTerminal;
         private TabsPosition _tabsPosition;
+        private string _windowTitle;
 
         public MainViewModel(ISettingsService settingsService, ITrayProcessCommunicationService trayProcessCommunicationService, IDialogService dialogService, IKeyboardCommandService keyboardCommandService,
-            IApplicationView applicationView, IDispatcherTimer dispatcherTimer, IClipboardService clipboardService)
+            IApplicationView applicationView, IDispatcherTimer dispatcherTimer, IClipboardService clipboardService, IDefaultValueProvider defaultValueProvider)
         {
             _settingsService = settingsService;
             _settingsService.CurrentThemeChanged += OnCurrentThemeChanged;
             _settingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
             _settingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
+            _settingsService.ShellProfileAdded += OnShellProfileAdded;
+            _settingsService.ShellProfileDeleted += OnShellProfileDeleted;
+
             _trayProcessCommunicationService = trayProcessCommunicationService;
             _dialogService = dialogService;
-            _applicationView = applicationView;
+            ApplicationView = applicationView;
             _dispatcherTimer = dispatcherTimer;
             _clipboardService = clipboardService;
+            _defaultValueProvider = defaultValueProvider;
             _keyboardCommandService = keyboardCommandService;
-            _keyboardCommandService.RegisterCommandHandler(Command.NewTab, () => AddTerminal(null, false));
-            _keyboardCommandService.RegisterCommandHandler(Command.ConfigurableNewTab, () => AddTerminal(null, true));
-            _keyboardCommandService.RegisterCommandHandler(Command.CloseTab, CloseCurrentTab);
+            _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);
 
             // 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++)
             {
-                Command switchCmd = Command.SwitchToTerm1 + i;
+                var switchCmd = Command.SwitchToTerm1 + i;
                 int tabNumber = i;
-                Action handler = () => SelectTabNumber(tabNumber);
-                _keyboardCommandService.RegisterCommandHandler(switchCmd, handler);
+                void handler() => SelectTabNumber(tabNumber);
+                _keyboardCommandService.RegisterCommandHandler(switchCmd.ToString(), handler);
+            }
+
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NextTab), SelectNextTab);
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.PreviousTab), SelectPreviousTab);
+
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewWindow), () => NewWindow(false));
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ConfigurableNewWindow), () => NewWindow(true));
+
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ShowSettings), ShowSettings);
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ToggleFullScreen), ToggleFullScreen);
+
+            foreach (ShellProfile profile in _settingsService.GetShellProfiles())
+            {
+                _keyboardCommandService.RegisterCommandHandler(profile.Id.ToString(), () => AddTerminal(profile.Id));
             }
-            _keyboardCommandService.RegisterCommandHandler(Command.NextTab, SelectNextTab);
-            _keyboardCommandService.RegisterCommandHandler(Command.PreviousTab, SelectPreviousTab);
 
-            _keyboardCommandService.RegisterCommandHandler(Command.NewWindow, NewWindow);
-            _keyboardCommandService.RegisterCommandHandler(Command.ShowSettings, ShowSettings);
-            _keyboardCommandService.RegisterCommandHandler(Command.ToggleFullScreen, ToggleFullScreen);
             var currentTheme = _settingsService.GetCurrentTheme();
             var options = _settingsService.GetTerminalOptions();
             Background = currentTheme.Colors.Background;
@@ -65,13 +82,30 @@ namespace FluentTerminal.App.ViewModels
             _applicationSettings = _settingsService.GetApplicationSettings();
             TabsPosition = _applicationSettings.TabsPosition;
 
-            AddTerminalCommand = new RelayCommand(() => AddTerminal(null, false));
+            AddTerminalCommand = new RelayCommand(() => AddTerminal());
+            ShowAboutCommand = new RelayCommand(ShowAbout);
             ShowSettingsCommand = new RelayCommand(ShowSettings);
 
-            _applicationView.CloseRequested += OnCloseRequest;
+            ApplicationView.CloseRequested += OnCloseRequest;
+            ApplicationView.Closed += OnClosed;
             Terminals.CollectionChanged += OnTerminalsCollectionChanged;
         }
 
+        private void OnClosed(object sender, EventArgs e)
+        {
+            Closed?.Invoke(this, e);
+        }
+
+        private void OnShellProfileDeleted(object sender, Guid e)
+        {
+            _keyboardCommandService.DeregisterCommandHandler(e.ToString());
+        }
+
+        private void OnShellProfileAdded(object sender, ShellProfile e)
+        {
+            _keyboardCommandService.RegisterCommandHandler(e.Id.ToString(), () => AddTerminal(e.Id));
+        }
+
         private void OnTerminalsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
             RaisePropertyChanged(nameof(ShowTabsOnTop));
@@ -80,12 +114,26 @@ namespace FluentTerminal.App.ViewModels
 
         public event EventHandler Closed;
 
-        public event EventHandler NewWindowRequested;
+        public event EventHandler<NewWindowRequestedEventArgs> NewWindowRequested;
 
         public event EventHandler ShowSettingsRequested;
 
+        public event EventHandler ShowAboutRequested;
+
         public RelayCommand AddTerminalCommand { get; }
 
+        public string WindowTitle
+        {
+            get => _windowTitle;
+            set
+            {
+                if (Set(ref _windowTitle, value))
+                {
+                    ApplicationView.Title = value;
+                }
+            }
+        }
+
         public bool ShowTabsOnTop
         {
             get => TabsPosition == TabsPosition.Top && (Terminals.Count > 1 || _applicationSettings.AlwaysShowTabs);
@@ -123,11 +171,21 @@ namespace FluentTerminal.App.ViewModels
                     if (SelectedTerminal != null)
                     {
                         SelectedTerminal.IsSelected = true;
+                        if (_applicationSettings.ShowCustomTitleInTitlebar)
+                        {
+                            WindowTitle = SelectedTerminal.TabTitle;
+                        }
+                        else
+                        {
+                            WindowTitle = SelectedTerminal.ShellTitle;
+                        }
                     }
                 }
             }
         }
 
+        public RelayCommand ShowAboutCommand { get; }
+
         public RelayCommand ShowSettingsCommand { get; }
 
         public TabsPosition TabsPosition
@@ -138,39 +196,118 @@ namespace FluentTerminal.App.ViewModels
 
         public ObservableCollection<TerminalViewModel> Terminals { get; } = new ObservableCollection<TerminalViewModel>();
 
-        public Task AddTerminal(string startupDirectory, bool showProfileSelection)
+        public IApplicationView ApplicationView { get; }
+
+        public Task AddConfigurableTerminal()
         {
-            return _applicationView.RunOnDispatcherThread(async () =>
+            return ApplicationView.RunOnDispatcherThread(async () =>
             {
-                ShellProfile profile = null;
-                if (showProfileSelection)
-                {
-                    profile = await _dialogService.ShowProfileSelectionDialogAsync();
+                var profile = await _dialogService.ShowProfileSelectionDialogAsync();
 
-                    if (profile == null)
+                if (profile == null)
+                {
+                    if (Terminals.Count == 0)
                     {
-                        return;
+                        await ApplicationView.TryClose();
                     }
-                }
-                else
-                {
-                    profile = _settingsService.GetDefaultShellProfile();
+
+                    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();
+            AddTerminal(profile);
+        }
+
+        public void AddTerminal(Guid shellProfileId)
+        {
+            var profile = _settingsService.GetShellProfile(shellProfileId);
+            AddTerminal(profile);
+        }
+
+        public void AddTerminal(ShellProfile profile)
+        {
+            ApplicationView.RunOnDispatcherThread(() =>
+            {
                 var terminal = new TerminalViewModel(_settingsService, _trayProcessCommunicationService, _dialogService, _keyboardCommandService,
-                    _applicationSettings, startupDirectory, profile, _applicationView, _dispatcherTimer, _clipboardService);
-                terminal.Closed += OnTerminalCloseRequested;
+                    _applicationSettings, profile, ApplicationView, _dispatcherTimer, _clipboardService);
+
+                terminal.Closed += OnTerminalClosed;
+                terminal.ShellTitleChanged += Terminal_ShellTitleChanged;
+                terminal.CustomTitleChanged += Terminal_CustomTitleChanged;
                 Terminals.Add(terminal);
 
                 SelectedTerminal = terminal;
             });
         }
 
-        public void CloseAllTerminals()
+        private void Terminal_CustomTitleChanged(object sender, string e)
+        {
+            if (sender is TerminalViewModel terminal)
+            {
+                if (terminal.IsSelected && _applicationSettings.ShowCustomTitleInTitlebar)
+                {
+                    if (string.IsNullOrWhiteSpace(e))
+                    {
+                        WindowTitle = terminal.ShellTitle;
+                    }
+                    else
+                    {
+                        WindowTitle = e;
+                    }
+                }
+            }
+        }
+
+        private void Terminal_ShellTitleChanged(object sender, string e)
+        {
+            if (sender is TerminalViewModel terminal && terminal.IsSelected && !_applicationSettings.ShowCustomTitleInTitlebar)
+            {
+                WindowTitle = e;
+            }
+        }
+
+        public async Task CloseAllTerminals()
         {
             foreach (var terminal in Terminals)
             {
-                terminal.CloseView();
+                terminal.Closed -= OnTerminalClosed;
+                terminal.ShellTitleChanged -= Terminal_ShellTitleChanged;
+                terminal.CustomTitleChanged -= Terminal_CustomTitleChanged;
+                await terminal.Close();
             }
         }
 
@@ -179,19 +316,33 @@ namespace FluentTerminal.App.ViewModels
             SelectedTerminal?.CloseCommand.Execute(null);
         }
 
-        private void NewWindow()
+        private void NewWindow(bool showProfileSelection)
         {
-            NewWindowRequested?.Invoke(this, EventArgs.Empty);
+            var args = new NewWindowRequestedEventArgs
+            {
+                ShowProfileSelection = showProfileSelection
+            };
+
+            NewWindowRequested?.Invoke(this, args);
         }
 
         private async void OnApplicationSettingsChanged(object sender, ApplicationSettings e)
         {
-            await _applicationView.RunOnDispatcherThread(() =>
+            await ApplicationView.RunOnDispatcherThread(() =>
             {
                 _applicationSettings = e;
                 TabsPosition = e.TabsPosition;
                 RaisePropertyChanged(nameof(ShowTabsOnTop));
                 RaisePropertyChanged(nameof(ShowTabsOnBottom));
+
+                if (e.ShowCustomTitleInTitlebar)
+                {
+                    WindowTitle = SelectedTerminal?.TabTitle;
+                }
+                else
+                {
+                    WindowTitle = SelectedTerminal?.ShellTitle;
+                }
             });
         }
 
@@ -203,8 +354,7 @@ namespace FluentTerminal.App.ViewModels
 
                 if (result == DialogButton.OK)
                 {
-                    CloseAllTerminals();
-                    Closed?.Invoke(this, EventArgs.Empty);
+                    await CloseAllTerminals();
                 }
                 else
                 {
@@ -213,42 +363,40 @@ namespace FluentTerminal.App.ViewModels
             }
             else
             {
-                CloseAllTerminals();
-                Closed?.Invoke(this, EventArgs.Empty);
+                await CloseAllTerminals();
             }
         }
 
         private async void OnCurrentThemeChanged(object sender, Guid e)
         {
-            await _applicationView.RunOnDispatcherThread(() =>
+            await ApplicationView.RunOnDispatcherThread(() =>
              {
                  var currentTheme = _settingsService.GetTheme(e);
                  Background = currentTheme.Colors.Background;
              });
         }
 
-        private void OnTerminalCloseRequested(object sender, EventArgs e)
+        private async void OnTerminalClosed(object sender, EventArgs e)
         {
             if (sender is TerminalViewModel terminal)
             {
-                terminal.CloseView();
                 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)
                 {
-                    Closed?.Invoke(this, EventArgs.Empty);
-                    _applicationView.TryClose();
+                    await ApplicationView.TryClose();
                 }
             }
         }
 
         private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
         {
-            await _applicationView.RunOnDispatcherThread(() =>
+            await ApplicationView.RunOnDispatcherThread(() =>
             {
                 BackgroundOpacity = e.BackgroundOpacity;
             });
@@ -276,6 +424,11 @@ namespace FluentTerminal.App.ViewModels
             SelectedTerminal = Terminals[previousIndex];
         }
 
+        private void ShowAbout()
+        {
+            ShowAboutRequested?.Invoke(this, EventArgs.Empty);
+        }
+
         private void ShowSettings()
         {
             ShowSettingsRequested?.Invoke(this, EventArgs.Empty);
@@ -283,7 +436,7 @@ namespace FluentTerminal.App.ViewModels
 
         private void ToggleFullScreen()
         {
-            _applicationView.ToggleFullScreen();
+            ApplicationView.ToggleFullScreen();
         }
     }
 }

FluentTerminal.App.ViewModels/Settings/AboutPageViewModel.cs

@@ -0,0 +1,79 @@
+using FluentTerminal.App.Services;
+using FluentTerminal.App.ViewModels.Infrastructure;
+using GalaSoft.MvvmLight;
+using System;
+using System.Threading.Tasks;
+
+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(ISettingsService settingsService, IUpdateService updateService, IApplicationView applicationView)
+        {
+            _settingsService = settingsService;
+            _updateService = updateService;
+            _applicationView = applicationView;
+
+            CheckForUpdatesCommand = new AsyncCommand(() => CheckForUpdate(true));
+        }
+
+        public IAsyncCommand CheckForUpdatesCommand { get; }
+
+        public string CurrentVersion
+        {
+            get
+            {
+                var version = _updateService.GetCurrentVersion();
+                return ConvertVersionToString(version);
+            }
+        }
+
+        public string CurrentVersionReleaseNotesURL => BaseUrl + CurrentVersion;
+
+        public string LatestVersion
+        {
+            get => _latestVersion;
+            set
+            {
+                if (Set(ref _latestVersion, value))
+                {
+                    RaisePropertyChanged(nameof(LatestVersionFound));
+                    RaisePropertyChanged(nameof(LatestVersionLoading));
+                    RaisePropertyChanged(nameof(LatestVersionNotFound));
+                    RaisePropertyChanged(nameof(LatestVersionReleaseNotesURL));
+                }
+            }
+        }
+
+        public bool LatestVersionFound => !LatestVersionNotFound && !LatestVersionLoading;
+
+        public bool LatestVersionLoading => LatestVersion == null;
+
+        public bool LatestVersionNotFound => LatestVersion == "0.0.0.0";
+
+        public string LatestVersionReleaseNotesURL => BaseUrl + LatestVersion;
+
+        public Task OnNavigatedTo()
+        {
+            return CheckForUpdate(false);
+        }
+
+        public async Task CheckForUpdate(bool notifyNoUpdate)
+        {
+            var version = ConvertVersionToString(await _updateService.GetLatestVersionAsync());
+            await _applicationView.RunOnDispatcherThread(() => LatestVersion = version);
+            await _updateService.CheckForUpdate(notifyNoUpdate);
+        }
+
+        private string ConvertVersionToString(Version version)
+        {
+            return string.Format("{0}.{1}.{2}.{3}", version.Major, version.Minor, version.Build, version.Revision);
+        }
+    }
+}

FluentTerminal.App.ViewModels/Settings/GeneralPageViewModel.cs

@@ -19,6 +19,7 @@ namespace FluentTerminal.App.ViewModels.Settings
         private bool _editingTabsPosition;
         private bool _editingInactiveTabColorMode;
         private bool _startupTaskEnabled;
+        private bool _shouldRestartForTrayMessage;
         private string _startupTaskErrorMessage;
 
         public GeneralPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider, IStartupTaskService startupTaskService)
@@ -53,6 +54,57 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
+        public bool AlwaysUseWinPty
+        {
+            get => _applicationSettings.AlwaysUseWinPty;
+            set
+            {
+                if (_applicationSettings.AlwaysUseWinPty != value)
+                {
+                    _applicationSettings.AlwaysUseWinPty = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public bool ShowCustomTitleInTitlebar
+        {
+            get => _applicationSettings.ShowCustomTitleInTitlebar;
+            set
+            {
+                if (_applicationSettings.ShowCustomTitleInTitlebar != value)
+                {
+                    _applicationSettings.ShowCustomTitleInTitlebar = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public bool EnableTrayIcon
+        {
+            get => _applicationSettings.EnableTrayIcon;
+            set
+            {
+                if (_applicationSettings.EnableTrayIcon != value)
+                {
+                    _applicationSettings.EnableTrayIcon = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+
+                    // Toggle message telling user to restart the program
+                    ShouldRestartForTrayMessage = !ShouldRestartForTrayMessage;
+                }
+            }
+        }
+
+        public bool ShouldRestartForTrayMessage
+        {
+            get => _shouldRestartForTrayMessage;
+            set => Set(ref _shouldRestartForTrayMessage, value);
+        }
+
         public bool ShowNewOutputIndicator
         {
             get => _applicationSettings.ShowNewOutputIndicator;
@@ -240,7 +292,10 @@ namespace FluentTerminal.App.ViewModels.Settings
                 InactiveTabColorMode = defaults.InactiveTabColorMode;
                 NewTerminalLocation = defaults.NewTerminalLocation;
                 AlwaysShowTabs = defaults.AlwaysShowTabs;
+                AlwaysUseWinPty = defaults.AlwaysUseWinPty;
                 ShowNewOutputIndicator = defaults.ShowNewOutputIndicator;
+                EnableTrayIcon = defaults.EnableTrayIcon;
+                ShowCustomTitleInTitlebar = defaults.ShowCustomTitleInTitlebar;
             }
         }
 

FluentTerminal.App.ViewModels/Settings/KeyBindingViewModel.cs

@@ -1,7 +1,7 @@
 using FluentTerminal.App.Services;
+using FluentTerminal.App.ViewModels.Infrastructure;
 using FluentTerminal.Models;
 using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
 using System;
 using System.Threading.Tasks;
 
@@ -11,18 +11,21 @@ namespace FluentTerminal.App.ViewModels.Settings
     {
         private readonly IDialogService _dialogService;
 
-        public KeyBindingViewModel(KeyBinding keyBinding, IDialogService dialogService)
+        public KeyBindingViewModel(KeyBinding keyBinding, IDialogService dialogService, KeyBindingsViewModel parent)
         {
             Model = keyBinding;
+            Parent = parent;
             _dialogService = dialogService;
-            EditCommand = new RelayCommand(async () => await Edit().ConfigureAwait(false));
-            DeleteCommand = new RelayCommand(async () => await Delete().ConfigureAwait(false));
+            EditCommand = new AsyncCommand(Edit);
+            DeleteCommand = new AsyncCommand(Delete);
         }
 
         public event EventHandler Deleted;
 
         public event EventHandler Edited;
 
+        public KeyBindingsViewModel Parent { get; }
+
         public bool Meta
         {
             get => Model.Meta;
@@ -62,8 +65,8 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        public RelayCommand DeleteCommand { get; }
-        public RelayCommand EditCommand { get; }
+        public IAsyncCommand DeleteCommand { get; }
+        public IAsyncCommand EditCommand { get; }
 
         public int Key
         {

FluentTerminal.App.ViewModels/Settings/KeyBindingsPageViewModel.cs

@@ -1,4 +1,5 @@
 using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
@@ -17,7 +18,7 @@ namespace FluentTerminal.App.ViewModels.Settings
         private readonly IDialogService _dialogService;
         private readonly ISettingsService _settingsService;
         private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
-        private IDictionary<Command, ICollection<KeyBinding>> _keyBindings;
+        private IDictionary<string, ICollection<KeyBinding>> _keyBindings;
 
         public KeyBindingsPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider, ITrayProcessCommunicationService trayProcessCommunicationService)
         {
@@ -26,19 +27,19 @@ namespace FluentTerminal.App.ViewModels.Settings
             _defaultValueProvider = defaultValueProvider;
             _trayProcessCommunicationService = trayProcessCommunicationService;
             RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
-            AddCommand = new RelayCommand<Command>(async command => await Add(command).ConfigureAwait(false));
+            AddCommand = new RelayCommand<string>(async command => await Add(command).ConfigureAwait(false));
 
-            Initialize(_settingsService.GetKeyBindings());
+            Initialize(_settingsService.GetCommandKeyBindings());
         }
 
-        public RelayCommand<Command> AddCommand { get; }
+        public RelayCommand<string> AddCommand { get; }
         public ObservableCollection<KeyBindingsViewModel> KeyBindings { get; } = new ObservableCollection<KeyBindingsViewModel>();
         public RelayCommand RestoreDefaultsCommand { get; }
 
-        private async Task Add(Command command)
+        private async Task Add(string command)
         {
             var keyBinding = KeyBindings.FirstOrDefault(k => k.Command == command);
-            await keyBinding?.Add();
+            await keyBinding?.ShowAddKeyBindingDialog();
         }
 
         private void ClearKeyBindings()
@@ -51,7 +52,7 @@ namespace FluentTerminal.App.ViewModels.Settings
             KeyBindings.Clear();
         }
 
-        private void Initialize(IDictionary<Command, ICollection<KeyBinding>> keyBindings)
+        private void Initialize(IDictionary<string, ICollection<KeyBinding>> keyBindings)
         {
             _keyBindings = keyBindings;
 
@@ -60,13 +61,17 @@ namespace FluentTerminal.App.ViewModels.Settings
             foreach (var value in Enum.GetValues(typeof(Command)))
             {
                 var command = (Command)value;
-                var viewModel = new KeyBindingsViewModel(command, _keyBindings[command], _dialogService);
+                var viewModel = new KeyBindingsViewModel(command.ToString(), _dialogService, EnumHelper.GetEnumDescription(command), true);
+                foreach (var keyBinding in _keyBindings[command.ToString()])
+                {
+                    viewModel.Add(keyBinding);
+                }
                 viewModel.Edited += OnEdited;
                 KeyBindings.Add(viewModel);
             }
         }
 
-        private void OnEdited(Command command, ICollection<KeyBinding> keyBindings)
+        private void OnEdited(string command, ICollection<KeyBinding> keyBindings)
         {
             _settingsService.SaveKeyBindings(command, keyBindings);
             _trayProcessCommunicationService.UpdateToggleWindowKeyBindings();
@@ -79,7 +84,7 @@ namespace FluentTerminal.App.ViewModels.Settings
             if (result == DialogButton.OK)
             {
                 _settingsService.ResetKeyBindings();
-                Initialize(_settingsService.GetKeyBindings());
+                Initialize(_settingsService.GetCommandKeyBindings());
             }
         }
     }

FluentTerminal.App.ViewModels/Settings/KeyBindingsViewModel.cs

@@ -1,11 +1,10 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.ViewModels.Settings
@@ -13,62 +12,73 @@ namespace FluentTerminal.App.ViewModels.Settings
     public class KeyBindingsViewModel : ViewModelBase
     {
         private readonly IDialogService _dialogService;
-        private readonly ICollection<KeyBinding> _keyBindings;
+        private bool _editable;
 
-        public KeyBindingsViewModel(Command command, ICollection<KeyBinding> keyBindings, IDialogService dialogService)
+        public KeyBindingsViewModel(string command, IDialogService dialogService, string commandName, bool editable)
         {
-            Command = command;
-            _keyBindings = keyBindings;
             _dialogService = dialogService;
 
-            CommandName = EnumHelper.GetEnumDescription(command);
-
-            foreach (var binding in keyBindings)
-            {
-                var viewModel = new KeyBindingViewModel(binding, _dialogService);
-                viewModel.Deleted += ViewModel_Deleted;
-                viewModel.Edited += ViewModel_Edited;
-                KeyBindings.Add(viewModel);
-            }
+            Command = command;
+            CommandName = commandName;
+            Editable = editable;
         }
 
-        public delegate void EditedEvent(Command command, ICollection<KeyBinding> keyBindings);
+        public delegate void EditedEvent(string command, ICollection<KeyBinding> keyBindings);
 
         public event EditedEvent Edited;
 
-        public Command Command { get; }
+        public string Command { get; }
 
         public string CommandName { get; }
 
+        /// <summary>
+        ///  Whether or not the "Edit" and "Delete" links appear next to the key binding list.
+        /// </summary>
+        public bool Editable
+        {
+            get => _editable;
+            set => Set(ref _editable, value);
+        }
+
         public ObservableCollection<KeyBindingViewModel> KeyBindings { get; } = new ObservableCollection<KeyBindingViewModel>();
 
-        public async Task Add()
+        public async Task ShowAddKeyBindingDialog()
         {
-            var newKeyBinding = new KeyBindingViewModel(new KeyBinding { Command = Command }, _dialogService);
+            var newKeyBinding = new KeyBindingViewModel(new KeyBinding { Command = Command }, _dialogService, this);
 
             if (await newKeyBinding.Edit().ConfigureAwait(true))
             {
-                newKeyBinding.Deleted += ViewModel_Deleted;
-                newKeyBinding.Edited += ViewModel_Edited;
-                KeyBindings.Add(newKeyBinding);
-                _keyBindings.Add(newKeyBinding.Model);
-                Edited?.Invoke(Command, _keyBindings);
+                Add(newKeyBinding.Model);
             }
         }
 
+        public void Clear()
+        {
+            KeyBindings.Clear();
+        }
+
+        public void Add(KeyBinding keyBinding)
+        {
+            var viewModel = new KeyBindingViewModel(keyBinding, _dialogService, this);
+
+            viewModel.Deleted += ViewModel_Deleted;
+            viewModel.Edited += ViewModel_Edited;
+            KeyBindings.Add(viewModel);
+            Edited?.Invoke(Command, KeyBindings.Select(x => x.Model).ToList());
+        }
+
         private void ViewModel_Deleted(object sender, EventArgs e)
         {
             if (sender is KeyBindingViewModel keyBinding)
             {
-                _keyBindings.Remove(keyBinding.Model);
                 KeyBindings.Remove(keyBinding);
-                Edited?.Invoke(Command, _keyBindings);
+                Edited?.Invoke(Command, KeyBindings.Select(x => x.Model).ToList());
             }
         }
 
         private void ViewModel_Edited(object sender, EventArgs e)
         {
-            Edited?.Invoke(Command, _keyBindings);
+            Edited?.Invoke(Command, KeyBindings.Select(x => x.Model).ToList());
         }
     }
 }

FluentTerminal.App.ViewModels/Settings/ProfilesPageViewModel.cs

@@ -4,6 +4,7 @@ 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
@@ -15,20 +16,23 @@ namespace FluentTerminal.App.ViewModels.Settings
         private readonly ISettingsService _settingsService;
         private readonly IFileSystemService _fileSystemService;
         private ShellProfileViewModel _selectedShellProfile;
+        private readonly IApplicationView _applicationView;
 
-        public ProfilesPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider, IFileSystemService fileSystemService)
+        public ProfilesPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider, IFileSystemService fileSystemService, IApplicationView applicationView)
         {
             _settingsService = settingsService;
             _dialogService = dialogService;
             _defaultValueProvider = defaultValueProvider;
             _fileSystemService = fileSystemService;
+            _applicationView = applicationView;
 
             CreateShellProfileCommand = new RelayCommand(CreateShellProfile);
+            CloneCommand = new RelayCommand<ShellProfileViewModel>(Clone);
 
             var defaultShellProfileId = _settingsService.GetDefaultShellProfileId();
             foreach (var shellProfile in _settingsService.GetShellProfiles())
             {
-                var viewModel = new ShellProfileViewModel(shellProfile, settingsService, dialogService, fileSystemService);
+                var viewModel = new ShellProfileViewModel(shellProfile, settingsService, dialogService, fileSystemService, applicationView, defaultValueProvider, false);
                 viewModel.Deleted += OnShellProfileDeleted;
                 viewModel.SetAsDefault += OnShellProfileSetAsDefault;
 
@@ -40,6 +44,7 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
 
             SelectedShellProfile = ShellProfiles.First(p => p.IsDefault);
+            
         }
 
         private void OnShellProfileSetAsDefault(object sender, EventArgs e)
@@ -76,18 +81,38 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         public RelayCommand CreateShellProfileCommand { get; }
 
+        public RelayCommand<ShellProfileViewModel> CloneCommand { get; }
+
         private void CreateShellProfile()
         {
             var shellProfile = new ShellProfile
             {
                 Id = Guid.NewGuid(),
                 PreInstalled = false,
-                Name = "New profile"
+                Name = "New profile",
+                KeyBindings = new List<KeyBinding>()
             };
 
-            _settingsService.SaveShellProfile(shellProfile);
+            AddShellProfile(shellProfile);
+        }
 
-            var viewModel = new ShellProfileViewModel(shellProfile, _settingsService, _dialogService, _fileSystemService);
+        private void Clone(ShellProfileViewModel shellProfile)
+        {
+            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;
             viewModel.Deleted += OnShellProfileDeleted;

FluentTerminal.App.ViewModels/Settings/TerminalPageViewModel.cs

@@ -96,6 +96,20 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
+        public int Padding
+        {
+            get => _terminalOptions.Padding;
+            set
+            {
+                if (_terminalOptions.Padding != value)
+                {
+                    _terminalOptions.Padding = value;
+                    _settingsService.SaveTerminalOptions(_terminalOptions);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
         public string ScrollBackLimit
         {
             get => _terminalOptions.ScrollBackLimit.ToString();
@@ -122,7 +136,21 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        public IEnumerable<string> Fonts { get; }
+        public bool BoldText
+        {
+            get => _terminalOptions.BoldText;
+            set
+            {
+                if (_terminalOptions.BoldText != value)
+                {
+                    _terminalOptions.BoldText = value;
+                    _settingsService.SaveTerminalOptions(_terminalOptions);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public IEnumerable<FontInfo> Fonts { get; }
 
         public int FontSize
         {
@@ -192,6 +220,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 ScrollBarStyle = defaults.ScrollBarStyle;
                 FontFamily = defaults.FontFamily;
                 FontSize = defaults.FontSize;
+                BoldText = defaults.BoldText;
                 BackgroundOpacity = defaults.BackgroundOpacity;
                 ScrollBackLimit = defaults.ScrollBackLimit.ToString();
             }
@@ -205,7 +234,7 @@ namespace FluentTerminal.App.ViewModels.Settings
 
             RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
 
-            Fonts = systemFontService.GetSystemFontFamilies().OrderBy(s => s);
+            Fonts = systemFontService.GetSystemFontFamilies().OrderBy(s => s.Name);
             Sizes = Enumerable.Range(1, 72);
 
             _terminalOptions = _settingsService.GetTerminalOptions();

FluentTerminal.App.ViewModels/Settings/ThemesPageViewModel.cs

@@ -31,6 +31,7 @@ namespace FluentTerminal.App.ViewModels.Settings
 
             CreateThemeCommand = new RelayCommand(CreateTheme);
             ImportThemeCommand = new RelayCommand(ImportTheme);
+            CloneCommand = new RelayCommand<ThemeViewModel>(CloneTheme);
 
             _settingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
 
@@ -39,7 +40,7 @@ namespace FluentTerminal.App.ViewModels.Settings
             var activeThemeId = _settingsService.GetCurrentThemeId();
             foreach (var theme in _settingsService.GetThemes())
             {
-                var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, fileSystemService);
+                var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, fileSystemService, false);
                 viewModel.Activated += OnThemeActivated;
                 viewModel.Deleted += OnThemeDeleted;
 
@@ -55,6 +56,7 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         public RelayCommand CreateThemeCommand { get; }
         public RelayCommand ImportThemeCommand { get; }
+        public RelayCommand<ThemeViewModel> CloneCommand { get; set; }
 
         public double BackgroundOpacity
         {
@@ -81,6 +83,18 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         public ObservableCollection<ThemeViewModel> Themes { get; } = new ObservableCollection<ThemeViewModel>();
 
+        private void CloneTheme(ThemeViewModel theme)
+        {
+            var cloned = new TerminalTheme(theme.Model)
+            {
+                Id = Guid.NewGuid(),
+                PreInstalled = false,
+                Name = $"Copy of {theme.Name}"
+            };
+
+            AddTheme(cloned);
+        }
+
         private void CreateTheme()
         {
             var defaultTheme = _settingsService.GetTheme(_defaultValueProvider.GetDefaultThemeId());
@@ -92,13 +106,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 Colors = new TerminalColors(defaultTheme.Colors)
             };
 
-            _settingsService.SaveTheme(theme);
-
-            var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, _fileSystemService);
-            viewModel.Activated += OnThemeActivated;
-            viewModel.Deleted += OnThemeDeleted;
-            Themes.Add(viewModel);
-            SelectedTheme = viewModel;
+            AddTheme(theme);
         }
 
         private async void ImportTheme()
@@ -118,13 +126,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 {
                     var theme = await parser.Parse(file.Name, file.Content).ConfigureAwait(true);
 
-                    _settingsService.SaveTheme(theme);
-
-                    var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, _fileSystemService);
-                    viewModel.Activated += OnThemeActivated;
-                    viewModel.Deleted += OnThemeDeleted;
-                    Themes.Add(viewModel);
-                    SelectedTheme = viewModel;
+                    AddTheme(theme);
                 }
                 catch (Exception exception)
                 {
@@ -133,6 +135,18 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
+        private void AddTheme(TerminalTheme theme)
+        {
+            _settingsService.SaveTheme(theme, true);
+
+            var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, _fileSystemService, true);
+            viewModel.EditCommand.Execute(null);
+            viewModel.Activated += OnThemeActivated;
+            viewModel.Deleted += OnThemeDeleted;
+            Themes.Add(viewModel);
+            SelectedTheme = viewModel;
+        }
+
         private void OnThemeActivated(object sender, EventArgs e)
         {
             if (sender is ThemeViewModel activatedTheme)

FluentTerminal.App.ViewModels/SettingsViewModel.cs

@@ -8,17 +8,20 @@ namespace FluentTerminal.App.ViewModels
     public class SettingsViewModel : ViewModelBase
     {
         public SettingsViewModel(ISettingsService settingsService, IDefaultValueProvider defaultValueProvider, IDialogService dialogService,
-            ITrayProcessCommunicationService trayProcessCommunicationService, IThemeParserFactory themeParserFactory, ISystemFontService systemFontService, IFileSystemService fileSystemService, IStartupTaskService startupTaskService)
+            ITrayProcessCommunicationService trayProcessCommunicationService, IThemeParserFactory themeParserFactory, ISystemFontService systemFontService,
+            IFileSystemService fileSystemService, IStartupTaskService startupTaskService, IUpdateService updateService, IApplicationView 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);
+            Shell = new ProfilesPageViewModel(settingsService, dialogService, defaultValueProvider, fileSystemService, applicationView);
             Terminal = new TerminalPageViewModel(settingsService, dialogService, defaultValueProvider, systemFontService);
             Themes = new ThemesPageViewModel(settingsService, dialogService, defaultValueProvider, themeParserFactory, fileSystemService);
             Mouse = new MousePageViewModel(settingsService, dialogService, defaultValueProvider);
         }
 
         public event EventHandler Closed;
+        public event EventHandler AboutPageRequested;
 
         public GeneralPageViewModel General { get; }
         public KeyBindingsPageViewModel KeyBindings { get; }
@@ -26,6 +29,12 @@ namespace FluentTerminal.App.ViewModels
         public TerminalPageViewModel Terminal { get; }
         public ThemesPageViewModel Themes { get; }
         public MousePageViewModel Mouse { get; }
+        public AboutPageViewModel About { get; }
+
+        public void NavigateToAboutPage()
+        {
+            AboutPageRequested?.Invoke(this, EventArgs.Empty);
+        }
 
         public void Close()
         {

FluentTerminal.App.ViewModels/ShellProfileViewModel.cs

@@ -1,6 +1,8 @@
 using FluentTerminal.App.Services;
 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;
@@ -15,29 +17,64 @@ namespace FluentTerminal.App.ViewModels
         private readonly IDialogService _dialogService;
         private readonly IFileSystemService _fileSystemService;
         private readonly ISettingsService _settingsService;
-        private readonly ShellProfile _shellProfile;
         private string _arguments;
-        private string _fallbackArguments;
-        private string _fallbackLocation;
-        private string _fallbackName;
-        private int _fallbackTabThemeId;
-        private string _fallbackWorkingDirectory;
+        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;
 
-        public ShellProfileViewModel(ShellProfile shellProfile, ISettingsService settingsService, IDialogService dialogService, IFileSystemService fileSystemService)
+        public ShellProfileViewModel(ShellProfile shellProfile, ISettingsService settingsService, IDialogService dialogService, IFileSystemService fileSystemService, IApplicationView applicationView, IDefaultValueProvider defaultValueProvider, Boolean isNew)
         {
-            _shellProfile = shellProfile;
+            Model = shellProfile;
             _settingsService = settingsService;
             _dialogService = dialogService;
             _fileSystemService = fileSystemService;
+            _applicationView = applicationView;
+            _defaultValueProvider = defaultValueProvider;
+            _isNew = isNew;
+
+            _settingsService.ThemeAdded += OnThemeAdded;
+            _settingsService.ThemeDeleted += OnThemeDeleted;
 
             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;
@@ -45,14 +82,37 @@ namespace FluentTerminal.App.ViewModels
             WorkingDirectory = shellProfile.WorkingDirectory;
             SelectedTabTheme = TabThemes.FirstOrDefault(t => t.Id == shellProfile.TabThemeId);
             PreInstalled = shellProfile.PreInstalled;
+            LineEndingStyle = shellProfile.LineEndingTranslation;
 
-            SetDefaultCommand = new RelayCommand(SetDefault);
-            DeleteCommand = new AsyncCommand(Delete, CanDelete);
-            EditCommand = new RelayCommand(Edit);
-            CancelEditCommand = new AsyncCommand(CancelEdit);
-            SaveChangesCommand = new RelayCommand(SaveChanges);
-            BrowseForCustomShellCommand = new AsyncCommand(BrowseForCustomShell);
-            BrowseForWorkingDirectoryCommand = new AsyncCommand(BrowseForWorkingDirectory);
+            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;
@@ -65,10 +125,14 @@ namespace FluentTerminal.App.ViewModels
         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 bool PreInstalled { get; }
+        public ObservableCollection<TerminalTheme> TerminalThemes { get; }
+        public ShellProfile Model { get; private set; }
+        public bool PreInstalled { get; private set; }
 
         public string Arguments
         {
@@ -76,7 +140,7 @@ namespace FluentTerminal.App.ViewModels
             set => Set(ref _arguments, value);
         }
 
-        public Guid Id { get; }
+        public Guid Id { get; private set; }
 
         public bool InEditMode
         {
@@ -114,23 +178,91 @@ namespace FluentTerminal.App.ViewModels
             }
         }
 
+        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()
         {
-            _shellProfile.Arguments = Arguments;
-            _shellProfile.Location = Location;
-            _shellProfile.Name = Name;
-            _shellProfile.WorkingDirectory = WorkingDirectory;
-            _shellProfile.TabThemeId = SelectedTabTheme.Id;
-
-            _settingsService.SaveShellProfile(_shellProfile);
+            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();
+            }
+
+            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)
+            {
+                Model = _defaultValueProvider.GetPreinstalledShellProfiles().FirstOrDefault(x => x.Id == Model.Id);
+                InitializeViewModelProperties(Model);
+                _settingsService.SaveShellProfile(Model);
+            }
+        }
+
+        public Task AddKeyboardShortcut()
+        {
+            return KeyBindings.ShowAddKeyBindingDialog();
         }
 
         private async Task BrowseForCustomShell()
@@ -153,23 +285,59 @@ namespace FluentTerminal.App.ViewModels
 
         private async Task CancelEdit()
         {
-            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)
+            if (_isNew)
             {
-                Arguments = _fallbackArguments;
-                Location = _fallbackLocation;
-                Name = _fallbackName;
-                WorkingDirectory = _fallbackWorkingDirectory;
-                SelectedTabTheme = TabThemes.FirstOrDefault(t => t.Id == _fallbackTabThemeId);
+                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()
+                };
 
-                InEditMode = false;
+                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 !_shellProfile.PreInstalled;
+            return !Model.PreInstalled;
         }
 
         private async Task Delete()
@@ -184,11 +352,19 @@ namespace FluentTerminal.App.ViewModels
 
         private void Edit()
         {
-            _fallbackArguments = _shellProfile.Arguments;
-            _fallbackLocation = _shellProfile.Location;
-            _fallbackName = _shellProfile.Name;
-            _fallbackWorkingDirectory = _shellProfile.WorkingDirectory;
-            _fallbackTabThemeId = _shellProfile.TabThemeId;
+            // 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;
         }
 

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/TerminalViewModel.cs

@@ -1,106 +1,114 @@
-using Fleck;
-using FluentTerminal.App.Services;
+using FluentTerminal.App.Services;
+using FluentTerminal.App.ViewModels.Infrastructure;
 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.Linq;
-using System.Threading;
+using System.Text;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.ViewModels
 {
     public class TerminalViewModel : ViewModelBase
     {
-        private readonly IApplicationView _applicationView;
-        private readonly IClipboardService _clipboardService;
-        private readonly ManualResetEventSlim _connectedEvent;
-        private readonly IDialogService _dialogService;
         private readonly IKeyboardCommandService _keyboardCommandService;
         private readonly IDispatcherTimer _resizeOverlayTimer;
-        private readonly ISettingsService _settingsService;
-        private readonly ShellProfile _shellProfile;
-        private readonly string _startupDirectory;
-        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
         private bool _isSelected;
-        private bool _newOutput;
+        private bool _hasNewOutput;
         private string _resizeOverlayContent;
         private string _searchText;
         private bool _showResizeOverlay;
         private bool _showSearchPanel;
         private TabTheme _tabTheme;
-        private int _terminalId;
-        private ITerminalView _terminalView;
-        private string _title;
-        private IWebSocketConnection _webSocket;
+        private TerminalTheme _terminalTheme;
+        private string _tabTitle;
+        private string _shellTitle;
+        private bool _hasCustomTitle;
 
         public TerminalViewModel(ISettingsService settingsService, ITrayProcessCommunicationService trayProcessCommunicationService, IDialogService dialogService,
-            IKeyboardCommandService keyboardCommandService, ApplicationSettings applicationSettings, string startupDirectory, ShellProfile shellProfile,
+            IKeyboardCommandService keyboardCommandService, ApplicationSettings applicationSettings, ShellProfile shellProfile,
             IApplicationView applicationView, IDispatcherTimer dispatcherTimer, IClipboardService clipboardService)
         {
-            Title = DefaultTitle;
+            SettingsService = settingsService;
+            SettingsService.CurrentThemeChanged += OnCurrentThemeChanged;
+            SettingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
+            SettingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
+            SettingsService.KeyBindingsChanged += OnKeyBindingsChanged;
 
-            _connectedEvent = new ManualResetEventSlim(false);
+            TrayProcessCommunicationService = trayProcessCommunicationService;
 
-            _settingsService = settingsService;
-            _settingsService.CurrentThemeChanged += OnCurrentThemeChanged;
-            _settingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
-            _settingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
-            _settingsService.KeyBindingsChanged += OnKeyBindingsChanged;
-
-            _trayProcessCommunicationService = trayProcessCommunicationService;
-            _trayProcessCommunicationService.TerminalExited += OnTerminalExited;
-
-            _dialogService = dialogService;
+            DialogService = dialogService;
             _keyboardCommandService = keyboardCommandService;
             ApplicationSettings = applicationSettings;
-            _startupDirectory = startupDirectory;
-            _shellProfile = shellProfile;
-            _applicationView = applicationView;
-            _clipboardService = clipboardService;
+            ApplicationView = applicationView;
+            ClipboardService = clipboardService;
 
-            TabThemes = new ObservableCollection<TabTheme>(_settingsService.GetTabThemes());
-            TabTheme = TabThemes.FirstOrDefault(t => t.Id == _shellProfile.TabThemeId);
+            ShellProfile = shellProfile;
+            TerminalTheme = shellProfile.TerminalThemeId == Guid.Empty ? SettingsService.GetCurrentTheme() : SettingsService.GetTheme(shellProfile.TerminalThemeId);
+
+            TabThemes = new ObservableCollection<TabTheme>(SettingsService.GetTabThemes());
+            TabTheme = TabThemes.FirstOrDefault(t => t.Id == ShellProfile.TabThemeId);
 
             _resizeOverlayTimer = dispatcherTimer;
             _resizeOverlayTimer.Interval = new TimeSpan(0, 0, 2);
             _resizeOverlayTimer.Tick += OnResizeOverlayTimerFinished;
 
             CloseCommand = new RelayCommand(async () => await TryClose().ConfigureAwait(false));
-            FindNextCommand = new RelayCommand(async () => await FindNext().ConfigureAwait(false));
-            FindPreviousCommand = new RelayCommand(async () => await FindPrevious().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.Closed += Terminal_Closed;
         }
 
+        public event EventHandler Activated;
         public event EventHandler Closed;
+        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<string> ShellTitleChanged;
+        public event EventHandler<string> CustomTitleChanged;
 
         public ApplicationSettings ApplicationSettings { get; private set; }
 
+        public IApplicationView ApplicationView { get; }
+
         public TabTheme BackgroundTabTheme
         {
             // 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 :
-                _settingsService.GetTabThemes().FirstOrDefault(t => t.Color == null);
+                SettingsService.GetTabThemes().FirstOrDefault(t => t.Color == null);
         }
 
+        public IClipboardService ClipboardService { get; }
+
         public RelayCommand CloseCommand { get; }
 
         public RelayCommand CloseSearchPanelCommand { get; }
 
-        public string DefaultTitle { get; private set; } = string.Empty;
+        public IDialogService DialogService { get; }
+
+        public IAsyncCommand EditTitleCommand { get; }
 
         public RelayCommand FindNextCommand { get; }
 
         public RelayCommand FindPreviousCommand { get; }
 
-        public bool Initialized { get; private set; }
-
         public bool IsSelected
         {
             get => _isSelected;
@@ -110,8 +118,7 @@ namespace FluentTerminal.App.ViewModels
                 {
                     if (IsSelected)
                     {
-                        _applicationView.Title = Title;
-                        _applicationView.RunOnDispatcherThread(() => NewOutput = false);
+                        HasNewOutput = false;
                     }
                     RaisePropertyChanged(nameof(IsUnderlined));
                     RaisePropertyChanged(nameof(BackgroundTabTheme));
@@ -122,10 +129,10 @@ namespace FluentTerminal.App.ViewModels
         public bool IsUnderlined => (IsSelected && ApplicationSettings.UnderlineSelectedTab) ||
             (!IsSelected && ApplicationSettings.InactiveTabColorMode == InactiveTabColorMode.Underlined && TabTheme.Color != null);
 
-        public bool NewOutput
+        public bool HasNewOutput
         {
-            get => _newOutput;
-            set => Set(ref _newOutput, value);
+            get => _hasNewOutput;
+            set => Set(ref _hasNewOutput, value);
         }
 
         public string ResizeOverlayContent
@@ -142,6 +149,10 @@ namespace FluentTerminal.App.ViewModels
 
         public RelayCommand<string> SelectTabThemeCommand { get; }
 
+        public ISettingsService SettingsService { get; }
+
+        public ShellProfile ShellProfile { get; }
+
         public bool ShowResizeOverlay
         {
             get => _showResizeOverlay;
@@ -178,118 +189,97 @@ namespace FluentTerminal.App.ViewModels
 
         public ObservableCollection<TabTheme> TabThemes { get; }
 
-        public string Title
+        public Terminal Terminal { get; private set; }
+
+        public TerminalTheme TerminalTheme
         {
-            get => _title;
+            get => _terminalTheme;
+            set => Set(ref _terminalTheme, value);
+        }
+
+        public string TabTitle
+        {
+            get => _tabTitle;
             set
             {
-                value = string.IsNullOrWhiteSpace(value) ? DefaultTitle : value;
-
-                if (Set(ref _title, value) && IsSelected)
+                if (Set(ref _tabTitle, value))
                 {
-                    _applicationView.Title = Title;
+                    CustomTitleChanged?.Invoke(this, value);
                 }
             }
         }
 
-        public async Task CloseView()
+        public string ShellTitle
         {
-            _terminalView.Close();
-            await _trayProcessCommunicationService.CloseTerminal(_terminalId).ConfigureAwait(true);
+            get => _shellTitle;
+            set
+            {
+                if (Set(ref _shellTitle, value) && !_hasCustomTitle)
+                {
+                    TabTitle = value;
+                }
+            }
+        }
+
+        public ITrayProcessCommunicationService TrayProcessCommunicationService { get; }
+
+        public Task Close()
+        {
+            SettingsService.CurrentThemeChanged -= OnCurrentThemeChanged;
+            SettingsService.TerminalOptionsChanged -= OnTerminalOptionsChanged;
+            SettingsService.ApplicationSettingsChanged -= OnApplicationSettingsChanged;
+            SettingsService.KeyBindingsChanged -= OnKeyBindingsChanged;
+            return Terminal.Close();
         }
 
         public void CopyText(string text)
         {
-            _clipboardService.SetText(text);
+            ClipboardService.SetText(text);
         }
 
-        public Task FocusTerminal()
+        public async Task EditTitle()
         {
-            return _terminalView?.FocusTerminal();
+            var result = await DialogService.ShowInputDialogAsync("Edit Title");
+            if (result != null)
+            {
+                if (string.IsNullOrWhiteSpace(result))
+                {
+                    _hasCustomTitle = false;
+                    TabTitle = ShellTitle;
+                }
+                else
+                {
+                    _hasCustomTitle = true;
+                    TabTitle = result;
+                }
+            }
         }
 
-        public async Task OnViewIsReady(ITerminalView terminalView)
+        public void FocusTerminal()
         {
-            _terminalView = terminalView;
-
-            var options = _settingsService.GetTerminalOptions();
-            var theme = _settingsService.GetCurrentTheme();
-            var keyBindings = _settingsService.GetKeyBindings();
-
-            var size = await _terminalView.CreateTerminal(options, theme.Colors, FlattenKeyBindings(keyBindings)).ConfigureAwait(true);
-
-            if (!string.IsNullOrWhiteSpace(_startupDirectory))
-            {
-                _shellProfile.WorkingDirectory = _startupDirectory;
-            }
-
-            var response = await _trayProcessCommunicationService.CreateTerminal(size, _shellProfile).ConfigureAwait(true);
-
-            if (response.Success)
-            {
-                _terminalId = response.Id;
-                _terminalView.TerminalSizeChanged += OnTerminalSizeChanged;
-                _terminalView.TerminalTitleChanged += OnTerminalTitleChanged;
-                _terminalView.KeyboardCommandReceived += OnKeyboardCommandReceived;
-
-                _trayProcessCommunicationService.SubscribeForTerminalOutput(_terminalId, t =>
-                {
-                    _connectedEvent.Wait();
-                    _webSocket.Send(t);
-                    if (!IsSelected && ApplicationSettings.ShowNewOutputIndicator)
-                    {
-                        _applicationView.RunOnDispatcherThread(() => NewOutput = true);
-                    }
-                });
-
-                DefaultTitle = response.ShellExecutableName;
-                Title = DefaultTitle;
-
-                var webSocketUrl = "ws://127.0.0.1:" + response.Id;
-                var webSocketServer = new WebSocketServer(webSocketUrl);
-                webSocketServer.Start(socket =>
-                {
-                    _webSocket = socket;
-                    socket.OnOpen = () => _connectedEvent.Set();
-                    socket.OnMessage = message => _trayProcessCommunicationService.WriteText(_terminalId, message);
-                });
-
-                await _terminalView.ConnectToSocket(webSocketUrl).ConfigureAwait(true);
-                Initialized = true;
-            }
-            else
-            {
-                await _dialogService.ShowMessageDialogAsnyc("Error", response.Error, DialogButton.OK).ConfigureAwait(true);
-            }
-
-            await FocusTerminal().ConfigureAwait(true);
+            Activated?.Invoke(this, EventArgs.Empty);
         }
 
         private void CloseSearchPanel()
         {
             SearchText = string.Empty;
             ShowSearchPanel = false;
-            _terminalView.FocusTerminal();
+            FocusTerminal();
         }
 
-        private Task FindNext()
+        private void FindNext()
         {
-            return _terminalView.FindNext(SearchText);
+            FindNextRequested?.Invoke(this, SearchText);
         }
 
-        private Task FindPrevious()
+        private void FindPrevious()
         {
-            return _terminalView.FindPrevious(SearchText);
-        }
-
-        private IEnumerable<KeyBinding> FlattenKeyBindings(IDictionary<Command, ICollection<KeyBinding>> keyBindings)
-        {
-            return keyBindings.Values.SelectMany(k => k);
+            FindPreviousRequested?.Invoke(this, SearchText);
         }
 
         private async void OnApplicationSettingsChanged(object sender, ApplicationSettings e)
         {
-            await _applicationView.RunOnDispatcherThread(() =>
+            await ApplicationView.RunOnDispatcherThread(() =>
             {
                 ApplicationSettings = e;
                 RaisePropertyChanged(nameof(IsUnderlined));
@@ -299,52 +289,21 @@ namespace FluentTerminal.App.ViewModels
 
         private async void OnCurrentThemeChanged(object sender, Guid e)
         {
-            await _applicationView.RunOnDispatcherThread(async () =>
+            await ApplicationView.RunOnDispatcherThread(() =>
             {
-                RaisePropertyChanged(nameof(IsUnderlined));
-                RaisePropertyChanged(nameof(BackgroundTabTheme));
-
-                var currentTheme = _settingsService.GetTheme(e);
-                await _terminalView.ChangeTheme(currentTheme.Colors).ConfigureAwait(true);
+                // 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 async void OnKeyBindingsChanged(object sender, EventArgs e)
         {
-            var keyBindings = _settingsService.GetKeyBindings();
-            await _applicationView.RunOnDispatcherThread(async () =>
-            {
-                await _terminalView.ChangeKeyBindings(FlattenKeyBindings(keyBindings)).ConfigureAwait(false);
-            });
-        }
-
-        private async void OnKeyboardCommandReceived(object sender, Command e)
-        {
-            if (e == Command.Copy)
-            {
-                var selection = await _terminalView.GetSelection().ConfigureAwait(true);
-                _clipboardService.SetText(selection);
-            }
-            else if (e == Command.Paste)
-            {
-                var content = await _clipboardService.GetText().ConfigureAwait(true);
-                if (content != null)
-                {
-                    await _trayProcessCommunicationService.WriteText(_terminalId, content).ConfigureAwait(true);
-                }
-            }
-            else if (e == Command.Search)
-            {
-                ShowSearchPanel = !ShowSearchPanel;
-                if (ShowSearchPanel)
-                {
-                    _terminalView.FocusSearchTextBox();
-                }
-            }
-            else
-            {
-                _keyboardCommandService.SendCommand(e);
-            }
+            await ApplicationView.RunOnDispatcherThread(() => KeyBindingsChanged?.Invoke(this, EventArgs.Empty));
         }
 
         private void OnResizeOverlayTimerFinished(object sender, object e)
@@ -353,36 +312,9 @@ namespace FluentTerminal.App.ViewModels
             ShowResizeOverlay = false;
         }
 
-        private void OnTerminalExited(object sender, int e)
-        {
-            if (e == _terminalId)
-            {
-                _applicationView.RunOnDispatcherThread(() => Closed?.Invoke(this, EventArgs.Empty));
-            }
-        }
-
         private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
         {
-            await _applicationView.RunOnDispatcherThread(async () =>
-            {
-                await _terminalView.ChangeOptions(e).ConfigureAwait(true);
-            });
-        }
-
-        private async void OnTerminalSizeChanged(object sender, TerminalSize e)
-        {
-            if (!Initialized)
-            {
-                return;
-            }
-            ResizeOverlayContent = $"{e.Columns} x {e.Rows}";
-            ShowResizeOverlay = true;
-            await _trayProcessCommunicationService.ResizeTerminal(_terminalId, e).ConfigureAwait(true);
-        }
-
-        private void OnTerminalTitleChanged(object sender, string e)
-        {
-            Title = e;
+            await ApplicationView.RunOnDispatcherThread(() => OptionsChanged?.Invoke(this, e));
         }
 
         private void SelectTabTheme(string name)
@@ -390,11 +322,83 @@ namespace FluentTerminal.App.ViewModels
             TabTheme = TabThemes.FirstOrDefault(t => t.Name == name);
         }
 
+        private void Terminal_Closed(object sender, EventArgs e)
+        {
+            ApplicationView.RunOnDispatcherThread(() => Closed?.Invoke(this, EventArgs.Empty));
+        }
+
+        private async void Terminal_KeyboardCommandReceived(object sender, string e)
+        {
+            switch (e)
+            {
+                case nameof(Command.Copy):
+                    {
+                        var selection = await Terminal.GetSelectedText().ConfigureAwait(true);
+                        ClipboardService.SetText(selection);
+                        break;
+                    }
+                case nameof(Command.Paste):
+                    {
+                        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.GetText().ConfigureAwait(true);
+                        if (content != null)
+                        {
+                            content = ShellProfile.NewlinePattern.Replace(content, string.Empty);
+                            await Terminal.Write(Encoding.UTF8.GetBytes(content)).ConfigureAwait(true);
+                        }
+                        break;
+                    }
+                case nameof(Command.Search):
+                    {
+                        ShowSearchPanel = !ShowSearchPanel;
+                        if (ShowSearchPanel)
+                        {
+                            SearchStarted?.Invoke(this, EventArgs.Empty);
+                        }
+                        break;
+                    }
+                default:
+                    {
+                        _keyboardCommandService.SendCommand(e);
+                        break;
+                    }
+            }
+        }
+
+        private void Terminal_OutputReceived(object sender, byte[] e)
+        {
+            if (!IsSelected && ApplicationSettings.ShowNewOutputIndicator)
+            {
+                ApplicationView.RunOnDispatcherThread(() => HasNewOutput = true);
+            }
+        }
+
+        private void Terminal_SizeChanged(object sender, TerminalSize e)
+        {
+            ResizeOverlayContent = $"{e.Columns} x {e.Rows}";
+            ShowResizeOverlay = true;
+        }
+
+        private void Terminal_TitleChanged(object sender, string e)
+        {
+            ShellTitle = e;
+            ShellTitleChanged?.Invoke(this, e);
+        }
+
         private async Task TryClose()
         {
             if (ApplicationSettings.ConfirmClosingTabs)
             {
-                var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to close this tab?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+                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)
                 {
@@ -402,8 +406,7 @@ namespace FluentTerminal.App.ViewModels
                 }
             }
 
-            await _trayProcessCommunicationService.CloseTerminal(_terminalId).ConfigureAwait(true);
-            Closed?.Invoke(this, EventArgs.Empty);
+            await Close().ConfigureAwait(true);
         }
     }
 }

FluentTerminal.App.ViewModels/ThemeViewModel.cs

@@ -29,58 +29,57 @@ namespace FluentTerminal.App.ViewModels
         private string _cursor;
         private string _cursorAccent;
         private string _cyan;
-        private string _fallBackAuthor;
-        private TerminalColors _fallBackColors;
-        private string _fallBackName;
+        private TerminalTheme _fallbackTheme;
         private string _foreground;
         private string _green;
         private bool _inEditMode;
         private bool _isActive;
         private string _magenta;
         private string _name;
+        private bool _isNew;
         private string _red;
         private string _selection;
-        private readonly TerminalTheme _theme;
         private string _white;
         private string _yellow;
         private readonly IFileSystemService _fileSystemService;
 
         public event EventHandler<string> BackgroundChanged;
 
-        public ThemeViewModel(TerminalTheme theme, ISettingsService settingsService, IDialogService dialogService, IFileSystemService fileSystemService)
+        public ThemeViewModel(TerminalTheme theme, ISettingsService settingsService, IDialogService dialogService, IFileSystemService fileSystemService, bool isNew)
         {
-            _theme = theme;
+            Model = theme;
             _settingsService = settingsService;
             _dialogService = dialogService;
             _fileSystemService = fileSystemService;
+            _isNew = isNew;
 
-            Name = _theme.Name;
-            Author = _theme.Author;
-            Id = _theme.Id;
+            Name = Model.Name;
+            Author = Model.Author;
+            Id = Model.Id;
 
-            Black = _theme.Colors.Black;
-            Red = _theme.Colors.Red;
-            Green = _theme.Colors.Green;
-            Yellow = _theme.Colors.Yellow;
-            Blue = _theme.Colors.Blue;
-            Magenta = _theme.Colors.Magenta;
-            Cyan = _theme.Colors.Cyan;
-            White = _theme.Colors.White;
+            Black = Model.Colors.Black;
+            Red = Model.Colors.Red;
+            Green = Model.Colors.Green;
+            Yellow = Model.Colors.Yellow;
+            Blue = Model.Colors.Blue;
+            Magenta = Model.Colors.Magenta;
+            Cyan = Model.Colors.Cyan;
+            White = Model.Colors.White;
 
-            BrightBlack = _theme.Colors.BrightBlack;
-            BrightRed = _theme.Colors.BrightRed;
-            BrightGreen = _theme.Colors.BrightGreen;
-            BrightYellow = _theme.Colors.BrightYellow;
-            BrightBlue = _theme.Colors.BrightBlue;
-            BrightMagenta = _theme.Colors.BrightMagenta;
-            BrightCyan = _theme.Colors.BrightCyan;
-            BrightWhite = _theme.Colors.BrightWhite;
+            BrightBlack = Model.Colors.BrightBlack;
+            BrightRed = Model.Colors.BrightRed;
+            BrightGreen = Model.Colors.BrightGreen;
+            BrightYellow = Model.Colors.BrightYellow;
+            BrightBlue = Model.Colors.BrightBlue;
+            BrightMagenta = Model.Colors.BrightMagenta;
+            BrightCyan = Model.Colors.BrightCyan;
+            BrightWhite = Model.Colors.BrightWhite;
 
-            Background = _theme.Colors.Background;
-            Foreground = _theme.Colors.Foreground;
-            Cursor = _theme.Colors.Cursor;
-            CursorAccent = _theme.Colors.CursorAccent;
-            Selection = _theme.Colors.Selection;
+            Background = Model.Colors.Background;
+            Foreground = Model.Colors.Foreground;
+            Cursor = Model.Colors.Cursor;
+            CursorAccent = Model.Colors.CursorAccent;
+            Selection = Model.Colors.Selection;
 
             SetActiveCommand = new RelayCommand(SetActive);
             DeleteCommand = new RelayCommand(async () => await Delete().ConfigureAwait(false), NotPreInstalled);
@@ -94,6 +93,8 @@ namespace FluentTerminal.App.ViewModels
 
         public event EventHandler Deleted;
 
+        public TerminalTheme Model { get; }
+
         public string Author
         {
             get => _author;
@@ -268,78 +269,125 @@ namespace FluentTerminal.App.ViewModels
 
         public void SaveChanges()
         {
-            _theme.Name = Name;
-            _theme.Author = Author;
+            Model.Name = Name;
+            Model.Author = Author;
 
-            _theme.Colors.Black = Black;
-            _theme.Colors.Red = Red;
-            _theme.Colors.Green = Green;
-            _theme.Colors.Yellow = Yellow;
-            _theme.Colors.Blue = Blue;
-            _theme.Colors.Magenta = Magenta;
-            _theme.Colors.Cyan = Cyan;
-            _theme.Colors.White = White;
+            Model.Colors.Black = Black;
+            Model.Colors.Red = Red;
+            Model.Colors.Green = Green;
+            Model.Colors.Yellow = Yellow;
+            Model.Colors.Blue = Blue;
+            Model.Colors.Magenta = Magenta;
+            Model.Colors.Cyan = Cyan;
+            Model.Colors.White = White;
 
-            _theme.Colors.BrightBlack = BrightBlack;
-            _theme.Colors.BrightRed = BrightRed;
-            _theme.Colors.BrightGreen = BrightGreen;
-            _theme.Colors.BrightYellow = BrightYellow;
-            _theme.Colors.BrightBlue = BrightBlue;
-            _theme.Colors.BrightMagenta = BrightMagenta;
-            _theme.Colors.BrightCyan = BrightCyan;
-            _theme.Colors.BrightWhite = BrightWhite;
+            Model.Colors.BrightBlack = BrightBlack;
+            Model.Colors.BrightRed = BrightRed;
+            Model.Colors.BrightGreen = BrightGreen;
+            Model.Colors.BrightYellow = BrightYellow;
+            Model.Colors.BrightBlue = BrightBlue;
+            Model.Colors.BrightMagenta = BrightMagenta;
+            Model.Colors.BrightCyan = BrightCyan;
+            Model.Colors.BrightWhite = BrightWhite;
 
-            _theme.Colors.Background = Background;
-            _theme.Colors.Foreground = Foreground;
-            _theme.Colors.Cursor = Cursor;
-            _theme.Colors.CursorAccent = CursorAccent;
-            _theme.Colors.Selection = Selection;
+            Model.Colors.Background = Background;
+            Model.Colors.Foreground = Foreground;
+            Model.Colors.Cursor = Cursor;
+            Model.Colors.CursorAccent = CursorAccent;
+            Model.Colors.Selection = Selection;
 
-            _settingsService.SaveTheme(_theme);
+            _settingsService.SaveTheme(Model);
 
             InEditMode = false;
+            _isNew = false;
         }
 
         private async Task CancelEdit()
         {
-            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)
+            if (_isNew)
             {
-                Black = _fallBackColors.Black;
-                Red = _fallBackColors.Red;
-                Green = _fallBackColors.Green;
-                Yellow = _fallBackColors.Yellow;
-                Blue = _fallBackColors.Blue;
-                Magenta = _fallBackColors.Magenta;
-                Cyan = _fallBackColors.Cyan;
-                White = _fallBackColors.White;
+                await Delete();
+            }
+            else
+            {
+                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 = _fallBackColors.BrightBlack;
-                BrightRed = _fallBackColors.BrightRed;
-                BrightGreen = _fallBackColors.BrightGreen;
-                BrightYellow = _fallBackColors.BrightYellow;
-                BrightBlue = _fallBackColors.BrightBlue;
-                BrightMagenta = _fallBackColors.BrightMagenta;
-                BrightCyan = _fallBackColors.BrightCyan;
-                BrightWhite = _fallBackColors.BrightWhite;
+                        BrightBlack = BrightBlack,
+                        BrightRed = BrightRed,
+                        BrightGreen = BrightGreen,
+                        BrightYellow = BrightYellow,
+                        BrightBlue = BrightBlue,
+                        BrightMagenta = BrightMagenta,
+                        BrightCyan = BrightCyan,
+                        BrightWhite = BrightWhite,
 
-                Background = _fallBackColors.Background;
-                Foreground = _fallBackColors.Foreground;
-                Cursor = _fallBackColors.Cursor;
-                CursorAccent = _fallBackColors.CursorAccent;
-                Selection = _fallBackColors.Selection;
+                        Background = Background,
+                        Foreground = Foreground,
+                        Cursor = Cursor,
+                        CursorAccent = CursorAccent,
+                        Selection = Selection
+                    }
+                };
 
-                Name = _fallBackName;
-                Author = _fallBackAuthor;
+                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);
 
-                InEditMode = false;
+                    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;
+                }
             }
         }
 
         private bool NotPreInstalled()
         {
-            return !_theme.PreInstalled;
+            return !Model.PreInstalled;
         }
 
         private async Task Delete()
@@ -354,9 +402,7 @@ namespace FluentTerminal.App.ViewModels
 
         private void Edit()
         {
-            _fallBackColors = new TerminalColors(_theme.Colors);
-            _fallBackName = Name;
-            _fallBackAuthor = Author;
+            _fallbackTheme = new TerminalTheme(Model);
             InEditMode = true;
         }
 
@@ -367,7 +413,7 @@ namespace FluentTerminal.App.ViewModels
 
         private Task Export()
         {
-            var content = JsonConvert.SerializeObject(_theme, Formatting.Indented, new JsonSerializerSettings { ContractResolver = new TerminalThemeContractResolver() });
+            var content = JsonConvert.SerializeObject(Model, Formatting.Indented, new JsonSerializerSettings { ContractResolver = new TerminalThemeContractResolver() });
             return _fileSystemService.SaveTextFile(Name, "Fluent Terminal Theme", ".flutecolors", content);
         }
     }

FluentTerminal.App/Adapters/ApplicationViewAdapter.cs

@@ -3,6 +3,7 @@ using FluentTerminal.App.Services.EventArgs;
 using System;
 using System.Threading.Tasks;
 using Windows.ApplicationModel.Core;
+using Windows.Foundation.Metadata;
 using Windows.UI.Core;
 using Windows.UI.Core.Preview;
 using Windows.UI.ViewManagement;
@@ -13,20 +14,37 @@ namespace FluentTerminal.App.Adapters
     {
         private readonly ApplicationView _applicationView;
         private readonly CoreDispatcher _dispatcher;
+        private bool _closed;
 
         public event CloseRequestedHandler CloseRequested;
+        public event EventHandler Closed;
 
         public ApplicationViewAdapter()
         {
             _applicationView = ApplicationView.GetForCurrentView();
+            _applicationView.Consolidated += _applicationView_Consolidated;
             _dispatcher = CoreApplication.GetCurrentView().Dispatcher;
             SystemNavigationManagerPreview.GetForCurrentView().CloseRequested += OnCloseRequest;
+
+            Logger.Instance.Debug("Created ApplicationViewAdapter for ApplicationView with Id: {Id}", _applicationView.Id);
         }
 
+        private void _applicationView_Consolidated(ApplicationView sender, ApplicationViewConsolidatedEventArgs args)
+        {
+            Closed?.Invoke(this, EventArgs.Empty);
+        }
+
+        public int Id => _applicationView.Id;
+
         public string Title
         {
             get => _applicationView.Title;
-            set => _applicationView.Title = value;
+            set => _applicationView.Title = value ?? string.Empty;
+        }
+
+        public bool IsApiContractPresent(string api, ushort version)
+        {
+            return ApiInformation.IsApiContractPresent(api, version);
         }
 
         public Task RunOnDispatcherThread(Action action)
@@ -34,9 +52,16 @@ namespace FluentTerminal.App.Adapters
             return _dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => action()).AsTask();
         }
 
-        public Task<bool> TryClose()
+        public async Task<bool> TryClose()
         {
-            return _applicationView.TryConsolidateAsync().AsTask();
+            if (_closed)
+            {
+                Logger.Instance.Debug("ApplicationViewAdapter.TryClose was called, but was already closed. ApplicationView.Id: {Id}", _applicationView.Id);
+                return true;
+            }
+            Logger.Instance.Debug("TryClose ApplicationView with Id: {Id}", _applicationView.Id);
+            _closed = await _applicationView.TryConsolidateAsync().AsTask();
+            return _closed;
         }
 
         public bool ToggleFullScreen()
@@ -57,10 +82,19 @@ namespace FluentTerminal.App.Adapters
             var deferral = e.GetDeferral();
 
             var args = new CancelableEventArgs();
-            await CloseRequested?.Invoke(this, args);
+
+            if (CloseRequested != null)
+            {
+                await CloseRequested.Invoke(this, args);
+            }
 
             e.Handled = args.Cancelled;
 
+            if (!e.Handled)
+            {
+                SystemNavigationManagerPreview.GetForCurrentView().CloseRequested -= OnCloseRequest;
+            }
+
             deferral.Complete();
         }
     }

FluentTerminal.App/App.xaml

@@ -37,6 +37,8 @@
             <converters:EnumValueToVisibiltyConverter x:Key="EnumValueToVisibiltyConverter" />
             <converters:TabThemeSelectedConverter x:Key="TabThemeSelectedConverter" />
             <converters:ColorResourceKeyFallbackConverter x:Key="ColorResourceKeyFallbackConverter" />
+            <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
+            <converters:TrueToBoldConverter x:Key="TrueToBoldConverter" />
         </ResourceDictionary>
     </Application.Resources>
 </Application>

FluentTerminal.App/App.xaml.cs

@@ -1,303 +1,453 @@
-using Autofac;
-using FluentTerminal.App.Adapters;
-using FluentTerminal.App.Dialogs;
-using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Adapters;
-using FluentTerminal.App.Services.Dialogs;
-using FluentTerminal.App.Services.Implementation;
-using FluentTerminal.App.ViewModels;
-using FluentTerminal.App.Views;
-using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Threading.Tasks;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.ApplicationModel.AppService;
-using Windows.ApplicationModel.Background;
-using Windows.ApplicationModel.Core;
-using Windows.Storage;
-using Windows.UI.Core;
-using Windows.UI.ViewManagement;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using IContainer = Autofac.IContainer;
-
-namespace FluentTerminal.App
-{
-    public sealed partial class App : Application
-    {
-        public TaskCompletionSource<int> _trayReady = new TaskCompletionSource<int>();
-        private readonly ISettingsService _settingsService;
-        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
-        private bool _alreadyLaunched;
-        private ApplicationSettings _applicationSettings;
-        private readonly IContainer _container;
-        private readonly List<MainViewModel> _mainViewModels;
-        private SettingsViewModel _settingsViewModel;
-        private int? _settingsWindowId;
-        private IAppServiceConnection _appServiceConnection;
-        private BackgroundTaskDeferral _appServiceDeferral;
-
-        public App()
-        {
-            _mainViewModels = new List<MainViewModel>();
-
-            InitializeComponent();
-
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                LocalSettings = new ApplicationDataContainerAdapter(ApplicationData.Current.LocalSettings),
-                RoamingSettings = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings),
-                KeyBindings = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings.CreateContainer(Constants.KeyBindingsContainerName, ApplicationDataCreateDisposition.Always)),
-                ShellProfiles = new ApplicationDataContainerAdapter(ApplicationData.Current.LocalSettings.CreateContainer(Constants.ShellProfilesContainerName, ApplicationDataCreateDisposition.Always)),
-                Themes = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings.CreateContainer(Constants.ThemesContainerName, ApplicationDataCreateDisposition.Always))
-            };
-
-            var builder = new ContainerBuilder();
-            builder.RegisterType<SettingsService>().As<ISettingsService>().SingleInstance();
-            builder.RegisterType<DefaultValueProvider>().As<IDefaultValueProvider>().SingleInstance();
-            builder.RegisterType<TrayProcessCommunicationService>().As<ITrayProcessCommunicationService>().SingleInstance();
-            builder.RegisterType<DialogService>().As<IDialogService>().SingleInstance();
-            builder.RegisterType<KeyboardCommandService>().As<IKeyboardCommandService>().InstancePerDependency();
-            builder.RegisterType<MainViewModel>().InstancePerDependency();
-            builder.RegisterType<SettingsViewModel>().InstancePerDependency();
-            builder.RegisterType<ThemeParserFactory>().As<IThemeParserFactory>().SingleInstance();
-            builder.RegisterType<ITermThemeParser>().As<IThemeParser>().SingleInstance();
-            builder.RegisterType<FluentTerminalThemeParser>().As<IThemeParser>().SingleInstance();
-            builder.RegisterType<ClipboardService>().As<IClipboardService>().SingleInstance();
-            builder.RegisterType<FileSystemService>().As<IFileSystemService>().SingleInstance();
-            builder.RegisterType<SystemFontService>().As<ISystemFontService>().SingleInstance();
-            builder.RegisterType<ShellProfileSelectionDialog>().As<IShellProfileSelectionDialog>().InstancePerDependency();
-            builder.RegisterType<CreateKeyBindingDialog>().As<ICreateKeyBindingDialog>().InstancePerDependency();
-            builder.RegisterType<MessageDialogAdapter>().As<IMessageDialog>().InstancePerDependency();
-            builder.RegisterType<ApplicationViewAdapter>().As<IApplicationView>().InstancePerDependency();
-            builder.RegisterType<DispatcherTimerAdapter>().As<IDispatcherTimer>().InstancePerDependency();
-            builder.RegisterType<StartupTaskService>().As<IStartupTaskService>().SingleInstance();
-            builder.RegisterInstance(applicationDataContainers);
-
-            _container = builder.Build();
-
-            _settingsService = _container.Resolve<ISettingsService>();
-            _settingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
-
-            _trayProcessCommunicationService = _container.Resolve<ITrayProcessCommunicationService>();
-
-            _applicationSettings = _settingsService.GetApplicationSettings();
-        }
-
-        protected override async void OnActivated(IActivatedEventArgs args)
-        {
-            if (args is CommandLineActivatedEventArgs commandLineActivated)
-            {
-                if (string.IsNullOrWhiteSpace(commandLineActivated.Operation.Arguments))
-                {
-                    return;
-                }
-
-                var arguments = commandLineActivated.Operation.Arguments.Split(' ', 2);
-                var command = arguments[0];
-                var parameter = arguments.Length > 1 ? arguments[1] : string.Empty;
-
-                if (_alreadyLaunched)
-                {
-                    if (command == "settings")
-                    {
-                        await ShowSettings().ConfigureAwait(true);
-                    }
-                    else if (command == "new")
-                    {
-                        if (_applicationSettings.NewTerminalLocation == NewTerminalLocation.Tab && _mainViewModels.Count > 0)
-                        {
-                            await _mainViewModels.Last().AddTerminal(parameter, false).ConfigureAwait(true);
-                        }
-                        else
-                        {
-                            await CreateNewTerminalWindow(parameter).ConfigureAwait(true);
-                        }
-                    }
-                }
-                else
-                {
-                    if (command == "settings")
-                    {
-                        var viewModel = _container.Resolve<SettingsViewModel>();
-                        await CreateMainView(typeof(SettingsPage), viewModel, true).ConfigureAwait(true);
-                    }
-                    else if (command == "new")
-                    {
-                        var viewModel = _container.Resolve<MainViewModel>();
-                        await viewModel.AddTerminal(parameter, false).ConfigureAwait(true);
-                        await CreateMainView(typeof(MainPage), viewModel, true).ConfigureAwait(true);
-                    }
-                }
-            }
-        }
-
-        protected override async void OnLaunched(LaunchActivatedEventArgs args)
-        {
-            if (!_alreadyLaunched)
-            {
-                var viewModel = _container.Resolve<MainViewModel>();
-                await viewModel.AddTerminal(null, false).ConfigureAwait(true);
-                await CreateMainView(typeof(MainPage), viewModel, true).ConfigureAwait(true);
-                Window.Current.Activate();
-            }
-            else if (_mainViewModels.Count == 0)
-            {
-                await CreateSecondaryView<MainViewModel>(typeof(MainPage), true, string.Empty).ConfigureAwait(true);
-            }
-        }
-
-        protected override void OnBackgroundActivated(BackgroundActivatedEventArgs args)
-        {
-            base.OnBackgroundActivated(args);
-
-            if (args.TaskInstance.TriggerDetails is AppServiceTriggerDetails details)
-            {
-                if (details.CallerPackageFamilyName == Package.Current.Id.FamilyName)
-                {
-                    _appServiceDeferral = args.TaskInstance.GetDeferral();
-                    args.TaskInstance.Canceled += OnTaskCanceled;
-
-                    _appServiceConnection = new AppServiceConnectionAdapter(details.AppServiceConnection);
-
-                    _trayReady.SetResult(0);
-                }
-            }
-        }
-
-        private void OnTaskCanceled(IBackgroundTaskInstance sender, BackgroundTaskCancellationReason reason)
-        {
-            _appServiceDeferral?.Complete();
-            _appServiceDeferral = null;
-            _appServiceConnection = null;
-
-            Application.Current.Exit();
-        }
-
-        private async Task CreateMainView(Type pageType, INotifyPropertyChanged viewModel, bool extendViewIntoTitleBar)
-        {
-            await StartSystemTray().ConfigureAwait(true);
-
-            Frame rootFrame = Window.Current.Content as Frame;
-            if (rootFrame == null)
-            {
-                rootFrame = new Frame();
-                Window.Current.Content = rootFrame;
-            }
-
-            if (rootFrame.Content == null)
-            {
-                CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = extendViewIntoTitleBar;
-
-                if (viewModel is MainViewModel mainViewModel)
-                {
-                    mainViewModel.Closed += OnMainViewModelClosed;
-                    mainViewModel.NewWindowRequested += OnNewWindowRequested;
-                    mainViewModel.ShowSettingsRequested += OnShowSettingsRequested;
-                    _mainViewModels.Add(mainViewModel);
-                }
-
-                rootFrame.Navigate(pageType, viewModel);
-            }
-            _alreadyLaunched = true;
-            Window.Current.Activate();
-        }
-
-        private async Task CreateNewTerminalWindow(string startupDirectory)
-        {
-            var id = await CreateSecondaryView<MainViewModel>(typeof(MainPage), true, startupDirectory).ConfigureAwait(true);
-            await ApplicationViewSwitcher.TryShowAsStandaloneAsync(id);
-        }
-
-        private async Task<int> CreateSecondaryView<TViewModel>(Type pageType, bool ExtendViewIntoTitleBar, object parameter)
-        {
-            int windowId = 0;
-            TViewModel viewModel = default;
-            await CoreApplication.CreateNewView().Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-            {
-                viewModel = _container.Resolve<TViewModel>();
-
-                CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = ExtendViewIntoTitleBar;
-                var frame = new Frame();
-                frame.Navigate(pageType, viewModel);
-                Window.Current.Content = frame;
-                Window.Current.Activate();
-
-                windowId = ApplicationView.GetForCurrentView().Id;
-            });
-
-            if (viewModel is MainViewModel mainViewModel && parameter is string directory)
-            {
-                mainViewModel.Closed += OnMainViewModelClosed;
-                mainViewModel.NewWindowRequested += OnNewWindowRequested;
-                mainViewModel.ShowSettingsRequested += OnShowSettingsRequested;
-                _mainViewModels.Add(mainViewModel);
-                await mainViewModel.AddTerminal(directory, false).ConfigureAwait(true);
-            }
-
-            if (viewModel is SettingsViewModel settingsViewModel)
-            {
-                _settingsViewModel = settingsViewModel;
-                _settingsViewModel.Closed += OnSettingsClosed;
-            }
-
-            return windowId;
-        }
-
-        private void OnApplicationSettingsChanged(object sender, ApplicationSettings e)
-        {
-            _applicationSettings = e;
-        }
-
-        private void OnMainViewModelClosed(object sender, EventArgs e)
-        {
-            if (sender is MainViewModel viewModel)
-            {
-                viewModel.Closed -= OnMainViewModelClosed;
-                viewModel.NewWindowRequested -= OnNewWindowRequested;
-                viewModel.ShowSettingsRequested -= OnShowSettingsRequested;
-
-                _mainViewModels.Remove(viewModel);
-            }
-        }
-
-        private async void OnNewWindowRequested(object sender, EventArgs e)
-        {
-            await CreateNewTerminalWindow(string.Empty).ConfigureAwait(true);
-        }
-
-        private void OnSettingsClosed(object sender, EventArgs e)
-        {
-            _settingsViewModel.Closed -= OnSettingsClosed;
-            _settingsViewModel = null;
-            _settingsWindowId = null;
-        }
-
-        private async void OnShowSettingsRequested(object sender, EventArgs e)
-        {
-            await ShowSettings().ConfigureAwait(true);
-        }
-
-        private async Task ShowSettings()
-        {
-            if (_settingsViewModel == null)
-            {
-                _settingsWindowId = await CreateSecondaryView<SettingsViewModel>(typeof(SettingsPage), true, null).ConfigureAwait(true);
-            }
-            await ApplicationViewSwitcher.TryShowAsStandaloneAsync(_settingsWindowId.Value);
-        }
-
-        private async Task StartSystemTray()
-        {
-            var launch = FullTrustProcessLauncher.LaunchFullTrustProcessForCurrentAppAsync("AppLaunchedParameterGroup").AsTask();
-            var clearCache = WebView.ClearTemporaryWebDataAsync().AsTask();
-            await Task.WhenAll(launch, clearCache, _trayReady.Task).ConfigureAwait(true);
-            _trayProcessCommunicationService.Initialize(_appServiceConnection);
-        }
-    }
+using Autofac;
+using CommandLine;
+using FluentTerminal.App.Adapters;
+using FluentTerminal.App.CommandLineArguments;
+using FluentTerminal.App.Dialogs;
+using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.Adapters;
+using FluentTerminal.App.Services.Dialogs;
+using FluentTerminal.App.Services.EventArgs;
+using FluentTerminal.App.Services.Implementation;
+using FluentTerminal.App.ViewModels;
+using FluentTerminal.App.Views;
+using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Serialization;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Activation;
+using Windows.ApplicationModel.AppService;
+using Windows.ApplicationModel.Background;
+using Windows.ApplicationModel.Core;
+using Windows.Storage;
+using Windows.UI.Core;
+using Windows.UI.ViewManagement;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using IContainer = Autofac.IContainer;
+
+namespace FluentTerminal.App
+{
+    public sealed partial class App : Application
+    {
+        public TaskCompletionSource<int> _trayReady = new TaskCompletionSource<int>();
+        private readonly ISettingsService _settingsService;
+        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
+        private bool _alreadyLaunched;
+        private ApplicationSettings _applicationSettings;
+        private readonly IContainer _container;
+        private readonly List<MainViewModel> _mainViewModels;
+        private SettingsViewModel _settingsViewModel;
+        private int? _settingsWindowId;
+        private IAppServiceConnection _appServiceConnection;
+        private BackgroundTaskDeferral _appServiceDeferral;
+        private Parser _commandLineParser;
+
+        public App()
+        {
+            _mainViewModels = new List<MainViewModel>();
+
+            InitializeComponent();
+
+            UnhandledException += OnUnhandledException;
+
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                LocalSettings = new ApplicationDataContainerAdapter(ApplicationData.Current.LocalSettings),
+                RoamingSettings = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings),
+                KeyBindings = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings.CreateContainer(Constants.KeyBindingsContainerName, ApplicationDataCreateDisposition.Always)),
+                ShellProfiles = new ApplicationDataContainerAdapter(ApplicationData.Current.LocalSettings.CreateContainer(Constants.ShellProfilesContainerName, ApplicationDataCreateDisposition.Always)),
+                Themes = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings.CreateContainer(Constants.ThemesContainerName, ApplicationDataCreateDisposition.Always))
+            };
+
+            var builder = new ContainerBuilder();
+            builder.RegisterType<SettingsService>().As<ISettingsService>().SingleInstance();
+            builder.RegisterType<DefaultValueProvider>().As<IDefaultValueProvider>().SingleInstance();
+            builder.RegisterType<TrayProcessCommunicationService>().As<ITrayProcessCommunicationService>().SingleInstance();
+            builder.RegisterType<DialogService>().As<IDialogService>().SingleInstance();
+            builder.RegisterType<KeyboardCommandService>().As<IKeyboardCommandService>().InstancePerDependency();
+            builder.RegisterType<NotificationService>().As<INotificationService>().InstancePerDependency();
+            builder.RegisterType<UpdateService>().As<IUpdateService>().InstancePerDependency();
+            builder.RegisterType<MainViewModel>().InstancePerDependency();
+            builder.RegisterType<SettingsViewModel>().InstancePerDependency();
+            builder.RegisterType<ThemeParserFactory>().As<IThemeParserFactory>().SingleInstance();
+            builder.RegisterType<ITermThemeParser>().As<IThemeParser>().SingleInstance();
+            builder.RegisterType<FluentTerminalThemeParser>().As<IThemeParser>().SingleInstance();
+            builder.RegisterType<ClipboardService>().As<IClipboardService>().SingleInstance();
+            builder.RegisterType<FileSystemService>().As<IFileSystemService>().SingleInstance();
+            builder.RegisterType<SystemFontService>().As<ISystemFontService>().SingleInstance();
+            builder.RegisterType<ShellProfileSelectionDialog>().As<IShellProfileSelectionDialog>().InstancePerDependency();
+            builder.RegisterType<CreateKeyBindingDialog>().As<ICreateKeyBindingDialog>().InstancePerDependency();
+            builder.RegisterType<InputDialog>().As<IInputDialog>().InstancePerDependency();
+            builder.RegisterType<MessageDialogAdapter>().As<IMessageDialog>().InstancePerDependency();
+            builder.RegisterType<SshInfoDialog>().As<ISshConnectionInfoDialog>().InstancePerDependency();
+            builder.RegisterType<ApplicationViewAdapter>().As<IApplicationView>().InstancePerDependency();
+            builder.RegisterType<DispatcherTimerAdapter>().As<IDispatcherTimer>().InstancePerDependency();
+            builder.RegisterType<StartupTaskService>().As<IStartupTaskService>().SingleInstance();
+            builder.RegisterInstance(applicationDataContainers);
+
+            _container = builder.Build();
+
+            _settingsService = _container.Resolve<ISettingsService>();
+            _settingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
+
+            _trayProcessCommunicationService = _container.Resolve<ITrayProcessCommunicationService>();
+
+            _applicationSettings = _settingsService.GetApplicationSettings();
+
+            JsonConvert.DefaultSettings = () =>
+            {
+                var settings = new JsonSerializerSettings
+                {
+                    ContractResolver = new CamelCasePropertyNamesContractResolver(),
+                };
+                settings.Converters.Add(new StringEnumConverter(typeof(CamelCaseNamingStrategy)));
+
+                return settings;
+            };
+
+            _commandLineParser = new Parser(settings =>
+            {
+                settings.CaseSensitive = false;
+                settings.CaseInsensitiveEnumValues = true;
+            });
+        }
+
+        private void OnUnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
+        {
+            Logger.Instance.Error(e.Exception, "Unhandled Exception");
+        }
+
+        private static IEnumerable<string> SplitArguments(string arguments)
+        {
+            var chars = arguments.ToCharArray();
+            var inQuote = false;
+
+            for (var i = 0; i < chars.Length; i++)
+            {
+                if (chars[i] == '"')
+                {
+                    inQuote = !inQuote;
+                }
+
+                if (!inQuote && chars[i] == ' ')
+                {
+                    chars[i] = '\n';
+                }
+            }
+
+            foreach (var value in new string(chars).Split('\n'))
+            {
+                yield return value.Trim('"');
+            }
+        }
+
+        protected override void OnActivated(IActivatedEventArgs args)
+        {
+            if (args is CommandLineActivatedEventArgs commandLineActivated)
+            {
+                if (string.IsNullOrWhiteSpace(commandLineActivated.Operation.Arguments))
+                {
+                    return;
+                }
+
+                _commandLineParser.ParseArguments(SplitArguments(commandLineActivated.Operation.Arguments), typeof(NewVerb), typeof(RunVerb), typeof(SettingsVerb)).WithParsed(async verb =>
+                {
+                    if (verb is SettingsVerb)
+                    {
+                        await ShowSettings().ConfigureAwait(true);
+                    }
+                    else if (verb is NewVerb newVerb)
+                    {
+                        var profile = default(ShellProfile);
+                        if (!string.IsNullOrWhiteSpace(newVerb.Profile))
+                        {
+                            profile = _settingsService.GetShellProfiles().FirstOrDefault(x => x.Name.Equals(newVerb.Profile, StringComparison.CurrentCultureIgnoreCase));
+                        }
+
+                        if (profile == null)
+                        {
+                            profile = _settingsService.GetDefaultShellProfile();
+                        }
+
+                        if (!string.IsNullOrWhiteSpace(newVerb.Directory))
+                        {
+                            profile.WorkingDirectory = newVerb.Directory;
+                        }
+
+                        var location = newVerb.Target == Target.Default ? _applicationSettings.NewTerminalLocation
+                            : newVerb.Target == Target.Tab ? NewTerminalLocation.Tab
+                            : NewTerminalLocation.Window;
+
+                        await CreateTerminal(profile, location).ConfigureAwait(true);
+                    }
+                    else if (verb is RunVerb runVerb)
+                    {
+                        var profile = new ShellProfile
+                        {
+                            Id = Guid.Empty,
+                            Location = null,
+                            Arguments = runVerb.Command,
+                            WorkingDirectory = runVerb.Directory
+                        };
+
+                        if (!string.IsNullOrWhiteSpace(runVerb.Theme))
+                        {
+                            var theme = _settingsService.GetThemes().FirstOrDefault(x => x.Name.Equals(runVerb.Theme, StringComparison.CurrentCultureIgnoreCase));
+                            if (theme != null)
+                            {
+                                profile.TerminalThemeId = theme.Id;
+                            }
+                        }
+
+                        if (string.IsNullOrWhiteSpace(profile.WorkingDirectory))
+                        {
+                            profile.WorkingDirectory = commandLineActivated.Operation.CurrentDirectoryPath;
+                        }
+
+                        var location = runVerb.Target == Target.Default ? _applicationSettings.NewTerminalLocation
+                            : runVerb.Target == Target.Tab ? NewTerminalLocation.Tab
+                            : NewTerminalLocation.Window;
+
+                        await CreateTerminal(profile, location).ConfigureAwait(true);
+                    }
+                });
+            }
+        }
+
+        protected override async void OnLaunched(LaunchActivatedEventArgs args)
+        {
+            if (!_alreadyLaunched)
+            {
+                var logDirectory = await ApplicationData.Current.LocalCacheFolder.CreateFolderAsync("Logs", CreationCollisionOption.OpenIfExists);
+                var logFile = Path.Combine(logDirectory.Path, "fluentterminal.app.log");
+                var configFile = await logDirectory.CreateFileAsync("config.json", CreationCollisionOption.OpenIfExists);
+                var configContent = await FileIO.ReadTextAsync(configFile);
+
+                if (string.IsNullOrWhiteSpace(configContent))
+                {
+                    configContent = JsonConvert.SerializeObject(new Logger.Configuration());
+                    await FileIO.WriteTextAsync(configFile, configContent);
+                }
+
+                var config = JsonConvert.DeserializeObject<Logger.Configuration>(configContent) ?? new Logger.Configuration();
+
+                Logger.Instance.Initialize(logFile, config);
+
+                var viewModel = _container.Resolve<MainViewModel>();
+                viewModel.AddTerminal();
+                await CreateMainView(typeof(MainPage), viewModel, true).ConfigureAwait(true);
+                Window.Current.Activate();
+            }
+            else if (_mainViewModels.Count == 0)
+            {
+                await CreateSecondaryView<MainViewModel>(typeof(MainPage), true).ConfigureAwait(true);
+            }
+        }
+
+        protected override void OnBackgroundActivated(BackgroundActivatedEventArgs args)
+        {
+            base.OnBackgroundActivated(args);
+
+            if (args.TaskInstance.TriggerDetails is AppServiceTriggerDetails details)
+            {
+                if (details.CallerPackageFamilyName == Package.Current.Id.FamilyName)
+                {
+                    _appServiceDeferral = args.TaskInstance.GetDeferral();
+                    args.TaskInstance.Canceled += OnTaskCanceled;
+
+                    _appServiceConnection = new AppServiceConnectionAdapter(details.AppServiceConnection);
+
+                    _trayReady.SetResult(0);
+                }
+            }
+        }
+
+        private void OnTaskCanceled(IBackgroundTaskInstance sender, BackgroundTaskCancellationReason reason)
+        {
+            _appServiceDeferral?.Complete();
+            _appServiceDeferral = null;
+            _appServiceConnection = null;
+
+            Application.Current.Exit();
+        }
+
+        private async Task CreateMainView(Type pageType, INotifyPropertyChanged viewModel, bool extendViewIntoTitleBar)
+        {
+            await StartSystemTray().ConfigureAwait(true);
+
+            Frame rootFrame = Window.Current.Content as Frame;
+            if (rootFrame == null)
+            {
+                rootFrame = new Frame();
+                Window.Current.Content = rootFrame;
+            }
+
+            if (rootFrame.Content == null)
+            {
+                CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = extendViewIntoTitleBar;
+
+                if (viewModel is MainViewModel mainViewModel)
+                {
+                    mainViewModel.Closed += OnMainViewModelClosed;
+                    mainViewModel.NewWindowRequested += OnNewWindowRequested;
+                    mainViewModel.ShowSettingsRequested += OnShowSettingsRequested;
+                    mainViewModel.ShowAboutRequested += OnShowAboutRequested;
+                    _mainViewModels.Add(mainViewModel);
+                }
+
+                rootFrame.Navigate(pageType, viewModel);
+            }
+            _alreadyLaunched = true;
+            Window.Current.Activate();
+        }
+
+        private async Task<MainViewModel> CreateNewTerminalWindow()
+        {
+            var viewModel = await CreateSecondaryView<MainViewModel>(typeof(MainPage), true).ConfigureAwait(true);
+            viewModel.Closed += OnMainViewModelClosed;
+            viewModel.NewWindowRequested += OnNewWindowRequested;
+            viewModel.ShowSettingsRequested += OnShowSettingsRequested;
+            viewModel.ShowAboutRequested += OnShowAboutRequested;
+            _mainViewModels.Add(viewModel);
+
+            return viewModel;
+        }
+
+        private async Task<TViewModel> CreateSecondaryView<TViewModel>(Type pageType, bool ExtendViewIntoTitleBar)
+        {
+            int windowId = 0;
+            TViewModel viewModel = default;
+            await CoreApplication.CreateNewView().Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
+            {
+                viewModel = _container.Resolve<TViewModel>();
+
+                CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = ExtendViewIntoTitleBar;
+                var frame = new Frame();
+                frame.Navigate(pageType, viewModel);
+                Window.Current.Content = frame;
+                Window.Current.Activate();
+
+                windowId = ApplicationView.GetForCurrentView().Id;
+            });
+
+            if (viewModel is SettingsViewModel settingsViewModel)
+            {
+                _settingsViewModel = settingsViewModel;
+                _settingsViewModel.Closed += OnSettingsClosed;
+                _settingsWindowId = windowId;
+            }
+
+            await ApplicationViewSwitcher.TryShowAsStandaloneAsync(windowId);
+
+            return viewModel;
+        }
+
+        private void OnApplicationSettingsChanged(object sender, ApplicationSettings e)
+        {
+            _applicationSettings = e;
+        }
+
+        private void OnMainViewModelClosed(object sender, EventArgs e)
+        {
+            if (sender is MainViewModel viewModel)
+            {
+                Logger.Instance.Debug("MainViewModel with ApplicationView Id: {@id} closed.", viewModel.ApplicationView.Id);
+
+                viewModel.Closed -= OnMainViewModelClosed;
+                viewModel.NewWindowRequested -= OnNewWindowRequested;
+                viewModel.ShowSettingsRequested -= OnShowSettingsRequested;
+                viewModel.ShowAboutRequested -= OnShowAboutRequested;
+
+                _mainViewModels.Remove(viewModel);
+            }
+        }
+
+        private async void OnNewWindowRequested(object sender, NewWindowRequestedEventArgs e)
+        {
+            var viewModel = await CreateNewTerminalWindow().ConfigureAwait(true);
+
+            if (e.ShowProfileSelection)
+            {
+                await viewModel.AddConfigurableTerminal().ConfigureAwait(true);
+            }
+            else
+            {
+                viewModel.AddTerminal();
+            }
+        }
+
+        private void OnSettingsClosed(object sender, EventArgs e)
+        {
+            _settingsViewModel.Closed -= OnSettingsClosed;
+            _settingsViewModel = null;
+            _settingsWindowId = null;
+        }
+
+        private void OnShowAboutRequested(object sender, EventArgs e)
+        {
+            ShowAbout().ConfigureAwait(true);
+        }
+
+        private async void OnShowSettingsRequested(object sender, EventArgs e)
+        {
+            await ShowSettings().ConfigureAwait(true);
+        }
+
+        private async Task ShowAbout()
+        {
+            await ShowSettings().ConfigureAwait(true);
+            _settingsViewModel.NavigateToAboutPage();
+        }
+
+        private async Task CreateTerminal(ShellProfile profile, NewTerminalLocation location)
+        {
+            if (!_alreadyLaunched)
+            {
+                var viewModel = _container.Resolve<MainViewModel>();
+                viewModel.AddTerminal(profile);
+                await CreateMainView(typeof(MainPage), viewModel, true).ConfigureAwait(true);
+            }
+            else if (location == NewTerminalLocation.Tab && _mainViewModels.Count > 0)
+            {
+                _mainViewModels.Last().AddTerminal(profile);
+            }
+            else
+            {
+                var viewModel = await CreateNewTerminalWindow().ConfigureAwait(true);
+                viewModel.AddTerminal(profile);
+            }
+        }
+
+        private async Task ShowSettings()
+        {
+            if (!_alreadyLaunched)
+            {
+                var viewModel = _container.Resolve<SettingsViewModel>();
+                await CreateMainView(typeof(SettingsPage), viewModel, true).ConfigureAwait(true);
+            }
+            else if (_settingsViewModel == null)
+            {
+                await CreateSecondaryView<SettingsViewModel>(typeof(SettingsPage), true).ConfigureAwait(true);
+            }
+            else
+            {
+                await ApplicationViewSwitcher.TryShowAsStandaloneAsync(_settingsWindowId.Value);
+            }
+        }
+
+        private async Task StartSystemTray()
+        {
+            var launch = FullTrustProcessLauncher.LaunchFullTrustProcessForCurrentAppAsync("AppLaunchedParameterGroup").AsTask();
+            await Task.WhenAll(launch, _trayReady.Task).ConfigureAwait(true);
+            _trayProcessCommunicationService.Initialize(_appServiceConnection);
+        }
+    }
 }

FluentTerminal.App/CommandLineArguments/NewVerb.cs

@@ -0,0 +1,17 @@
+using CommandLine;
+
+namespace FluentTerminal.App.CommandLineArguments
+{
+    [Verb("new")]
+    public class NewVerb
+    {
+        [Value(0)]
+        public string Directory { get; set; }
+
+        [Option("profile")]
+        public string Profile { get; set; }
+
+        [Option("target")]
+        public Target Target { get; set; }
+    }
+}

FluentTerminal.App/CommandLineArguments/RunVerb.cs

@@ -0,0 +1,20 @@
+using CommandLine;
+
+namespace FluentTerminal.App.CommandLineArguments
+{
+    [Verb("run")]
+    public class RunVerb
+    {
+        [Value(0)]
+        public string Command { get; set; }
+
+        [Option("directory")]
+        public string Directory { get; set; }
+
+        [Option("theme")]
+        public string Theme { get; set; }
+
+        [Option("target")]
+        public Target Target { get; set; }
+    }
+}

FluentTerminal.App/CommandLineArguments/SettingsVerb.cs

@@ -0,0 +1,9 @@
+using CommandLine;
+
+namespace FluentTerminal.App.CommandLineArguments
+{
+    [Verb("settings")]
+    public class SettingsVerb
+    {
+    }
+}

FluentTerminal.App/CommandLineArguments/Target.cs

@@ -0,0 +1,9 @@
+namespace FluentTerminal.App.CommandLineArguments
+{
+    public enum Target
+    {
+        Default,
+        Tab,
+        Window
+    }
+}

FluentTerminal.App/Converters/ColorResourceKeyFallbackConverter.cs

@@ -1,5 +1,6 @@
 using Microsoft.Toolkit.Uwp.Helpers;
 using System;
+using Windows.UI;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Media;

FluentTerminal.App/Converters/EnumToDescriptionConverter.cs

@@ -0,0 +1,24 @@
+using System;
+using FluentTerminal.App.Services.Utilities;
+using Windows.UI.Xaml.Data;
+
+namespace FluentTerminal.App.Converters
+{
+    public class EnumToDescriptionConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            // value is the Enum, parameter is the string.
+            if (value is Enum enumValue)
+            {
+                return EnumHelper.GetEnumDescription(enumValue);
+            }
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}

FluentTerminal.App/Converters/ToolTipValueToPixelConverter.cs

@@ -0,0 +1,18 @@
+using System;
+using Windows.UI.Xaml.Data;
+
+namespace FluentTerminal.App.Converters
+{
+    public class ToolTipValueToPixelConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            return string.Format("{0} px", value);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

FluentTerminal.App/Converters/TrueToBoldConverter.cs

@@ -0,0 +1,23 @@
+using System;
+using Windows.UI.Text;
+using Windows.UI.Xaml.Data;
+
+namespace FluentTerminal.App.Converters
+{
+    public class TrueToBoldConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is bool bold)
+            {
+                return bold ? FontWeights.Bold : FontWeights.Normal;
+            }
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

FluentTerminal.App/Dialogs/InputDialog.xaml

@@ -0,0 +1,13 @@
+<ContentDialog
+    x:Class="FluentTerminal.App.Dialogs.InputDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+    CloseButtonText="Cancel"
+    PrimaryButtonText="OK"
+    KeyDown="Dialog_KeyUp"
+    mc:Ignorable="d">
+    <TextBox VerticalAlignment="Center" Text="{x:Bind Input, Mode=TwoWay}" />
+</ContentDialog>

FluentTerminal.App/Dialogs/InputDialog.xaml.cs

@@ -0,0 +1,45 @@
+using FluentTerminal.App.Services.Dialogs;
+using System.Threading.Tasks;
+using Windows.UI.Xaml.Controls;
+using System;
+using Windows.UI.Xaml.Input;
+using Windows.System;
+
+namespace FluentTerminal.App.Dialogs
+{
+    public sealed partial class InputDialog : ContentDialog, IInputDialog
+    {
+
+        private bool EnterPressed = false;
+        public string Input { get; private set; }
+
+        public InputDialog()
+        {
+            this.InitializeComponent();
+        }
+
+        public async Task<string> GetInput()
+        {
+            var result = await ShowAsync();
+            if (result == ContentDialogResult.Primary || EnterPressed)
+            {
+                return Input;
+            }
+            return null;
+        }
+
+        public void SetTitle(string title)
+        {
+            Title = title;
+        }
+
+        void Dialog_KeyUp(object sender, KeyRoutedEventArgs e)
+        {
+           if (e.Key == VirtualKey.Enter)
+           {
+                EnterPressed = true;
+                Hide();
+           }
+        }
+    }
+}

FluentTerminal.App/Dialogs/SshInfoDialog.xaml

@@ -0,0 +1,37 @@
+<ContentDialog
+    x:Class="FluentTerminal.App.Dialogs.SshInfoDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="using:FluentTerminal.App.ViewModels"
+    Title="SSH Info"
+    PrimaryButtonText="OK"
+    SecondaryButtonText="Cancel"
+    mc:Ignorable="d">
+    <ContentDialog.DataContext>
+        <vm:SshConnectionInfoViewModel />
+    </ContentDialog.DataContext>
+    <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
+        <TextBox
+            Width="50"
+            PlaceholderText="user"
+            Text="{Binding Username, Mode=TwoWay}" />
+        <TextBlock
+            Width="20"
+            FontSize="22"
+            Text="@" />
+        <TextBox
+            Width="120"
+            PlaceholderText="host"
+            Text="{Binding Host, Mode=TwoWay}" />
+        <TextBlock
+            Width="20"
+            FontSize="22"
+            Text=":" />
+        <TextBox
+            Width="50"
+            PlaceholderText="port"
+            Text="{Binding Port, Mode=TwoWay}" />
+    </StackPanel>
+</ContentDialog>

FluentTerminal.App/Dialogs/SshInfoDialog.xaml.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Threading.Tasks;
+using Windows.UI.Xaml.Controls;
+using FluentTerminal.App.Services.Dialogs;
+using FluentTerminal.App.Utilities;
+using FluentTerminal.App.Services;
+
+namespace FluentTerminal.App.Dialogs
+{
+    public sealed partial class SshInfoDialog : ContentDialog, ISshConnectionInfoDialog
+    {
+        public SshInfoDialog(ISettingsService settingsService)
+        {
+            InitializeComponent();
+            var currentTheme = settingsService.GetCurrentTheme();
+            RequestedTheme = ContrastHelper.GetIdealThemeForBackgroundColor(currentTheme.Colors.Background);
+        }
+
+        public async Task<ISshConnectionInfo> GetSshConnectionInfoAsync()
+        {
+            ContentDialogResult result = await ShowAsync();
+
+            return result == ContentDialogResult.Primary ? (ISshConnectionInfo)DataContext : null;
+        }
+    }
+}

FluentTerminal.App/FluentTerminal.App.csproj

@@ -17,8 +17,8 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
-    <PackageCertificateKeyFile>FluentTerminal.App_StoreKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>8FA8EF727E767FAE5409DDD1694C1CEE054A2962</PackageCertificateThumbprint>
+    <PackageCertificateKeyFile>FluentTerminal.App_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>F96F3E0E485F07E8E98DA6E5C06AA4B6F112B498</PackageCertificateThumbprint>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
     <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
@@ -111,8 +111,13 @@
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
     <Compile Include="Behaviors\MiddleClickBehavior.cs" />
+    <Compile Include="CommandLineArguments\NewVerb.cs" />
+    <Compile Include="CommandLineArguments\RunVerb.cs" />
+    <Compile Include="CommandLineArguments\SettingsVerb.cs" />
+    <Compile Include="CommandLineArguments\Target.cs" />
     <Compile Include="Converters\BackgroundToApplicationThemeConverter.cs" />
     <Compile Include="Converters\ColorResourceKeyFallbackConverter.cs" />
+    <Compile Include="Converters\EnumToDescriptionConverter.cs" />
     <Compile Include="Converters\TabColorFallbackConverter.cs" />
     <Compile Include="Converters\EnumValueToVisibiltyConverter.cs" />
     <Compile Include="Converters\FalseToVisibleConverter.cs" />
@@ -122,8 +127,13 @@
     <Compile Include="Converters\StringToColorConverter.cs" />
     <Compile Include="Converters\TabThemeSelectedConverter.cs" />
     <Compile Include="Converters\TerminalViewModelToViewConverter.cs" />
+    <Compile Include="Converters\ToolTipValueToPixelConverter.cs" />
+    <Compile Include="Converters\TrueToBoldConverter.cs" />
     <Compile Include="Converters\TrueToVisibleConverter.cs" />
     <Compile Include="Adapters\MessageDialogAdapter.cs" />
+    <Compile Include="Dialogs\InputDialog.xaml.cs">
+      <DependentUpon>InputDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Dialogs\ShellProfileSelectionDialog.xaml.cs">
       <DependentUpon>ShellProfileSelectionDialog.xaml</DependentUpon>
     </Compile>
@@ -133,6 +143,7 @@
     <Compile Include="Services\SystemFontService.cs" />
     <Compile Include="Utilities\ColorExtensions.cs" />
     <Compile Include="Utilities\ContrastHelper.cs" />
+    <Compile Include="Utilities\DebouncedAction.cs" />
     <Compile Include="Views\KeyBindingsView.xaml.cs">
       <DependentUpon>KeyBindingsView.xaml</DependentUpon>
     </Compile>
@@ -143,9 +154,32 @@
     <Compile Include="Dialogs\CreateKeyBindingDialog.xaml.cs">
       <DependentUpon>CreateKeyBindingDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\NativeFrontend\Ansi\AnsiParser.cs" />
+    <Compile Include="Views\NativeFrontend\Ansi\C0.cs" />
+    <Compile Include="Views\NativeFrontend\Ansi\CharAttributes.cs" />
+    <Compile Include="Views\NativeFrontend\Ansi\TerminalCode.cs" />
+    <Compile Include="Views\NativeFrontend\Ansi\TerminalCodeType.cs" />
+    <Compile Include="Views\NativeFrontend\TerminalColorHelper.cs" />
+    <Compile Include="Views\NativeFrontend\TerminalControl.xaml.cs">
+      <DependentUpon>TerminalControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\NativeFrontend\Terminal\SelectionMode.cs" />
+    <Compile Include="Views\NativeFrontend\Terminal\SpecialColorIds.cs" />
+    <Compile Include="Views\NativeFrontend\Terminal\TerminalBuffer.cs" />
+    <Compile Include="Views\NativeFrontend\Terminal\TerminalBufferChar.cs" />
+    <Compile Include="Views\NativeFrontend\Terminal\TerminalBufferLine.cs" />
+    <Compile Include="Views\NativeFrontend\Terminal\TerminalPoint.cs" />
+    <Compile Include="Views\NativeFrontend\Terminal\TerminalSelection.cs" />
+    <Compile Include="Views\NativeFrontend\Terminal\TerminalSize.cs" />
+    <Compile Include="Views\NativeFrontend\Terminal\TerminalTag.cs" />
+    <Compile Include="Views\NativeFrontend\Terminal\TerminalTagArray.cs" />
+    <Compile Include="Views\NativeFrontend\Utility\ArrayReader.cs" />
     <Compile Include="Views\SettingsPage.xaml.cs">
       <DependentUpon>SettingsPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\SettingsPages\About.xaml.cs">
+      <DependentUpon>About.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\SettingsPages\MouseSettings.xaml.cs">
       <DependentUpon>MouseSettings.xaml</DependentUpon>
     </Compile>
@@ -164,22 +198,36 @@
     <Compile Include="Views\SettingsPages\ShellProfileSettings.xaml.cs">
       <DependentUpon>ShellProfileSettings.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Dialogs\SshInfoDialog.xaml.cs">
+      <DependentUpon>SshInfoDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\TabBar.xaml.cs">
       <DependentUpon>TabBar.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\TabBarBackgroundBindingHelper.cs" />
+    <Compile Include="Views\TerminalKeybindTemplateSelector.cs" />
     <Compile Include="Views\TabThemeTemplateSelector.cs" />
     <Compile Include="Views\TerminalColorPicker.xaml.cs">
       <DependentUpon>TerminalColorPicker.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\NoValueTemplateSelector.cs" />
+    <Compile Include="Views\TerminalThemeTemplateSelector.cs" />
+    <Compile Include="Views\ITerminalView.cs" />
     <Compile Include="Views\TerminalView.xaml.cs">
       <DependentUpon>TerminalView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\VtNetCoreFrontend\VtNetCoreTerminal.xaml.cs">
+      <DependentUpon>VtNetCoreTerminal.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\XtermTerminalView.xaml.cs">
+      <DependentUpon>XtermTerminalView.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
+    <Content Include="Assets\AppIcons\Square106x106Logo.black.png" />
     <Content Include="Assets\settingsicons.ttf" />
     <Content Include="Win32\Autofac.dll" />
     <Content Include="Win32\FluentTerminal.App.Services.dll" />
@@ -190,7 +238,11 @@
     <Content Include="Win32\FluentTerminal.SystemTray.pdb" />
     <Content Include="Win32\GlobalHotKey.dll" />
     <Content Include="Win32\Newtonsoft.Json.dll" />
+    <Content Include="Win32\PListNet.dll" />
     <Content Include="Win32\RestSharp.dll" />
+    <Content Include="Win32\Serilog.dll" />
+    <Content Include="Win32\Serilog.Sinks.Async.dll" />
+    <Content Include="Win32\Serilog.Sinks.File.dll" />
     <Content Include="Win32\System.Data.Common.dll" />
     <Content Include="Win32\System.Diagnostics.StackTrace.dll" />
     <Content Include="Win32\System.Diagnostics.Tracing.dll" />
@@ -208,7 +260,6 @@
     <Content Include="Win32\winpty.dll" />
     <Content Include="Win32\winpty.NET.dll" />
     <None Include="FluentTerminal.App_StoreKey.pfx" />
-    <None Include="FluentTerminal.App_TemporaryKey.pfx" />
     <Content Include="Client\bundle.js" />
     <Content Include="Client\index.html" />
     <Content Include="Client\style.css" />
@@ -261,7 +312,6 @@
     <Content Include="Assets\AppIcons\Wide310x150Logo.scale-150.png" />
     <Content Include="Assets\AppIcons\Wide310x150Logo.scale-200.png" />
     <Content Include="Assets\AppIcons\Wide310x150Logo.scale-400.png" />
-    <None Include="Package.StoreAssociation.xml" />
     <Content Include="Properties\Default.rd.xml" />
   </ItemGroup>
   <ItemGroup>
@@ -269,6 +319,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Page Include="Dialogs\InputDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Dialogs\ShellProfileSelectionDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -290,10 +344,18 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\NativeFrontend\TerminalControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\SettingsPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\SettingsPages\About.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\SettingsPages\MouseSettings.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -318,6 +380,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Dialogs\SshInfoDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\TabBar.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -330,25 +396,39 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\VtNetCoreFrontend\VtNetCoreTerminal.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\XtermTerminalView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Autofac">
-      <Version>4.8.1</Version>
+      <Version>4.9.1</Version>
+    </PackageReference>
+    <PackageReference Include="CommandLineParser">
+      <Version>2.4.3</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.1.5</Version>
+      <Version>6.2.8</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI">
-      <Version>3.0.0</Version>
+      <Version>5.1.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
-      <Version>3.0.0</Version>
+      <Version>5.1.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
       <Version>2.0.0</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>11.0.2</Version>
+      <Version>12.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="VtNetCore">
+      <Version>1.0.15</Version>
     </PackageReference>
     <PackageReference Include="Win2D.uwp">
       <Version>1.21.0</Version>

FluentTerminal.App/Package.appxmanifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" IgnorableNamespaces="uap mp desktop rescap">
-  <Identity Name="53621FSApps.FluentTerminal" Publisher="CN=BDC72197-B634-438A-B863-16DCB7D90C85" Version="0.2.1.0" />
+  <Identity Name="53621FSApps.FluentTerminal" Publisher="CN=BDC72197-B634-438A-B863-16DCB7D90C85" Version="0.4.1.0" />
   <mp:PhoneIdentity PhoneProductId="f7225014-f405-4342-ad2e-ebf6ac60ea2c" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Fluent Terminal</DisplayName>

FluentTerminal.App/Services/SystemFontService.cs

@@ -1,13 +1,28 @@
-using Microsoft.Graphics.Canvas.Text;
+using FluentTerminal.Models;
+using Microsoft.Graphics.Canvas.Text;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace FluentTerminal.App.Services
 {
     public class SystemFontService : ISystemFontService
     {
-        public IEnumerable<string> GetSystemFontFamilies()
+        public IEnumerable<FontInfo> GetSystemFontFamilies()
         {
-            return CanvasTextFormat.GetSystemFontFamilies();
+            return CanvasFontSet.GetSystemFontSet().Fonts.Select(x => new FontInfo { Name = x.FamilyNames.Values.FirstOrDefault(), IsMonospaced = x.IsMonospaced }).Distinct(new FontInfoComparer());
+        }
+
+        private class FontInfoComparer : IEqualityComparer<FontInfo>
+        {
+            public bool Equals(FontInfo x, FontInfo y)
+            {
+                return x.Name == y.Name;
+            }
+
+            public int GetHashCode(FontInfo obj)
+            {
+                return obj.Name.GetHashCode();
+            }
         }
     }
 }

FluentTerminal.App/Styles/Custom.xaml

@@ -1,5 +1,9 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
+    <Thickness x:Key="HeaderMargin">24,0,0,0</Thickness>
+    <Thickness x:Key="ContainerMargin">24,0,24,24</Thickness>
+    <Thickness x:Key="ItemMargin">0,24,0,0</Thickness>
+
     <Style
         x:Key="WindowTitleTextBlockStyle"
         BasedOn="{StaticResource CaptionTextBlockStyle}"

FluentTerminal.App/Utilities/DebouncedAction.cs

@@ -0,0 +1,49 @@
+using System;
+using Windows.UI.Core;
+using Windows.UI.Xaml;
+
+namespace FluentTerminal.App.Utilities
+{
+    public class DebouncedAction<T>
+    {
+        private DispatcherTimer timer;
+        private readonly CoreDispatcher _dispatcher;
+        private readonly TimeSpan _interval;
+        private readonly Action<T> _action;
+        private T _parameter;
+
+        public DebouncedAction(CoreDispatcher dispatcher, TimeSpan interval, Action<T> action)
+        {
+            _dispatcher = dispatcher;
+            _interval = interval;
+            _action = action;
+        }
+
+        public void Invoke(T parameter)
+        {
+            _parameter = parameter;
+
+            timer?.Stop();
+            timer = null;
+
+            timer = new DispatcherTimer
+            {
+                Interval = _interval
+            };
+            timer.Tick += (s, e) =>
+            {
+                if (timer == null)
+                {
+                    return;
+                }
+
+                timer?.Stop();
+                timer = null;
+
+                _dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => _action.Invoke(_parameter));
+            };
+
+            timer.Start();
+        }
+    }
+}

FluentTerminal.App/Views/ITerminalView.cs

@@ -0,0 +1,17 @@
+using FluentTerminal.App.ViewModels;
+using FluentTerminal.Models;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Views
+{
+    public interface ITerminalView
+    {
+        Task ChangeTheme(TerminalTheme theme);
+        Task ChangeKeyBindings();
+        Task ChangeOptions(TerminalOptions options);
+        Task Initialize(TerminalViewModel viewModel);
+        Task FindNext(string searchText);
+        Task FindPrevious(string searchText);
+        Task FocusTerminal();
+    }
+}

FluentTerminal.App/Views/KeyBindingsView.xaml

@@ -10,13 +10,15 @@
     mc:Ignorable="d">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="180" />
+            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
         <TextBlock
             Grid.Column="0"
+            Width="180"
             Margin="0,6,24,0"
-            Text="{x:Bind ViewModel.CommandName, Mode=OneWay}" />
+            Text="{x:Bind ViewModel.CommandName, Mode=OneWay}"
+            Visibility="{x:Bind ShowCommandName, Mode=OneWay}" />
         <ItemsControl Grid.Column="1" ItemsSource="{x:Bind ViewModel.KeyBindings, Mode=OneWay}">
             <ItemsControl.ItemTemplate>
                 <DataTemplate x:DataType="settings:KeyBindingViewModel">
@@ -82,11 +84,13 @@
                         <HyperlinkButton
                             Margin="12,0,0,0"
                             Command="{x:Bind EditCommand}"
-                            Content="Edit" />
+                            Content="Edit"
+                            Visibility="{x:Bind Parent.Editable, Converter={StaticResource TrueToVisibleConverter}, Mode=OneWay}" />
                         <HyperlinkButton
                             Margin="12,0,0,0"
                             Command="{x:Bind DeleteCommand}"
-                            Content="Delete" />
+                            Content="Delete"
+                            Visibility="{x:Bind Parent.Editable, Converter={StaticResource TrueToVisibleConverter}, Mode=OneWay}" />
                     </StackPanel>
                 </DataTemplate>
             </ItemsControl.ItemTemplate>

FluentTerminal.App/Views/KeyBindingsView.xaml.cs

@@ -6,14 +6,23 @@ namespace FluentTerminal.App.Views
 {
     public sealed partial class KeyBindingsView : UserControl
     {
+        public static readonly DependencyProperty ShowCommandNameProperty =
+            DependencyProperty.Register(nameof(ShowCommandName), typeof(bool), typeof(KeyBindingsView), new PropertyMetadata(true));
+
         public static readonly DependencyProperty ViewModelProperty =
-                    DependencyProperty.Register(nameof(ViewModel), typeof(KeyBindingsViewModel), typeof(KeyBindingsView), new PropertyMetadata(null));
+                            DependencyProperty.Register(nameof(ViewModel), typeof(KeyBindingsViewModel), typeof(KeyBindingsView), new PropertyMetadata(null));
 
         public KeyBindingsView()
         {
             InitializeComponent();
         }
 
+        public bool ShowCommandName
+        {
+            get { return (bool)GetValue(ShowCommandNameProperty); }
+            set { SetValue(ShowCommandNameProperty, value); }
+        }
+
         public KeyBindingsViewModel ViewModel
         {
             get { return (KeyBindingsViewModel)GetValue(ViewModelProperty); }

FluentTerminal.App/Views/MainPage.xaml

@@ -6,7 +6,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:views="using:FluentTerminal.App.Views"
-    RequestedTheme="{x:Bind ViewModel.Background, Mode=OneWay, Converter={StaticResource BackgroundToApplicationThemeConverter}}"
+    RequestedTheme="{x:Bind ViewModel.SelectedTerminal.TerminalTheme.Colors.Background, Mode=OneWay, Converter={StaticResource BackgroundToApplicationThemeConverter}}"
     mc:Ignorable="d">
     <Page.Resources>
         <converters:TerminalViewModelToViewConverter x:Key="TerminalViewModelToViewConverter" />
@@ -15,9 +15,11 @@
         <Grid.Background>
             <AcrylicBrush
                 BackgroundSource="HostBackdrop"
-                FallbackColor="{x:Bind ViewModel.Background, Mode=OneWay}"
-                TintColor="{x:Bind ViewModel.Background, Mode=OneWay}"
-                TintOpacity="{x:Bind ViewModel.BackgroundOpacity, Mode=OneWay}" />
+                FallbackColor="{x:Bind ViewModel.SelectedTerminal.TerminalTheme.Colors.Background, Mode=OneWay}"
+                TintColor="{x:Bind ViewModel.SelectedTerminal.TerminalTheme.Colors.Background, Mode=OneWay}"
+                TintOpacity="{x:Bind ViewModel.BackgroundOpacity, Mode=OneWay}"
+                TintTransitionDuration="{x:Bind NoDuration}" />
+
         </Grid.Background>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -60,15 +62,122 @@
                                 <SymbolIcon Symbol="Setting" />
                             </MenuFlyoutItem.Icon>
                         </MenuFlyoutItem>
+                        <MenuFlyoutItem
+                            Width="160"
+                            Command="{x:Bind ViewModel.ShowAboutCommand}"
+                            Text="About">
+                            <MenuFlyoutItem.Icon>
+                                <FontIcon
+                                    FontFamily="Segoe MDL2 Assets"
+                                    Glyph="&#xE946;"
+                                    ToolTipService.ToolTip="About" />
+                            </MenuFlyoutItem.Icon>
+                        </MenuFlyoutItem>
                     </MenuFlyout>
                 </Button.Flyout>
             </Button>
-            <TextBlock
+            <RelativePanel
                 Grid.Column="1"
-                IsHitTestVisible="False"
-                Style="{StaticResource WindowTitleTextBlockStyle}"
-                Text="{x:Bind ViewModel.SelectedTerminal.Title, Mode=OneWay}"
-                Visibility="{x:Bind ViewModel.ShowTabsOnTop, Mode=OneWay, Converter={StaticResource FalseToVisibleConverter}}" />
+                Height="32"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Stretch"
+                Background="{x:Bind ViewModel.SelectedTerminal.TabTheme, Mode=OneWay, Converter={StaticResource TabColorFallbackConverter}, ConverterParameter=Background}">
+                <RelativePanel.ContextFlyout>
+                    <MenuFlyout>
+                        <MenuFlyoutSubItem Text="Color">
+                            <ToggleMenuFlyoutItem
+                                Command="{x:Bind ViewModel.SelectedTerminal.SelectTabThemeCommand}"
+                                CommandParameter="None"
+                                IsChecked="{x:Bind ViewModel.SelectedTerminal.TabTheme, Mode=OneWay, Converter={StaticResource TabThemeSelectedConverter}, ConverterParameter=None}"
+                                Text="None">
+                                <ToggleMenuFlyoutItem.Icon>
+                                    <FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xF126;" />
+                                </ToggleMenuFlyoutItem.Icon>
+                            </ToggleMenuFlyoutItem>
+                            <ToggleMenuFlyoutItem
+                                Command="{x:Bind ViewModel.SelectedTerminal.SelectTabThemeCommand}"
+                                CommandParameter="Red"
+                                IsChecked="{x:Bind ViewModel.SelectedTerminal.TabTheme, Mode=OneWay, Converter={StaticResource TabThemeSelectedConverter}, ConverterParameter=Red}"
+                                Text="Red">
+                                <ToggleMenuFlyoutItem.Icon>
+                                    <FontIcon
+                                        FontFamily="Segoe MDL2 Assets"
+                                        Foreground="#E81123"
+                                        Glyph="&#xF127;" />
+                                </ToggleMenuFlyoutItem.Icon>
+                            </ToggleMenuFlyoutItem>
+                            <ToggleMenuFlyoutItem
+                                Command="{x:Bind ViewModel.SelectedTerminal.SelectTabThemeCommand}"
+                                CommandParameter="Green"
+                                IsChecked="{x:Bind ViewModel.SelectedTerminal.TabTheme, Mode=OneWay, Converter={StaticResource TabThemeSelectedConverter}, ConverterParameter=Green}"
+                                Text="Green">
+                                <ToggleMenuFlyoutItem.Icon>
+                                    <FontIcon
+                                        FontFamily="Segoe MDL2 Assets"
+                                        Foreground="#10893E"
+                                        Glyph="&#xF127;" />
+                                </ToggleMenuFlyoutItem.Icon>
+                            </ToggleMenuFlyoutItem>
+                            <ToggleMenuFlyoutItem
+                                Command="{x:Bind ViewModel.SelectedTerminal.SelectTabThemeCommand}"
+                                CommandParameter="Blue"
+                                IsChecked="{x:Bind ViewModel.SelectedTerminal.TabTheme, Mode=OneWay, Converter={StaticResource TabThemeSelectedConverter}, ConverterParameter=Blue}"
+                                Text="Blue">
+                                <ToggleMenuFlyoutItem.Icon>
+                                    <FontIcon
+                                        FontFamily="Segoe MDL2 Assets"
+                                        Foreground="#0078D7"
+                                        Glyph="&#xF127;" />
+                                </ToggleMenuFlyoutItem.Icon>
+                            </ToggleMenuFlyoutItem>
+                            <ToggleMenuFlyoutItem
+                                Command="{x:Bind ViewModel.SelectedTerminal.SelectTabThemeCommand}"
+                                CommandParameter="Purple"
+                                IsChecked="{x:Bind ViewModel.SelectedTerminal.TabTheme, Mode=OneWay, Converter={StaticResource TabThemeSelectedConverter}, ConverterParameter=Purple}"
+                                Text="Purple">
+                                <ToggleMenuFlyoutItem.Icon>
+                                    <FontIcon
+                                        FontFamily="Segoe MDL2 Assets"
+                                        Foreground="#881798"
+                                        Glyph="&#xF127;" />
+                                </ToggleMenuFlyoutItem.Icon>
+                            </ToggleMenuFlyoutItem>
+                            <ToggleMenuFlyoutItem
+                                Command="{x:Bind ViewModel.SelectedTerminal.SelectTabThemeCommand}"
+                                CommandParameter="Orange"
+                                IsChecked="{x:Bind ViewModel.SelectedTerminal.TabTheme, Mode=OneWay, Converter={StaticResource TabThemeSelectedConverter}, ConverterParameter=Orange}"
+                                Text="Orange">
+                                <ToggleMenuFlyoutItem.Icon>
+                                    <FontIcon
+                                        FontFamily="Segoe MDL2 Assets"
+                                        Foreground="#FF8C00"
+                                        Glyph="&#xF127;" />
+                                </ToggleMenuFlyoutItem.Icon>
+                            </ToggleMenuFlyoutItem>
+                            <ToggleMenuFlyoutItem
+                                Command="{x:Bind ViewModel.SelectedTerminal.SelectTabThemeCommand}"
+                                CommandParameter="Teal"
+                                IsChecked="{x:Bind ViewModel.SelectedTerminal.TabTheme, Mode=OneWay, Converter={StaticResource TabThemeSelectedConverter}, ConverterParameter=Teal}"
+                                Text="Teal">
+                                <ToggleMenuFlyoutItem.Icon>
+                                    <FontIcon
+                                        FontFamily="Segoe MDL2 Assets"
+                                        Foreground="#00B7C3"
+                                        Glyph="&#xF127;" />
+                                </ToggleMenuFlyoutItem.Icon>
+                            </ToggleMenuFlyoutItem>
+                        </MenuFlyoutSubItem>
+                        <MenuFlyoutItem Command="{x:Bind ViewModel.SelectedTerminal.EditTitleCommand}" Text="Edit Title" />
+                    </MenuFlyout>
+                </RelativePanel.ContextFlyout>
+                <TextBlock
+                    Margin="12,8,12,0"
+                    Style="{StaticResource CaptionTextBlockStyle}"
+                    Text="{x:Bind ViewModel.WindowTitle, Mode=OneWay}"
+                    TextTrimming="CharacterEllipsis"
+                    TextWrapping="NoWrap"
+                    Visibility="{x:Bind ViewModel.ShowTabsOnTop, Mode=OneWay, Converter={StaticResource FalseToVisibleConverter}}" />
+            </RelativePanel>
             <views:TabBar
                 Grid.Column="1"
                 HorizontalAlignment="Left"

FluentTerminal.App/Views/MainPage.xaml.cs

@@ -1,5 +1,6 @@
 using FluentTerminal.App.Utilities;
 using FluentTerminal.App.ViewModels;
+using System;
 using System.ComponentModel;
 using Windows.ApplicationModel.Core;
 using Windows.UI.Core;
@@ -18,6 +19,8 @@ namespace FluentTerminal.App.Views
 
         public double CoreTitleBarHeight => coreTitleBar.Height;
 
+        public TimeSpan NoDuration => TimeSpan.Zero;
+
         public Thickness CoreTitleBarPadding
         {
             get
@@ -59,11 +62,11 @@ namespace FluentTerminal.App.Views
             }
         }
 
-        private async void OnWindowActivated(object sender, WindowActivatedEventArgs e)
+        private void OnWindowActivated(object sender, WindowActivatedEventArgs e)
         {
             if (e.WindowActivationState != CoreWindowActivationState.Deactivated && TerminalContainer.Content is TerminalView terminal)
             {
-                await terminal.FocusWebView().ConfigureAwait(true);
+                terminal.ViewModel.FocusTerminal();
             }
         }
 

FluentTerminal.App/Views/NativeFrontend/Ansi/AnsiParser.cs

@@ -0,0 +1,679 @@
+using FluentTerminal.App.Views.NativeFrontend.Utility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Views.NativeFrontend.Ansi
+{
+    internal class AnsiParser
+    {
+        private ParserState _state;
+        private int _position;
+        private object _currentParam;
+        private List<object> _params = new List<object>();
+        private List<TerminalCode> _terminalCodes = new List<TerminalCode>();
+
+        /// <summary>
+        /// CSI codes can have prefixes of '?', '>'
+        /// </summary>
+        private string _prefix;
+
+        /// <summary>
+        /// CSI codes can have postfixes of '$',
+        /// </summary>
+        private string _postfix;
+
+        private readonly StringBuilder _currentTextEmit = new StringBuilder(capacity: 128);
+
+        public TerminalCode[] Parse(ArrayReader<char> reader)
+        {
+            _terminalCodes.Clear();
+            while (reader.TryRead(out char ch))
+            {
+                int code = ch;
+                // if (0xD800 <= code && code <= 0xDBFF)
+                // {
+                //     // we got a surrogate high
+                //     // get surrogate low (next 2 bytes)
+                //     if (!reader.TryPeek(out char low))
+                //     {
+                //         // end of data stream, save surrogate high
+                //         // this._terminal.surrogate_high = ch;
+                //         continue;
+                //     }
+                //     code = ((code - 0xD800) * 0x400) + (low - 0xDC00) + 0x10000;
+                //     // ch += low;
+                // }
+                // // surrogate low - already handled above
+                // if (0xDC00 <= code && code <= 0xDFFF)
+                // {
+                //     continue;
+                // }
+
+                switch (_state)
+                {
+                    case ParserState.Normal:
+                        if (!NormalStateHandler(ch))
+                        {
+                            Emit(ch);
+                        }
+                        break;
+                    case ParserState.Escaped:
+                        if (!EscapedStateHandler(ch))
+                        {
+                            switch (ch)
+                            {
+                                // ESC (,),*,+,-,. Designate G0-G2 Character Set.
+                                case '(': // <-- this seems to get all the attention
+                                          // this._terminal.gcharset = 0;
+                                    _state = ParserState.Charset;
+                                    break;
+                                case ')':
+                                case '-':
+                                    // this._terminal.gcharset = 1;
+                                    _state = ParserState.Charset;
+                                    break;
+                                case '*':
+                                case '.':
+                                    // this._terminal.gcharset = 2;
+                                    _state = ParserState.Charset;
+                                    break;
+                                case '+':
+                                    // this._terminal.gcharset = 3;
+                                    _state = ParserState.Charset;
+                                    break;
+
+                                // Designate G3 Character Set (VT300).
+                                // A = ISO Latin-1 Supplemental.
+                                // Not implemented.
+                                case '/':
+                                    // _terminal.gcharset = 3;
+                                    _state = ParserState.Charset;
+                                    // _position--
+                                    break;
+
+                                // ESC N
+                                // Single Shift Select of G2 Character Set
+                                // ( SS2 is 0x8e). This affects next character only.
+                                case 'N':
+                                    break;
+                                // ESC O
+                                // Single Shift Select of G3 Character Set
+                                // ( SS3 is 0x8f). This affects next character only.
+                                case 'O':
+                                    break;
+                                // ESC n
+                                // Invoke the G2 Character Set as GL (LS2).
+                                case 'n':
+                                    // this._terminal.setgLevel(2);
+                                    break;
+                                // ESC o
+                                // Invoke the G3 Character Set as GL (LS3).
+                                case 'o':
+                                    // this._terminal.setgLevel(3);
+                                    break;
+                                // ESC |
+                                // Invoke the G3 Character Set as GR (LS3R).
+                                case '|':
+                                    // this._terminal.setgLevel(3);
+                                    break;
+                                // ESC }
+                                // Invoke the G2 Character Set as GR (LS2R).
+                                case '}':
+                                    // this._terminal.setgLevel(2);
+                                    break;
+                                // ESC ~
+                                // Invoke the G1 Character Set as GR (LS1R).
+                                case '~':
+                                    // this._terminal.setgLevel(1);
+                                    break;
+
+                                // ESC 7 Save Cursor (DECSC).
+                                case '7':
+                                    Emit(TerminalCodeType.SaveCursor);
+                                    _state = ParserState.Normal;
+                                    break;
+
+                                // ESC 8 Restore Cursor (DECRC).
+                                case '8':
+                                    Emit(TerminalCodeType.RestoreCursor);
+                                    _state = ParserState.Normal;
+                                    break;
+
+                                // ESC # 3 DEC line height/width
+                                case '#':
+                                    _state = ParserState.Normal;
+                                    // _position++;
+                                    break;
+
+                                // ESC H Tab Set (HTS is 0x88).
+                                case 'H':
+                                    Emit(TerminalCodeType.TabSet);
+                                    _state = ParserState.Normal;
+                                    break;
+
+                                // ESC = Application Keypad (DECKPAM).
+                                case '=':
+                                    // this._terminal.log('Serial port requested application keypad.');
+                                    // this._terminal.applicationKeypad = true;
+                                    // this._terminal.viewport.syncScrollArea();
+                                    _state = ParserState.Normal;
+                                    break;
+
+                                // ESC > Normal Keypad (DECKPNM).
+                                case '>':
+                                    // this._terminal.log('Switching back to normal keypad.');
+                                    // this._terminal.applicationKeypad = false;
+                                    // this._terminal.viewport.syncScrollArea();
+                                    _state = ParserState.Normal;
+                                    break;
+
+                                default:
+                                    _state = ParserState.Normal;
+                                    // _terminal.error('Unknown ESC control: %s.', ch);
+                                    break;
+                            }
+                        }
+                        break;
+                    case ParserState.Charset:
+                        // if (ch in CHARSETS)
+                        // {
+                        //     cs = CHARSETS[ch];
+                        //     if (ch === '/')
+                        //     { // ISOLatin is actually /A
+                        //         this.skipNextChar();
+                        //     }
+                        // }
+                        // else
+                        // {
+                        //     cs = DEFAULT_CHARSET;
+                        // }
+                        // this._terminal.setgCharset(this._terminal.gcharset, cs);
+                        // this._terminal.gcharset = null;
+                        _state = ParserState.Normal;
+                        break;
+                    case ParserState.Osc:
+                        // OSC Ps ; Pt ST
+                        // OSC Ps ; Pt BEL
+                        //   Set Text Parameters.
+                        if (ch == C0.ESC || ch == C0.BEL)
+                        {
+                            if (ch == C0.ESC)
+                            {
+                                _position++;
+                            }
+                            _params.Add(_currentParam);
+                            switch ((int)_params[0])
+                            {
+                                case 0:
+                                case 1:
+                                case 2:
+                                    if (_params.Count >= 1 && _params[1] != null)
+                                    {
+                                        Emit(new TerminalCode(TerminalCodeType.SetTitle, (string)_params[1]));
+                                    }
+                                    break;
+                                case 3:
+                                    // set X property
+                                    break;
+                                case 4:
+                                case 5:
+                                    // change dynamic colors
+                                    break;
+                                case 10:
+                                case 11:
+                                case 12:
+                                case 13:
+                                case 14:
+                                case 15:
+                                case 16:
+                                case 17:
+                                case 18:
+                                case 19:
+                                    // change dynamic ui colors
+                                    break;
+                                case 46:
+                                    // change log file
+                                    break;
+                                case 50:
+                                    // dynamic font
+                                    break;
+                                case 51:
+                                    // emacs shell
+                                    break;
+                                case 52:
+                                    // manipulate selection data
+                                    break;
+                                case 104:
+                                case 105:
+                                case 110:
+                                case 111:
+                                case 112:
+                                case 113:
+                                case 114:
+                                case 115:
+                                case 116:
+                                case 117:
+                                case 118:
+                                    // reset colors
+                                    break;
+                            }
+
+                            _params.Clear();
+                            _currentParam = 0;
+                            _state = ParserState.Normal;
+                        }
+                        else
+                        {
+                            if (_params.Count == 0)
+                            {
+                                if (ch >= '0' && ch <= '9')
+                                {
+                                    _currentParam = ((int)_currentParam * 10) + ch - 48;
+                                }
+                                else if (ch == ';')
+                                {
+                                    _params.Add(_currentParam);
+                                    _currentParam = "";
+                                }
+                            }
+                            else
+                            {
+                                _currentParam = (string)_currentParam + ch;
+                            }
+                        }
+                        break;
+                    case ParserState.CsiParam:
+                        if (!CsiParamStateHandler(ch))
+                        {
+                            FinaliseParam();
+                            _state = ParserState.Csi;
+                            goto case ParserState.Csi;
+                        }
+                        break;
+                    case ParserState.Csi:
+                        if (!CsiStateHandler(ch))
+                        {
+                            //throw new Exception($"Unknown CSI code: {ch}"); // conpty is sending 'X' ?!
+                        }
+                        _state = ParserState.Normal;
+                        _prefix = "";
+                        _postfix = "";
+                        break;
+
+                    case ParserState.Dcs:
+                        if (ch == C0.ESC || ch == C0.BEL)
+                        {
+                            if (ch == C0.ESC)
+                            {
+                                // _position++;
+                            }
+                            switch (_prefix)
+                            {
+                                // User-Defined Keys (DECUDK)
+                                case "":
+                                    break;
+
+                                // Request Status String (DECRQSS).
+                                // test: echo -e '\eP$q"p\e\\'
+                                case "$q":
+                                    {
+                                        string pt = (string)_currentParam;
+                                        bool valid = false;
+                                        switch (pt)
+                                        {
+                                            // DECSCA
+                                            case "\"q":
+                                                pt = "0\"q";
+                                                break;
+
+                                            // DECSCL
+                                            case "\"p":
+                                                pt = "61\"p";
+                                                break;
+
+                                            // DECSTBM
+                                            case "r":
+                                                // pt = ""
+                                                //     + (this._terminal.scrollTop + 1)
+                                                //     + ";"
+                                                //     + (this._terminal.scrollBottom + 1)
+                                                //     + "r";
+                                                break;
+
+                                            // SGR
+                                            case "m":
+                                                pt = "0m";
+                                                break;
+
+                                            default:
+                                                throw new Exception($"Unknown DCS Pt: {pt}.");
+                                                pt = "";
+                                                break;
+                                        }
+
+                                        // this._terminal.send(C0.ESC + 'P' + +valid + '$r' + pt + C0.ESC + '\\');
+                                        break;
+                                    }
+
+                                // Set Termcap/Terminfo Data (xterm, experimental).
+                                case "+p":
+                                    break;
+
+                                // Request Termcap/Terminfo String (xterm, experimental)
+                                // Regular xterm does not even respond to this sequence.
+                                // This can cause a small glitch in vim.
+                                // test: echo -ne '\eP+q6b64\e\\'
+                                case "+q":
+                                    {
+                                        string pt = (string)_currentParam;
+                                        bool valid = false;
+                                        // this._terminal.send(C0.ESC + 'P' + +valid + '+r' + pt + C0.ESC + '\\');
+                                        break;
+                                    }
+                                default:
+                                    throw new Exception($"Unknown DCS prefix: {_prefix}");
+                                    break;
+                            }
+
+                            _currentParam = 0;
+                            _prefix = "";
+                            _state = ParserState.Normal;
+                        }
+                        else if (_currentParam == null)
+                        {
+                            if (_prefix.Length == 0 && ch != '$' && ch != '+')
+                            {
+                                _currentParam = ch;
+                            }
+                            else if (_prefix.Length == 2)
+                            {
+                                _currentParam = ch;
+                            }
+                            else
+                            {
+                                _prefix += ch;
+                            }
+                        }
+                        else
+                        {
+                            _currentParam = (string)_currentParam + ch;
+                        }
+                        break;
+                    case ParserState.Ignore:
+                        // For PM and APC.
+                        if (ch == C0.ESC || ch == C0.BEL)
+                        {
+                            if (ch == C0.ESC)
+                            {
+                                _position++;
+                            }
+                            _state = ParserState.Normal;
+                        }
+                        break;
+                }
+            }
+            FinialiseEmit();
+            return _terminalCodes.ToArray();
+        }
+
+        private bool NormalStateHandler(char c)
+        {
+            switch (c)
+            {
+                case C0.BEL:
+                    Emit(TerminalCodeType.Bell);
+                    return true;
+                case C0.LF:
+                case C0.VT:
+                case C0.FF:
+                    Emit(TerminalCodeType.LineFeed);
+                    return true;
+                case C0.CR:
+                    Emit(TerminalCodeType.CarriageReturn);
+                    return true;
+                case C0.BS:
+                    Emit(TerminalCodeType.Backspace);
+                    return true;
+                case C0.HT:
+                    Emit(TerminalCodeType.Tab);
+                    return true;
+                case C0.SO:
+                    Emit(TerminalCodeType.ShiftOut);
+                    return true;
+                case C0.SI:
+                    Emit(TerminalCodeType.ShiftIn);
+                    return true;
+                case C0.ESC:
+                    _state = ParserState.Escaped;
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        private bool EscapedStateHandler(char ch)
+        {
+            switch (ch)
+            {
+                case '[':
+                    // ESC [ Control Sequence Introducer (CSI  is 0x9b)
+                    _params.Clear();
+                    _currentParam = 0;
+                    _state = ParserState.CsiParam;
+                    return true;
+                case ']':
+                    // ESC ] Operating System Command (OSC is 0x9d)
+                    _params.Clear();
+                    _currentParam = 0;
+                    _state = ParserState.Osc;
+                    return true;
+                case 'P':
+                    // ESC P Device Control String (DCS is 0x90)
+                    _params.Clear();
+                    _currentParam = 0;
+                    _state = ParserState.Dcs;
+                    return true;
+                case '_':
+                    // ESC _ Application Program Command ( APC is 0x9f).
+                    _state = ParserState.Ignore;
+                    return true;
+                case '^':
+                    // ESC ^ Privacy Message ( PM is 0x9e).
+                    _state = ParserState.Ignore;
+                    return true;
+                case 'c':
+                    // ESC c Full Reset (RIS).
+                    Emit(TerminalCodeType.Reset);
+                    return true;
+                case 'E':
+                    // ESC E Next Line ( NEL is 0x85).
+                    // terminal.x = 0;
+                    // termina.index();
+                    _state = ParserState.Normal;
+                    return true;
+                case 'D':
+                    // ESC D Index ( IND is 0x84).
+                    // terminal.index();
+                    _state = ParserState.Normal;
+                    return true;
+                case 'M':
+                    // ESC M Reverse Index ( RI is 0x8d).
+                    // terminal.reverseIndex();
+                    _state = ParserState.Normal;
+                    return true;
+                case '%':
+                    // ESC % Select default/utf-8 character set.
+                    // @ = default, G = utf-8
+                    // terminal.setgLevel(0);
+                    // terminal.setgCharset(0, DEFAULT_CHARSET); // US (default)
+                    _state = ParserState.Normal;
+                    // parser.skipNextChar();
+                    return true;
+                case C0.CAN:
+                    _state = ParserState.Normal;
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        private bool CsiStateHandler(char ch)
+        {
+            switch (ch)
+            {
+                case 'A':
+                    Emit(new TerminalCode(TerminalCodeType.CursorUp, (int)_params[0], 0));
+                    return true;
+                case 'G':
+                    Emit(new TerminalCode(TerminalCodeType.CursorCharAbsolute, 0, (int)_params[0] - 1));
+                    return true;
+                case 'H':
+                    var line = _params.Count > 1 ? (int)_params[1] - 1 : 0; // make conpty happy
+                    Emit(new TerminalCode(TerminalCodeType.CursorPosition, line, (int)_params[0] - 1));
+                    return true;
+                case 'K':
+                    Emit(TerminalCodeType.EraseInLine);
+                    return true;
+                case 'J':
+                    Emit(TerminalCodeType.EraseInDisplay);
+                    return true;
+                case 'h':
+                    Emit(TerminalCodeType.SetMode);
+                    return true;
+                case 'l':
+                    Emit(TerminalCodeType.ResetMode);
+                    return true;
+                case 'n':
+                    return true;
+                case 'm':
+                    Emit(new TerminalCode(TerminalCodeType.CharAttributes, GetCharAttributes()));
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        private bool CsiParamStateHandler(char ch)
+        {
+            switch (ch)
+            {
+                case '?':
+                case '>':
+                case '!':
+                case '$':
+                case '"':
+                case ' ':
+                case '\'':
+                    _prefix = ch.ToString();
+                    return true;
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                case '8':
+                case '9':
+                    _currentParam = (int)_currentParam * 10 + (ch - '0');
+                    return true;
+                case ';':
+                    FinaliseParam();
+                    return true;
+                case C0.CAN:
+                    _state = ParserState.Normal;
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        private void FinaliseParam()
+        {
+            _params.Add(_currentParam);
+            _currentParam = 0;
+        }
+
+        private CharAttributes GetCharAttributes()
+        {
+            var attributes = new CharAttributes();
+            for (int i = 0; i < _params.Count; i++)
+            {
+                int p = (int)_params[i];
+                if (p >= 30 && p <= 37)
+                {
+                    // fg color 8
+                    attributes.ForegroundColor = p - 30;
+                }
+                else if (p >= 40 && p <= 47)
+                {
+                    // bg color 8
+                    attributes.BackgroundColor = p - 40;
+                }
+                else if (p >= 90 && p <= 97)
+                {
+                    // fg color 16
+                    p += 8;
+                    attributes.ForegroundColor = p - 90;
+                }
+                else if (p == 0)
+                {
+                    attributes.Flags = 0;
+                    attributes.ForegroundColor = 0;
+                    attributes.BackgroundColor = 0;
+                }
+                else if (p == 1)
+                {
+                    attributes.Flags |= 1;
+                }
+                else
+                {
+
+                }
+            }
+            return attributes;
+        }
+
+        private void Emit(TerminalCodeType type)
+        {
+            Emit(new TerminalCode(type));
+        }
+
+        private void Emit(char c)
+        {
+            _currentTextEmit.Append(c);
+        }
+
+        private void Emit(TerminalCode code)
+        {
+            FinialiseEmit();
+            _terminalCodes.Add(code);
+        }
+
+        private void FinialiseEmit()
+        {
+            if (_currentTextEmit.Length != 0)
+            {
+                string text = _currentTextEmit.ToString();
+                _currentTextEmit.Clear();
+                _terminalCodes.Add(new TerminalCode(TerminalCodeType.Text, text));
+            }
+        }
+
+        private enum ParserState
+        {
+            Normal,
+            Escaped,
+            CsiParam,
+            Csi,
+            Osc,
+            Charset,
+            Dcs,
+            Ignore
+        }
+    }
+}

FluentTerminal.App/Views/NativeFrontend/Ansi/C0.cs

@@ -0,0 +1,74 @@
+namespace FluentTerminal.App.Views.NativeFrontend.Ansi
+{
+    public class C0
+    {
+        /// <summary>Null (Caret = ^@, C = \0)</summary>
+        public const char NUL = (char)0x00;
+        /// <summary>Start of Heading (Caret = ^A)</summary>
+        public const char SOH = (char)0x01;
+        /// <summary>Start of Text (Caret = ^B)</summary>
+        public const char STX = (char)0x02;
+        /// <summary>End of Text (Caret = ^C)</summary>
+        public const char ETX = (char)0x03;
+        /// <summary>End of Transmission (Caret = ^D)</summary>
+        public const char EOT = (char)0x04;
+        /// <summary>Enquiry (Caret = ^E)</summary>
+        public const char ENQ = (char)0x05;
+        /// <summary>Acknowledge (Caret = ^F)</summary>
+        public const char ACK = (char)0x06;
+        /// <summary>Bell (Caret = ^G, C = \a)</summary>
+        public const char BEL = (char)0x07;
+        /// <summary>Backspace (Caret = ^H, C = \b)</summary>
+        public const char BS = (char)0x08;
+        /// <summary>Character Tabulation, Horizontal Tabulation (Caret = ^I, C = \t)</summary>
+        public const char HT = (char)0x09;
+        /// <summary>Line Feed (Caret = ^J, C = \n)</summary>
+        public const char LF = (char)0x0a;
+        /// <summary>Line Tabulation, Vertical Tabulation (Caret = ^K, C = \v)</summary>
+        public const char VT = (char)0x0b;
+        /// <summary>Form Feed (Caret = ^L, C = \f)</summary>
+        public const char FF = (char)0x0c;
+        /// <summary>Carriage Return (Caret = ^M, C = \r)</summary>
+        public const char CR = (char)0x0d;
+        /// <summary>Shift Out (Caret = ^N)</summary>
+        public const char SO = (char)0x0e;
+        /// <summary>Shift In (Caret = ^O)</summary>
+        public const char SI = (char)0x0f;
+        /// <summary>Data Link Escape (Caret = ^P)</summary>
+        public const char DLE = (char)0x10;
+        /// <summary>Device Control One (XON) (Caret = ^Q)</summary>
+        public const char DC1 = (char)0x11;
+        /// <summary>Device Control Two (Caret = ^R)</summary>
+        public const char DC2 = (char)0x12;
+        /// <summary>Device Control Three (XOFF) (Caret = ^S)</summary>
+        public const char DC3 = (char)0x13;
+        /// <summary>Device Control Four (Caret = ^T)</summary>
+        public const char DC4 = (char)0x14;
+        /// <summary>Negative Acknowledge (Caret = ^U)</summary>
+        public const char NAK = (char)0x15;
+        /// <summary>Synchronous Idle (Caret = ^V)</summary>
+        public const char SYN = (char)0x16;
+        /// <summary>End of Transmission Block (Caret = ^W)</summary>
+        public const char ETB = (char)0x17;
+        /// <summary>Cancel (Caret = ^X)</summary>
+        public const char CAN = (char)0x18;
+        /// <summary>End of Medium (Caret = ^Y)</summary>
+        public const char EM = (char)0x19;
+        /// <summary>Substitute (Caret = ^Z)</summary>
+        public const char SUB = (char)0x1a;
+        /// <summary>Escape (Caret = ^[, C = \e)</summary>
+        public const char ESC = (char)0x1b;
+        /// <summary>File Separator (Caret = ^\)</summary>
+        public const char FS = (char)0x1c;
+        /// <summary>Group Separator (Caret = ^])</summary>
+        public const char GS = (char)0x1d;
+        /// <summary>Record Separator (Caret = ^^)</summary>
+        public const char RS = (char)0x1e;
+        /// <summary>Unit Separator (Caret = ^_)</summary>
+        public const char US = (char)0x1f;
+        /// <summary>Space</summary>
+        public const char SP = (char)0x20;
+        /// <summary>Delete (Caret = ^?)</summary>
+        public const char DEL = (char)0x7f;
+    }
+}

FluentTerminal.App/Views/NativeFrontend/Ansi/CharAttributes.cs

@@ -0,0 +1,36 @@
+using System;
+
+namespace FluentTerminal.App.Views.NativeFrontend.Ansi
+{
+    public struct CharAttributes : IEquatable<CharAttributes>
+    {
+        public int Flags { get; set; }
+        public int BackgroundColor { get; set; }
+        public int ForegroundColor { get; set; }
+
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+
+        public override bool Equals(object obj)
+        {
+            return base.Equals(obj);
+        }
+
+        public bool Equals(CharAttributes other)
+        {
+            return base.Equals(other);
+        }
+
+        public static bool operator ==(CharAttributes a, CharAttributes b)
+        {
+            return a.Equals(b);
+        }
+
+        public static bool operator !=(CharAttributes a, CharAttributes b)
+        {
+            return !a.Equals(b);
+        }
+    }
+}

FluentTerminal.App/Views/NativeFrontend/Ansi/TerminalCode.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Views.NativeFrontend.Ansi
+{
+    internal struct TerminalCode
+    {
+        public TerminalCodeType Type { get; }
+        public int Line { get; }
+        public int Column { get; }
+        public string Text { get; }
+        public CharAttributes CharAttributes { get; }
+
+        public TerminalCode(TerminalCodeType type) : this()
+        {
+            Type = type;
+        }
+
+        public TerminalCode(TerminalCodeType type, string text) : this(type)
+        {
+            Text = text;
+        }
+
+        public TerminalCode(TerminalCodeType type, int line, int column) : this(type)
+        {
+            Line = line;
+            Column = column;
+        }
+
+        public TerminalCode(TerminalCodeType type, CharAttributes charAttributes) : this(type)
+        {
+            CharAttributes = charAttributes;
+        }
+
+        public override string ToString()
+        {
+            if (Type == TerminalCodeType.Text)
+            {
+                return Text;
+            }
+            else
+            {
+                return Type.ToString();
+            }
+        }
+    }
+}

FluentTerminal.App/Views/NativeFrontend/Ansi/TerminalCodeType.cs

@@ -0,0 +1,33 @@
+namespace FluentTerminal.App.Views.NativeFrontend.Ansi
+{
+    public enum TerminalCodeType
+    {
+        Text,
+        Bell,
+        LineFeed,
+        CarriageReturn,
+        Backspace,
+        Tab,
+        ShiftOut,
+        ShiftIn,
+        SaveCursor,
+        Reset,
+        SetTitle,
+        RestoreCursor,
+        TabSet,
+
+        CursorPosition,
+        CursorCharAbsolute,
+        CursorUp,
+        CursorDown,
+        CursorForward,
+        CursorBackward,
+        RestoreCursorPosition,
+        EraseInDisplay,
+        EraseInLine,
+        SetGraphicsMode,
+        SetMode,
+        CharAttributes,
+        ResetMode,
+    }
+}

FluentTerminal.App/Views/NativeFrontend/Terminal/SelectionMode.cs

@@ -0,0 +1,8 @@
+namespace FluentTerminal.App.Views.NativeFrontend.Terminal
+{
+    public enum SelectionMode
+    {
+        Stream,
+        Block
+    }
+}

FluentTerminal.App/Views/NativeFrontend/Terminal/SpecialColorIds.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Views.NativeFrontend.Terminal
+{
+    internal static class SpecialColorIds
+    {
+        public const int Cursor = -1;
+        public const int Selection = -2;
+        public const int Historic = -3;
+        public const int Futuristic = -4;
+    }
+}

FluentTerminal.App/Views/NativeFrontend/Terminal/TerminalBuffer.cs

@@ -0,0 +1,477 @@
+using FluentTerminal.App.Views.NativeFrontend.Ansi;
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Views.NativeFrontend.Terminal
+{
+    internal class TerminalBuffer
+    {
+        private const int MaxHistorySize = 1024;
+
+        private TerminalBufferChar[] _buffer;
+        private TerminalSize _size;
+        private readonly List<TerminalBufferLine> _history = new List<TerminalBufferLine>();
+
+        public bool ShowCursor { get; set; }
+        public int CursorX { get; set; }
+        public int CursorY { get; set; }
+        public CharAttributes CurrentCharAttributes { get; set; }
+        public TerminalSelection Selection { get; set; }
+
+        public int WindowTop { get; set; }
+        public int WindowBottom
+        {
+            get => WindowTop + _size.Rows - 1;
+            set
+            {
+                WindowTop = value - _size.Rows + 1;
+            }
+        }
+
+        public TerminalBuffer(TerminalSize size)
+        {
+            Initialise(size);
+        }
+
+        private void Initialise(TerminalSize size)
+        {
+            _buffer = new TerminalBufferChar[size.Rows * size.Columns];
+            _size = size;
+            CursorX = 0;
+            CursorY = 0;
+            Clear();
+        }
+
+        public TerminalSize Size
+        {
+            get => _size;
+            set
+            {
+                if (value != _size)
+                {
+                    var srcSize = _size;
+                    var dstSize = value;
+
+                    var srcBuffer = _buffer;
+                    var dstBuffer = new TerminalBufferChar[dstSize.Rows * dstSize.Columns];
+
+                    int srcLeft = 0;
+                    int srcRight = Math.Min(srcSize.Columns, dstSize.Columns) - 1;
+                    int srcTop = Math.Max(0, CursorY - dstSize.Rows + 1);
+                    int srcBottom = srcTop + Math.Min(srcSize.Rows, dstSize.Rows) - 1;
+                    int dstLeft = 0;
+                    int dstTop = 0;
+
+                    CopyBufferToBuffer(srcBuffer, srcSize, srcLeft, srcTop, srcRight, srcBottom,
+                                       dstBuffer, dstSize, dstLeft, dstTop);
+
+                    _buffer = dstBuffer;
+                    _size = dstSize;
+
+                    CursorY = Math.Min(CursorY, _size.Rows - 1);
+                }
+            }
+        }
+
+        public void Clear()
+        {
+            ClearBlock(0, 0, _size.Columns - 1, _size.Rows - 1);
+        }
+
+        public void ClearBlock(int left, int top, int right, int bottom)
+        {
+            left = Math.Max(0, left);
+            top = Math.Max(0, top);
+            right = Math.Min(right, _size.Columns - 1);
+            bottom = Math.Min(bottom, _size.Rows - 1);
+
+            for (int y = top; y <= bottom; y++)
+            {
+                for (int x = left; x <= right; x++)
+                {
+                    int index = GetBufferIndex(x, y);
+                    _buffer[index] = new TerminalBufferChar(' ', default(CharAttributes));
+                }
+            }
+            ScrollToCursor();
+        }
+
+        public void Type(char c)
+        {
+            if (IsInBuffer(CursorX, CursorY))
+            {
+                int index = GetBufferIndex(CursorX, CursorY);
+                _buffer[index] = new TerminalBufferChar(c, CurrentCharAttributes);
+                CursorX++;
+            }
+            ScrollToCursor();
+        }
+
+        internal void Type(string text)
+        {
+            foreach (char c in text)
+            {
+                if (IsInBuffer(CursorX, CursorY))
+                {
+                    int index = GetBufferIndex(CursorX, CursorY);
+                    _buffer[index] = new TerminalBufferChar(c, CurrentCharAttributes);
+                    CursorX++;
+                }
+            }
+            ScrollToCursor();
+        }
+
+        public void ShiftUp()
+        {
+            var topLine = GetBufferLine(0);
+            AddHistory(topLine);
+
+            for (int y = 0; y < _size.Rows - 1; y++)
+            {
+                Array.Copy(_buffer, (y + 1) * _size.Columns, _buffer, y * _size.Columns, _size.Columns);
+            }
+        }
+
+        public string GetText(int y)
+        {
+            return GetText(0, y, _size.Columns);
+        }
+
+        public string[] GetText(int left, int top, int right, int bottom)
+        {
+            int width = right - left + 1;
+            int height = bottom - top + 1;
+            string[] result = new string[height];
+            for (int i = 0; i < height; i++)
+            {
+                result[i] = GetText(left, top + i, width);
+            }
+            return result;
+        }
+
+        public string GetText(int x, int y, int length)
+        {
+            if (x + length > _size.Columns)
+            {
+                throw new ArgumentException("Range overflows line length.", nameof(length));
+            }
+
+            (var buffer, int startIndex, int endIndex) = GetLineBufferRange(y);
+            if (buffer == null)
+            {
+                return string.Empty;
+            }
+
+            int maxLength = endIndex - startIndex;
+            string line = GetTextAtIndex(buffer, startIndex + x, Math.Min(length, maxLength));
+            return line;
+        }
+
+        private static string GetTextAtIndex(IList<TerminalBufferChar> buffer, int index, int length)
+        {
+            var chars = new char[length];
+            for (int i = 0; i < length; i++)
+            {
+                chars[i] = buffer[index + i].Char;
+            }
+            string line = new string(chars);
+            return line;
+        }
+
+        public string[] GetSelectionText()
+        {
+            var selection = Selection;
+            if (selection.Mode == SelectionMode.Stream)
+            {
+                (var start, var end) = selection.GetMinMax();
+                var result = new List<string>();
+                for (int y = start.Row; y <= end.Row; y++)
+                {
+                    int x0 = 0;
+                    int x1 = _size.Columns - 1;
+                    if (y == start.Row)
+                    {
+                        x0 = start.Column;
+                    }
+                    if (y == end.Row)
+                    {
+                        x1 = end.Column;
+                    }
+                    result.Add(GetText(x0, y, x1 - x0 + 1));
+                }
+                return result.ToArray();
+            }
+            else if (selection.Mode == SelectionMode.Block)
+            {
+                int left = Math.Min(selection.Start.Column, selection.End.Column);
+                int right = Math.Max(selection.Start.Column, selection.End.Column);
+                int top = Math.Min(selection.Start.Row, selection.End.Row);
+                int bottom = Math.Max(selection.Start.Row, selection.End.Row);
+                return GetText(left, top, right, bottom);
+            }
+            else
+            {
+                throw new InvalidOperationException("Unknown selection mode.");
+            }
+        }
+
+        public void CopySelection()
+        {
+            //string[] selectionText = GetSelectionText()
+            //    .Select(x => x.TrimEnd())
+            //    .ToArray();
+            //string text = String.Join(Environment.NewLine, selectionText);
+            //var dataObject = new DataObject();
+            //dataObject.SetText(text);
+            //dataObject.SetData("MSDEVColumnSelect", true);
+            //Clipboard.SetDataObject(dataObject, copy: true);
+        }
+
+        private TerminalBufferLine GetBufferLine(int y)
+        {
+            int startIndex = GetBufferIndex(0, y);
+            var bufferLine = new TerminalBufferLine(_buffer, startIndex, _size.Columns);
+            return bufferLine;
+        }
+
+        public TerminalTagArray GetFormattedLine(int y)
+        {
+            var tags = ImmutableArray.CreateBuilder<TerminalTag>(initialCapacity: _size.Columns);
+
+            (var buffer, int startIndex, int endIndex) = GetLineBufferRange(y);
+            if (buffer == null)
+            {
+                AddFillerTags(tags, 0, y, _size.Columns);
+                return new TerminalTagArray(tags.ToImmutable());
+            }
+
+            // Group sequentially by attribute
+            int lineLength = endIndex - startIndex;
+            var currentTagStartIndex = startIndex;
+            var currentTagAttribute = GetAttributesAt(buffer[startIndex], 0, y);
+            for (int i = startIndex + 1; i < endIndex; i++)
+            {
+                int x = i - startIndex;
+                var c = buffer[i];
+                var attr = GetAttributesAt(c, x, y);
+                if (!CanContinueTag(currentTagAttribute, attr, c.Char))
+                {
+                    string tagText = GetTextAtIndex(buffer, currentTagStartIndex, i - currentTagStartIndex);
+                    tags.Add(new TerminalTag(tagText, currentTagAttribute));
+
+                    currentTagStartIndex = i;
+                    currentTagAttribute = attr;
+                }
+            }
+
+            // Last tag
+            {
+                string tagText = GetTextAtIndex(buffer, currentTagStartIndex, endIndex - currentTagStartIndex);
+                tags.Add(new TerminalTag(tagText, currentTagAttribute));
+            }
+
+            // Filler tags
+            if (lineLength < _size.Columns)
+            {
+                AddFillerTags(tags, lineLength, y, _size.Columns - lineLength);
+            }
+
+            return new TerminalTagArray(tags.ToImmutable());
+        }
+
+        private void AddFillerTags(ImmutableArray<TerminalTag>.Builder builder, int x, int y, int length)
+        {
+            int tagLength = 0;
+            var lastAttr = GetAttributesAt(default(TerminalBufferChar), x, y);
+            for (int i = 0; i < length; i++)
+            {
+                tagLength++;
+                var attr = GetAttributesAt(default(TerminalBufferChar), x + i, y);
+                if (attr != lastAttr)
+                {
+                    string text = new string(' ', tagLength);
+                    builder.Add(new TerminalTag(text, lastAttr));
+                    lastAttr = attr;
+                    tagLength = 0;
+                }
+            }
+
+            // Last tag
+            {
+                string text = new string(' ', tagLength);
+                builder.Add(new TerminalTag(text, lastAttr));
+            }
+        }
+
+        private CharAttributes GetAttributesAt(TerminalBufferChar bufferChar, int x, int y)
+        {
+            CharAttributes attr = bufferChar.Attributes;
+            if (ShowCursor && x == CursorX && y == CursorY)
+            {
+                attr.BackgroundColor = SpecialColorIds.Cursor;
+            }
+            else if (IsPointInSelection(x, y))
+            {
+                attr.BackgroundColor = SpecialColorIds.Selection;
+            }
+            else if (y < 0)
+            {
+                attr.BackgroundColor = SpecialColorIds.Historic;
+            }
+            else if (y >= _size.Rows)
+            {
+                attr.BackgroundColor = SpecialColorIds.Futuristic;
+            }
+            return attr;
+        }
+
+        private (IList<TerminalBufferChar> buffer, int startIndex, int endIndex) GetLineBufferRange(int y)
+        {
+            if (y < 0)
+            {
+                int historyIndex = _history.Count + y;
+                if (historyIndex < 0)
+                {
+                    return (null, 0, 0);
+                }
+                var historyLine = _history[historyIndex];
+                var buffer = historyLine.Buffer;
+                return (buffer, 0, Math.Min(buffer.Length, _size.Columns));
+            }
+            else
+            {
+                if (y >= _size.Rows)
+                {
+                    return (null, 0, 0);
+                }
+                int startIndex = GetBufferIndex(0, y);
+                return (_buffer, startIndex, startIndex + _size.Columns);
+            }
+        }
+
+        private bool IsPointInSelection(int x, int y)
+        {
+            var selection = Selection;
+            if (selection == null)
+            {
+                return false;
+            }
+            else if (selection.Mode == SelectionMode.Stream)
+            {
+                (var start, var end) = selection.GetMinMax();
+                if (y == start.Row)
+                {
+                    if (x < start.Column)
+                    {
+                        return false;
+                    }
+                }
+                if (y == end.Row)
+                {
+                    if (x > end.Column)
+                    {
+                        return false;
+                    }
+                }
+                if (y < start.Row || y > end.Row)
+                {
+                    return false;
+                }
+                return true;
+            }
+            else if (selection.Mode == SelectionMode.Block)
+            {
+                int left = Math.Min(selection.Start.Column, selection.End.Column);
+                int right = Math.Max(selection.Start.Column, selection.End.Column);
+                int top = Math.Min(selection.Start.Row, selection.End.Row);
+                int bottom = Math.Max(selection.Start.Row, selection.End.Row);
+                return (x >= left && x <= right &&
+                        y >= top && y <= bottom);
+            }
+            else
+            {
+                throw new InvalidOperationException("Unknown selection mode.");
+            }
+        }
+
+        private static bool CanContinueTag(CharAttributes previous, CharAttributes next, char nextC)
+        {
+            if (nextC == ' ')
+            {
+                return previous.BackgroundColor == next.BackgroundColor;
+            }
+            else
+            {
+                return previous == next;
+            }
+        }
+
+        public bool IsInBuffer(int x, int y)
+        {
+            return (x >= 0 && x < _size.Columns && y >= 0 && y < _size.Rows);
+        }
+
+        private int GetBufferIndex(int x, int y)
+        {
+            return x + (y * _size.Columns);
+        }
+
+        private TerminalPoint GetBufferPoint(int index)
+        {
+            return new TerminalPoint(index % _size.Columns, index % _size.Columns);
+        }
+
+        private void AddHistory(TerminalBufferLine line)
+        {
+            if (_history.Count >= MaxHistorySize)
+            {
+                _history.RemoveAt(0);
+            }
+            _history.Add(line);
+        }
+
+        public int CurrentHistoryLength => _history.Count;
+
+        public void Scroll(int scroll)
+        {
+            int top = WindowTop + scroll;
+            top = Math.Max(top, -_history.Count);
+            // top = Math.Min(top, _size.Rows - 1);
+            top = Math.Min(top, CursorY);
+            WindowTop = top;
+        }
+
+        public void ScrollToCursor()
+        {
+            int windowTop = WindowTop;
+            int windowBottom = WindowBottom;
+            if (CursorY < windowTop)
+            {
+                WindowTop = CursorY;
+            }
+            else if (CursorY > windowBottom)
+            {
+                WindowBottom = CursorY;
+            }
+        }
+
+        private static void CopyBufferToBuffer(TerminalBufferChar[] srcBuffer, TerminalSize srcSize, int srcLeft, int srcTop, int srcRight, int srcBottom,
+                                               TerminalBufferChar[] dstBuffer, TerminalSize dstSize, int dstLeft, int dstTop)
+        {
+            int cols = srcRight - srcLeft + 1;
+            int rows = srcBottom - srcTop + 1;
+            for (int y = 0; y < rows; y++)
+            {
+                int srcY = srcTop + y;
+                int dstY = dstTop + y;
+                int srcIndex = srcLeft + (srcY * srcSize.Columns);
+                int dstIndex = dstLeft + (dstY * dstSize.Columns);
+                Array.Copy(srcBuffer, srcIndex, dstBuffer, dstIndex, cols);
+            }
+        }
+    }
+}

FluentTerminal.App/Views/NativeFrontend/Terminal/TerminalBufferChar.cs

@@ -0,0 +1,26 @@
+using FluentTerminal.App.Views.NativeFrontend.Ansi;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Views.NativeFrontend.Terminal
+{
+    public struct TerminalBufferChar
+    {
+        public char Char { get; }
+        public CharAttributes Attributes { get; }
+
+        public TerminalBufferChar(char c, CharAttributes attr)
+        {
+            Char = c;
+            Attributes = attr;
+        }
+
+        public override string ToString()
+        {
+            return Char.ToString();
+        }
+    }
+}

FluentTerminal.App/Views/NativeFrontend/Terminal/TerminalBufferLine.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Views.NativeFrontend.Terminal
+{
+    /// <summary>
+    /// Represents a single immutable line from a terminal buffer.
+    /// </summary>
+    internal class TerminalBufferLine
+    {
+        public int Columns { get; }
+        public ImmutableArray<TerminalBufferChar> Buffer { get; }
+
+        public TerminalBufferLine(TerminalBufferChar[] buffer, int index, int length)
+        {
+            Buffer = buffer.Skip(index).Take(length).ToImmutableArray();
+            Columns = length;
+        }
+
+        public override string ToString()
+        {
+            return new string(Buffer.Select(x => x.Char).ToArray());
+        }
+    }
+}

FluentTerminal.App/Views/NativeFrontend/Terminal/TerminalPoint.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Views.NativeFrontend.Terminal
+{
+    [DebuggerDisplay("{Column}, {Row}")]
+    public struct TerminalPoint : IEquatable<TerminalPoint>, IComparable<TerminalPoint>
+    {
+        public int Column { get; set; }
+        public int Row { get; set; }
+
+        public TerminalPoint(int col, int row)
+        {
+            Column = col;
+            Row = row;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return base.Equals(obj);
+        }
+
+        public bool Equals(TerminalPoint other)
+        {
+            return Column == other.Column &&
+                   Row == other.Row;
+        }
+
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+
+        public int CompareTo(TerminalPoint other)
+        {
+            if (Row < other.Row) return -1;
+            if (Row > other.Row) return 1;
+            if (Column < other.Column) return -1;
+            if (Column > other.Column) return 1;
+            return 0;
+        }
+
+        public static bool operator ==(TerminalPoint a, TerminalPoint b)
+        {
+            return a.Equals(b);
+        }
+
+        public static bool operator !=(TerminalPoint a, TerminalPoint b)
+        {
+            return !a.Equals(b);
+        }
+
+        public static bool operator >(TerminalPoint a, TerminalPoint b)
+        {
+            return a.CompareTo(b) == 1;
+        }
+
+        public static bool operator <(TerminalPoint a, TerminalPoint b)
+        {
+            return a.CompareTo(b) == -1;
+        }
+
+        public static bool operator >=(TerminalPoint a, TerminalPoint b)
+        {
+            return a.CompareTo(b) >= 0;
+        }
+
+        public static bool operator <=(TerminalPoint a, TerminalPoint b)
+        {
+            return a.CompareTo(b) <= 0;
+        }
+    }
+}

FluentTerminal.App/Views/NativeFrontend/Terminal/TerminalSelection.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Views.NativeFrontend.Terminal
+{
+    internal class TerminalSelection
+    {
+        public SelectionMode Mode { get; }
+        public TerminalPoint Start { get; }
+        public TerminalPoint End { get; }
+        public bool IsReversed { get; }
+
+        public TerminalSelection(SelectionMode mode, TerminalPoint start, TerminalPoint end)
+        {
+            Mode = mode;
+            Start = start;
+            End = end;
+            IsReversed = start > end;
+        }
+
+        public (TerminalPoint, TerminalPoint) GetMinMax()
+        {
+            return IsReversed ? (End, Start) : (Start, End);
+        }
+    }
+}

FluentTerminal.App/Views/NativeFrontend/Terminal/TerminalSize.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Views.NativeFrontend.Terminal
+{
+    public struct TerminalSize : IEquatable<TerminalSize>
+    {
+        public int Columns { get; }
+        public int Rows { get; }
+
+        public TerminalSize(int columns, int rows)
+        {
+            Columns = columns;
+            Rows = rows;
+        }
+
+        public bool Equals(TerminalSize other)
+        {
+            return base.Equals(other);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return base.Equals(obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+
+        public override string ToString()
+        {
+            return $"{Columns} x {Rows}";
+        }
+
+        public static bool operator ==(TerminalSize a, TerminalSize b)
+        {
+            return a.Equals(b);
+        }
+
+        public static bool operator !=(TerminalSize a, TerminalSize b)
+        {
+            return !a.Equals(b);
+        }
+    }
+}

FluentTerminal.App/Views/NativeFrontend/Terminal/TerminalTag.cs

@@ -0,0 +1,62 @@
+using FluentTerminal.App.Views.NativeFrontend.Ansi;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Views.NativeFrontend.Terminal
+{
+    public struct TerminalTag : IEquatable<TerminalTag>
+    {
+        public string Text { get; }
+        public CharAttributes Attributes { get; }
+
+        public TerminalTag(string text, CharAttributes attributes)
+        {
+            Text = text;
+            Attributes = attributes;
+        }
+
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals((TerminalTag)obj);
+        }
+
+        public bool Equals(TerminalTag other)
+        {
+            return Text == other.Text &&
+                   Attributes == other.Attributes;
+        }
+
+        public TerminalTag Substring(int index)
+        {
+            return new TerminalTag(Text.Substring(index), Attributes);
+        }
+
+        public TerminalTag Substring(int index, int length)
+        {
+            return new TerminalTag(Text.Substring(index, length), Attributes);
+        }
+
+        public override string ToString()
+        {
+            return Text;
+        }
+
+        public static bool operator ==(TerminalTag a, TerminalTag b)
+        {
+            return a.Equals(b);
+        }
+
+        public static bool operator !=(TerminalTag a, TerminalTag b)
+        {
+            return !a.Equals(b);
+        }
+    }
+}

FluentTerminal.App/Views/NativeFrontend/Terminal/TerminalTagArray.cs

@@ -0,0 +1,106 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Views.NativeFrontend.Terminal
+{
+    public struct TerminalTagArray : IEquatable<TerminalTagArray>, IEnumerable<TerminalTag>
+    {
+        private readonly ImmutableArray<TerminalTag> _tags;
+        private readonly int _hash;
+
+        public int Length => _tags.IsDefaultOrEmpty ? 0 : _tags.Length;
+
+        public TerminalTagArray(ImmutableArray<TerminalTag> tags)
+        {
+            _tags = tags;
+            _hash = GetHashCode(tags);
+        }
+
+        private static int GetHashCode(ImmutableArray<TerminalTag> tags)
+        {
+            unchecked
+            {
+                int hash = 17;
+                for (int i = 0; i < tags.Length; i++)
+                {
+                    hash = hash * 23 + tags[i].GetHashCode();
+                }
+                return hash;
+            }
+        }
+
+        public override int GetHashCode()
+        {
+            return _hash;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals((ImmutableArray<TerminalTag>)obj);
+        }
+
+        public bool Equals(TerminalTagArray other)
+        {
+            if (_hash != other._hash)
+            {
+                return false;
+            }
+
+            var tagsA = _tags;
+            var tagsB = other._tags;
+            if (tagsA != tagsB)
+            {
+                if (tagsA.IsDefaultOrEmpty || tagsB.IsDefaultOrEmpty)
+                {
+                    return false;
+                }
+                if (tagsA.Length != tagsB.Length)
+                {
+                    return false;
+                }
+                for (int i = 0; i < tagsA.Length; i++)
+                {
+                    if (tagsA[i] != tagsB[i])
+                    {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
+        public override string ToString()
+        {
+            return base.ToString();
+        }
+
+        public IEnumerator<TerminalTag> GetEnumerator()
+        {
+            if (_tags.IsDefaultOrEmpty)
+            {
+                return Enumerable.Empty<TerminalTag>().GetEnumerator();
+            }
+            return ((IEnumerable<TerminalTag>)_tags).GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public static bool operator ==(TerminalTagArray a, TerminalTagArray b)
+        {
+            return a.Equals(b);
+        }
+
+        public static bool operator !=(TerminalTagArray a, TerminalTagArray b)
+        {
+            return !a.Equals(b);
+        }
+    }
+}

FluentTerminal.App/Views/NativeFrontend/TerminalColorHelper.cs

@@ -0,0 +1,87 @@
+using FluentTerminal.App.Utilities;
+using FluentTerminal.App.Views.NativeFrontend.Terminal;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.UI;
+using Windows.UI.Xaml.Media;
+
+namespace FluentTerminal.App.Views.NativeFrontend
+{
+    internal class TerminalColorHelper
+    {
+        private readonly Dictionary<int, Brush> _brushDictionary = new Dictionary<int, Brush>();
+        private readonly Brush _defaultForegroundBrush = new SolidColorBrush(Color.FromArgb(255, 204, 204, 204));
+
+        public Brush GetForegroundBrush(int id)
+        {
+            Brush brush = GetBrush(id);
+            if (brush == null)
+            {
+                brush = _defaultForegroundBrush;
+            }
+            return brush;
+        }
+
+        public Brush GetBackgroundBrush(int id)
+        {
+            return GetBrush(id);
+        }
+
+        public Brush GetBrush(int id)
+        {
+            Brush result = null;
+            if (id != 0)
+            {
+                if (!_brushDictionary.TryGetValue(id, out result))
+                {
+                    result = new SolidColorBrush(GetColour(id));
+                    _brushDictionary.Add(id, result);
+                }
+            }
+            return result;
+        }
+
+        public Color GetColour(int id)
+        {
+            switch (id)
+            {
+                case SpecialColorIds.Cursor:
+                    return Color.FromArgb(255, 204, 204, 204);
+                case SpecialColorIds.Selection:
+                    return Color.FromArgb(255, 203, 203, 203);
+                case SpecialColorIds.Historic:
+                case SpecialColorIds.Futuristic:
+                    return Color.FromArgb(255, 24, 24, 24);
+                default:
+                    return TangoColours[id % 16].FromString();
+            }
+        }
+
+        // Colors 0-15
+        private readonly static string[] TangoColours =
+        {
+            // dark:
+            "#2e3436",
+            "#cc0000",
+            "#0dbc79",
+            "#c4a000",
+            "#3465a4",
+            "#75507b",
+            "#06989a",
+            "#d3d7cf",
+
+            // bright:
+            "#555753",
+            "#ef2929",
+            "#23D18B",
+            "#fce94f",
+            "#729fcf",
+            "#ad7fa8",
+            "#34e2e2",
+            "#eeeeec"
+        };
+    }
+}

FluentTerminal.App/Views/NativeFrontend/TerminalControl.xaml

@@ -0,0 +1,16 @@
+<UserControl
+    x:Class="FluentTerminal.App.Views.NativeFrontend.TerminalControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:FluentTerminal.App.Views.NativeFrontend"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:xaml="using:Microsoft.Graphics.Canvas.UI.Xaml"
+    d:DesignHeight="300"
+    d:DesignWidth="400"
+    mc:Ignorable="d">
+
+    <ScrollViewer x:Name="scroll" VerticalScrollBarVisibility="Auto">
+        <xaml:CanvasVirtualControl x:Name="canvas" IsTabStop="True" RegionsInvalidated="OnRegionsInvalidated"/>
+    </ScrollViewer>
+</UserControl>

FluentTerminal.App/Views/NativeFrontend/TerminalControl.xaml.cs

@@ -0,0 +1,476 @@
+using FluentTerminal.App.Services;
+using FluentTerminal.App.ViewModels;
+using FluentTerminal.App.Views.NativeFrontend.Ansi;
+using FluentTerminal.App.Views.NativeFrontend.Terminal;
+using FluentTerminal.App.Views.NativeFrontend.Utility;
+using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
+using Microsoft.Graphics.Canvas;
+using Microsoft.Graphics.Canvas.Text;
+using Microsoft.Graphics.Canvas.UI.Xaml;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.Foundation;
+using Windows.System;
+using Windows.UI;
+using Windows.UI.Core;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Input;
+
+namespace FluentTerminal.App.Views.NativeFrontend
+{
+    public sealed partial class TerminalControl : UserControl, ITerminalView
+    {
+        private TerminalBuffer _buffer;
+        private double _characterHeight;
+        private double _characterWidth;
+        private TerminalColorHelper _colorHelper = new TerminalColorHelper();
+        private readonly TerminalOptions _terminalOptions;
+        private int _cols;
+        private CanvasTextFormat _format;
+        private Ansi.AnsiParser _parser;
+        private int _rows;
+        private int _gridSize = 150;
+        private CoreDispatcher _dispatcher;
+
+        public TerminalControl(ISettingsService settingsService)
+        {
+            InitializeComponent();
+            canvas.KeyUp += _canvas_KeyUp;
+            canvas.GotFocus += _canvas_GotFocus;
+            canvas.CharacterReceived += Canvas_CharacterReceived;
+
+            _terminalOptions = settingsService.GetTerminalOptions();
+            _dispatcher = Window.Current.CoreWindow.Dispatcher;
+        }
+
+        int regionsInvalidatedEventCount = 0;
+        int regionsInvalidatedCount = 0;
+
+        private void OnRegionsInvalidated(CanvasVirtualControl sender, CanvasRegionsInvalidatedEventArgs args)
+        {
+            ++regionsInvalidatedEventCount;
+
+            var invalidatedRegions = args.InvalidatedRegions;
+            regionsInvalidatedCount += invalidatedRegions.Count();
+
+            foreach (var region in invalidatedRegions)
+            {
+                DrawRegion(sender, region);
+            }
+        }
+
+        private void DrawRegion(CanvasVirtualControl sender, Rect region)
+        {
+            var top = (int)(region.Top / _characterHeight);
+            var bottom = top + (int)(region.Height / _characterHeight);
+
+            using (var ds = sender.CreateDrawingSession(region))
+            {
+                var y = 0.0;
+                for (int i = top; i < bottom; i++)
+                {
+                    var x = 0.0;
+                    var line = _buffer.GetFormattedLine(i);
+                    foreach (var item in line)
+                    {
+                        if (item.Attributes.BackgroundColor != 0)
+                        {
+                            ds.FillRectangle(new Windows.Foundation.Rect { Height = _characterHeight, Width = _characterWidth * item.Text.Length, X = x, Y = y }, _colorHelper.GetColour(item.Attributes.BackgroundColor));
+                        }
+
+                        var foreground = Colors.White;
+                        if (item.Attributes.ForegroundColor != 0)
+                        {
+                            foreground = _colorHelper.GetColour(item.Attributes.ForegroundColor);
+                        }
+                        var pos = new System.Numerics.Vector2 { X = (float)x, Y = (float)y };
+                
+                        ds.DrawText(item.Text, pos, foreground, _format);
+                        x += item.Text.Length * _characterWidth;
+                    }
+                    y += _characterHeight;
+                }
+            }
+        }
+
+        public void Measure()
+        {
+            var device = CanvasDevice.GetSharedDevice();
+            using (CanvasRenderTarget offscreen = new CanvasRenderTarget(device, (float)256, (float)256, canvas.Dpi))
+            {
+                using (CanvasDrawingSession ds = offscreen.CreateDrawingSession())
+                {
+                    _format = new CanvasTextFormat
+                    {
+                        FontSize = _terminalOptions.FontSize,
+                        FontFamily = _terminalOptions.FontFamily,
+                        FontWeight = _terminalOptions.FontWeight
+                    };
+
+                    var textLayout = new CanvasTextLayout(ds, "\u2560", _format, 0.0f, 0.0f);
+                    _characterWidth = textLayout.DrawBounds.Right;
+                    _characterHeight = textLayout.DrawBounds.Bottom;
+
+                    _cols = (int)Math.Floor(Window.Current.CoreWindow.Bounds.Width / _characterWidth);
+                    _rows = (int)Math.Floor((Window.Current.CoreWindow.Bounds.Height - 32) / _characterHeight);
+                }
+            }
+        }
+
+
+        private void UserControl_Unloaded(object sender, RoutedEventArgs args)
+        {
+            // Explicitly remove references to allow the Win2D controls to get garbage collected
+            canvas.RemoveFromVisualTree();
+            canvas = null;
+        }
+
+        public TerminalViewModel ViewModel { get; private set; }
+
+        public Task ChangeKeyBindings()
+        {
+            //throw new NotImplementedException();
+            return Task.CompletedTask;
+        }
+
+        public Task ChangeOptions(TerminalOptions options)
+        {
+            //throw new NotImplementedException();
+            return Task.CompletedTask;
+        }
+
+        public Task ChangeTheme(TerminalTheme theme)
+        {
+            //throw new NotImplementedException();
+            return Task.CompletedTask;
+        }
+
+        public Task FindNext(string searchText)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task FindPrevious(string searchText)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task FocusTerminal()
+        {
+            canvas.Focus(FocusState.Programmatic);
+            return Task.CompletedTask;
+        }
+
+        public async Task Initialize(TerminalViewModel viewModel)
+        {
+            Measure();
+            ViewModel = viewModel;
+            ViewModel.Terminal.OutputReceived += Terminal_OutputReceived;
+            //ViewModel.Terminal.RegisterSelectedTextCallback(() => ExecuteScriptAsync("term.getSelection()"));
+            //ViewModel.Terminal.Closed += Terminal_Closed;
+
+            var options = ViewModel.SettingsService.GetTerminalOptions();
+            var keyBindings = ViewModel.SettingsService.GetCommandKeyBindings();
+            var profiles = ViewModel.SettingsService.GetShellProfiles();
+            var settings = ViewModel.SettingsService.GetApplicationSettings();
+            var theme = ViewModel.TerminalTheme;
+            var sessionType = SessionType.Unknown;
+            if (settings.AlwaysUseWinPty || !ViewModel.ApplicationView.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 7))
+            {
+                sessionType = SessionType.WinPty;
+            }
+            else
+            {
+                sessionType = SessionType.ConPty;
+            }
+            var size = new Models.TerminalSize { Rows = _rows, Columns = _cols };
+            _buffer = new TerminalBuffer(new Terminal.TerminalSize(size.Columns, size.Rows));
+            _parser = new Ansi.AnsiParser();
+            var response = await ViewModel.Terminal.StartShellProcess(ViewModel.ShellProfile, size, sessionType).ConfigureAwait(true);
+            if (!response.Success)
+            {
+                await ViewModel.DialogService.ShowMessageDialogAsnyc("Error", response.Error, DialogButton.OK).ConfigureAwait(true);
+                ViewModel.Terminal.ReportLauchFailed();
+                return;
+            }
+
+            canvas.Focus(FocusState.Keyboard);
+        }
+
+        private void _canvas_GotFocus(object sender, RoutedEventArgs e)
+        {
+            Debug.WriteLine("focus");
+        }
+
+        private void _canvas_KeyUp(object sender, KeyRoutedEventArgs e)
+        {
+            var controlPressed = (Window.Current.CoreWindow.GetKeyState(Windows.System.VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down));
+            var shiftPressed = (Window.Current.CoreWindow.GetKeyState(Windows.System.VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down));
+            var windowsPressed = (Window.Current.CoreWindow.GetKeyState(Windows.System.VirtualKey.LeftWindows).HasFlag(CoreVirtualKeyStates.Down));
+            var altPressed = (Window.Current.CoreWindow.GetKeyState(Windows.System.VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down));
+
+            int modCode = 0;
+            if (shiftPressed) modCode |= 1;
+            if (altPressed) modCode |= 2;
+            if (controlPressed) modCode |= 4;
+            if (windowsPressed) modCode |= 8;
+
+            //if (IsSelecting && !modifiers.HasFlag(ModifierKeys.Alt))
+            //{
+            //    ClearSelection();
+            //    if (e.Key == Key.Escape)
+            //    {
+            //        return;
+            //    }
+            //}
+
+            string text = string.Empty;
+            switch (e.Key)
+            {
+                case VirtualKey.Escape:
+                    text = $"{C0.ESC}{C0.ESC}{C0.ESC}";
+                    break;
+
+                case VirtualKey.Back:
+                    text = shiftPressed ?
+                        C0.BS.ToString() :
+                        C0.DEL.ToString();
+                    break;
+
+                case VirtualKey.Delete:
+                    text = (modCode == 0) ?
+                        $"{C0.ESC}[3~" :
+                        $"{C0.ESC}[3;{modCode + 1}~";
+                    break;
+
+                case VirtualKey.Tab:
+                    text = shiftPressed ?
+                        $"{C0.ESC}[Z" :
+                        C0.HT.ToString();
+                    break;
+
+                case VirtualKey.Up:
+                    text = Construct(1, 'A');
+                    break;
+
+                case VirtualKey.Down:
+                    text = Construct(1, 'B');
+                    break;
+
+                case VirtualKey.Right:
+                    text = Construct(1, 'C');
+                    break;
+
+                case VirtualKey.Left:
+                    text = Construct(1, 'D');
+                    break;
+
+                case VirtualKey.Home:
+                    text = Construct(1, 'H');
+                    break;
+
+                case VirtualKey.End:
+                    text = Construct(1, 'F');
+                    break;
+
+                case VirtualKey.PageUp:
+                    text = $"{C0.ESC}[5~";
+                    break;
+
+                case VirtualKey.PageDown:
+                    text = $"{C0.ESC}[6~";
+                    break;
+
+                case VirtualKey.Enter:
+                    text = C0.CR.ToString();
+                    break;
+
+                case VirtualKey.Space:
+                    text = " ";
+                    break;
+
+                case VirtualKey.F1:
+                    text = Construct(1, 'P');
+                    break;
+
+                case VirtualKey.F2:
+                    text = Construct(1, 'Q');
+                    break;
+
+                case VirtualKey.F3:
+                    text = Construct(1, 'R');
+                    break;
+
+                case VirtualKey.F4:
+                    text = Construct(1, 'S');
+                    break;
+
+                case VirtualKey.F5:
+                    text = (modCode == 0) ?
+                        $"{C0.ESC}[15~" :
+                        $"{C0.ESC}[15;{modCode + 1}~";
+                    break;
+
+                case VirtualKey.F6:
+                    text = (modCode == 0) ?
+                        $"{C0.ESC}[17~" :
+                        $"{C0.ESC}[17;{modCode + 1}~";
+                    break;
+
+                case VirtualKey.F7:
+                    text = (modCode == 0) ?
+                        $"{C0.ESC}[18~" :
+                        $"{C0.ESC}[18;{modCode + 1}~";
+                    break;
+
+                case VirtualKey.F8:
+                    text = (modCode == 0) ?
+                        $"{C0.ESC}[19~" :
+                        $"{C0.ESC}[19;{modCode + 1}~";
+                    break;
+
+                case VirtualKey.F9:
+                    text = (modCode == 0) ?
+                        $"{C0.ESC}[20~" :
+                        $"{C0.ESC}[20;{modCode + 1}~";
+                    break;
+
+                case VirtualKey.F10:
+                    text = (modCode == 0) ?
+                        $"{C0.ESC}[21~" :
+                        $"{C0.ESC}[21;{modCode + 1}~";
+                    break;
+
+                case VirtualKey.F11:
+                    text = (modCode == 0) ?
+                        $"{C0.ESC}[23~" :
+                        $"{C0.ESC}[23;{modCode + 1}~";
+                    break;
+
+                case VirtualKey.F12:
+                    text = (modCode == 0) ?
+                        $"{C0.ESC}[24~" :
+                        $"{C0.ESC}[24;{modCode + 1}~";
+                    break;
+            }
+            if (text != string.Empty)
+            {
+                ViewModel.Terminal.Write(Encoding.UTF8.GetBytes(text));
+                e.Handled = true;
+            }
+
+            string Construct(int a, char c)
+            {
+                return (modCode == 0) ?
+                    $"{C0.ESC}O{c}" :
+                    $"{C0.ESC}[{a};{modCode + 1}{c}";
+            }
+        }
+
+        private void Canvas_CharacterReceived(UIElement sender, CharacterReceivedRoutedEventArgs args)
+        {
+            var text = Encoding.UTF8.GetBytes(new[] { args.Character });
+            ViewModel.Terminal.Write(text);
+        }
+
+        private void ProcessTerminalCode(TerminalCode code)
+        {
+            switch (code.Type)
+            {
+                case TerminalCodeType.ResetMode:
+                    _buffer.ShowCursor = false;
+                    break;
+
+                case TerminalCodeType.SetMode:
+                    _buffer.ShowCursor = true;
+
+                    // HACK We want clear to reset the window position but not general typing.
+                    //      We therefore reset the window only if the cursor is moved to the top.
+                    if (_buffer.CursorY == 0)
+                    {
+                        _buffer.WindowTop = 0;
+                    }
+                    break;
+
+                case TerminalCodeType.Text:
+                    _buffer.Type(code.Text);
+                    break;
+
+                case TerminalCodeType.LineFeed:
+                    if (_buffer.CursorY == _buffer.Size.Rows - 1)
+                    {
+                        _buffer.ShiftUp();
+                    }
+                    else
+                    {
+                        _buffer.CursorY++;
+                    }
+                    break;
+
+                case TerminalCodeType.CarriageReturn:
+                    _buffer.CursorX = 0;
+                    break;
+
+                case TerminalCodeType.CharAttributes:
+                    _buffer.CurrentCharAttributes = code.CharAttributes;
+                    break;
+
+                case TerminalCodeType.CursorPosition:
+                    _buffer.CursorX = code.Column;
+                    _buffer.CursorY = code.Line;
+                    break;
+
+                case TerminalCodeType.CursorUp:
+                    _buffer.CursorY -= code.Line;
+                    break;
+
+                case TerminalCodeType.CursorCharAbsolute:
+                    _buffer.CursorX = code.Column;
+                    break;
+
+                case TerminalCodeType.EraseInLine:
+                    if (code.Line == 0)
+                    {
+                        _buffer.ClearBlock(_buffer.CursorX, _buffer.CursorY, _buffer.Size.Columns - 1, _buffer.CursorY);
+                    }
+                    break;
+
+                case TerminalCodeType.EraseInDisplay:
+                    _buffer.Clear();
+                    _buffer.CursorX = 0;
+                    _buffer.CursorY = 0;
+                    break;
+
+                case TerminalCodeType.SetTitle:
+                    //ViewModel.Terminal.SetTitle(code.Text);
+                    break;
+            }
+        }
+
+        private void Terminal_OutputReceived(object sender, byte[] e)
+        {
+  
+            var text = Encoding.UTF8.GetString(e, 0, e.Length);
+            var reader = new ArrayReader<char>(text.ToCharArray());
+            var codes = _parser.Parse(reader);
+            foreach (var code in codes)
+            {
+                ProcessTerminalCode(code);
+            }
+
+            _dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
+            {
+                canvas.Height = Math.Max(_buffer.CurrentHistoryLength * _characterHeight, _buffer.Size.Rows * _characterHeight);
+                canvas.Invalidate();
+            });
+        }
+
+    }
+}

FluentTerminal.App/Views/NativeFrontend/Utility/ArrayReader.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Views.NativeFrontend.Utility
+{
+    internal class ArrayReader<T>
+    {
+        private readonly T[] _array;
+
+        public int Offset { get; private set; }
+        public int RemainingLength { get; private set; }
+
+        public ArrayReader(T[] array)
+        {
+            _array = array;
+            Offset = 0;
+            RemainingLength = array.Length;
+        }
+
+        public ArrayReader(T[] array, int offset, int count)
+        {
+            _array = array;
+            Offset = offset;
+            RemainingLength = count;
+        }
+
+        public ArrayReader(ArraySegment<T> segment)
+        {
+            _array = segment.Array;
+            Offset = segment.Offset;
+            RemainingLength = segment.Count;
+        }
+
+        public bool TryRead(out T element)
+        {
+            if (RemainingLength > 0)
+            {
+                element = _array[Offset];
+                Offset++;
+                RemainingLength--;
+                return true;
+            }
+            else
+            {
+                element = default(T);
+                return false;
+            }
+        }
+
+        public bool TryPeek(out T element)
+        {
+            if (RemainingLength > 0)
+            {
+                element = _array[Offset];
+                return true;
+            }
+            else
+            {
+                element = default(T);
+                return false;
+            }
+        }
+
+        public T Read()
+        {
+            T element;
+            if (!TryRead(out element))
+            {
+                throw new IndexOutOfRangeException();
+            }
+            return element;
+        }
+
+        public T Peek()
+        {
+            T element;
+            if (!TryPeek(out element))
+            {
+                throw new IndexOutOfRangeException();
+            }
+            return element;
+        }
+    }
+}

FluentTerminal.App/Views/NoValueTemplateSelector.cs

@@ -0,0 +1,26 @@
+using System;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace FluentTerminal.App.Views
+{
+    public class NoValueTemplateSelector : DataTemplateSelector
+    {
+        public DataTemplate DefaultTemplate { get; set; }
+        public DataTemplate CustomTemplate { get; set; }
+
+        protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
+        {
+            return SelectTemplateCore(item);
+        }
+
+        protected override DataTemplate SelectTemplateCore(object item)
+        {
+            if (item is String arguments)
+            {
+                return String.Empty.Equals(arguments) ? DefaultTemplate : CustomTemplate;
+            }
+            return null;
+        }
+    }
+}

FluentTerminal.App/Views/SettingsPage.xaml

@@ -18,7 +18,7 @@
             x:Name="NavigationView"
             AlwaysShowHeader="False"
             Canvas.ZIndex="0"
-            CompactModeThresholdWidth="560"
+            CompactModeThresholdWidth="0"
             ExpandedModeThresholdWidth="560"
             IsSettingsVisible="False"
             Loaded="NavigationView_Loaded"
@@ -74,6 +74,16 @@
                     </NavigationViewItem.Icon>
                 </NavigationViewItem>
             </NavigationView.MenuItems>
+            <NavigationView.PaneFooter>
+                <NavigationViewItem Content="About" Tapped="AboutTapped">
+                    <NavigationViewItem.Icon>
+                        <FontIcon
+                            FontFamily="Segoe MDL2 Assets"
+                            Glyph="&#xE946;"
+                            ToolTipService.ToolTip="About" />
+                    </NavigationViewItem.Icon>
+                </NavigationViewItem>
+            </NavigationView.PaneFooter>
             <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
                 <Frame x:Name="ContentFrame" />
                 <TextBlock

FluentTerminal.App/Views/SettingsPage.xaml.cs

@@ -1,6 +1,7 @@
 using FluentTerminal.App.Utilities;
 using FluentTerminal.App.ViewModels;
 using FluentTerminal.App.Views.SettingsPages;
+using System;
 using System.Linq;
 using Windows.ApplicationModel.Core;
 using Windows.Foundation;
@@ -9,6 +10,7 @@ using Windows.UI.Core.Preview;
 using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Navigation;
 
 namespace FluentTerminal.App.Views
@@ -18,6 +20,7 @@ namespace FluentTerminal.App.Views
         private readonly UISettings _uiSettings;
         private readonly ApplicationViewTitleBar _titleBar;
         private readonly CoreDispatcher _dispatcher;
+        private readonly NavigationViewItem hiddenNavigationItem;
         private bool _onThemesPage;
 
         public SettingsPage()
@@ -39,6 +42,8 @@ namespace FluentTerminal.App.Views
             _uiSettings = new UISettings();
             _uiSettings.ColorValuesChanged += OnColorValuesChanged;
             SystemNavigationManagerPreview.GetForCurrentView().CloseRequested += SettingsPage_CloseRequested;
+            
+            hiddenNavigationItem = new NavigationViewItem();
         }
 
         private void OnColorValuesChanged(UISettings sender, object args)
@@ -67,9 +72,24 @@ namespace FluentTerminal.App.Views
             if (e.Parameter is SettingsViewModel viewModel)
             {
                 ViewModel = viewModel;
+                ViewModel.AboutPageRequested += OnAboutPageRequested;
             }
         }
 
+        private void OnAboutPageRequested(object sender, System.EventArgs e)
+        {
+            _dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
+            {
+                ContentFrame.Navigate(typeof(About), ViewModel.About);
+
+                // Deselect item in NavigationView (https://stackoverflow.com/a/49082640/4132379)
+                NavigationView.MenuItems.Add(hiddenNavigationItem);
+                NavigationView.SelectedItem = hiddenNavigationItem;
+                NavigationView.SelectedItem = null;
+                NavigationView.MenuItems.Remove(hiddenNavigationItem);
+            });
+        }
+
         private void NavigationView_Loaded(object sender, RoutedEventArgs e)
         {
             NavigationView.SelectedItem = NavigationView.MenuItems.Cast<NavigationViewItemBase>().FirstOrDefault(m => m.Tag.ToString() == "general");
@@ -116,6 +136,11 @@ namespace FluentTerminal.App.Views
             }
         }
 
+        private void AboutTapped(object sender, TappedRoutedEventArgs e)
+        {
+            OnAboutPageRequested(sender, EventArgs.Empty);
+        }
+
         private void SettingsPage_CloseRequested(object sender, SystemNavigationCloseRequestedPreviewEventArgs e)
         {
             ViewModel.Close();

FluentTerminal.App/Views/SettingsPages/About.xaml

@@ -0,0 +1,90 @@
+<Page
+    x:Class="FluentTerminal.App.Views.SettingsPages.About"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="32" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <Grid Grid.Row="1" Margin="{StaticResource HeaderMargin}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <TextBlock
+                Margin="0,10,0,0"
+                VerticalAlignment="Center"
+                FontSize="28"
+                Style="{StaticResource TitleTextBlockStyle}"
+                Text="About" />
+            <CommandBar
+                Grid.Column="1"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Top"
+                Background="{ThemeResource SystemControlBackgroundAltHighBrush}"
+                DefaultLabelPosition="Right">
+                <AppBarButton
+                    Command="{x:Bind ViewModel.CheckForUpdatesCommand}"
+                    Icon="Sync"
+                    Label="Check for updates" />
+            </CommandBar>
+        </Grid>
+        <ScrollViewer Grid.Row="2">
+            <Grid Margin="{StaticResource ContainerMargin}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <StackPanel Grid.Row="0">
+                    <Image
+                        MaxWidth="106"
+                        MaxHeight="106"
+                        Margin="{StaticResource ItemMargin}"
+                        HorizontalAlignment="Left"
+                        Source="/Assets/AppIcons/Square106x106Logo.black.png"
+                        Stretch="None" />
+
+                    <StackPanel Margin="{StaticResource ItemMargin}">
+                        <TextBlock Margin="0,0,0,8" Text="Current version" />
+                        <TextBlock>
+                            <Run Text="{x:Bind ViewModel.CurrentVersion}" />
+                            -<Hyperlink NavigateUri="{x:Bind ViewModel.CurrentVersionReleaseNotesURL}">Release notes</Hyperlink>
+                        </TextBlock>
+                    </StackPanel>
+
+                    <StackPanel Margin="{StaticResource ItemMargin}">
+                        <TextBlock Margin="0,0,0,8" Text="Latest version" />
+                        <StackPanel Orientation="Horizontal" Visibility="{x:Bind ViewModel.LatestVersionLoading, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}">
+                            <ProgressRing Margin="0,0,8,0" IsActive="True" />
+                            <TextBlock><Italic>Checking for updates...</Italic></TextBlock>
+                        </StackPanel>
+                        <TextBlock Visibility="{x:Bind ViewModel.LatestVersionNotFound, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}">
+                            <Italic>Not found</Italic>
+                        </TextBlock>
+                        <TextBlock Visibility="{x:Bind ViewModel.LatestVersionFound, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}">
+                            <Run Text="{x:Bind ViewModel.LatestVersion, Mode=OneWay}" />
+                            -<Hyperlink NavigateUri="{x:Bind ViewModel.LatestVersionReleaseNotesURL, Mode=OneWay}">Release notes</Hyperlink>
+                        </TextBlock>
+                    </StackPanel>
+
+                    <StackPanel Margin="{StaticResource ItemMargin}">
+                        <TextBlock Margin="0,0,0,8" Text="License" />
+                        <TextBlock><Hyperlink NavigateUri="https://github.com/felixse/FluentTerminal/blob/master/LICENSE">GNU General Public License v3.0</Hyperlink></TextBlock>
+                    </StackPanel>
+                </StackPanel>
+                <StackPanel
+                    Grid.Row="1"
+                    Margin="0,72,0,0"
+                    VerticalAlignment="Bottom">
+                    <TextBlock x:Name="CreatedBy" />
+                </StackPanel>
+            </Grid>
+        </ScrollViewer>
+    </Grid>
+</Page>

FluentTerminal.App/Views/SettingsPages/About.xaml.cs

@@ -0,0 +1,31 @@
+using FluentTerminal.App.ViewModels.Settings;
+using System;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Documents;
+using Windows.UI.Xaml.Navigation;
+
+namespace FluentTerminal.App.Views.SettingsPages
+{
+    public sealed partial class About : Page
+    {
+        public AboutPageViewModel ViewModel { get; private set; }
+
+        public About()
+        {
+            InitializeComponent();
+            CreatedBy.Inlines.Add(new Run { Text = "Created by " });
+            CreatedBy.Inlines.Add(new Italic { Inlines = { new Run { Text = "felixse " } } });
+            CreatedBy.Inlines.Add(new Run { Text = "and " });
+            CreatedBy.Inlines.Add(new Hyperlink { Inlines = { new Run { Text = "contributors" } }, NavigateUri = new Uri("https://github.com/felixse/FluentTerminal/graphs/contributors") });
+        }
+
+        protected override void OnNavigatedTo(NavigationEventArgs e)
+        {
+            if (e.Parameter is AboutPageViewModel viewModel)
+            {
+                ViewModel = viewModel;
+            }
+            ViewModel.OnNavigatedTo();
+        }
+    }
+}

FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml

@@ -11,7 +11,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Grid Grid.Row="1" Margin="24,00,0,24">
+        <Grid Grid.Row="1" Margin="{StaticResource HeaderMargin}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition />
@@ -34,67 +34,98 @@
                     Label="Restore Defaults" />
             </CommandBar>
         </Grid>
-        <ScrollViewer Grid.Row="2" Margin="24,0,0,0">
-            <StackPanel>
+        <ScrollViewer Grid.Row="2">
+            <StackPanel Margin="{StaticResource ContainerMargin}">
+                <StackPanel Margin="{StaticResource ItemMargin}">
+                    <ToggleSwitch
+                        Header="Run on startup"
+                        IsEnabled="{x:Bind ViewModel.CanEnableStartupTask, Mode=OneWay}"
+                        IsOn="{x:Bind ViewModel.StartupTaskEnabled, Mode=TwoWay}" />
+                    <TextBlock
+                        Foreground="Red"
+                        Text="{x:Bind ViewModel.StartupTaskErrorMessage, Mode=OneWay}"
+                        Visibility="{x:Bind ViewModel.CanEnableStartupTask, Mode=OneWay, Converter={StaticResource FalseToVisibleConverter}}" />
+                </StackPanel>
+
+                <StackPanel Margin="{StaticResource ItemMargin}">
+                    <ToggleSwitch Header="Show in system tray" IsOn="{x:Bind ViewModel.EnableTrayIcon, Mode=TwoWay}" />
+                    <TextBlock
+                        Foreground="Red"
+                        Text="Relaunch required to apply setting"
+                        Visibility="{x:Bind ViewModel.ShouldRestartForTrayMessage, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}" />
+                </StackPanel>
+
+                <StackPanel Margin="{StaticResource ItemMargin}">
+                    <TextBlock Margin="0,0,0,8" Text="Open new terminals as" />
+                    <RadioButton
+                        Content="Tabs"
+                        GroupName="NewTerminalLocation"
+                        IsChecked="{x:Bind ViewModel.TabIsSelected, Mode=TwoWay}" />
+                    <RadioButton
+                        Content="Windows"
+                        GroupName="NewTerminalLocation"
+                        IsChecked="{x:Bind ViewModel.WindowIsSelected, Mode=TwoWay}" />
+                </StackPanel>
+
+                <StackPanel Margin="{StaticResource ItemMargin}">
+                    <TextBlock Margin="0,0,0,8" Text="Show tabs on" />
+                    <RadioButton
+                        Content="Top"
+                        GroupName="TabsPosition"
+                        IsChecked="{x:Bind ViewModel.TopIsSelected, Mode=TwoWay}" />
+                    <RadioButton
+                        Content="Bottom"
+                        GroupName="TabsPosition"
+                        IsChecked="{x:Bind ViewModel.BottomIsSelected, Mode=TwoWay}" />
+                </StackPanel>
+
                 <ToggleSwitch
-                    Header="Run on startup"
-                    IsEnabled="{x:Bind ViewModel.CanEnableStartupTask, Mode=OneWay}"
-                    IsOn="{x:Bind ViewModel.StartupTaskEnabled, Mode=TwoWay}" />
-                <TextBlock
-                    Foreground="Red"
-                    Text="{x:Bind ViewModel.StartupTaskErrorMessage, Mode=OneWay}"
-                    Visibility="{x:Bind ViewModel.CanEnableStartupTask, Mode=OneWay, Converter={StaticResource FalseToVisibleConverter}}" />
-                <TextBlock Margin="0,24,0,8" Text="Open new terminals as" />
-                <RadioButton
-                    Content="Tabs"
-                    GroupName="NewTerminalLocation"
-                    IsChecked="{x:Bind ViewModel.TabIsSelected, Mode=TwoWay}" />
-                <RadioButton
-                    Margin="0,0,0,24"
-                    Content="Windows"
-                    GroupName="NewTerminalLocation"
-                    IsChecked="{x:Bind ViewModel.WindowIsSelected, Mode=TwoWay}" />
-                <TextBlock Margin="0,0,0,8" Text="Show tabs on" />
-                <RadioButton
-                    Content="Top"
-                    GroupName="TabsPosition"
-                    IsChecked="{x:Bind ViewModel.TopIsSelected, Mode=TwoWay}" />
-                <RadioButton
-                    Margin="0,0,0,24"
-                    Content="Bottom"
-                    GroupName="TabsPosition"
-                    IsChecked="{x:Bind ViewModel.BottomIsSelected, Mode=TwoWay}" />
-                <ToggleSwitch
-                    Margin="0,0,0,24"
+                    Margin="{StaticResource ItemMargin}"
                     Header="Always show tabs"
                     IsOn="{x:Bind ViewModel.AlwaysShowTabs, Mode=TwoWay}" />
+
                 <ToggleSwitch
-                    Margin="0,0,0,24"
+                    Margin="{StaticResource ItemMargin}"
+                    Header="Show custom tab title also in titlebar"
+                    IsOn="{x:Bind ViewModel.ShowCustomTitleInTitlebar, Mode=TwoWay}" />
+
+                <ToggleSwitch
+                    Margin="{StaticResource ItemMargin}"
                     Header="Underline selected tab"
                     IsOn="{x:Bind ViewModel.UnderlineSelectedTab, Mode=TwoWay}" />
-                <TextBlock Margin="0,0,0,8" Text="Color on inactive tabs" />
-                <RadioButton
-                    Content="Background"
-                    GroupName="InactiveTabColorMode"
-                    IsChecked="{x:Bind ViewModel.BackgroundIsSelected, Mode=TwoWay}" />
-                <RadioButton
-                    Margin="0,0,0,24"
-                    Content="Underline"
-                    GroupName="InactiveTabColorMode"
-                    IsChecked="{x:Bind ViewModel.UnderlinedIsSelected, Mode=TwoWay}" />
+
+                <StackPanel Margin="{StaticResource ItemMargin}">
+                    <TextBlock Margin="0,0,0,8" Text="Color on inactive tabs" />
+                    <RadioButton
+                        Content="Background"
+                        GroupName="InactiveTabColorMode"
+                        IsChecked="{x:Bind ViewModel.BackgroundIsSelected, Mode=TwoWay}" />
+                    <RadioButton
+                        Content="Underline"
+                        GroupName="InactiveTabColorMode"
+                        IsChecked="{x:Bind ViewModel.UnderlinedIsSelected, Mode=TwoWay}" />
+                </StackPanel>
+
                 <ToggleSwitch
-                    Margin="0,0,0,24"
+                    Margin="{StaticResource ItemMargin}"
                     Header="Ask before closing windows"
                     IsOn="{x:Bind ViewModel.ConfirmClosingWindows, Mode=TwoWay}" />
+
                 <ToggleSwitch
-                    Margin="0,0,0,24"
+                    Margin="{StaticResource ItemMargin}"
                     Header="Ask before closing tabs"
                     IsOn="{x:Bind ViewModel.ConfirmClosingTabs, Mode=TwoWay}" />
+
                 <ToggleSwitch
-                    Margin="0,0,0,24"
+                    Margin="{StaticResource ItemMargin}"
                     Header="Show new output indicator on background tabs"
                     IsOn="{x:Bind ViewModel.ShowNewOutputIndicator, Mode=TwoWay}" />
+
+                <ToggleSwitch
+                    Margin="{StaticResource ItemMargin}"
+                    Header="Windows 10 1809+: Always use WinPty"
+                    IsOn="{x:Bind ViewModel.AlwaysUseWinPty, Mode=TwoWay}" />
             </StackPanel>
         </ScrollViewer>
     </Grid>
-</Page>
+</Page>

FluentTerminal.App/Views/SettingsPages/KeyBindingSettings.xaml

@@ -13,7 +13,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Grid Grid.Row="1" Margin="24,0,0,0">
+        <Grid Grid.Row="1" Margin="{StaticResource HeaderMargin}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition />
@@ -42,11 +42,11 @@
                     Label="Restore Defaults" />
             </CommandBar>
         </Grid>
-        <ScrollViewer Grid.Row="2" Margin="24,24,0,0">
-            <ItemsControl ItemsSource="{x:Bind ViewModel.KeyBindings, Mode=OneWay}">
+        <ScrollViewer Grid.Row="2">
+            <ItemsControl Margin="{StaticResource ContainerMargin}" ItemsSource="{x:Bind ViewModel.KeyBindings, Mode=OneWay}">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate x:DataType="settings:KeyBindingsViewModel">
-                        <views:KeyBindingsView Margin="0,0,0,24" ViewModel="{x:Bind}" />
+                        <views:KeyBindingsView Margin="{StaticResource ItemMargin}" ViewModel="{x:Bind}" />
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ItemsControl>

FluentTerminal.App/Views/SettingsPages/KeyBindingSettings.xaml.cs

@@ -1,6 +1,7 @@
 using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.App.ViewModels.Settings;
 using FluentTerminal.Models.Enums;
+using FluentTerminal.Models;
 using System;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
@@ -22,17 +23,18 @@ namespace FluentTerminal.App.Views.SettingsPages
             {
                 ViewModel = viewModel;
 
+                // Add the commands corresponding to all of the application's static commands
                 foreach (var value in Enum.GetValues(typeof(Command)))
                 {
-                    var command = (Command)value;
+                    Command command = (Command)value;
                     AddCommandMenu.Items.Add(new MenuFlyoutItem
                     {
                         Text = EnumHelper.GetEnumDescription(command),
                         Command = ViewModel.AddCommand,
-                        CommandParameter = command
+                        CommandParameter = command.ToString()
                     });
                 }
             }
         }
     }
-}
+}

FluentTerminal.App/Views/SettingsPages/MouseSettings.xaml

@@ -6,14 +6,13 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
     mc:Ignorable="d">
-
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="32" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Grid Grid.Row="1" Margin="24,00,0,24">
+        <Grid Grid.Row="1" Margin="{StaticResource HeaderMargin}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition />
@@ -36,40 +35,44 @@
                     Label="Restore Defaults" />
             </CommandBar>
         </Grid>
-        <ScrollViewer Grid.Row="2" Margin="24,0,0,0">
-            <StackPanel>
+        <ScrollViewer Grid.Row="2">
+            <StackPanel Margin="{StaticResource ContainerMargin}">
                 <ToggleSwitch
-                Margin="0,0,0,24"
-                Header="Copy on select"
-                IsOn="{x:Bind ViewModel.CopyOnSelect, Mode=TwoWay}" />
-                <TextBlock Margin="0,0,0,8" Text="Middle button action" />
-                <RadioButton
-                Content="Nothing"
-                GroupName="MiddleButton"
-                IsChecked="{x:Bind ViewModel.MouseMiddleClickNoneIsSelected, Mode=TwoWay}" />
-                <RadioButton
-                Content="Context menu"
-                GroupName="MiddleButton"
-                IsChecked="{x:Bind ViewModel.MouseMiddleClickContextMenuIsSelected, Mode=TwoWay}" />
-                <RadioButton
-                Margin="0,0,0,24"
-                Content="Paste"
-                GroupName="MiddleButton"
-                IsChecked="{x:Bind ViewModel.MouseMiddleClickPasteIsSelected, Mode=TwoWay}" />
-                <TextBlock Margin="0,0,0,8" Text="Right button action" />
-                <RadioButton
-                Content="Nothing"
-                GroupName="RightButton"
-                IsChecked="{x:Bind ViewModel.MouseRightClickNoneIsSelected, Mode=TwoWay}" />
-                <RadioButton
-                Content="Context menu"
-                GroupName="RightButton"
-                IsChecked="{x:Bind ViewModel.MouseRightClickContextMenuIsSelected, Mode=TwoWay}" />
-                <RadioButton
-                Margin="0,0,0,24"
-                Content="Paste"
-                GroupName="RightButton"
-                IsChecked="{x:Bind ViewModel.MouseRightClickPasteIsSelected, Mode=TwoWay}" />
+                    Margin="{StaticResource ItemMargin}"
+                    Header="Copy on select"
+                    IsOn="{x:Bind ViewModel.CopyOnSelect, Mode=TwoWay}" />
+
+                <StackPanel Margin="{StaticResource ItemMargin}">
+                    <TextBlock Margin="0,0,0,8" Text="Middle button action" />
+                    <RadioButton
+                        Content="Nothing"
+                        GroupName="MiddleButton"
+                        IsChecked="{x:Bind ViewModel.MouseMiddleClickNoneIsSelected, Mode=TwoWay}" />
+                    <RadioButton
+                        Content="Context menu"
+                        GroupName="MiddleButton"
+                        IsChecked="{x:Bind ViewModel.MouseMiddleClickContextMenuIsSelected, Mode=TwoWay}" />
+                    <RadioButton
+                        Content="Paste"
+                        GroupName="MiddleButton"
+                        IsChecked="{x:Bind ViewModel.MouseMiddleClickPasteIsSelected, Mode=TwoWay}" />
+                </StackPanel>
+
+                <StackPanel Margin="{StaticResource ItemMargin}">
+                    <TextBlock Margin="0,0,0,8" Text="Right button action" />
+                    <RadioButton
+                        Content="Nothing"
+                        GroupName="RightButton"
+                        IsChecked="{x:Bind ViewModel.MouseRightClickNoneIsSelected, Mode=TwoWay}" />
+                    <RadioButton
+                        Content="Context menu"
+                        GroupName="RightButton"
+                        IsChecked="{x:Bind ViewModel.MouseRightClickContextMenuIsSelected, Mode=TwoWay}" />
+                    <RadioButton
+                        Content="Paste"
+                        GroupName="RightButton"
+                        IsChecked="{x:Bind ViewModel.MouseRightClickPasteIsSelected, Mode=TwoWay}" />
+                </StackPanel>
             </StackPanel>
         </ScrollViewer>
     </Grid>