Increase version

* ThemeAdded and ThemeRemoved events replaced by MVVMLight Messenger.

* ApplicationSettingsChanged event replaced by MVVMLight Messenger implementation.

* CurrentThemeChanged event replaced by MVVMLight Messenger implementation.

* SettingsService.KeyBindingsChanged event replaced with MVVMLight Messenger implementation.

* Further simplifying KeyBindingsChangedMessage propagation.

* ShellProfileAdded, ShellProfileDeleted, SshProfileAdded and SshProfileDeleted events replaced by MVVMLight Messenger implementation.

.gitattributes

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

.gitignore

@@ -2,6 +2,7 @@
 FluentTerminal.App/Win32
 FluentTerminal.App/Client/
 FluentTerminal.Client/dist
+/.sonarqube
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
@@ -291,3 +292,5 @@ __pycache__/
 *.btm.cs
 *.odx.cs
 *.xsd.cs
+
+!FluentTerminal.App/MoshExecutables/*

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

@@ -0,0 +1,157 @@
+using FluentAssertions;
+using FluentTerminal.App.Services.Implementation;
+using FluentTerminal.Models.Enums;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FluentTerminal.App.Services.Test
+{
+    public class DefaultValueProviderTests
+    {
+        public static IEnumerable<object[]> Commands => System.Enum.GetValues(typeof(Command)).Cast<Command>().Select(x => new object[] { x });
+
+        [Fact]
+        public void GetDefaultApplicationSettings_Default_DoesNotReturnNull()
+        {
+            var defaultValueProvider = new DefaultValueProvider();
+
+            var applicationSettings = defaultValueProvider.GetDefaultApplicationSettings();
+
+            applicationSettings.Should().NotBeNull();
+        }
+
+        [Theory]
+        [MemberData(nameof(Commands))]
+        public void GetDefaultKeyBindings_AllCommands_ReturnsANonEmptyList(Command command)
+        {
+            var defaultValueProvider = new DefaultValueProvider();
+
+            var keyBindings = defaultValueProvider.GetDefaultKeyBindings(command);
+
+            keyBindings.Should().NotBeNullOrEmpty();
+        }
+
+        [Fact]
+        public void GetDefaultShellProfileId_Default_DoesNotReturnEmptyGuid()
+        {
+            var defaultValueProvider = new DefaultValueProvider();
+
+            var defaultShellProfileId = defaultValueProvider.GetDefaultShellProfileId();
+
+            defaultShellProfileId.Should().NotBeEmpty();
+        }
+
+        [Fact]
+        public void GetDefaultShellProfileId_Default_IdIsOneOfThePreInstalledShellProfiles()
+        {
+            var defaultValueProvider = new DefaultValueProvider();
+            var shellProfiles = defaultValueProvider.GetPreinstalledShellProfiles();
+
+            var defaultShellProfileId = defaultValueProvider.GetDefaultShellProfileId();
+
+            shellProfiles.Select(x => x.Id).Should().Contain(defaultShellProfileId);
+        }
+
+        [Fact]
+        public void GetDefaultTerminalOptions_Default_DoesNotReturnNull()
+        {
+            var defaultValueProvider = new DefaultValueProvider();
+
+            var defaultTerminalOptions = defaultValueProvider.GetDefaultTerminalOptions();
+
+            defaultTerminalOptions.Should().NotBeNull();
+        }
+
+        [Fact]
+        public void GetDefaultThemeId_Default_DoesNotReturnEmptyGuid()
+        {
+            var defaultValueProvider = new DefaultValueProvider();
+
+            var defaultThemeId = defaultValueProvider.GetDefaultThemeId();
+
+            defaultThemeId.Should().NotBeEmpty();
+        }
+
+        [Fact]
+        public void GetDefaultThemeId_Default_IdIsOneOfThePreInstalledThemes()
+        {
+            var defaultValueProvider = new DefaultValueProvider();
+            var themes = defaultValueProvider.GetPreInstalledThemes();
+
+            var defaultThemeId = defaultValueProvider.GetDefaultThemeId();
+
+            themes.Select(x => x.Id).Should().Contain(defaultThemeId);
+        }
+
+        [Fact]
+        public void GetPreinstalledShellProfiles_Default_ReturnsANonEmptyList()
+        {
+            var defaultValueProvider = new DefaultValueProvider();
+
+            var shellProfiles = defaultValueProvider.GetPreinstalledShellProfiles();
+
+            shellProfiles.Should().NotBeNullOrEmpty();
+        }
+
+        [Fact]
+        public void GetPreinstalledShellProfiles_Default_HaveUniqueIds()
+        {
+            var defaultValueProvider = new DefaultValueProvider();
+
+            var shellProfiles = defaultValueProvider.GetPreinstalledShellProfiles();
+
+            shellProfiles.Select(x => x.Id).Should().OnlyHaveUniqueItems();
+        }
+
+        [Fact]
+        public void GetPreinstalledShellProfiles_Default_HavePreInstalledSetToTrue()
+        {
+            var defaultValueProvider = new DefaultValueProvider();
+
+            var shellProfiles = defaultValueProvider.GetPreinstalledShellProfiles();
+
+            shellProfiles.Select(x => x.PreInstalled).Should().AllBeEquivalentTo(true);
+        }
+
+        [Fact]
+        public void GetPreinstalledShellProfiles_Default_HaveNonEmptyLocations()
+        {
+            var defaultValueProvider = new DefaultValueProvider();
+
+            var shellProfiles = defaultValueProvider.GetPreinstalledShellProfiles();
+
+            shellProfiles.Select(x => x.Location).Should().NotBeNullOrEmpty();
+        }
+
+        [Fact]
+        public void GetPreInstalledThemes_Default_ReturnsANonEmptyList()
+        {
+            var defaultValueProvider = new DefaultValueProvider();
+
+            var themes = defaultValueProvider.GetPreInstalledThemes();
+
+            themes.Should().NotBeNullOrEmpty();
+        }
+
+        [Fact]
+        public void GetPreinstalledThemes_Default_HaveUniqueIds()
+        {
+            var defaultValueProvider = new DefaultValueProvider();
+
+            var themes = defaultValueProvider.GetPreInstalledThemes();
+
+            themes.Select(x => x.Id).Should().OnlyHaveUniqueItems();
+        }
+
+        [Fact]
+        public void GetPreinstalledThemes_Default_HavePreInstalledSetToTrue()
+        {
+            var defaultValueProvider = new DefaultValueProvider();
+
+            var themes = defaultValueProvider.GetPreInstalledThemes();
+
+            themes.Select(x => x.PreInstalled).Should().AllBeEquivalentTo(true);
+        }
+    }
+}

FluentTerminal.App.Services.Test/DialogServiceTests.cs

@@ -1,11 +1,11 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoFixture;
+using AutoFixture;
 using FluentAssertions;
 using FluentTerminal.App.Services.Dialogs;
 using FluentTerminal.App.Services.Implementation;
 using Moq;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace FluentTerminal.App.Services.Test
@@ -20,41 +20,90 @@ namespace FluentTerminal.App.Services.Test
         }
 
         [Fact]
-        public void ShowDialogAsync_TitleIsEmpty_ThrowsArgumentNullException()
+        public void ShowCreateKeyBindingDialog_Default_UsesCreateKeyBindingDialog()
+        {
+            var createKeyBindingDialog = new Mock<ICreateKeyBindingDialog>();
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, () => createKeyBindingDialog.Object, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ICustomCommandDialog>, Mock.Of<ISshProfileSelectionDialog>, Mock.Of<IAboutDialog>);
+
+            dialogService.ShowCreateKeyBindingDialog();
+
+            createKeyBindingDialog.Verify(x => x.CreateKeyBinding(), Times.Once);
+        }
+
+        [Fact]
+        public void ShowMessageDialogAsnyc_TitleIsEmpty_ThrowsArgumentNullException()
         {
             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>, Mock.Of<ICustomCommandDialog>, Mock.Of<ISshProfileSelectionDialog>, Mock.Of<IAboutDialog>);
 
-            Func<Task<DialogButton>> invoke = () => dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
+            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
 
-            invoke.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("title");
+            showMessageDialogAsnyc.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("title");
         }
 
         [Fact]
-        public void ShowDialogAsync_ContentIsEmpty_ThrowsArgumentNullException()
+        public void ShowMessageDialogAsnyc_ContentIsEmpty_ThrowsArgumentNullException()
         {
             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>, Mock.Of<ICustomCommandDialog>, Mock.Of<ISshProfileSelectionDialog>, Mock.Of<IAboutDialog>);
 
-            Func<Task<DialogButton>> invoke = () => dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
+            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
 
-            invoke.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("content");
+            showMessageDialogAsnyc.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("content");
         }
 
         [Fact]
-        public void ShowDialogAsync_NoButtonsPassed_ThrowsArgumentException()
+        public void ShowMessageDialogAsnyc_NoButtonsPassed_ThrowsArgumentException()
         {
             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>, Mock.Of<ICustomCommandDialog>, Mock.Of<ISshProfileSelectionDialog>, Mock.Of<IAboutDialog>);
 
-            Func<Task<DialogButton>> invoke = () => dialogService.ShowMessageDialogAsnyc(title, content);
+            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content);
 
-            invoke.Should().Throw<ArgumentException>().And.ParamName.Should().Be("buttons");
+            showMessageDialogAsnyc.Should().Throw<ArgumentException>().And.ParamName.Should().Be("buttons");
+        }
+
+        [Fact]
+        public void ShowMessageDialogAsnyc_Default_UsesMessageDialog()
+        {
+            var title = _fixture.Create<string>();
+            var content = _fixture.Create<string>();
+            var buttons = _fixture.CreateMany<DialogButton>(2);
+            var messageDialog = new Mock<IMessageDialog>();
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, () => messageDialog.Object, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ICustomCommandDialog>, Mock.Of<ISshProfileSelectionDialog>, Mock.Of<IAboutDialog>);
+
+            dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
+
+            messageDialog.Verify(x => x.ShowAsync(), Times.Once);
+        }
+
+        [Fact]
+        public void ShowProfileSelectionDialogAsync_Default_UsesShellProfileSelectionDialog()
+        {
+            var shellProfileSelectionDialog = new Mock<IShellProfileSelectionDialog>();
+            var dialogService = new DialogService(() => shellProfileSelectionDialog.Object, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ICustomCommandDialog>, Mock.Of<ISshProfileSelectionDialog>, Mock.Of<IAboutDialog>);
+
+            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>, Mock.Of<ICustomCommandDialog>, Mock.Of<ISshProfileSelectionDialog>, Mock.Of<IAboutDialog>);
+
+            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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
@@ -7,17 +7,38 @@
   </PropertyGroup>
 
   <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="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <None Remove="TestData\AdventureTime.itermcolors" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AutoFixture" Version="4.11.0" />
+    <PackageReference Include="FluentAssertions" Version="5.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="Moq" Version="4.13.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <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>
 
+  <ItemGroup>
+    <EmbeddedResource Include="TestData\AdventureTime.itermcolors">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\FluentTerminal.App.Services\FluentTerminal.App.Services.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="Windows.Foundation.FoundationContract">
+      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+
 </Project>

FluentTerminal.App.Services.Test/FluentTerminalThemeParserTests.cs

@@ -0,0 +1,80 @@
+using AutoFixture;
+using FluentAssertions;
+using FluentTerminal.App.Services.Implementation;
+using FluentTerminal.Models;
+using Newtonsoft.Json;
+using System;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace FluentTerminal.App.Services.Test
+{
+    public class FluentTerminalThemeParserTests
+    {
+        private readonly Fixture _fixture;
+
+        public FluentTerminalThemeParserTests()
+        {
+            _fixture = new Fixture();
+        }
+
+        [Fact]
+        public async Task Parse_ValidFileStream_ReturnsTheme()
+        {
+            var theme = _fixture.Create<TerminalTheme>();
+            var serialized = JsonConvert.SerializeObject(theme);
+            var stream = new MemoryStream(Encoding.UTF8.GetBytes(serialized));
+            var parser = new FluentTerminalThemeParser();
+
+            var parsedTheme = await parser.Parse(theme.Name, stream);
+
+            parsedTheme.Name.Should().Be(theme.Name);
+            parsedTheme.Author.Should().Be(theme.Author);
+            parsedTheme.PreInstalled.Should().Be(false);
+            parsedTheme.Colors.Should().BeEquivalentTo(theme.Colors);
+        }
+
+        [Fact]
+        public void Parse_InvalidFileStream_ThrowsException()
+        {
+            var fileName = _fixture.Create<string>();
+            var serialized = _fixture.Create<string>();
+            var stream = new MemoryStream(Encoding.UTF8.GetBytes(serialized));
+            var parser = new FluentTerminalThemeParser();
+
+            Func<Task<TerminalTheme>> parse = () => parser.Parse(fileName, stream);
+
+            parse.Should().Throw<Exception>();
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        [InlineData(" ")]
+        public void Parse_InvalidFileName_ThrowsArgumentNullException(string fileName)
+        {
+            var theme = _fixture.Create<TerminalTheme>();
+            var serialized = JsonConvert.SerializeObject(theme);
+            var stream = new MemoryStream(Encoding.UTF8.GetBytes(serialized));
+            var parser = new FluentTerminalThemeParser();
+
+            Func<Task<TerminalTheme>> parse = () => parser.Parse(fileName, stream);
+
+            parse.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("fileName");
+        }
+
+        [Fact]
+        public void Parse_FileStreamIsNull_ThrowsArgumentNullException()
+        {
+            var fileName = _fixture.Create<string>();
+            Stream stream = null;
+            var parser = new FluentTerminalThemeParser();
+
+            Func<Task<TerminalTheme>> parse = () => parser.Parse(fileName, stream);
+
+            parse.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("fileContent");
+        }
+    }
+}

FluentTerminal.App.Services.Test/ITermThemeParserTests.cs

@@ -0,0 +1,91 @@
+using AutoFixture;
+using FluentAssertions;
+using FluentTerminal.App.Services.Implementation;
+using FluentTerminal.Models;
+using System;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace FluentTerminal.App.Services.Test
+{
+    public class ITermThemeParserTests
+    {
+        private readonly Fixture _fixture;
+
+        public ITermThemeParserTests()
+        {
+            _fixture = new Fixture();
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        [InlineData(" ")]
+        public void Parse_InvalidFileName_ThrowsArgumentNullException(string fileName)
+        {
+            var stream = typeof(ITermThemeParserTests).Assembly.GetManifestResourceStream("FluentTerminal.App.Services.Test.TestData.AdventureTime.itermcolors");
+            var parser = new ITermThemeParser();
+
+            Func<Task<TerminalTheme>> parse = () => parser.Parse(fileName, stream);
+
+            parse.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("fileName");
+        }
+
+        [Fact]
+        public void Parse_FileStreamIsNull_ThrowsArgumentNullException()
+        {
+            var fileName = _fixture.Create<string>();
+            Stream stream = null;
+            var parser = new ITermThemeParser();
+
+            Func<Task<TerminalTheme>> parse = () => parser.Parse(fileName, stream);
+
+            parse.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("fileContent");
+        }
+
+        [Fact]
+        public void Parse_InvalidFileStream_ThrowsException()
+        {
+            var fileName = _fixture.Create<string>();
+            var serialized = _fixture.Create<string>();
+            var stream = new MemoryStream(Encoding.UTF8.GetBytes(serialized));
+            var parser = new ITermThemeParser();
+
+            Func<Task<TerminalTheme>> parse = () => parser.Parse(fileName, stream);
+
+            parse.Should().Throw<Exception>();
+        }
+
+        [Fact]
+        public async Task Parse_ValidThemeFile_ParsesCorrectly()
+        {
+            var fileName = _fixture.Create<string>();
+            var stream = typeof(ITermThemeParserTests).Assembly.GetManifestResourceStream("FluentTerminal.App.Services.Test.TestData.AdventureTime.itermcolors");
+            var parser = new ITermThemeParser();
+
+            var theme = await parser.Parse(fileName, stream);
+
+            theme.Colors.Background.ToLower().Should().Be("#1f1d45");
+            theme.Colors.Cursor.ToLower().Should().Be("#efbf38");
+            theme.Colors.Foreground.ToLower().Should().Be("#f8dcc0");
+            theme.Colors.Black.ToLower().Should().Be("#050404");
+            theme.Colors.Red.ToLower().Should().Be("#bd0013");
+            theme.Colors.Green.ToLower().Should().Be("#4ab118");
+            theme.Colors.Yellow.ToLower().Should().Be("#e7741e");
+            theme.Colors.Blue.ToLower().Should().Be("#0f4ac6");
+            theme.Colors.Magenta.ToLower().Should().Be("#665993");
+            theme.Colors.Cyan.ToLower().Should().Be("#70a598");
+            theme.Colors.White.ToLower().Should().Be("#f8dcc0");
+            theme.Colors.BrightBlack.ToLower().Should().Be("#4e7cbf");
+            theme.Colors.BrightRed.ToLower().Should().Be("#fc5f5a");
+            theme.Colors.BrightGreen.ToLower().Should().Be("#9eff6e");
+            theme.Colors.BrightYellow.ToLower().Should().Be("#efc11a");
+            theme.Colors.BrightBlue.ToLower().Should().Be("#1997c6");
+            theme.Colors.BrightMagenta.ToLower().Should().Be("#9b5953");
+            theme.Colors.BrightCyan.ToLower().Should().Be("#c8faf4");
+            theme.Colors.BrightWhite.ToLower().Should().Be("#f6f5fb");
+        }
+    }
+}

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

@@ -0,0 +1,762 @@
+using AutoFixture;
+using FluentAssertions;
+using FluentTerminal.App.Services.Implementation;
+using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
+using Moq;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using FluentTerminal.Models.Messages;
+using GalaSoft.MvvmLight.Messaging;
+using Xunit;
+
+namespace FluentTerminal.App.Services.Test
+{
+    public class SettingsServiceTests
+    {
+        private readonly Fixture _fixture;
+
+        public SettingsServiceTests()
+        {
+            _fixture = new Fixture();
+        }
+
+        [Fact]
+        public void Constructor_Default_WritesAllPreinstalledThemesInThemeContainer()
+        {
+            var themes = _fixture.CreateMany<TerminalTheme>(3);
+            var defaultValueProvider = new Mock<IDefaultValueProvider>();
+            defaultValueProvider.Setup(x => x.GetPreInstalledThemes()).Returns(themes);
+            var themesContainer = new Mock<IApplicationDataContainer>();
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                Themes = themesContainer.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+
+            new SettingsService(defaultValueProvider.Object, applicationDataContainers);
+
+            defaultValueProvider.Verify(x => x.GetPreInstalledThemes(), Times.Once);
+            foreach (var theme in themes)
+            {
+                themesContainer.Verify(x => x.WriteValueAsJson(theme.Id.ToString(), theme), Times.Once);
+            }
+        }
+
+        [Fact]
+        public void Constructor_Default_WritesAllPreinstalledShellProfilesInShellProfilesContainer()
+        {
+            var shellProfiles = _fixture.CreateMany<ShellProfile>(3);
+            var defaultValueProvider = new Mock<IDefaultValueProvider>();
+            defaultValueProvider.Setup(x => x.GetPreinstalledShellProfiles()).Returns(shellProfiles);
+            var shellProfilesContainer = new Mock<IApplicationDataContainer>();
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                ShellProfiles = shellProfilesContainer.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>()
+            };
+
+            new SettingsService(defaultValueProvider.Object, applicationDataContainers);
+
+            defaultValueProvider.Verify(x => x.GetPreinstalledShellProfiles(), Times.Once);
+            foreach (var shellProfile in shellProfiles)
+            {
+                shellProfilesContainer.Verify(x => x.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile), Times.Once);
+            }
+        }
+
+        [Fact]
+        public void GetCurrentThemeId_ValueExistsInRoamingSettings_ReturnsCurrentThemeId()
+        {
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var roamingSettings = new Mock<IApplicationDataContainer>();
+            var currentThemeId = (object)_fixture.Create<Guid>();
+            roamingSettings.Setup(x => x.TryGetValue(SettingsService.CurrentThemeKey, out currentThemeId)).Returns(true);
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                RoamingSettings = roamingSettings.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+
+            var result = settingsService.GetCurrentThemeId();
+
+            result.Should().Be((Guid)currentThemeId);
+            roamingSettings.Verify(x => x.TryGetValue(SettingsService.CurrentThemeKey, out currentThemeId), Times.Once);
+        }
+
+        [Fact]
+        public void GetCurrentThemeId_ValueDoesNotExistInRoamingSettings_ReturnsDefaultThemeIdFromDefaultValueProvider()
+        {
+            var defaultValueProvider = new Mock<IDefaultValueProvider>();
+            var defaultThemeId = _fixture.Create<Guid>();
+            defaultValueProvider.Setup(x => x.GetDefaultThemeId()).Returns(defaultThemeId);
+            var roamingSettings = new Mock<IApplicationDataContainer>();
+            var currentThemeId = (object)_fixture.Create<Guid>();
+            roamingSettings.Setup(x => x.TryGetValue(SettingsService.CurrentThemeKey, out currentThemeId)).Returns(false);
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                RoamingSettings = roamingSettings.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
+
+            var result = settingsService.GetCurrentThemeId();
+
+            result.Should().Be(defaultThemeId);
+            defaultValueProvider.Verify(x => x.GetDefaultThemeId(), Times.Once);
+            roamingSettings.Verify(x => x.TryGetValue(SettingsService.CurrentThemeKey, out currentThemeId), Times.Once);
+        }
+
+        [Fact]
+        public void SaveCurrentThemeId_Default_SetsValueOnRoamingSettings()
+        {
+            var currentThemeId = _fixture.Create<Guid>();
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var roamingSettings = new Mock<IApplicationDataContainer>();
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                RoamingSettings = roamingSettings.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+
+            settingsService.SaveCurrentThemeId(currentThemeId);
+
+            roamingSettings.Verify(x => x.SetValue(SettingsService.CurrentThemeKey, currentThemeId), Times.Once);
+        }
+
+        [Fact]
+        public void SaveCurrentThemeId_Default_InvokesCurrentThemeChangedEvent()
+        {
+            var currentThemeId = _fixture.Create<Guid>();
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var roamingSettings = new Mock<IApplicationDataContainer>();
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                RoamingSettings = roamingSettings.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>()
+            };
+            var currentThemeChangedEventInvoked = false;
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+            Messenger.Default.Register<CurrentThemeChangedMessage>(this,
+                message => currentThemeChangedEventInvoked = true);
+
+            settingsService.SaveCurrentThemeId(currentThemeId);
+
+            currentThemeChangedEventInvoked.Should().BeTrue();
+        }
+
+        [Fact]
+        public void SaveTheme_Default_WritesToThemesContainer()
+        {
+            var theme = _fixture.Create<TerminalTheme>();
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var themesContainer = new Mock<IApplicationDataContainer>();
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                Themes = themesContainer.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+
+            settingsService.SaveTheme(theme);
+
+            themesContainer.Verify(x => x.WriteValueAsJson(theme.Id.ToString(), theme), Times.Once);
+        }
+
+        [Fact]
+        public void SaveTheme_ThemeIsCurrentTheme_InvokesCurrentThemeChangedEvent()
+        {
+            var theme = _fixture.Create<TerminalTheme>();
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var themesContainer = new Mock<IApplicationDataContainer>();
+            var roamingSettings = new Mock<IApplicationDataContainer>();
+            var currentThemeId = (object)theme.Id;
+            roamingSettings.Setup(x => x.TryGetValue(SettingsService.CurrentThemeKey, out currentThemeId)).Returns(true);
+            var currentThemeChangedEventInvoked = false;
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                Themes = themesContainer.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                RoamingSettings = roamingSettings.Object,
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+            Messenger.Default.Register<CurrentThemeChangedMessage>(this,
+                message => currentThemeChangedEventInvoked = true);
+
+            settingsService.SaveTheme(theme);
+
+            currentThemeChangedEventInvoked.Should().BeTrue();
+        }
+
+        [Fact]
+        public void DeleteTheme_Default_CallsDeleteOnThemesContainer()
+        {
+            var themeId = _fixture.Create<Guid>();
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var themesContainer = new Mock<IApplicationDataContainer>();
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                Themes = themesContainer.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+
+            settingsService.DeleteTheme(themeId);
+
+            themesContainer.Verify(x => x.Delete(themeId.ToString()), Times.Once);
+        }
+
+        [Fact]
+        public void GetThemes_Default_CallsGetAllOnThemesContainer()
+        {
+            var themes = _fixture.CreateMany<TerminalTheme>(3);
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var themesContainer = new Mock<IApplicationDataContainer>();
+            themesContainer.Setup(x => x.GetAll()).Returns(themes.Select(JsonConvert.SerializeObject));
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                Themes = themesContainer.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+
+            var result = settingsService.GetThemes();
+
+            result.Should().BeEquivalentTo(themes);
+            themesContainer.Verify(x => x.GetAll(), Times.Once);
+        }
+
+        [Fact]
+        public void GetTheme_ValidThemeId_ReturnsThemeFromThemesContainer()
+        {
+            var theme = _fixture.Create<TerminalTheme>();
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var themesContainer = new Mock<IApplicationDataContainer>();
+            themesContainer.Setup(x => x.ReadValueFromJson(theme.Id.ToString(), default(TerminalTheme))).Returns(theme);
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                Themes = themesContainer.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+
+            var result = settingsService.GetTheme(theme.Id);
+
+            result.Should().BeEquivalentTo(theme);
+            themesContainer.Verify(x => x.ReadValueFromJson(theme.Id.ToString(), default(TerminalTheme)), Times.Once);
+        }
+
+        [Fact]
+        public void GetTheme_UnknownThemeId_ReturnsNull()
+        {
+            var themeId = _fixture.Create<Guid>();
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var themesContainer = new Mock<IApplicationDataContainer>();
+            themesContainer.Setup(x => x.ReadValueFromJson(themeId.ToString(), default(TerminalTheme))).Returns(value: null);
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                Themes = themesContainer.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+
+            var result = settingsService.GetTheme(themeId);
+
+            result.Should().BeNull();
+            themesContainer.Verify(x => x.ReadValueFromJson(themeId.ToString(), default(TerminalTheme)), Times.Once);
+        }
+
+        [Fact]
+        public void GetTerminalOptions_Default_ReturnsTerminalOptionsFromRoamingSettings()
+        {
+            var terminalOptions = _fixture.Create<TerminalOptions>();
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var roamingSettings = new Mock<IApplicationDataContainer>();
+            roamingSettings.Setup(x => x.ReadValueFromJson(nameof(TerminalOptions), It.IsAny<TerminalOptions>())).Returns(terminalOptions);
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                RoamingSettings = roamingSettings.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+
+            var result = settingsService.GetTerminalOptions();
+
+            result.Should().BeEquivalentTo(terminalOptions);
+            roamingSettings.Verify(x => x.ReadValueFromJson(nameof(TerminalOptions), It.IsAny<TerminalOptions>()), Times.Once);
+        }
+
+        [Fact]
+        public void SaveTerminalOptions_Default_WritesToRoamingSettings()
+        {
+            var terminalOptions = _fixture.Create<TerminalOptions>();
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var roamingSettings = new Mock<IApplicationDataContainer>();
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                RoamingSettings = roamingSettings.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+
+            settingsService.SaveTerminalOptions(terminalOptions);
+
+            roamingSettings.Verify(x => x.WriteValueAsJson(nameof(TerminalOptions), terminalOptions), Times.Once);
+        }
+
+        [Fact]
+        public void SaveTerminalOptions_Default_InvokesTerminalOptionsChangedEvent()
+        {
+            var terminalOptions = _fixture.Create<TerminalOptions>();
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var roamingSettings = new Mock<IApplicationDataContainer>();
+            var terminalOptionsChangedEventInvoked = false;
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                RoamingSettings = roamingSettings.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+            Messenger.Default.Register<TerminalOptionsChangedMessage>(this,
+                message => terminalOptionsChangedEventInvoked = true);
+
+            settingsService.SaveTerminalOptions(terminalOptions);
+
+            terminalOptionsChangedEventInvoked.Should().BeTrue();
+        }
+
+        [Fact]
+        public void GetApplicationSettings_Default_ReturnsApplicationSettingsFromRoamingSettings()
+        {
+            var applicationSettings = _fixture.Create<ApplicationSettings>();
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var roamingSettings = new Mock<IApplicationDataContainer>();
+            roamingSettings.Setup(x => x.ReadValueFromJson(nameof(ApplicationSettings), It.IsAny<ApplicationSettings>())).Returns(applicationSettings);
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                RoamingSettings = roamingSettings.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+
+            var result = settingsService.GetApplicationSettings();
+
+            result.Should().BeEquivalentTo(applicationSettings);
+            roamingSettings.Verify(x => x.ReadValueFromJson(nameof(ApplicationSettings), It.IsAny<ApplicationSettings>()), Times.Once);
+        }
+
+        [Fact]
+        public void SaveApplicationSettings_Default_WritesToRoamingSettings()
+        {
+            var applicationSettings = _fixture.Create<ApplicationSettings>();
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var roamingSettings = new Mock<IApplicationDataContainer>();
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                RoamingSettings = roamingSettings.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+
+            settingsService.SaveApplicationSettings(applicationSettings);
+
+            roamingSettings.Verify(x => x.WriteValueAsJson(nameof(ApplicationSettings), applicationSettings), Times.Once);
+        }
+
+        [Fact]
+        public void SaveApplicationSettings_Default_InvokesApplicationSettingsChangedEvent()
+        {
+            var applicationSettings = _fixture.Create<ApplicationSettings>();
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var roamingSettings = new Mock<IApplicationDataContainer>();
+            var applicationSettingsChangedEventInvoked = false;
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                RoamingSettings = roamingSettings.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+            Messenger.Default.Register<ApplicationSettingsChangedMessage>(this,
+                a => applicationSettingsChangedEventInvoked = true);
+
+            settingsService.SaveApplicationSettings(applicationSettings);
+
+            applicationSettingsChangedEventInvoked.Should().BeTrue();
+        }
+
+        [Fact]
+        public void GetKeyBindings_KeyBindingsInKeyBindingsContainer_ReturnsKeyBindingsFromKeyBindingsContainer()
+        {
+            var commands = _fixture.CreateMany<Command>(5);
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var keyBindingsContainer = new Mock<IApplicationDataContainer>();
+            foreach (var command in commands)
+            {
+                keyBindingsContainer.Setup(x => x.ReadValueFromJson<Collection<KeyBinding>>(command.ToString(), null)).Returns(new Collection<KeyBinding> { });
+            }
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                KeyBindings = keyBindingsContainer.Object,
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+
+            var result = settingsService.GetCommandKeyBindings();
+
+            foreach (var command in commands)
+            {
+                keyBindingsContainer.Verify(x => x.ReadValueFromJson<Collection<KeyBinding>>(command.ToString(), null), Times.Once);
+            }
+        }
+
+        [Fact]
+        public void GetKeyBindings_KeyBindingsNotInKeyBindingsContainer_ReturnsKeyBindingsFromDefaultValueProvider()
+        {
+            var commands = _fixture.CreateMany<Command>(5);
+            var defaultValueProvider = new Mock<IDefaultValueProvider>();
+            var keyBindingsContainer = new Mock<IApplicationDataContainer>();
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                KeyBindings = keyBindingsContainer.Object,
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
+
+            var result = settingsService.GetCommandKeyBindings();
+
+            foreach (Command command in Enum.GetValues(typeof(Command)))
+            {
+                defaultValueProvider.Verify(x => x.GetDefaultKeyBindings(command), Times.Once);
+            }
+        }
+
+        [Fact]
+        public void SaveKeyBindings_Default_WritesToKeyBindingsContainer()
+        {
+            var command = _fixture.Create<Command>();
+            var keyBindings = _fixture.Create<ICollection<KeyBinding>>();
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var keyBindingsContainer = new Mock<IApplicationDataContainer>();
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                KeyBindings = keyBindingsContainer.Object,
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+
+            settingsService.SaveKeyBindings(command.ToString(), keyBindings);
+
+            keyBindingsContainer.Verify(x => x.WriteValueAsJson(command.ToString(), keyBindings), Times.Once);
+        }
+
+        [Fact]
+        public void SaveKeyBindings_Default_InvokesKeyBindingsChangedEvent()
+        {
+            var command = _fixture.Create<Command>();
+            var keyBindings = _fixture.Create<Collection<KeyBinding>>();
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var keyBindingsContainer = new Mock<IApplicationDataContainer>();
+            var keyBindingsChangedEventInvoked = false;
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                KeyBindings = keyBindingsContainer.Object,
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+            Messenger.Default.Register<KeyBindingsChangedMessage>(this,
+                message => keyBindingsChangedEventInvoked = true);
+
+            settingsService.SaveKeyBindings(command.ToString(), keyBindings);
+
+            keyBindingsChangedEventInvoked.Should().BeTrue();
+        }
+
+        [Fact]
+        public void ResetKeyBindings_Default_WritesToKeyBindingsContainerFromDefaultValueProvider()
+        {
+            var defaultValueProvider = new Mock<IDefaultValueProvider>();
+            var keyBindingsContainer = new Mock<IApplicationDataContainer>();
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                KeyBindings = keyBindingsContainer.Object,
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
+
+            settingsService.ResetKeyBindings();
+
+            foreach (Command command in Enum.GetValues(typeof(Command)))
+            {
+                keyBindingsContainer.Verify(x => x.WriteValueAsJson(command.ToString(), It.IsAny<ICollection<KeyBinding>>()), Times.Once);
+                defaultValueProvider.Verify(x => x.GetDefaultKeyBindings(command), Times.Once);
+            }
+        }
+
+        [Fact]
+        public void ResetKeyBindings_Default_InvokesKeyBindingsChangedEvent()
+        {
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var keyBindingsContainer = new Mock<IApplicationDataContainer>();
+            var keyBindingsChangedEventInvoked = false;
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                KeyBindings = keyBindingsContainer.Object,
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+            Messenger.Default.Register<KeyBindingsChangedMessage>(this,
+                message => keyBindingsChangedEventInvoked = true);
+
+            settingsService.ResetKeyBindings();
+
+            keyBindingsChangedEventInvoked.Should().BeTrue();
+        }
+
+        [Fact]
+        public void GetDefaultShellProfileId_ValueExistsInRoamingSettings_ReturnsDefaultShellProfileId()
+        {
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var localSettings = new Mock<IApplicationDataContainer>();
+            var defaultShellProfileId = (object)_fixture.Create<Guid>();
+            localSettings.Setup(x => x.TryGetValue(SettingsService.DefaultShellProfileKey, out defaultShellProfileId)).Returns(true);
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                LocalSettings = localSettings.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+
+            var result = settingsService.GetDefaultShellProfileId();
+
+            result.Should().Be((Guid)defaultShellProfileId);
+            localSettings.Verify(x => x.TryGetValue(SettingsService.DefaultShellProfileKey, out defaultShellProfileId), Times.Once);
+        }
+
+        [Fact]
+        public void GetDefaultShellProfileId_ValueDoesNotExistInRoamingSettings_ReturnsDefaultShellProfileIdFromDefaultValueProvider()
+        {
+            var defaultValueProvider = new Mock<IDefaultValueProvider>();
+            var defaultShellProfileId = _fixture.Create<Guid>();
+            defaultValueProvider.Setup(x => x.GetDefaultShellProfileId()).Returns(defaultShellProfileId);
+            var localSettings = new Mock<IApplicationDataContainer>();
+            var currentDefaultShellProfileId = (object)_fixture.Create<Guid>();
+            localSettings.Setup(x => x.TryGetValue(SettingsService.DefaultShellProfileKey, out currentDefaultShellProfileId)).Returns(false);
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                LocalSettings = localSettings.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
+
+            var result = settingsService.GetDefaultShellProfileId();
+
+            result.Should().Be(defaultShellProfileId);
+            defaultValueProvider.Verify(x => x.GetDefaultShellProfileId(), Times.Once);
+            localSettings.Verify(x => x.TryGetValue(SettingsService.DefaultShellProfileKey, out currentDefaultShellProfileId), Times.Once);
+        }
+
+        [Fact]
+        public void GetShellProfiles_Default_CallsGetAllOnShellProfilesContainer()
+        {
+            var shellProfiles = _fixture.CreateMany<ShellProfile>(3);
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var shellProfilesContainer = new Mock<IApplicationDataContainer>();
+            shellProfilesContainer.Setup(x => x.GetAll()).Returns(shellProfiles.Select(JsonConvert.SerializeObject));
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                ShellProfiles = shellProfilesContainer.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+
+            var result = settingsService.GetShellProfiles();
+
+            result.Select(p => p.EqualTo(shellProfiles.FirstOrDefault(x => x.Id == p.Id)).Should().BeTrue());
+            shellProfilesContainer.Verify(x => x.GetAll(), Times.Once);
+        }
+
+        [Fact]
+        public void SaveShellProfile_Default_WritesToShellProfilesContainer()
+        {
+            var shellProfile = _fixture.Create<ShellProfile>();
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var shellProfilesContainer = new Mock<IApplicationDataContainer>();
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                ShellProfiles = shellProfilesContainer.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+
+            settingsService.SaveShellProfile(shellProfile);
+
+            shellProfilesContainer.Verify(x => x.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile), Times.Once);
+        }
+
+        [Fact]
+        public void DeleteShellProfile_Default_CallsDeleteOnShellProfilesContainer()
+        {
+            var shellProfileId = _fixture.Create<Guid>();
+            var defaultValueProvider = Mock.Of<IDefaultValueProvider>();
+            var shellProfilesContainer = new Mock<IApplicationDataContainer>();
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                ShellProfiles = shellProfilesContainer.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                Themes = Mock.Of<IApplicationDataContainer>()
+            };
+            var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
+
+            settingsService.DeleteShellProfile(shellProfileId);
+
+            shellProfilesContainer.Verify(x => x.Delete(shellProfileId.ToString()), Times.Once);
+        }
+
+        [Fact]
+        public void GetDefaultShellProfile_ProfileNotFound_DefaultShellProfileIdGetsResetToDefault()
+        {
+            var currentShellProfileId = (object)_fixture.Create<Guid>();
+            var defaultShellProfile = _fixture.Create<ShellProfile>();
+            var defaultValueProvider = new Mock<IDefaultValueProvider>();
+            defaultValueProvider.Setup(x => x.GetDefaultShellProfileId()).Returns(defaultShellProfile.Id);
+            var shellProfilesContainer = new Mock<IApplicationDataContainer>();
+            var localSettings = new Mock<IApplicationDataContainer>();
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                ShellProfiles = shellProfilesContainer.Object,
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = localSettings.Object,
+                Themes = Mock.Of<IApplicationDataContainer>()
+            };
+            shellProfilesContainer.Setup(x => x.ReadValueFromJson(currentShellProfileId.ToString(), default(ShellProfile))).Returns(value: null);
+            shellProfilesContainer.Setup(x => x.ReadValueFromJson(defaultShellProfile.Id.ToString(), default(ShellProfile))).Returns(defaultShellProfile);
+            localSettings.Setup(x => x.TryGetValue(SettingsService.DefaultShellProfileKey, out currentShellProfileId)).Returns(true);
+            var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
+
+            var result = settingsService.GetDefaultShellProfile();
+
+            result.Should().Be(defaultShellProfile);
+            localSettings.Verify(x => x.SetValue(SettingsService.DefaultShellProfileKey, defaultShellProfile.Id), Times.Once);
+        }
+
+        [Fact]
+        public void GetCurrentTheme_ThemeNotFound_CurrentThemeIdGetsResetToDefault()
+        {
+            var currentThemeId = (object)_fixture.Create<Guid>();
+            var defaultTheme = _fixture.Create<TerminalTheme>();
+            var defaultValueProvider = new Mock<IDefaultValueProvider>();
+            defaultValueProvider.Setup(x => x.GetDefaultThemeId()).Returns(defaultTheme.Id);
+            var themesContainer = new Mock<IApplicationDataContainer>();
+            var roamingSettings = new Mock<IApplicationDataContainer>();
+            var applicationDataContainers = new ApplicationDataContainers
+            {
+                ShellProfiles = Mock.Of<IApplicationDataContainer>(),
+                KeyBindings = Mock.Of<IApplicationDataContainer>(),
+                LocalSettings = Mock.Of<IApplicationDataContainer>(),
+                RoamingSettings = roamingSettings.Object,
+                Themes = themesContainer.Object
+            };
+            themesContainer.Setup(x => x.ReadValueFromJson(currentThemeId.ToString(), default(TerminalTheme))).Returns(value: null);
+            themesContainer.Setup(x => x.ReadValueFromJson(defaultTheme.Id.ToString(), default(TerminalTheme))).Returns(defaultTheme);
+            roamingSettings.Setup(x => x.TryGetValue(SettingsService.CurrentThemeKey, out currentThemeId)).Returns(true);
+            var settingsService = new SettingsService(defaultValueProvider.Object, applicationDataContainers);
+
+            var result = settingsService.GetCurrentTheme();
+
+            result.Should().Be(defaultTheme);
+            roamingSettings.Verify(x => x.SetValue(SettingsService.CurrentThemeKey, defaultTheme.Id), Times.Once);
+        }
+    }
+}

FluentTerminal.App.Services.Test/TestData/AdventureTime.itermcolors

@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Ansi 0 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.016337040811777115</real>
+		<key>Green Component</key>
+		<real>0.016232240945100784</real>
+		<key>Red Component</key>
+		<real>0.020433688536286354</real>
+	</dict>
+	<key>Ansi 1 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.075083047151565552</real>
+		<key>Green Component</key>
+		<real>0.0</real>
+		<key>Red Component</key>
+		<real>0.73976802825927734</real>
+	</dict>
+	<key>Ansi 10 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.43171143531799316</real>
+		<key>Green Component</key>
+		<real>1</real>
+		<key>Red Component</key>
+		<real>0.61819148063659668</real>
+	</dict>
+	<key>Ansi 11 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.10242157429456711</real>
+		<key>Green Component</key>
+		<real>0.7578997015953064</real>
+		<key>Red Component</key>
+		<real>0.93761706352233887</real>
+	</dict>
+	<key>Ansi 12 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.77801346778869629</real>
+		<key>Green Component</key>
+		<real>0.59102588891983032</real>
+		<key>Red Component</key>
+		<real>0.096501544117927551</real>
+	</dict>
+	<key>Ansi 13 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.32394066452980042</real>
+		<key>Green Component</key>
+		<real>0.34950375556945801</real>
+		<key>Red Component</key>
+		<real>0.60686224699020386</real>
+	</dict>
+	<key>Ansi 14 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.95550096035003662</real>
+		<key>Green Component</key>
+		<real>0.97915208339691162</real>
+		<key>Red Component</key>
+		<real>0.78500419855117798</real>
+	</dict>
+	<key>Ansi 15 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.98438382148742676</real>
+		<key>Green Component</key>
+		<real>0.96043074131011963</real>
+		<key>Red Component</key>
+		<real>0.96449893712997437</real>
+	</dict>
+	<key>Ansi 2 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.092498354613780975</real>
+		<key>Green Component</key>
+		<real>0.6950421929359436</real>
+		<key>Red Component</key>
+		<real>0.28945007920265198</real>
+	</dict>
+	<key>Ansi 3 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.1164485365152359</real>
+		<key>Green Component</key>
+		<real>0.45553147792816162</real>
+		<key>Red Component</key>
+		<real>0.90543299913406372</real>
+	</dict>
+	<key>Ansi 4 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.77829605340957642</real>
+		<key>Green Component</key>
+		<real>0.28880593180656433</real>
+		<key>Red Component</key>
+		<real>0.059818677604198456</real>
+	</dict>
+	<key>Ansi 5 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.57602518796920776</real>
+		<key>Green Component</key>
+		<real>0.35004982352256775</real>
+		<key>Red Component</key>
+		<real>0.40191537141799927</real>
+	</dict>
+	<key>Ansi 6 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.59465551376342773</real>
+		<key>Green Component</key>
+		<real>0.64633101224899292</real>
+		<key>Red Component</key>
+		<real>0.43781715631484985</real>
+	</dict>
+	<key>Ansi 7 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.75428962707519531</real>
+		<key>Green Component</key>
+		<real>0.86175870895385742</real>
+		<key>Red Component</key>
+		<real>0.97308963537216187</real>
+	</dict>
+	<key>Ansi 8 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.7491685152053833</real>
+		<key>Green Component</key>
+		<real>0.48549851775169373</real>
+		<key>Red Component</key>
+		<real>0.30726605653762817</real>
+	</dict>
+	<key>Ansi 9 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.35247993469238281</real>
+		<key>Green Component</key>
+		<real>0.37095117568969727</real>
+		<key>Red Component</key>
+		<real>0.98876720666885376</real>
+	</dict>
+	<key>Background Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.27054747939109802</real>
+		<key>Green Component</key>
+		<real>0.11274909973144531</real>
+		<key>Red Component</key>
+		<real>0.12003477662801743</real>
+	</dict>
+	<key>Bold Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.075083047151565552</real>
+		<key>Green Component</key>
+		<real>0.0</real>
+		<key>Red Component</key>
+		<real>0.73976802825927734</real>
+	</dict>
+	<key>Cursor Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.21945112943649292</real>
+		<key>Green Component</key>
+		<real>0.74987590312957764</real>
+		<key>Red Component</key>
+		<real>0.93704277276992798</real>
+	</dict>
+	<key>Cursor Text Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.037519864737987518</real>
+		<key>Green Component</key>
+		<real>0.032785907387733459</real>
+		<key>Red Component</key>
+		<real>0.02988031692802906</real>
+	</dict>
+	<key>Foreground Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.75428962707519531</real>
+		<key>Green Component</key>
+		<real>0.86175870895385742</real>
+		<key>Red Component</key>
+		<real>0.97308963537216187</real>
+	</dict>
+	<key>Selected Text Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.767447829246521</real>
+		<key>Green Component</key>
+		<real>0.85237473249435425</real>
+		<key>Red Component</key>
+		<real>0.95287787914276123</real>
+	</dict>
+	<key>Selection Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.30699285864830017</real>
+		<key>Green Component</key>
+		<real>0.41871801018714905</real>
+		<key>Red Component</key>
+		<real>0.43789717555046082</real>
+	</dict>
+</dict>
+</plist>

FluentTerminal.App.Services.Test/ThemeParserFactoryTests.cs

@@ -0,0 +1,45 @@
+using AutoFixture;
+using FluentAssertions;
+using FluentTerminal.App.Services.Implementation;
+using Moq;
+using Xunit;
+
+namespace FluentTerminal.App.Services.Test
+{
+    public class ThemeParserFactoryTests
+    {
+        private readonly Fixture _fixture;
+
+        public ThemeParserFactoryTests()
+        {
+            _fixture = new Fixture();
+        }
+
+        [Fact]
+        public void GetParser_SupportedFileType_ReturnsParser()
+        {
+            var supportedFileType = _fixture.Create<string>();
+            var parser = new Mock<IThemeParser>();
+            parser.Setup(x => x.SupportedFileTypes).Returns(new string[] { supportedFileType });
+            var themeParserFactory = new ThemeParserFactory(new IThemeParser[] { parser.Object });
+
+            var result = themeParserFactory.GetParser(supportedFileType);
+
+            parser.Should().Be(parser);
+        }
+
+        [Fact]
+        public void GetParser_UnsupportedFileType_ReturnsNull()
+        {
+            var unSupportedFileType = _fixture.Create<string>();
+            var supportedFileType = _fixture.Create<string>();
+            var parser = new Mock<IThemeParser>();
+            parser.Setup(x => x.SupportedFileTypes).Returns(new string[] { supportedFileType });
+            var themeParserFactory = new ThemeParserFactory(new IThemeParser[] { parser.Object });
+
+            var result = themeParserFactory.GetParser(unSupportedFileType);
+
+            result.Should().BeNull();
+        }
+    }
+}

FluentTerminal.App.Services.Test/TrayProcessCommunicationServiceTests.cs

@@ -0,0 +1,179 @@
+using AutoFixture;
+using FluentAssertions;
+using FluentTerminal.App.Services.Implementation;
+using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
+using FluentTerminal.Models.Requests;
+using FluentTerminal.Models.Responses;
+using Moq;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Windows.Foundation.Collections;
+using Xunit;
+
+namespace FluentTerminal.App.Services.Test
+{
+    public class TrayProcessCommunicationServiceTests
+    {
+        private readonly Fixture _fixture;
+
+        public TrayProcessCommunicationServiceTests()
+        {
+            _fixture = new Fixture();
+        }
+
+        [Fact]
+        public async Task CreateTerminal_Default_ReturnsResponseFromAppServiceConnection()
+        {
+            var settingsService = new Mock<ISettingsService>();
+            var keyBindings = _fixture.CreateMany<KeyBinding>(3);
+            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
+            {
+                [nameof(Command.ToggleWindow)] = keyBindings.ToList()
+            });
+            var appServiceConnection = new Mock<IAppServiceConnection>();
+            var response = _fixture.Create<CreateTerminalResponse>();
+            var responseMessage = new ValueSet
+            {
+                [MessageKeys.Type] = _fixture.Create<string>(),
+                [MessageKeys.Content] = JsonConvert.SerializeObject(response)
+            };
+            appServiceConnection.Setup(x => x.SendMessageAsync(It.IsAny<ValueSet>())).Returns(Task.FromResult(responseMessage));
+            var terminalSize = _fixture.Create<TerminalSize>();
+            var shellProfile = _fixture.Create<ShellProfile>();
+            var sessionType = _fixture.Create<SessionType>();
+            var id = _fixture.Create<byte>();
+            var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
+            trayProcessCommunicationService.Initialize(appServiceConnection.Object);
+
+            var result = await trayProcessCommunicationService.CreateTerminal(id, terminalSize, shellProfile, sessionType);
+
+            result.Should().BeEquivalentTo(response);
+        }
+
+        [Fact]
+        public async Task ResizeTerminal_Default_SendsResizeTerminalRequest()
+        {
+            var terminalId = _fixture.Create<byte>();
+            var terminalSize = _fixture.Create<TerminalSize>();
+            var settingsService = new Mock<ISettingsService>();
+            var keyBindings = _fixture.CreateMany<KeyBinding>(3);
+            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
+            {
+                [nameof(Command.ToggleWindow)] = keyBindings.ToList()
+            });
+            var appServiceConnection = new Mock<IAppServiceConnection>();
+            var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
+            trayProcessCommunicationService.Initialize(appServiceConnection.Object);
+
+            await trayProcessCommunicationService.ResizeTerminal(terminalId, terminalSize);
+
+            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<ValueSet>(d => (byte)d[MessageKeys.Type] == (byte)MessageIdentifiers.ResizeTerminalRequest)), Times.Once);
+        }
+
+        [Fact]
+        public async Task Write_Default_SendsWriteDataRequest()
+        {
+            var terminalId = _fixture.Create<byte>();
+            var data = _fixture.Create<byte[]>();
+            var settingsService = new Mock<ISettingsService>();
+            var keyBindings = _fixture.CreateMany<KeyBinding>(3);
+            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
+            {
+                [nameof(Command.ToggleWindow)] = keyBindings.ToList()
+            });
+            var appServiceConnection = new Mock<IAppServiceConnection>();
+            var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
+            trayProcessCommunicationService.Initialize(appServiceConnection.Object);
+
+            await trayProcessCommunicationService.Write(terminalId, data);
+
+            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<ValueSet>(d => (byte)d[MessageKeys.Type] == Constants.TerminalBufferRequestIdentifier)), Times.Once);
+        }
+
+        [Fact]
+        public async Task CloseTerminal_Default_SendsTerminalExitedRequest()
+        {
+            var terminalId = _fixture.Create<byte>();
+            var settingsService = new Mock<ISettingsService>();
+            var keyBindings = _fixture.CreateMany<KeyBinding>(3);
+            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
+            {
+                [nameof(Command.ToggleWindow)] = keyBindings.ToList()
+            });
+            var appServiceConnection = new Mock<IAppServiceConnection>();
+            var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
+            trayProcessCommunicationService.Initialize(appServiceConnection.Object);
+
+            await trayProcessCommunicationService.CloseTerminal(terminalId);
+
+            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<ValueSet>(d => (byte)d[MessageKeys.Type] == (byte)MessageIdentifiers.TerminalExitedRequest)), Times.Once);
+        }
+
+        [Fact]
+        public void OnMessageReceived_TerminalExitedRequest_InvokesTerminalExitedEvent()
+        {
+            var request = new TerminalExitedRequest(_fixture.Create<byte>(), _fixture.Create<int>());
+
+            var receivedExitStatus = (TerminalExitStatus) null;
+
+            var message = new ValueSet
+            {
+                [MessageKeys.Type] = (byte) MessageIdentifiers.TerminalExitedRequest,
+                [MessageKeys.Content] = JsonConvert.SerializeObject(request)
+            };
+            var settingsService = new Mock<ISettingsService>();
+            var keyBindings = _fixture.CreateMany<KeyBinding>(3);
+            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
+            {
+                [nameof(Command.ToggleWindow)] = keyBindings.ToList()
+            });
+            var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
+            var appServiceConnection = new Mock<IAppServiceConnection>();
+            trayProcessCommunicationService.Initialize(appServiceConnection.Object);
+            trayProcessCommunicationService.TerminalExited += (s, status) =>
+            {
+                receivedExitStatus = status;
+            };
+
+            appServiceConnection.Raise(x => x.MessageReceived += null, null, message);
+
+            receivedExitStatus.Should().NotBeNull();
+            receivedExitStatus.TerminalId.Should().Be(request.TerminalId);
+            receivedExitStatus.ExitCode.Should().Be(request.ExitCode);
+        }
+
+        [Fact]
+        public void OnMessageReceived_DisplayTerminalOutputRequest_InvokesCorrectOutputHandler()
+        {
+            var terminalId = _fixture.Create<byte>();
+            var output = _fixture.Create<byte[]>();
+            var receivedOutput = default(byte[]);
+            var message = new ValueSet
+            {
+                [MessageKeys.Type] = Constants.TerminalBufferRequestIdentifier,
+                [MessageKeys.TerminalId] = terminalId,
+                [MessageKeys.Content] = output
+            };
+            var settingsService = new Mock<ISettingsService>();
+            var keyBindings = _fixture.CreateMany<KeyBinding>(3);
+            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
+            {
+                [nameof(Command.ToggleWindow)] = keyBindings.ToList()
+            });
+            var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
+            var appServiceConnection = new Mock<IAppServiceConnection>();
+            trayProcessCommunicationService.Initialize(appServiceConnection.Object);
+            trayProcessCommunicationService.SubscribeForTerminalOutput(terminalId, o =>
+            {
+                receivedOutput = o;
+            });
+
+            appServiceConnection.Raise(x => x.MessageReceived += null, null, message);
+
+            receivedOutput.Should().BeEquivalentTo(output);
+        }
+    }
+}

FluentTerminal.App.Services/Adapters/ApplicationDataContainerAdapter.cs

@@ -1,11 +1,10 @@
-using FluentTerminal.App.Services;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Windows.Storage;
 
-namespace FluentTerminal.App.Adapters
+namespace FluentTerminal.App.Services.Adapters
 {
     public class ApplicationDataContainerAdapter : IApplicationDataContainer
     {
@@ -21,6 +20,11 @@ namespace FluentTerminal.App.Adapters
             _applicationDataContainer.Values.Remove(key);
         }
 
+        public void Clear()
+        {
+            _applicationDataContainer.Values.Clear();
+        }
+
         public IEnumerable<object> GetAll()
         {
             return _applicationDataContainer.Values.Select(x => x.Value);
@@ -50,7 +54,6 @@ namespace FluentTerminal.App.Adapters
             return _applicationDataContainer.Values.TryGetValue(key, out value);
         }
 
-
         public void WriteValueAsJson<T>(string name, T value)
         {
             _applicationDataContainer.Values[name] = JsonConvert.SerializeObject(value);

FluentTerminal.App.Services/ApplicationDataContainers.cs

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

FluentTerminal.App.Services/Constants.cs

@@ -0,0 +1,15 @@
+namespace FluentTerminal.App.Services
+{
+    public static class Constants
+    {
+        public const string ThemesContainerName = "Themes";
+        public const string KeyBindingsContainerName = "KeyBindings";
+        public const string ShellProfilesContainerName = "ShellProfiles";
+        public const string SshProfilesContainerName = "SshProfiles";
+        public const byte TerminalBufferRequestIdentifier = 0;
+        public const string SshCommandName = "ssh";
+        public const string MoshCommandName = "mosh";
+        public const string ExecutedCommandsContainerName = "HistoryContainer";
+        public const string TerminalViewModelStateId = "TerminalViewModelState";
+    }
+}

FluentTerminal.App.Services/Dialogs/IAboutDialog.cs

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

FluentTerminal.App.Services/Dialogs/ICreateKeyBindingDialog.cs

@@ -7,4 +7,4 @@ namespace FluentTerminal.App.Services.Dialogs
     {
         Task<KeyBinding> CreateKeyBinding();
     }
-}
+}

FluentTerminal.App.Services/Dialogs/ICustomCommandDialog.cs

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

FluentTerminal.App.Services/Dialogs/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/IMessageDialog.cs

@@ -11,4 +11,4 @@ namespace FluentTerminal.App.Services.Dialogs
 
         Task<DialogButton> ShowAsync();
     }
-}
+}

FluentTerminal.App.Services/Dialogs/IShellProfileSelectionDialog.cs

@@ -9,4 +9,4 @@ namespace FluentTerminal.App.Services.Dialogs
 
         Task<ShellProfile> SelectProfile();
     }
-}
+}

FluentTerminal.App.Services/Dialogs/ISshConnectionInfoDialog.cs

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

FluentTerminal.App.Services/Dialogs/ISshProfileSelectionDialog.cs

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

FluentTerminal.App.Services/EventArgs/CancelableEventArgs.cs

@@ -4,4 +4,4 @@
     {
         public bool Cancelled { get; set; }
     }
-}
+}

FluentTerminal.App.Services/EventArgs/NewTabRequestedEventArgs.cs

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

FluentTerminal.App.Services/EventArgs/NewWindowRequestedEventArgs.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace FluentTerminal.App.Services.EventArgs
+{
+    public class NewWindowRequestedEventArgs : System.EventArgs
+    {
+        public Models.Enums.NewWindowAction Action { get; set; }
+        public Guid ProfileId { get; set; }
+    }
+}

FluentTerminal.App.Services/Exceptions/SaveTextFileException.cs

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

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

@@ -1,24 +1,34 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <LangVersion>7.1</LangVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <LangVersion>7.1</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="PListNet" Version="2.0.3" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
+    <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="PListNet" Version="3.0.0" />
+    <PackageReference Include="RestSharp" Version="106.6.10" />
+    <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="System.Runtime.InteropServices.WindowsRuntime" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\FluentTerminal.Models\FluentTerminal.Models.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="Windows.Foundation.FoundationContract">
+      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Windows.Foundation.UniversalApiContract">
+      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.UniversalApiContract\5.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+
 </Project>

FluentTerminal.App.Services/IAppServiceConnection.cs

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

FluentTerminal.App.Services/IApplicationDataContainer.cs

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

FluentTerminal.App.Services/IApplicationLanguageService.cs

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

FluentTerminal.App.Services/IApplicationView.cs

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

FluentTerminal.App.Services/IClipboardService.cs

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

FluentTerminal.App.Services/IDefaultValueProvider.cs

@@ -7,12 +7,20 @@ namespace FluentTerminal.App.Services
 {
     public interface IDefaultValueProvider
     {
-        IEnumerable<ShellProfile> GetPreinstalledShellProfiles();
-        Guid GetDefaultShellProfileId();
-        TerminalOptions GetDefaultTerminalOptions();
-        ICollection<KeyBinding> GetDefaultKeyBindings(Command command);
         ApplicationSettings GetDefaultApplicationSettings();
+
+        ICollection<KeyBinding> GetDefaultKeyBindings(Command command);
+
+        Guid GetDefaultShellProfileId();
+
+        IEnumerable<TabTheme> GetDefaultTabThemes();
+
+        TerminalOptions GetDefaultTerminalOptions();
+
         Guid GetDefaultThemeId();
+
+        IEnumerable<ShellProfile> GetPreinstalledShellProfiles();
+
         IEnumerable<TerminalTheme> GetPreInstalledThemes();
     }
-}
+}

FluentTerminal.App.Services/IDialogService.cs

@@ -16,5 +16,14 @@ namespace FluentTerminal.App.Services
         Task<ShellProfile> ShowProfileSelectionDialogAsync();
 
         Task<KeyBinding> ShowCreateKeyBindingDialog();
+        Task<string> ShowInputDialogAsync(string title);
+
+        Task<SshProfile> ShowSshConnectionInfoDialogAsync(SshProfile input = null);
+
+        Task<ShellProfile> ShowCustomCommandDialogAsync(ShellProfile input = null);
+
+        Task<SshProfile> ShowSshProfileSelectionDialogAsync();
+
+        Task ShowAboutDialogAsync();
     }
-}
+}

FluentTerminal.App.Services/IDispatcherTimer.cs

@@ -5,6 +5,7 @@ namespace FluentTerminal.App.Services
     public interface IDispatcherTimer
     {
         void Start();
+
         void Stop();
 
         TimeSpan Interval { get; set; }
@@ -12,4 +13,4 @@ namespace FluentTerminal.App.Services
 
         event EventHandler<object> Tick;
     }
-}
+}

FluentTerminal.App.Services/IFileSystemService.cs

@@ -12,4 +12,4 @@ namespace FluentTerminal.App.Services
 
         Task SaveTextFile(string name, string fileTypeDescription, string fileType, string content);
     }
-}
+}

FluentTerminal.App.Services/IKeyboardCommandService.cs

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

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;
 
@@ -7,36 +6,37 @@ namespace FluentTerminal.App.Services
 {
     public interface ISettingsService
     {
-        event EventHandler<Guid> CurrentThemeChanged;
-        event EventHandler<TerminalOptions> TerminalOptionsChanged;
-        event EventHandler<ApplicationSettings> ApplicationSettingsChanged;
-        event EventHandler KeyBindingsChanged;
-
-        Guid GetDefaultShellProfileId();
-        ShellProfile GetDefaultShellProfile();
-        void SaveDefaultShellProfileId(Guid id);
-
-        IEnumerable<ShellProfile> GetShellProfiles();
-        void SaveShellProfile(ShellProfile shellProfile);
         void DeleteShellProfile(Guid id);
-
-        TerminalOptions GetTerminalOptions();
-        void SaveTerminalOptions(TerminalOptions terminalOptions);
-
+        void DeleteSshProfile(Guid id);
+        void DeleteTheme(Guid id);
         ApplicationSettings GetApplicationSettings();
-        void SaveApplicationSettings(ApplicationSettings applicationSettings);
-
-        IDictionary<Command, ICollection<KeyBinding>> GetKeyBindings();
-        void SaveKeyBindings(Command command, ICollection<KeyBinding> keyBindings);
-        void ResetKeyBindings();
-
         TerminalTheme GetCurrentTheme();
         Guid GetCurrentThemeId();
+        ShellProfile GetDefaultShellProfile();
+        SshProfile GetDefaultSshProfile();
+        Guid GetDefaultShellProfileId();
+        Guid GetDefaultSshProfileId();
+        IDictionary<string, ICollection<KeyBinding>> GetCommandKeyBindings();
+        IEnumerable<ShellProfile> GetShellProfiles();
+        IEnumerable<SshProfile> GetSshProfiles();
+        IEnumerable<TabTheme> GetTabThemes();
+        TerminalOptions GetTerminalOptions();
         TerminalTheme GetTheme(Guid id);
-        void SaveCurrentThemeId(Guid id);
-
         IEnumerable<TerminalTheme> GetThemes();
-        void SaveTheme(TerminalTheme theme);
-        void DeleteTheme(Guid id);
+        void ResetKeyBindings();
+        void SaveApplicationSettings(ApplicationSettings applicationSettings);
+        void NotifyApplicationSettingsChanged(ApplicationSettings applicationSettings);
+        void SaveCurrentThemeId(Guid id);
+        void SaveDefaultShellProfileId(Guid id);
+        void SaveDefaultSshProfileId(Guid id);
+        void SaveKeyBindings(string command, ICollection<KeyBinding> keyBindings);
+        void SaveShellProfile(ShellProfile shellProfile, bool newShell = false);
+        void SaveSshProfile(SshProfile sshProfile, bool newShell = false);
+        void SaveTerminalOptions(TerminalOptions terminalOptions);
+        void SaveTheme(TerminalTheme theme, bool newTheme = false);
+        ShellProfile GetShellProfile(Guid id);
+        SshProfile GetSshProfile(Guid id);
+        string ExportSettings();
+        void ImportSettings(string serializedSettings);
     }
-}
+}

FluentTerminal.App.Services/IShellProfileMigrationService.cs

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

FluentTerminal.App.Services/IStartupTaskService.cs

@@ -0,0 +1,12 @@
+using FluentTerminal.Models.Enums;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Services
+{
+    public interface IStartupTaskService
+    {
+        Task DisableStartupTask();
+        Task<StartupTaskStatus> EnableStartupTask();
+        Task<StartupTaskStatus> GetStatus();
+    }
+}

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,28 +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 Write(string text);
-        Task FindNext(string searchText);
-        Task FindPrevious(string searchText);
-        void FocusSearchTextBox();
-    }
-}

FluentTerminal.App.Services/IThemeParser.cs

@@ -11,4 +11,4 @@ namespace FluentTerminal.App.Services
 
         Task<TerminalTheme> Parse(string fileName, Stream fileContent);
     }
-}
+}

FluentTerminal.App.Services/IThemeParserFactory.cs

@@ -8,4 +8,4 @@ namespace FluentTerminal.App.Services
 
         IThemeParser GetParser(string fileType);
     }
-}
+}

FluentTerminal.App.Services/ITrayProcessCommunicationService.cs

@@ -1,14 +1,48 @@
 using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
 using FluentTerminal.Models.Responses;
+using System;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.Services
 {
     public interface ITrayProcessCommunicationService
     {
-        Task Initialize(IAppServiceConnection appServiceConnection);
-        Task<CreateTerminalResponse> CreateTerminal(TerminalSize size, ShellProfile shellProfile);
-        Task ResizeTerminal(int id, TerminalSize size);
+        event EventHandler<TerminalExitStatus> TerminalExited;
+
+        void Initialize(IAppServiceConnection appServiceConnection);
+
+        Task<CreateTerminalResponse> CreateTerminal(byte id, TerminalSize size, ShellProfile shellProfile, SessionType sessionType);
+
+        Task<PauseTerminalOutputResponse> PauseTerminalOutput(byte id, bool pause);
+
+        Task ResizeTerminal(byte id, TerminalSize size);
+
         Task UpdateToggleWindowKeyBindings();
+
+        Task Write(byte terminalId, byte[] data);
+
+        void SubscribeForTerminalOutput(byte terminalId, Action<byte[]> callback);
+
+        void UnsubscribeFromTerminalOutput(byte terminalId);
+
+        Task CloseTerminal(byte terminalId);
+        byte GetNextTerminalId();
+
+        Task<string> GetUserName();
+
+        Task SaveTextFileAsync(string path, string content);
+
+        Task<string> GetSshConfigDirAsync();
+
+        Task<string[]> GetFilesFromSshConfigDirAsync();
+
+        Task<bool> CheckFileExistsAsync(string path);
+
+        void MuteTerminal(bool mute);
+
+        void UpdateSettings(ApplicationSettings settings);
+
+        Task<string> GetCommandPathAsync(string command);
     }
-}
+}

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

@@ -1,7 +1,10 @@
-using FluentTerminal.Models;
+using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using System;
 using System.Collections.Generic;
+using Windows.Foundation.Metadata;
+using Windows.Storage;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -9,12 +12,35 @@ namespace FluentTerminal.App.Services.Implementation
     {
         public ApplicationSettings GetDefaultApplicationSettings()
         {
+            var logDirectoryPath = string.Empty;
+            try
+            {
+                // Accessing ApplicationData.Current during run of unit tests causes
+                // "System.InvalidOperationException : The process has no package identity" exception.
+                logDirectoryPath = ApplicationData.Current.LocalCacheFolder.Path;
+            } catch (InvalidOperationException) { }
+
             return new ApplicationSettings
             {
                 ConfirmClosingTabs = false,
                 ConfirmClosingWindows = false,
                 UnderlineSelectedTab = false,
-                NewTerminalLocation = NewTerminalLocation.Tab
+                InactiveTabColorMode = InactiveTabColorMode.Background,
+                NewTerminalLocation = NewTerminalLocation.Tab,
+                TabsPosition = TabsPosition.Top,
+                CopyOnSelect = false,
+                MouseMiddleClickAction = MouseAction.None,
+                MouseRightClickAction = MouseAction.ContextMenu,
+                ShowNewOutputIndicator = false,
+                EnableTrayIcon = true,
+                ShowCustomTitleInTitlebar = true,
+                UseMoshByDefault = true,
+                AutoFallbackToWindowsUsernameInLinks = true,
+                RTrimCopiedLines = true,
+                MuteTerminalBeeps = true,
+                EnableLogging = false,
+                PrintableOutputOnly = true,
+                LogDirectoryPath = logDirectoryPath
             };
         }
 
@@ -23,189 +49,318 @@ namespace FluentTerminal.App.Services.Implementation
             switch (command)
             {
                 case Command.ToggleWindow:
-                return new List<KeyBinding>
+                    return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = Command.ToggleWindow,
-                        Ctrl = false,
-                        Alt = false,
-                        Shift = false,
+                        Command = nameof(Command.ToggleWindow),
                         Key = (int)ExtendedVirtualKey.Scroll
                     }
                 };
 
                 case Command.NextTab:
-                return new List<KeyBinding>
+                    return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = Command.NextTab,
+                        Command = nameof(Command.NextTab),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
                         Key = (int)ExtendedVirtualKey.Tab
                     }
                 };
 
                 case Command.PreviousTab:
-                return new List<KeyBinding>
+                    return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = Command.PreviousTab,
+                        Command = nameof(Command.PreviousTab),
                         Ctrl = true,
-                        Alt = false,
                         Shift = true,
                         Key = (int)ExtendedVirtualKey.Tab
                     }
                 };
 
-                case Command.NewTab:
-                return new List<KeyBinding>
+                case Command.SwitchToTerm1:
+                case Command.SwitchToTerm2:
+                case Command.SwitchToTerm3:
+                case Command.SwitchToTerm4:
+                case Command.SwitchToTerm5:
+                case Command.SwitchToTerm6:
+                case Command.SwitchToTerm7:
+                case Command.SwitchToTerm8:
+                case Command.SwitchToTerm9:
+                    return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = Command.NewTab,
-                        Ctrl = true,
-                        Alt = false,
-                        Shift = false,
-                        Key = (int)ExtendedVirtualKey.T
+                        Command = command.ToString(),
+                        Alt = true,
+                        Key = (int)ExtendedVirtualKey.Number1 + (command - Command.SwitchToTerm1)
                     }
                 };
 
-                case Command.ConfigurableNewTab:
-                return new List<KeyBinding>
+                case Command.DuplicateTab:
+                    return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = Command.ConfigurableNewTab,
+                        Command = nameof(Command.DuplicateTab),
+                        Ctrl = true,
+                        Shift = true,
+                        Key = (int)ExtendedVirtualKey.D
+                    }
+                };
+
+                case Command.NewTab:
+                    return new List<KeyBinding>
+                {
+                    new KeyBinding
+                    {
+                        Command = nameof(Command.NewTab),
                         Ctrl = true,
-                        Alt = false,
                         Shift = true,
                         Key = (int)ExtendedVirtualKey.T
                     }
                 };
 
-                case Command.CloseTab:
-                return new List<KeyBinding>
+                case Command.ConfigurableNewTab:
+                    return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = Command.CloseTab,
+                        Command = nameof(Command.ConfigurableNewTab),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
+                        Alt = true,
+                        Key = (int)ExtendedVirtualKey.T
+                    }
+                };
+
+                case Command.NewSshTab:
+                    return new List<KeyBinding>
+                    {
+                        new KeyBinding
+                        {
+                            Command = nameof(Command.NewSshTab),
+                            Ctrl = true,
+                            Shift = true,
+                            Key = (int)ExtendedVirtualKey.Y
+                        }
+                    };
+
+                case Command.NewSshWindow:
+                    return new List<KeyBinding>
+                    {
+                        new KeyBinding
+                        {
+                            Command = nameof(Command.NewSshWindow),
+                            Ctrl = true,
+                            Alt = true,
+                            Key = (int)ExtendedVirtualKey.Y
+                        }
+                    };
+
+                case Command.NewCustomCommandTab:
+                    return new List<KeyBinding>
+                    {
+                        new KeyBinding
+                        {
+                            Command = nameof(Command.NewCustomCommandTab),
+                            Ctrl = true,
+                            Shift = true,
+                            Key = (int)ExtendedVirtualKey.Q
+                        }
+                    };
+
+                case Command.NewCustomCommandWindow:
+                    return new List<KeyBinding>
+                    {
+                        new KeyBinding
+                        {
+                            Command = nameof(Command.NewCustomCommandWindow),
+                            Ctrl = true,
+                            Alt = true,
+                            Key = (int)ExtendedVirtualKey.Q
+                        }
+                    };
+
+                case Command.SavedSshNewTab:
+                    return new List<KeyBinding>
+                    {
+                        new KeyBinding
+                        {
+                            Command = nameof(Command.SavedSshNewTab),
+                            Ctrl = true,
+                            Shift = true,
+                            Key = (int)ExtendedVirtualKey.U
+                        }
+                    };
+
+                case Command.SavedSshNewWindow:
+                    return new List<KeyBinding>
+                    {
+                        new KeyBinding
+                        {
+                            Command = nameof(Command.SavedSshNewWindow),
+                            Ctrl = true,
+                            Alt = true,
+                            Key = (int)ExtendedVirtualKey.U
+                        }
+                    };
+
+
+                case Command.ChangeTabTitle:
+                    return new List<KeyBinding>
+                {
+                    new KeyBinding
+                    {
+                        Command = nameof(Command.ChangeTabTitle),
+                        Ctrl = true,
+                        Shift = true,
+                        Key = (int)ExtendedVirtualKey.R
+                    }
+                };
+
+                case Command.CloseTab:
+                    return new List<KeyBinding>
+                {
+                    new KeyBinding
+                    {
+                        Command = nameof(Command.CloseTab),
+                        Ctrl = true,
+                        Shift = true,
                         Key = (int)ExtendedVirtualKey.W
                     }
                 };
 
                 case Command.NewWindow:
-                return new List<KeyBinding>
+                    return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = Command.NewWindow,
+                        Command = nameof(Command.NewWindow),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
+                        Shift = true,
+                        Key = (int)ExtendedVirtualKey.N
+                    }
+                };
+
+                case Command.ConfigurableNewWindow:
+                    return new List<KeyBinding>
+                {
+                    new KeyBinding
+                    {
+                        Command = nameof(Command.ConfigurableNewWindow),
+                        Ctrl = true,
+                        Alt = true,
                         Key = (int)ExtendedVirtualKey.N
                     }
                 };
 
                 case Command.ShowSettings:
-                return new List<KeyBinding>
+                    return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = Command.ShowSettings,
+                        Command = nameof(Command.ShowSettings),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
+                        Shift = true,
                         Key = (int)ExtendedVirtualKey.Comma
                     }
                 };
 
                 case Command.Copy:
-                return new List<KeyBinding>
+                    return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = Command.Copy,
+                        Command = nameof(Command.Copy),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
+                        Shift = true,
                         Key = (int)ExtendedVirtualKey.C
                     }
                 };
 
                 case Command.Paste:
-                return new List<KeyBinding>
+                    return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = Command.Paste,
+                        Command = nameof(Command.Paste),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
+                        Shift = true,
+                        Key = (int)ExtendedVirtualKey.V
+                    }
+                };
+
+
+                case Command.PasteWithoutNewlines:
+                    return new List<KeyBinding>
+                {
+                    new KeyBinding
+                    {
+                        Command = nameof(Command.PasteWithoutNewlines),
+                        Ctrl = true,
+                        Alt = true,
                         Key = (int)ExtendedVirtualKey.V
                     }
                 };
 
                 case Command.Search:
-                return new List<KeyBinding>
+                    return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = Command.Search,
+                        Command = nameof(Command.Search),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
+                        Shift = true,
                         Key = (int)ExtendedVirtualKey.F
                     }
                 };
 
                 case Command.ToggleFullScreen:
-                return new List<KeyBinding>
+                    return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = Command.ToggleFullScreen,
-                        Ctrl = false,
+                        Command = nameof(Command.ToggleFullScreen),
                         Alt = true,
-                        Shift = false,
                         Key = (int)ExtendedVirtualKey.Enter
+                    },
+                    new KeyBinding
+                    {
+                        Command = nameof(Command.ToggleFullScreen),
+                        Key = (int)ExtendedVirtualKey.F11
                     }
                 };
 
                 case Command.SelectAll:
-                return new List<KeyBinding>
+                    return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = Command.SelectAll,
+                        Command = nameof(Command.SelectAll),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
+                        Shift = true,
                         Key = (int)ExtendedVirtualKey.A
                     }
                 };
 
                 case Command.Clear:
-                return new List<KeyBinding>
+                    return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = Command.Clear,
+                        Command = nameof(Command.Clear),
                         Ctrl = true,
-                        Alt = false,
-                        Shift = false,
+                        Alt = true,
                         Key = (int)ExtendedVirtualKey.L
                     }
                 };
-            }
 
-            return null;
+                default:
+                    throw new InvalidOperationException($"Default keybindings for Command '{command}' are missing");
+            }
         }
 
         public Guid GetDefaultShellProfileId()
@@ -213,6 +368,60 @@ namespace FluentTerminal.App.Services.Implementation
             return Guid.Parse("813f2298-210a-481a-bdbf-c17bc637a3e2");
         }
 
+        public IEnumerable<TabTheme> GetDefaultTabThemes()
+        {
+            return new[]
+            {
+                new TabTheme
+                {
+                    Id = 0,
+                    Name = I18N.Translate("TabTheme.None"),
+                    BackgroundOpacity = double.NaN,
+                    BackgroundPointerOverOpacity = double.NaN,
+                    BackgroundPressedOpacity = double.NaN,
+                    BackgroundSelectedOpacity = double.NaN,
+                    BackgroundSelectedPointerOverOpacity = double.NaN,
+                    BackgroundSelectedPressedOpacity = double.NaN
+                },
+                new TabTheme
+                {
+                    Id = 1,
+                    Name = I18N.Translate("TabTheme.Red"),
+                    Color = "#E81123"
+                },
+                new TabTheme
+                {
+                    Id = 2,
+                    Name = I18N.Translate("TabTheme.Green"),
+                    Color = "#10893E"
+                },
+                new TabTheme
+                {
+                    Id = 3,
+                    Name = I18N.Translate("TabTheme.Blue"),
+                    Color = "#0078D7"
+                },
+                new TabTheme
+                {
+                    Id = 4,
+                    Name = I18N.Translate("TabTheme.Purple"),
+                    Color = "#881798"
+                },
+                new TabTheme
+                {
+                    Id = 5,
+                    Name = I18N.Translate("TabTheme.Orange"),
+                    Color = "#FF8C00"
+                },
+                new TabTheme
+                {
+                    Id = 6,
+                    Name = I18N.Translate("TabTheme.Teal"),
+                    Color = "#00B7C3"
+                }
+            };
+        }
+
         public TerminalOptions GetDefaultTerminalOptions()
         {
             return new TerminalOptions
@@ -223,8 +432,11 @@ namespace FluentTerminal.App.Services.Implementation
                 ScrollBarStyle = ScrollBarStyle.Hidden,
                 FontFamily = "Consolas",
                 FontSize = 13,
+                BoldText = false,
                 BackgroundOpacity = 0.8,
-                ScrollBackLimit = 1000
+                Padding = 12,
+                ScrollBackLimit = 1000,
+                WordSeparator = " ()[]{}:;|│!&*<>@&quot;&squo;"
             };
         }
 
@@ -241,28 +453,85 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     Id = GetDefaultShellProfileId(),
                     Name = "Powershell",
+                    MigrationVersion = ShellProfile.CurrentMigrationVersion,
                     Arguments = string.Empty,
                     Location = @"C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe",
                     PreInstalled = true,
-                    WorkingDirectory = string.Empty
+                    WorkingDirectory = string.Empty,
+                    LineEndingTranslation = LineEndingStyle.DoNotModify,
+                    UseConPty = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8), // Windows 10 1903+
+                    EnvironmentVariables = new Dictionary<string, string>
+                    {
+                        ["TERM"] = "xterm-256color"
+                    },
+                    KeyBindings = new []
+                    {
+                        new KeyBinding
+                        {
+                            Command = GetDefaultShellProfileId().ToString(),
+                            Ctrl=true,
+                            Alt=true,
+                            Shift=false,
+                            Meta=false,
+                            Key=(int)ExtendedVirtualKey.Number1
+                        }
+                    }
                 },
                 new ShellProfile
                 {
                     Id = Guid.Parse("ab942a61-7673-4755-9bd8-765aff91d9a3"),
                     Name = "CMD",
+                    MigrationVersion = ShellProfile.CurrentMigrationVersion,
                     Arguments = string.Empty,
                     Location = @"C:\Windows\System32\cmd.exe",
                     PreInstalled = true,
-                    WorkingDirectory = string.Empty
+                    WorkingDirectory = string.Empty,
+                    LineEndingTranslation = LineEndingStyle.DoNotModify,
+                    UseConPty = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 7), // Windows 10 1809+
+                    EnvironmentVariables = new Dictionary<string, string>
+                    {
+                        ["TERM"] = "xterm-256color"
+                    },
+                    KeyBindings = new []
+                    {
+                        new KeyBinding
+                        {
+                            Command = "ab942a61-7673-4755-9bd8-765aff91d9a3",
+                            Ctrl=true,
+                            Alt=true,
+                            Shift=false,
+                            Meta=false,
+                            Key=(int)ExtendedVirtualKey.Number2
+                        }
+                    }
                 },
                 new ShellProfile
                 {
                     Id= Guid.Parse("e5785ad6-584f-40cb-bdcd-d5b3b3953e7f"),
                     Name = "WSL",
+                    MigrationVersion = ShellProfile.CurrentMigrationVersion,
                     Arguments = string.Empty,
                     Location = @"C:\windows\system32\wsl.exe",
                     PreInstalled = true,
-                    WorkingDirectory = string.Empty
+                    WorkingDirectory = string.Empty,
+                    LineEndingTranslation = LineEndingStyle.ToLF,
+                    UseConPty = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 7), // Windows 10 1809+
+                    EnvironmentVariables = new Dictionary<string, string>
+                    {
+                        ["TERM"] = "xterm-256color"
+                    },
+                    KeyBindings = new []
+                    {
+                        new KeyBinding
+                        {
+                            Command = "e5785ad6-584f-40cb-bdcd-d5b3b3953e7f",
+                            Ctrl=true,
+                            Alt=true,
+                            Shift=false,
+                            Meta=false,
+                            Key=(int)ExtendedVirtualKey.Number3
+                        }
+                    }
                 }
             };
         }
@@ -411,20 +680,20 @@ namespace FluentTerminal.App.Services.Implementation
                     CursorAccent = "#000000",
                     Selection = "#4DABEDC1",
                     Black = "#300A24",
-                    Red = "#3465A4",
+                    Red = "#CC0000",
                     Green = "#4E9A06",
-                    Yellow = "#06989A",
-                    Blue = "#CC0000",
+                    Yellow = "#C4A000",
+                    Blue = "#3465A4",
                     Magenta = "#75507B",
-                    Cyan = "#C4A000",
+                    Cyan = "#06989A",
                     White = "#D3D7CF",
                     BrightBlack = "#554E53",
-                    BrightRed = "#729FCF",
+                    BrightRed = "#EF2929",
                     BrightGreen = "#8AE234",
-                    BrightYellow = "#34E2E2",
-                    BrightBlue = "#EF2929",
+                    BrightYellow = "#FCE94F",
+                    BrightBlue = "#729FCF",
                     BrightMagenta = "#AD7FA8",
-                    BrightCyan = "#FCE94F",
+                    BrightCyan = "#34E2E2",
                     BrightWhite = "#EEEEEE"
                 }
             };

FluentTerminal.App.Services/Implementation/DialogService.cs

@@ -1,7 +1,7 @@
-using System;
-using System.Threading.Tasks;
-using FluentTerminal.App.Services.Dialogs;
+using FluentTerminal.App.Services.Dialogs;
 using FluentTerminal.Models;
+using System;
+using System.Threading.Tasks;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -10,12 +10,27 @@ 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;
+        private readonly Func<ICustomCommandDialog> _customCommandDialogFactory;
+        private readonly Func<ISshProfileSelectionDialog> _sshProfileSelectionDialogFactory;
+        private readonly Func<IAboutDialog> _aboutDialogFactory;
 
-        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,
+            Func<ICustomCommandDialog> customCommandDialogFactory,
+            Func<ISshProfileSelectionDialog> sshProfileSelectionDialogFactory,
+            Func<IAboutDialog> aboutDialogFactory)
         {
             _shellProfileSelectionDialogFactory = shellProfileSelectionDialogFactory;
             _messageDialogFactory = messageDialogFactory;
             _createKeyBindingDialogFactory = createKeyBindingDialogFactory;
+            _inputDialogFactory = inputDialogFactory;
+            _sshConnectionInfoDialogFactory = sshConnectionInfoDialogFactory;
+            _customCommandDialogFactory = customCommandDialogFactory;
+            _sshProfileSelectionDialogFactory = sshProfileSelectionDialogFactory;
+            _aboutDialogFactory = aboutDialogFactory;
         }
 
         public Task<KeyBinding> ShowCreateKeyBindingDialog()
@@ -54,11 +69,39 @@ 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<SshProfile> ShowSshConnectionInfoDialogAsync(SshProfile input = null) =>
+            _sshConnectionInfoDialogFactory().GetSshConnectionInfoAsync(input);
+
+        public Task<ShellProfile> ShowCustomCommandDialogAsync(ShellProfile input = null) =>
+            _customCommandDialogFactory().GetCustomCommandAsync(input);
+
+        public Task<SshProfile> ShowSshProfileSelectionDialogAsync()
+        {
+            var dialog = _sshProfileSelectionDialogFactory();
+
+            return dialog.SelectProfile();
+        }
+
+        public Task ShowAboutDialogAsync()
+        {
+            var dialog = _aboutDialogFactory();
+
+            return dialog.ShowAsync();
+        }
     }
-}
+}

FluentTerminal.App.Services/Implementation/FluentTerminalThemeParser.cs

@@ -1,9 +1,9 @@
-using System;
+using FluentTerminal.Models;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-using FluentTerminal.Models;
-using Newtonsoft.Json;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -13,6 +13,16 @@ namespace FluentTerminal.App.Services.Implementation
 
         public async Task<TerminalTheme> Parse(string fileName, Stream fileContent)
         {
+            if (string.IsNullOrWhiteSpace(fileName))
+            {
+                throw new ArgumentNullException(nameof(fileName));
+            }
+
+            if (fileContent == null)
+            {
+                throw new ArgumentNullException(nameof(fileContent));
+            }
+
             using (var streamReader = new StreamReader(fileContent))
             {
                 var content = await streamReader.ReadToEndAsync();
@@ -25,4 +35,4 @@ namespace FluentTerminal.App.Services.Implementation
             }
         }
     }
-}
+}

FluentTerminal.App.Services/Implementation/ITermThemeParser.cs

@@ -51,17 +51,27 @@ namespace FluentTerminal.App.Services.Implementation
             public const string RedComponent = "Red Component";
         }
 
-        public async Task<TerminalTheme> Parse(string fileName, Stream fileContent)
+        public Task<TerminalTheme> Parse(string fileName, Stream fileContent)
         {
+            if (string.IsNullOrWhiteSpace(fileName))
+            {
+                throw new ArgumentNullException(nameof(fileName));
+            }
+
+            if (fileContent == null)
+            {
+                throw new ArgumentNullException(nameof(fileContent));
+            }
+
             var node = PList.Load(fileContent) as DictionaryNode ?? throw new ParseThemeException("Root node was not a dictionary.");
 
-            return new TerminalTheme
+            return Task.FromResult(new TerminalTheme
             {
                 Name = Path.GetFileNameWithoutExtension(fileName),
                 Colors = GetColors(node),
                 Id = Guid.NewGuid(),
                 PreInstalled = false
-            };
+            });
         }
 
         private TerminalColors GetColors(DictionaryNode themeDictionary)
@@ -73,6 +83,8 @@ namespace FluentTerminal.App.Services.Implementation
                 Cursor = GetColorString(themeDictionary[ITermThemeKeys.CursorColor]),
                 CursorAccent = GetColorString(themeDictionary[ITermThemeKeys.CursorTextColor]),
                 Selection = GetColorString(themeDictionary[ITermThemeKeys.SelectionColor], Opacity30Percent),
+                SelectionForeground = GetColorString(themeDictionary[ITermThemeKeys.SelectedTextColor]),
+                SelectionBackground = GetColorString(themeDictionary[ITermThemeKeys.SelectionColor]),
                 Black = GetColorString(themeDictionary[ITermThemeKeys.Ansi0Color]),
                 Red = GetColorString(themeDictionary[ITermThemeKeys.Ansi1Color]),
                 Green = GetColorString(themeDictionary[ITermThemeKeys.Ansi2Color]),
@@ -100,8 +112,6 @@ namespace FluentTerminal.App.Services.Implementation
             var green = dictionaryNode[ITermThemeColorKeys.GreenComponent] as RealNode ?? throw new ParseThemeException("Green node value was not a real number");
             var blue = dictionaryNode[ITermThemeColorKeys.BlueComponent] as RealNode ?? throw new ParseThemeException("Blue node value was not a real number");
 
-            var color = $"#{alpha:X2}{GetByteValue(red):X2}{GetByteValue(green):X2}{GetByteValue(blue):X2}";
-
             if (alpha == byte.MaxValue)
             {
                 return $"#{GetByteValue(red):X2}{GetByteValue(green):X2}{GetByteValue(blue):X2}";
@@ -124,4 +134,4 @@ namespace FluentTerminal.App.Services.Implementation
             return (alpha / 256.0).ToString(CultureInfo.InvariantCulture);
         }
     }
-}
+}

FluentTerminal.App.Services/Implementation/KeyboardCommandService.cs

@@ -1,38 +1,51 @@
-using System;
-using System.Collections.Generic;
-using FluentTerminal.Models.Enums;
-
-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}");
+        }
+
+        public void ClearCommandHandlers()
+        {
+            _commandHandlers.Clear();
+        }
+    }
+}

FluentTerminal.App.Services/Implementation/NotificationService.cs

@@ -1,11 +1,12 @@
-using Windows.Data.Xml.Dom;
+using System.Diagnostics;
+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)
+        public void ShowNotification(string title, string content, string url = null)
         {
             string xml = $@"<toast>
                             <visual>
@@ -20,7 +21,11 @@ namespace FluentTerminal.SystemTray.Services
             doc.LoadXml(xml);
 
             var toast = new ToastNotification(doc);
+            if (url != null)
+            {
+                toast.Activated += (n, o) => Process.Start(url);
+            }
             ToastNotificationManager.CreateToastNotifier().Show(toast);
         }
     }
-}
+}

FluentTerminal.App.Services/Implementation/SettingsService.cs

@@ -1,10 +1,12 @@
-using System;
+using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
-using Newtonsoft.Json;
+using FluentTerminal.Models.Messages;
+using GalaSoft.MvvmLight.Messaging;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -12,18 +14,15 @@ namespace FluentTerminal.App.Services.Implementation
     {
         public const string CurrentThemeKey = "CurrentTheme";
         public const string DefaultShellProfileKey = "DefaultShellProfile";
+        public const string DefaultSshProfileKey = "DefaultSshProfile";
 
         private readonly IDefaultValueProvider _defaultValueProvider;
-        private readonly IApplicationDataContainer _localSettings;
-        private readonly IApplicationDataContainer _themes;
         private readonly IApplicationDataContainer _keyBindings;
-        private readonly IApplicationDataContainer _shellProfiles;
+        private readonly IApplicationDataContainer _localSettings;
         private readonly IApplicationDataContainer _roamingSettings;
-
-        public event EventHandler<Guid> CurrentThemeChanged;
-        public event EventHandler<TerminalOptions> TerminalOptionsChanged;
-        public event EventHandler<ApplicationSettings> ApplicationSettingsChanged;
-        public event EventHandler KeyBindingsChanged;
+        private readonly IApplicationDataContainer _shellProfiles;
+        private readonly IApplicationDataContainer _sshProfiles;
+        private readonly IApplicationDataContainer _themes;
 
         public SettingsService(IDefaultValueProvider defaultValueProvider, ApplicationDataContainers containers)
         {
@@ -34,22 +33,167 @@ namespace FluentTerminal.App.Services.Implementation
             _themes = containers.Themes;
             _keyBindings = containers.KeyBindings;
             _shellProfiles = containers.ShellProfiles;
+            _sshProfiles = containers.SshProfiles;
+
 
             foreach (var theme in _defaultValueProvider.GetPreInstalledThemes())
             {
-                _themes.WriteValueAsJson(theme.Id.ToString(), theme);
+                if (GetTheme(theme.Id) == null)
+                {
+                    _themes.WriteValueAsJson(theme.Id.ToString(), theme);
+                }
             }
 
             foreach (var shellProfile in _defaultValueProvider.GetPreinstalledShellProfiles())
             {
-                _shellProfiles.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile);
+                if (GetShellProfile(shellProfile.Id) == null)
+                {
+                    _shellProfiles.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile);
+                }
             }
         }
 
+        public string ExportSettings()
+        {
+            var config = new
+            {
+                App = GetApplicationSettings(),
+                KeyBindings = GetCommandKeyBindings(),
+                TerminalOptions = GetTerminalOptions(),
+                Themes = new List<TerminalTheme>(),
+                Profiles = new List<ShellProfile>(),
+                SshProfiles = new List<SshProfile>()
+            };
+
+            foreach (var theme in GetThemes().Where(x => !x.PreInstalled))
+            {
+                config.Themes.Add(theme);
+            }
+
+            foreach (var profile in GetShellProfiles().Where(x => !x.PreInstalled))
+            {
+                config.Profiles.Add(profile);
+            }
+
+            foreach (var profile in GetSshProfiles())
+            {
+                config.SshProfiles.Add(profile);
+            }
+
+            return JsonConvert.SerializeObject(config);
+        }
+
+        public void ImportSettings(string serializedSettings)
+        {
+            var config = new
+            {
+                App = GetApplicationSettings(),
+                KeyBindings = new Dictionary<string, ICollection<KeyBinding>>(),
+                Themes = new List<TerminalTheme>(),
+                Profiles = new List<ShellProfile>(),
+                SshProfiles = new List<SshProfile>(),
+                TerminalOptions = GetTerminalOptions()
+            };
+
+            JsonConvert.PopulateObject(serializedSettings, config);
+
+            SaveApplicationSettings(config.App);
+
+            // Since we set each command sepaartely, we don't need all existing settings
+            foreach (var pair in config.KeyBindings)
+            {
+                SaveKeyBindings(pair.Key, pair.Value);
+            }
+
+            // Can't create/modify pre-installed themes
+            foreach (var theme in config.Themes.Where(x => !x.PreInstalled))
+            {
+                var existingTheme = GetTheme(theme.Id);
+                if (existingTheme?.PreInstalled == true)
+                {
+                    continue;
+                }
+                SaveTheme(theme, existingTheme != null);
+            }
+
+            // Can't create pre-installed profiles
+            foreach (var profile in config.Profiles.Where(x => !x.PreInstalled))
+            {
+                var existingProfile = GetShellProfile(profile.Id);
+                var isNew = existingProfile.EqualTo(default);
+
+                // You can only edit certain parts of preinstalled profiles
+                if (!isNew && existingProfile.PreInstalled)
+                {
+                    existingProfile.WorkingDirectory = profile.WorkingDirectory;
+                    existingProfile.Arguments = profile.Arguments;
+                    existingProfile.TabThemeId = profile.TabThemeId;
+                    existingProfile.TerminalThemeId = profile.TerminalThemeId;
+                    existingProfile.LineEndingTranslation = profile.LineEndingTranslation;
+                    existingProfile.KeyBindings = profile.KeyBindings;
+                    SaveShellProfile(profile, isNew);
+                    continue;
+                }
+                SaveShellProfile(profile, isNew);
+            }
+
+            foreach (var profile in config.SshProfiles)
+            {
+                var existingProfile = GetSshProfile(profile.Id);
+                var isNew = existingProfile.EqualTo(default(SshProfile));
+
+                SaveSshProfile(profile, isNew);
+            }
+
+            SaveTerminalOptions(config.TerminalOptions);
+        }
+
+        public void DeleteShellProfile(Guid id)
+        {
+            _shellProfiles.Delete(id.ToString());
+            Messenger.Default.Send(new ShellProfileDeletedMessage(id));
+        }
+
+        public void DeleteSshProfile(Guid id)
+        {
+            _sshProfiles.Delete(id.ToString());
+            Messenger.Default.Send(new SshProfileDeletedMessage(id));
+            Messenger.Default.Send(new KeyBindingsChangedMessage());
+        }
+
+
+        public void DeleteTheme(Guid id)
+        {
+            _themes.Delete(id.ToString());
+
+            foreach (var profile in GetShellProfiles())
+            {
+                if (profile.TerminalThemeId == id)
+                {
+                    profile.TerminalThemeId = Guid.Empty;
+                    SaveShellProfile(profile);
+                }
+            }
+
+            Messenger.Default.Send(new ThemeDeletedMessage(id));
+        }
+
+        public ApplicationSettings GetApplicationSettings()
+        {
+            return _roamingSettings.ReadValueFromJson(nameof(ApplicationSettings), _defaultValueProvider.GetDefaultApplicationSettings());
+        }
+
         public TerminalTheme GetCurrentTheme()
         {
             var id = GetCurrentThemeId();
-            return GetTheme(id);
+            var theme = GetTheme(id);
+            if (theme == null)
+            {
+                id = _defaultValueProvider.GetDefaultThemeId();
+                SaveCurrentThemeId(id);
+                theme = GetTheme(id);
+            }
+            return theme;
         }
 
         public Guid GetCurrentThemeId()
@@ -61,108 +205,61 @@ namespace FluentTerminal.App.Services.Implementation
             return _defaultValueProvider.GetDefaultThemeId();
         }
 
-        public void SaveCurrentThemeId(Guid id)
+        public ShellProfile GetDefaultShellProfile()
         {
-            _roamingSettings.SetValue(CurrentThemeKey, id);
-
-            CurrentThemeChanged?.Invoke(this, id);
-        }
-
-        public void SaveTheme(TerminalTheme theme)
-        {
-            _themes.WriteValueAsJson(theme.Id.ToString(), theme);
-
-            if (theme.Id == GetCurrentThemeId())
+            var id = GetDefaultShellProfileId();
+            var profile = _shellProfiles.ReadValueFromJson(id.ToString(), default(ShellProfile));
+            if (profile == null)
             {
-                CurrentThemeChanged?.Invoke(this, theme.Id);
+                id = _defaultValueProvider.GetDefaultShellProfileId();
+                SaveDefaultShellProfileId(id);
+                profile = _shellProfiles.ReadValueFromJson(id.ToString(), default(ShellProfile));
             }
+            return profile;
+        }
+        public SshProfile GetDefaultSshProfile()
+        {
+            var id = GetDefaultSshProfileId();
+            var profile = _sshProfiles.ReadValueFromJson(id.ToString(), default(SshProfile));
+
+            return profile;
         }
 
-        public void DeleteTheme(Guid id)
+        public ShellProfile GetShellProfile(Guid id)
         {
-            _themes.Delete(id.ToString());
+            return _shellProfiles.ReadValueFromJson(id.ToString(), default(ShellProfile));
         }
-
-        public IEnumerable<TerminalTheme> GetThemes()
+        public SshProfile GetSshProfile(Guid id)
         {
-            return _themes.GetAll().Select(x => JsonConvert.DeserializeObject<TerminalTheme>((string)x)).ToList();
-        }
-
-        public TerminalTheme GetTheme(Guid id)
-        {
-            return _themes.ReadValueFromJson(id.ToString(), default(TerminalTheme));
-        }
-
-        public TerminalOptions GetTerminalOptions()
-        {
-            return _roamingSettings.ReadValueFromJson(nameof(TerminalOptions), _defaultValueProvider.GetDefaultTerminalOptions());
-        }
-
-        public void SaveTerminalOptions(TerminalOptions terminalOptions)
-        {
-            _roamingSettings.WriteValueAsJson(nameof(TerminalOptions), terminalOptions);
-            TerminalOptionsChanged?.Invoke(this, terminalOptions);
-        }
-
-        public ApplicationSettings GetApplicationSettings()
-        {
-            return _roamingSettings.ReadValueFromJson(nameof(ApplicationSettings), _defaultValueProvider.GetDefaultApplicationSettings());
-        }
-
-        public void SaveApplicationSettings(ApplicationSettings applicationSettings)
-        {
-            _roamingSettings.WriteValueAsJson(nameof(ApplicationSettings), applicationSettings);
-            ApplicationSettingsChanged?.Invoke(this, applicationSettings);
-        }
-
-        public IDictionary<Command, ICollection<KeyBinding>> GetKeyBindings()
-        {
-            var keyBindings = new Dictionary<Command, ICollection<KeyBinding>>();
-            foreach (var value in Enum.GetValues(typeof(Command)))
-            {
-                var command = (Command)value;
-                keyBindings.Add(command, _keyBindings.ReadValueFromJson<Collection<KeyBinding>>(command.ToString(), null) ?? _defaultValueProvider.GetDefaultKeyBindings(command));
-            }
-
-            return keyBindings;
-        }
-
-        public void SaveKeyBindings(Command command, ICollection<KeyBinding> keyBindings)
-        {
-            _keyBindings.WriteValueAsJson(command.ToString(), keyBindings);
-            _roamingSettings.WriteValueAsJson(nameof(KeyBindings), keyBindings);
-            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
-        }
-
-        public void ResetKeyBindings()
-        {
-            foreach (var value in Enum.GetValues(typeof(Command)))
-            {
-                var command = (Command)value;
-                _keyBindings.WriteValueAsJson(command.ToString(), _defaultValueProvider.GetDefaultKeyBindings(command));
-            }
-
-            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
+            return _sshProfiles.ReadValueFromJson(id.ToString(), default(SshProfile));
         }
 
         public Guid GetDefaultShellProfileId()
         {
-            if (_roamingSettings.TryGetValue(DefaultShellProfileKey, out object value))
+            if (_localSettings.TryGetValue(DefaultShellProfileKey, out object value))
             {
                 return (Guid)value;
             }
             return _defaultValueProvider.GetDefaultShellProfileId();
         }
-
-        public ShellProfile GetDefaultShellProfile()
+        public Guid GetDefaultSshProfileId()
         {
-            var id = GetDefaultShellProfileId();
-            return _shellProfiles.ReadValueFromJson(id.ToString(), default(ShellProfile));
+            if (_localSettings.TryGetValue(DefaultSshProfileKey, out object value))
+            {
+                return (Guid)value;
+            }
+            return System.Guid.Empty;
         }
 
-        public void SaveDefaultShellProfileId(Guid id)
+        public IDictionary<string, ICollection<KeyBinding>> GetCommandKeyBindings()
         {
-            _roamingSettings.SetValue(DefaultShellProfileKey, id);
+            var keyBindings = new Dictionary<string, ICollection<KeyBinding>>();
+
+            foreach (Command command in Enum.GetValues(typeof(Command)))
+            {
+                keyBindings.Add(command.ToString(), _keyBindings.ReadValueFromJson<Collection<KeyBinding>>(command.ToString(), null) ?? _defaultValueProvider.GetDefaultKeyBindings(command));
+            }
+            return keyBindings;
         }
 
         public IEnumerable<ShellProfile> GetShellProfiles()
@@ -170,14 +267,131 @@ namespace FluentTerminal.App.Services.Implementation
             return _shellProfiles.GetAll().Select(x => JsonConvert.DeserializeObject<ShellProfile>((string)x)).ToList();
         }
 
-        public void SaveShellProfile(ShellProfile shellProfile)
+        public IEnumerable<SshProfile> GetSshProfiles()
         {
-            _shellProfiles.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile);
+            if (_sshProfiles == null)
+            {
+                return new List<SshProfile>();
+            }
+            else
+            {
+                return _sshProfiles.GetAll()
+                   .Select(x => JsonConvert.DeserializeObject<SshProfile>((string)x)).ToList();
+            }
         }
 
-        public void DeleteShellProfile(Guid id)
+        public IEnumerable<TabTheme> GetTabThemes()
         {
-            _shellProfiles.Delete(id.ToString());
+            return _defaultValueProvider.GetDefaultTabThemes();
+        }
+
+        public TerminalOptions GetTerminalOptions()
+        {
+            return _roamingSettings.ReadValueFromJson(nameof(TerminalOptions), _defaultValueProvider.GetDefaultTerminalOptions());
+        }
+
+        public TerminalTheme GetTheme(Guid id)
+        {
+            return _themes.ReadValueFromJson(id.ToString(), default(TerminalTheme));
+        }
+
+        public IEnumerable<TerminalTheme> GetThemes()
+        {
+            return _themes.GetAll().Select(x => JsonConvert.DeserializeObject<TerminalTheme>((string)x)).ToList();
+        }
+
+        public void ResetKeyBindings()
+        {
+            foreach (Command command in Enum.GetValues(typeof(Command)))
+            {
+                _keyBindings.WriteValueAsJson(command.ToString(), _defaultValueProvider.GetDefaultKeyBindings(command));
+            }
+
+            Messenger.Default.Send(new KeyBindingsChangedMessage());
+        }
+
+        public void SaveApplicationSettings(ApplicationSettings applicationSettings)
+        {
+            _roamingSettings.WriteValueAsJson(nameof(ApplicationSettings), applicationSettings);
+            Messenger.Default.Send(new ApplicationSettingsChangedMessage(applicationSettings));
+        }
+
+        public void NotifyApplicationSettingsChanged(ApplicationSettings applicationSettings)
+        {
+            Messenger.Default.Send(new ApplicationSettingsChangedMessage(applicationSettings));
+        }
+
+        public void SaveCurrentThemeId(Guid id)
+        {
+            _roamingSettings.SetValue(CurrentThemeKey, id);
+
+            Messenger.Default.Send(new CurrentThemeChangedMessage(id));
+        }
+
+        public void SaveDefaultShellProfileId(Guid id)
+        {
+            _localSettings.SetValue(DefaultShellProfileKey, id);
+        }
+        public void SaveDefaultSshProfileId(Guid id)
+        {
+            _localSettings.SetValue(DefaultSshProfileKey, id);
+        }
+
+        public void SaveKeyBindings(string command, ICollection<KeyBinding> keyBindings)
+        {
+            if (!Enum.TryParse<Command>(command, true, out var enumValue))
+            {
+                throw new InvalidOperationException();
+            }
+
+            _keyBindings.WriteValueAsJson(enumValue.ToString(), keyBindings);
+            Messenger.Default.Send(new KeyBindingsChangedMessage());
+        }
+
+        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.
+            Messenger.Default.Send(new KeyBindingsChangedMessage());
+
+            if (newShell)
+            {
+                Messenger.Default.Send(new ShellProfileAddedMessage(shellProfile));
+            }
+        }
+        public void SaveSshProfile(SshProfile sshProfile, bool newShell = false)
+        {
+            _sshProfiles.WriteValueAsJson(sshProfile.Id.ToString(), sshProfile);
+
+            // When saving the shell profile, we also need to update keybindings for everywhere.
+            Messenger.Default.Send(new KeyBindingsChangedMessage());
+
+            if (newShell)
+            {
+                Messenger.Default.Send(new SshProfileAddedMessage(sshProfile));
+            }
+        }
+
+        public void SaveTerminalOptions(TerminalOptions terminalOptions)
+        {
+            _roamingSettings.WriteValueAsJson(nameof(TerminalOptions), terminalOptions);
+            Messenger.Default.Send(new TerminalOptionsChangedMessage(terminalOptions));
+        }
+
+        public void SaveTheme(TerminalTheme theme, bool newTheme = false)
+        {
+            _themes.WriteValueAsJson(theme.Id.ToString(), theme);
+
+            if (theme.Id == GetCurrentThemeId())
+            {
+                Messenger.Default.Send(new CurrentThemeChangedMessage(theme.Id));
+            }
+
+            if (newTheme)
+            {
+                Messenger.Default.Send(new ThemeAddedMessage(theme));
+            }
         }
     }
 }

FluentTerminal.App.Services/Implementation/ShellProfileMigrationService.cs

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

FluentTerminal.App.Services/Implementation/ThemeParserFactory.cs

@@ -5,7 +5,7 @@ namespace FluentTerminal.App.Services.Implementation
 {
     public class ThemeParserFactory : IThemeParserFactory
     {
-        private IEnumerable<IThemeParser> _parsers;
+        private readonly IEnumerable<IThemeParser> _parsers;
 
         public IEnumerable<string> SupportedFileTypes { get; }
 
@@ -20,4 +20,4 @@ namespace FluentTerminal.App.Services.Implementation
             return _parsers.FirstOrDefault(p => p.SupportedFileTypes.Contains(fileType));
         }
     }
-}
+}

FluentTerminal.App.Services/Implementation/TrayProcessCommunicationService.cs

@@ -1,10 +1,13 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
+using FluentTerminal.App.Services.Exceptions;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using FluentTerminal.Models.Requests;
 using FluentTerminal.Models.Responses;
 using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Windows.Foundation.Collections;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -12,38 +15,198 @@ namespace FluentTerminal.App.Services.Implementation
     {
         private readonly ISettingsService _settingsService;
         private IAppServiceConnection _appServiceConnection;
+        private readonly Dictionary<byte, Action<byte[]>> _terminalOutputHandlers;
+        private byte _nextTerminalId = 0;
+
+        public event EventHandler<TerminalExitStatus> TerminalExited;
 
         public TrayProcessCommunicationService(ISettingsService settingsService)
         {
             _settingsService = settingsService;
+            _terminalOutputHandlers = new Dictionary<byte, Action<byte[]>>();
         }
 
-        public async Task<CreateTerminalResponse> CreateTerminal(TerminalSize size, ShellProfile shellProfile)
+        public byte GetNextTerminalId()
+        {
+            return _nextTerminalId++;
+        }
+
+        private string _userName;
+
+        public async Task<string> GetUserName()
+        {
+            if (!string.IsNullOrEmpty(_userName))
+            {
+                // Returning the username from cache
+                return _userName;
+            }
+
+            StringValueResponse response;
+
+            // No need to crash for username, so try/catch
+            try
+            {
+                var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(new GetUserNameRequest()));
+                response = JsonConvert.DeserializeObject<StringValueResponse>((string)responseMessage[MessageKeys.Content]);
+            }
+            catch (Exception e)
+            {
+                Logger.Instance.Error(e, "Error while trying to get username.");
+
+                return null;
+            }
+
+            Logger.Instance.Debug("Received GetUserNameResponse: {@response}", response);
+
+            _userName = response.Value;
+
+            return _userName;
+        }
+
+        public async Task SaveTextFileAsync(string path, string content)
+        {
+            var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(new SaveTextFileRequest {Path = path, Content = content}));
+
+            var response = JsonConvert.DeserializeObject<CommonResponse>((string)responseMessage[MessageKeys.Content]);
+
+            if (!response.Success)
+            {
+                throw new SaveTextFileException(string.IsNullOrEmpty(response.Error) ? "Failed to save the file." : response.Error);
+            }
+        }
+
+        private static string _sshConfigDir;
+
+        public async Task<string> GetSshConfigDirAsync()
+        {
+            if (string.IsNullOrEmpty(_sshConfigDir))
+            {
+                var response = await GetSshConfigFolderAsync(false);
+
+                if (response?.Success ?? false)
+                {
+                    _sshConfigDir = response.Path;
+                }
+            }
+
+            return _sshConfigDir;
+        }
+
+        public async Task<string[]> GetFilesFromSshConfigDirAsync()
+        {
+            var response = await GetSshConfigFolderAsync(false);
+
+            if (response == null || !response.Success)
+            {
+                return null;
+            }
+
+            if (string.IsNullOrEmpty(_sshConfigDir))
+            {
+                _sshConfigDir = response.Path;
+            }
+
+            return response.Files;
+        }
+
+        private async Task<GetSshConfigFolderResponse> GetSshConfigFolderAsync(bool includeContent)
+        {
+            var responseMessage =
+                await _appServiceConnection.SendMessageAsync(CreateMessage(new GetSshConfigFolderRequest
+                    {IncludeContent = includeContent}));
+
+            return JsonConvert.DeserializeObject<GetSshConfigFolderResponse>(
+                (string) responseMessage[MessageKeys.Content]);
+        }
+
+        public async Task<bool> CheckFileExistsAsync(string path)
+        {
+            var responseMessage =
+                await _appServiceConnection.SendMessageAsync(CreateMessage(new CheckFileExistsRequest {Path = path}));
+
+            return JsonConvert.DeserializeObject<CommonResponse>((string) responseMessage[MessageKeys.Content]).Success;
+        }
+
+        public void MuteTerminal(bool mute)
+        {
+            _appServiceConnection.SendMessageAsync(CreateMessage(new MuteTerminalRequest { Mute = mute }));
+        }
+
+        public void UpdateSettings(ApplicationSettings settings)
+        {
+            _appServiceConnection.SendMessageAsync(CreateMessage(new UpdateSettingsRequest { Settings = settings }));
+        }
+
+        public async Task<CreateTerminalResponse> CreateTerminal(byte id, TerminalSize size, ShellProfile shellProfile, SessionType sessionType)
         {
             var request = new CreateTerminalRequest
             {
+                Id = id,
                 Size = size,
-                Profile = shellProfile
+                Profile = shellProfile,
+                SessionType = sessionType
             };
 
-            var message = new Dictionary<string, string>
-            {
-                { MessageKeys.Type, MessageTypes.CreateTerminalRequest },
-                { MessageKeys.Content, JsonConvert.SerializeObject(request) }
-            };
+            Logger.Instance.Debug("Sending CreateTerminalRequest: {@request}", request);
 
-            var responseMessage = await _appServiceConnection.SendMessageAsync(message);
+            var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(request));
+            var response = JsonConvert.DeserializeObject<CreateTerminalResponse>((string)responseMessage[MessageKeys.Content]);
 
-            return JsonConvert.DeserializeObject<CreateTerminalResponse>(responseMessage[MessageKeys.Content]);
+            Logger.Instance.Debug("Received CreateTerminalResponse: {@response}", response);
+
+            return response;
         }
 
-        public Task Initialize(IAppServiceConnection appServiceConnection)
+        public async Task<PauseTerminalOutputResponse> PauseTerminalOutput(byte id, bool pause)
+        {
+            var request = new PauseTerminalOutputRequest
+            {
+                Id = id,
+                Pause = pause
+            };
+
+            var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(request));
+            return JsonConvert.DeserializeObject<PauseTerminalOutputResponse>((string)responseMessage[MessageKeys.Content]);
+        }
+
+        public void Initialize(IAppServiceConnection appServiceConnection)
         {
             _appServiceConnection = appServiceConnection;
-            return UpdateToggleWindowKeyBindings();
+            _appServiceConnection.MessageReceived += OnMessageReceived;
         }
 
-        public Task ResizeTerminal(int id, TerminalSize size)
+        private void OnMessageReceived(object sender, IDictionary<string, object> e)
+        {
+            var messageType = (byte)e[MessageKeys.Type];
+            var messageContent = e[MessageKeys.Content];
+
+            switch (messageType)
+            {
+                case Constants.TerminalBufferRequestIdentifier:
+                    var terminalId = (byte)e[MessageKeys.TerminalId];
+
+                    if (_terminalOutputHandlers.ContainsKey(terminalId))
+                    {
+                        _terminalOutputHandlers[terminalId].Invoke((byte[])messageContent);
+                    }
+                    else
+                    {
+                        Logger.Instance.Error("Received output for unknown terminal Id {id}", terminalId);
+                    }
+                    break;
+                case (byte) MessageIdentifiers.TerminalExitedRequest:
+                    var request = JsonConvert.DeserializeObject<TerminalExitedRequest>((string)messageContent);
+                    Logger.Instance.Debug("Received TerminalExitedRequest: {@request}", request);
+
+                    TerminalExited?.Invoke(this, request.ToStatus());
+                    break;
+                default:
+                    Logger.Instance.Error("Received unknown message type: {messageType}", messageType);
+                    break;
+            }
+        }
+
+        public Task ResizeTerminal(byte id, TerminalSize size)
         {
             var request = new ResizeTerminalRequest
             {
@@ -51,31 +214,105 @@ namespace FluentTerminal.App.Services.Implementation
                 NewSize = size
             };
 
-            var message = new Dictionary<string, string>
-            {
-                { MessageKeys.Type, MessageTypes.ResizeTerminalRequest },
-                { MessageKeys.Content, JsonConvert.SerializeObject(request) }
-            };
+            return _appServiceConnection.SendMessageAsync(CreateMessage(request));
+        }
 
-            return _appServiceConnection.SendMessageAsync(message);
+        public void SubscribeForTerminalOutput(byte terminalId, Action<byte[]> callback)
+        {
+            _terminalOutputHandlers[terminalId] = callback;
+        }
+
+        public void UnsubscribeFromTerminalOutput(byte id)
+        {
+            if (_terminalOutputHandlers.ContainsKey(id))
+            {
+                _terminalOutputHandlers.Remove(id);
+            }
         }
 
         public Task UpdateToggleWindowKeyBindings()
         {
-            var keyBindings = _settingsService.GetKeyBindings()[Command.ToggleWindow];
+            var keyBindings = _settingsService.GetCommandKeyBindings()[nameof(Command.ToggleWindow)];
 
             var request = new SetToggleWindowKeyBindingsRequest
             {
                 KeyBindings = keyBindings
             };
 
-            var message = new Dictionary<string, string>
+            return _appServiceConnection.SendMessageAsync(CreateMessage(request));
+        }
+
+        public Task Write(byte id, byte[] data)
+        {
+            var message = new ValueSet
             {
-                { MessageKeys.Type, MessageTypes.SetToggleWindowKeyBindingsRequest },
-                { MessageKeys.Content, JsonConvert.SerializeObject(request) }
+                [MessageKeys.Type] = Constants.TerminalBufferRequestIdentifier,
+                [MessageKeys.TerminalId] = id,
+                [MessageKeys.Content] = data
             };
 
             return _appServiceConnection.SendMessageAsync(message);
         }
+
+        public Task CloseTerminal(byte terminalId)
+        {
+            var request = new TerminalExitedRequest(terminalId, -1);
+
+            Logger.Instance.Debug("Sending TerminalExitedRequest: {@request}", request);
+
+            return _appServiceConnection.SendMessageAsync(CreateMessage(request));
+        }
+
+        private static readonly Dictionary<string, string> CommandPaths = new Dictionary<string, string>();
+
+        private static readonly Dictionary<string, string> CommandErrors = new Dictionary<string, string>();
+
+        public async Task<string> GetCommandPathAsync(string command)
+        {
+            if (string.IsNullOrWhiteSpace(command))
+            {
+                throw new ArgumentException("Input value is null or empty.", nameof(command));
+            }
+
+            command = command.Trim();
+
+            var commandLower = command.ToLowerInvariant();
+
+            if (CommandPaths.TryGetValue(commandLower, out var path))
+            {
+                return path;
+            }
+
+            if (CommandErrors.TryGetValue(commandLower, out var error))
+            {
+                throw new Exception(error);
+            }
+
+            var request = new GetCommandPathRequest {Command = command};
+
+            var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(request));
+            var response =
+                JsonConvert.DeserializeObject<StringValueResponse>((string) responseMessage[MessageKeys.Content]);
+
+            if (response.Success)
+            {
+                CommandPaths[commandLower] = response.Value;
+
+                return response.Value;
+            }
+
+            CommandErrors[commandLower] = response.Error;
+
+            throw new Exception(response.Error);
+        }
+
+        private ValueSet CreateMessage(IMessage content)
+        {
+            return new ValueSet
+            {
+                [MessageKeys.Type] = content.Identifier,
+                [MessageKeys.Content] = JsonConvert.SerializeObject(content)
+            };
+        }
     }
-}
+}

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,68 @@
+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 file is not created during unhandled exception processing.
+            // Force log file creation with the highest severity initialization record.
+            Log.Fatal("Initialized");
+        }
+
+        public void Debug(string text, params object[] propertyValues)
+        {
+            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,181 @@
+using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
+using FluentTerminal.Models.Responses;
+using System;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Services
+{
+    public class Terminal
+    {
+        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
+        private Func<Task<string>> _selectedTextCallback;
+        private bool _closingFromUI;
+        private bool _exited;
+        private readonly bool _requireShellProcessStart;
+
+        public Terminal(ITrayProcessCommunicationService trayProcessCommunicationService, byte? terminalId = null)
+        {
+            _trayProcessCommunicationService = trayProcessCommunicationService;
+            _trayProcessCommunicationService.TerminalExited += OnTerminalExited;
+            Id = terminalId ?? trayProcessCommunicationService.GetNextTerminalId();
+            _requireShellProcessStart = !terminalId.HasValue;
+        }
+
+        private void OnTerminalExited(object sender, TerminalExitStatus status)
+        {
+            if (status.TerminalId != Id)
+            {
+                return;
+            }
+
+            _exited = true;
+            Exited?.Invoke(this, status.ExitCode);
+
+            if (_closingFromUI || status.ExitCode <= 0)
+            {
+                Closed?.Invoke(this, System.EventArgs.Empty);
+            }
+
+            _trayProcessCommunicationService.TerminalExited -= OnTerminalExited;
+        }
+
+        public event EventHandler<int> Exited;
+
+        /// <summary>
+        /// To be observed by both view and viewmodel
+        /// </summary>
+        public event EventHandler Closed;
+
+        /// <summary>
+        /// to be observed by viewmodel
+        /// </summary>
+        public event EventHandler<string> KeyboardCommandReceived;
+
+        /// <summary>
+        /// to be observed by view
+        /// </summary>
+        public event EventHandler<byte[]> OutputReceived;
+
+        /// <summary>
+        /// to be observed by viewmodel
+        /// </summary>
+        public event EventHandler<TerminalSize> SizeChanged;
+
+        /// <summary>
+        /// to be observed by viewmodel
+        /// </summary>
+        public event EventHandler<string> TitleChanged;
+
+        public string FallbackTitle { get; private set; }
+
+        public byte Id { get; }
+
+        /// <summary>
+        /// To be called by either view or viewmodel
+        /// </summary>
+        public async Task Close()
+        {
+            if (_exited)
+            {
+                Closed?.Invoke(this, System.EventArgs.Empty);
+                return;
+            }
+            _closingFromUI = true;
+            _trayProcessCommunicationService.UnsubscribeFromTerminalOutput(Id);
+            await _trayProcessCommunicationService.CloseTerminal(Id).ConfigureAwait(true);
+        }
+
+        /// <summary>
+        /// to be called by viewmodel
+        /// </summary>
+        /// <returns></returns>
+        public Task<string> GetSelectedText()
+        {
+            return _selectedTextCallback?.Invoke();
+        }
+
+        /// <summary>
+        /// to be called by view
+        /// </summary>
+        public void ProcessKeyboardCommand(string command)
+        {
+            KeyboardCommandReceived?.Invoke(this, command);
+        }
+
+        /// <summary>
+        /// To be set by view
+        /// </summary>
+        public void RegisterSelectedTextCallback(Func<Task<string>> selectedTextCallback)
+        {
+            _selectedTextCallback = selectedTextCallback;
+        }
+
+        /// <summary>
+        /// To be called by view
+        /// </summary>
+        public async Task 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<TerminalResponse> StartShellProcess(ShellProfile shellProfile, TerminalSize size, SessionType sessionType, string termState)
+        {
+            if (!_requireShellProcessStart && !string.IsNullOrEmpty(termState))
+            {
+                OutputReceived?.Invoke(this, Encoding.UTF8.GetBytes(termState));
+            }
+
+            _trayProcessCommunicationService.SubscribeForTerminalOutput(Id, t => OutputReceived?.Invoke(this, t));
+
+            if (_requireShellProcessStart)
+            {
+                var response = await _trayProcessCommunicationService.CreateTerminal(Id, size, shellProfile, sessionType).ConfigureAwait(true);
+
+                if (response.Success)
+                {
+                    FallbackTitle = response.ShellExecutableName;
+                    SetTitle(FallbackTitle);
+                }
+                return response;
+            }
+            else
+            {
+                return await _trayProcessCommunicationService.PauseTerminalOutput(Id, false);
+            }
+        }
+
+        public Task Write(byte[] data)
+        {
+            return _trayProcessCommunicationService.Write(Id, data);
+        }
+
+        /// <summary>
+        /// Tells the ViewModel that this view failed to launch and can be closed.
+        /// </summary>
+        public void ReportLauchFailed()
+        {
+            Closed?.Invoke(this, System.EventArgs.Empty);
+        }
+    }
+}

FluentTerminal.App.Services/Utilities/EnumHelper.cs

@@ -18,4 +18,4 @@ namespace FluentTerminal.App.Services.Utilities
             return value.ToString();
         }
     }
-}
+}

FluentTerminal.App.Services/Utilities/I18N.cs

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

FluentTerminal.App.Services/Utilities/TerminalThemeContractResolver.cs

@@ -24,4 +24,4 @@ namespace FluentTerminal.App.Services.Utilities
             return property;
         }
     }
-}
+}

FluentTerminal.App.ViewModels/EnvironmentVariableViewModel.cs

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

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

@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MvvmLightLibs" Version="5.4.1" />
+    <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
   </ItemGroup>
 
   <ItemGroup>

FluentTerminal.App.ViewModels/ISessionSuccessTracker.cs

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

FluentTerminal.App.ViewModels/ITerminalView.cs

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

FluentTerminal.App.ViewModels/Infrastructure/AsyncCommand.cs

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

FluentTerminal.App.ViewModels/Infrastructure/IAsyncCommand.cs

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

FluentTerminal.App.ViewModels/Infrastructure/IErrorHandler.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace FluentTerminal.App.ViewModels.Infrastructure
+{
+    public interface IErrorHandler
+    {
+        void HandleError(Exception ex);
+    }
+}

FluentTerminal.App.ViewModels/MainViewModel.cs

@@ -1,271 +1,626 @@
-using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.EventArgs;
-using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
-using System;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace FluentTerminal.App.ViewModels
-{
-    public class MainViewModel : ViewModelBase
-    {
-        private readonly IDialogService _dialogService;
-        private readonly IKeyboardCommandService _keyboardCommandService;
-        private readonly ISettingsService _settingsService;
-        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
-        private ApplicationSettings _applicationSettings;
-        private string _background;
-        private double _backgroundOpacity;
-        private int _nextTerminalId;
-        private TerminalViewModel _selectedTerminal;
-        private string _title;
-        private readonly IApplicationView _applicationView;
-        private readonly IDispatcherTimer _dispatcherTimer;
-        private readonly IClipboardService _clipboardService;
-
-        public event EventHandler Closed;
-        public event EventHandler NewWindowRequested;
-        public event EventHandler ShowSettingsRequested;
-
-        public MainViewModel(ISettingsService settingsService, ITrayProcessCommunicationService trayProcessCommunicationService, IDialogService dialogService, IKeyboardCommandService keyboardCommandService,
-            IApplicationView applicationView, IDispatcherTimer dispatcherTimer, IClipboardService clipboardService)
-        {
-            _settingsService = settingsService;
-            _settingsService.CurrentThemeChanged += OnCurrentThemeChanged;
-            _settingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
-            _settingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
-            _trayProcessCommunicationService = trayProcessCommunicationService;
-            _dialogService = dialogService;
-            _applicationView = applicationView;
-            _dispatcherTimer = dispatcherTimer;
-            _clipboardService = clipboardService;
-            _keyboardCommandService = keyboardCommandService;
-            _keyboardCommandService.RegisterCommandHandler(Command.NewTab, () => AddTerminal(null, false));
-            _keyboardCommandService.RegisterCommandHandler(Command.ConfigurableNewTab, () => AddTerminal(null, true));
-            _keyboardCommandService.RegisterCommandHandler(Command.CloseTab, CloseCurrentTab);
-            _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;
-            BackgroundOpacity = options.BackgroundOpacity;
-            _applicationSettings = _settingsService.GetApplicationSettings();
-
-            AddTerminalCommand = new RelayCommand(() => AddTerminal(null, false));
-            ShowSettingsCommand = new RelayCommand(ShowSettings);
-
-            Terminals.CollectionChanged += OnTerminalsCollectionChanged;
-
-            Title = "Fluent Terminal";
-
-            _applicationView.CloseRequested += OnCloseRequest;
-        }
-
-        private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
-        {
-            await _applicationView.RunOnDispatcherThread(() =>
-            {
-                BackgroundOpacity = e.BackgroundOpacity;
-            });
-        }
-
-        public RelayCommand AddTerminalCommand { get; }
-
-        public string Background
-        {
-            get => _background;
-            set => Set(ref _background, value);
-        }
-
-        public double BackgroundOpacity
-        {
-            get => _backgroundOpacity;
-            set => Set(ref _backgroundOpacity, value);
-        }
-
-        public TerminalViewModel SelectedTerminal
-        {
-            get => _selectedTerminal;
-            set
-            {
-                if (SelectedTerminal != null)
-                {
-                    _selectedTerminal.IsSelected = false;
-                }
-                if (Set(ref _selectedTerminal, value))
-                {
-                    SelectedTerminal?.FocusTerminal();
-                    if (SelectedTerminal != null)
-                    {
-                        SelectedTerminal.IsSelected = true;
-                    }
-                }
-            }
-        }
-
-        public RelayCommand ShowSettingsCommand { get; }
-
-        public ObservableCollection<TerminalViewModel> Terminals { get; } = new ObservableCollection<TerminalViewModel>();
-
-        public string Title
-        {
-            get => _title;
-            set => Set(ref _title, value);
-        }
-
-        public Task AddTerminal(string startupDirectory, bool showProfileSelection)
-        {
-            return _applicationView.RunOnDispatcherThread(async () =>
-            {
-                ShellProfile profile = null;
-                if (showProfileSelection)
-                {
-                    profile = await _dialogService.ShowProfileSelectionDialogAsync();
-
-                    if (profile == null)
-                    {
-                        return;
-                    }
-                }
-                else
-                {
-                    profile = _settingsService.GetDefaultShellProfile();
-                }
-
-                var terminal = new TerminalViewModel(GetNextTerminalId(), _settingsService, _trayProcessCommunicationService, _dialogService, _keyboardCommandService,
-                    _applicationSettings, startupDirectory, profile, _applicationView, _dispatcherTimer, _clipboardService);
-                terminal.CloseRequested += OnTerminalCloseRequested;
-                terminal.TitleChanged += OnTitleChanged;
-                Terminals.Add(terminal);
-
-                SelectedTerminal = terminal;
-            });
-        }
-
-        public void CloseAllTerminals()
-        {
-            foreach (var terminal in Terminals)
-            {
-                terminal.CloseView();
-            }
-        }
-
-        private void CloseCurrentTab()
-        {
-            SelectedTerminal?.CloseCommand.Execute(null);
-        }
-
-        private int GetNextTerminalId()
-        {
-            return _nextTerminalId++;
-        }
-
-        private void NewWindow()
-        {
-            NewWindowRequested?.Invoke(this, EventArgs.Empty);
-        }
-
-        private async void OnApplicationSettingsChanged(object sender, ApplicationSettings e)
-        {
-            await _applicationView.RunOnDispatcherThread(() => _applicationSettings = e);
-        }
-
-        private async Task OnCloseRequest(object sender, CancelableEventArgs e)
-        {
-            if (_applicationSettings.ConfirmClosingWindows)
-            {
-                var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to close this window?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(false);
-
-                if (result == DialogButton.OK)
-                {
-                    CloseAllTerminals();
-                    Closed?.Invoke(this, EventArgs.Empty);
-                }
-                else
-                {
-                    e.Cancelled = true;
-                }
-            }
-            else
-            {
-                CloseAllTerminals();
-                Closed?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
-        private async void OnCurrentThemeChanged(object sender, Guid e)
-        {
-            await _applicationView.RunOnDispatcherThread(() =>
-             {
-                 var currentTheme = _settingsService.GetTheme(e);
-                 Background = currentTheme.Colors.Background;
-             });
-        }
-
-        private void OnTerminalCloseRequested(object sender, EventArgs e)
-        {
-            if (sender is TerminalViewModel terminal)
-            {
-                terminal.CloseView();
-                if (SelectedTerminal == terminal)
-                {
-                    SelectedTerminal = Terminals.LastOrDefault(t => t != terminal);
-                }
-                Terminals.Remove(terminal);
-
-                if (Terminals.Count == 0)
-                {
-                    Closed?.Invoke(this, EventArgs.Empty);
-                    _applicationView.TryClose();
-                }
-            }
-        }
-
-        private void OnTerminalsCollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
-        {
-            if (Terminals.Any())
-            {
-                Title = Terminals.First().Title;
-            }
-        }
-
-        private void OnTitleChanged(object sender, string e)
-        {
-            if (sender is TerminalViewModel terminal && Terminals.First() == terminal)
-            {
-                Title = e;
-            }
-        }
-
-        private void SelectNextTab()
-        {
-            var currentIndex = Terminals.IndexOf(SelectedTerminal);
-            var nextIndex = (currentIndex + 1) % Terminals.Count;
-            SelectedTerminal = Terminals[nextIndex];
-        }
-
-        private void SelectPreviousTab()
-        {
-            var currentIndex = Terminals.IndexOf(SelectedTerminal);
-            var previousIndex = (currentIndex - 1 + Terminals.Count) % Terminals.Count;
-            SelectedTerminal = Terminals[previousIndex];
-        }
-
-        private void ShowSettings()
-        {
-            ShowSettingsRequested?.Invoke(this, EventArgs.Empty);
-        }
-      
-        private void ToggleFullScreen()
-        {
-            _applicationView.ToggleFullScreen();
-        }
-    }
+using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.EventArgs;
+using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.App.ViewModels.Infrastructure;
+using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using System;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Threading.Tasks;
+using FluentTerminal.Models.Messages;
+
+namespace FluentTerminal.App.ViewModels
+{
+    public class MainViewModel : ViewModelBase
+    {
+        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 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)
+        {
+            MessengerInstance.Register<ApplicationSettingsChangedMessage>(this, OnApplicationSettingsChanged);
+            MessengerInstance.Register<CurrentThemeChangedMessage>(this, OnCurrentThemeChanged);
+            MessengerInstance.Register<ShellProfileAddedMessage>(this, OnShellProfileAdded);
+            MessengerInstance.Register<ShellProfileDeletedMessage>(this, OnShellProfileDeleted);
+            MessengerInstance.Register<SshProfileAddedMessage>(this, OnSshProfileAdded);
+            MessengerInstance.Register<SshProfileDeletedMessage>(this, OnSshProfileDeleted);
+            MessengerInstance.Register<TerminalOptionsChangedMessage>(this, OnTerminalOptionsChanged);
+
+            _settingsService = settingsService;
+
+            _trayProcessCommunicationService = trayProcessCommunicationService;
+            _dialogService = dialogService;
+            ApplicationView = applicationView;
+            _dispatcherTimer = dispatcherTimer;
+            _clipboardService = clipboardService;
+            _keyboardCommandService = keyboardCommandService;
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewTab), async () => await AddLocalTabAsync());
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewSshTab), async () => await AddSshTabAsync());
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewCustomCommandTab), async () => await AddCustomCommandTabAsync());
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ConfigurableNewTab), async () => await AddConfigurableTerminal());
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ChangeTabTitle), async () => await SelectedTerminal.EditTitle());
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.CloseTab), CloseCurrentTab);
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.SavedSshNewTab), async () => await AddSavedSshTerminalAsync());
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.SavedSshNewWindow), () => NewWindow(NewWindowAction.ShowSshProfileSelection));
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewSshWindow), () => NewWindow(NewWindowAction.ShowSshInfoDialog));
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewCustomCommandWindow), () => NewWindow(NewWindowAction.ShowCustomCommandDialog));
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.DuplicateTab), async () => await AddTerminalAsync(SelectedTerminal.ShellProfile.Clone()));
+
+            // Add all of the commands for switching to a tab of a given ID, if there's one open there
+            for (int i = 0; i < 9; i++)
+            {
+                var switchCmd = Command.SwitchToTerm1 + i;
+                int tabNumber = i;
+                // ReSharper disable once InconsistentNaming
+                void handler() => SelectTabNumber(tabNumber);
+                _keyboardCommandService.RegisterCommandHandler(switchCmd.ToString(), handler);
+            }
+
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NextTab), SelectNextTab);
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.PreviousTab), SelectPreviousTab);
+
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewWindow), () => NewWindow(NewWindowAction.StartDefaultLocalTerminal));
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ConfigurableNewWindow), () => NewWindow(NewWindowAction.ShowProfileSelection));
+
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ShowSettings), ShowSettings);
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ToggleFullScreen), ToggleFullScreen);
+
+            foreach (ShellProfile profile in _settingsService.GetShellProfiles())
+            {
+                _keyboardCommandService.RegisterCommandHandler(profile.Id.ToString(), async () => await AddLocalTabOrWindowAsync(profile.Id));
+            }
+
+            foreach (SshProfile profile in _settingsService.GetSshProfiles())
+            {
+                _keyboardCommandService.RegisterCommandHandler(profile.Id.ToString(), async () => await AddSshTabOrWindowAsync(profile.Id));
+            }
+
+            var currentTheme = _settingsService.GetCurrentTheme();
+            var options = _settingsService.GetTerminalOptions();
+            Background = currentTheme.Colors.Background;
+            BackgroundOpacity = options.BackgroundOpacity;
+            _applicationSettings = _settingsService.GetApplicationSettings();
+            TabsPosition = _applicationSettings.TabsPosition;
+
+            AddLocalShellCommand = new RelayCommand(async () => await AddLocalTabAsync());
+            AddSshShellCommand = new RelayCommand(async () => await AddSshTabAsync());
+            AddQuickShellCommand = new RelayCommand(async () => await AddCustomCommandTabAsync());
+            ShowAboutCommand = new AsyncCommand(ShowAbout);
+            ShowSettingsCommand = new RelayCommand(ShowSettings);
+
+            ApplicationView.CloseRequested += OnCloseRequest;
+            ApplicationView.Closed += OnClosed;
+            Terminals.CollectionChanged += OnTerminalsCollectionChanged;
+        }
+
+        private void OnClosed(object sender, EventArgs e)
+        {
+            MessengerInstance.Unregister(this);
+
+            ApplicationView.CloseRequested -= OnCloseRequest;
+            ApplicationView.Closed -= OnClosed;
+            Terminals.CollectionChanged -= OnTerminalsCollectionChanged;
+
+            _keyboardCommandService.ClearCommandHandlers();
+
+            _applicationSettings = null;
+
+            AddLocalShellCommand = null;
+            AddSshShellCommand = null;
+            AddQuickShellCommand = null;
+            ShowAboutCommand = null;
+            ShowSettingsCommand = null;
+
+            Closed?.Invoke(this, e);
+        }
+
+        private void OnShellProfileDeleted(ShellProfileDeletedMessage message)
+        {
+            _keyboardCommandService.DeregisterCommandHandler(message.ProfileId.ToString());
+        }
+
+        private void OnShellProfileAdded(ShellProfileAddedMessage message)
+        {
+            _keyboardCommandService.RegisterCommandHandler(message.ShellProfile.Id.ToString(),
+                () => AddLocalTabOrWindowAsync(message.ShellProfile.Id));
+        }
+
+        private void OnSshProfileAdded(SshProfileAddedMessage message)
+        {
+            _keyboardCommandService.RegisterCommandHandler(message.SshProfile.Id.ToString(),
+                () => AddSshTabOrWindowAsync(message.SshProfile.Id));
+        }
+        private void OnSshProfileDeleted(SshProfileDeletedMessage message)
+        {
+            _keyboardCommandService.DeregisterCommandHandler(message.ProfileId.ToString());
+        }
+        
+        private void OnTerminalsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            RaisePropertyChanged(nameof(ShowTabsOnTop));
+            RaisePropertyChanged(nameof(ShowTabsOnBottom));
+        }
+
+        public event EventHandler Closed;
+
+        public event EventHandler<NewWindowRequestedEventArgs> NewWindowRequested;
+
+        public event EventHandler ShowSettingsRequested;
+
+        public event EventHandler ActivatedMv;
+
+        public event EventHandler<TerminalViewModel> TabTearedOff;
+
+        public void TearOffTab(TerminalViewModel model)
+        {
+            TabTearedOff?.Invoke(this, model);
+        }
+
+        public void FocusWindow()
+        {
+            ActivatedMv?.Invoke(this, EventArgs.Empty);
+        }
+
+        public RelayCommand AddLocalShellCommand { get; private set; }
+        public RelayCommand AddSshShellCommand { get; private set; }
+        public RelayCommand AddQuickShellCommand { get; private set; }
+
+        public string WindowTitle
+        {
+            get => _windowTitle;
+            set
+            {
+                if (Set(ref _windowTitle, value))
+                {
+                    ApplicationView.Title = value;
+                }
+            }
+        }
+
+        public bool ShowTabsOnTop
+        {
+            get => TabsPosition == TabsPosition.Top;
+        }
+
+        public bool ShowTabsOnBottom
+        {
+            get => TabsPosition == TabsPosition.Bottom;
+        }
+
+        public string Background
+        {
+            get => _background;
+            set => Set(ref _background, value);
+        }
+
+        public double BackgroundOpacity
+        {
+            get => _backgroundOpacity;
+            set => Set(ref _backgroundOpacity, value);
+        }
+
+        public TerminalViewModel SelectedTerminal
+        {
+            get => _selectedTerminal;
+            set
+            {
+                if (SelectedTerminal != null)
+                {
+                    _selectedTerminal.IsSelected = false;
+                }
+                if (Set(ref _selectedTerminal, value))
+                {
+                    SelectedTerminal?.FocusTerminal();
+                    if (SelectedTerminal != null)
+                    {
+                        SelectedTerminal.IsSelected = true;
+                        if (_applicationSettings.ShowCustomTitleInTitlebar)
+                        {
+                            WindowTitle = SelectedTerminal.TabTitle;
+                        }
+                        else
+                        {
+                            WindowTitle = SelectedTerminal.ShellTitle;
+                        }
+                    }
+                }
+            }
+        }
+
+        public IAsyncCommand ShowAboutCommand { get; private set; }
+
+        public RelayCommand ShowSettingsCommand { get; private set; }
+
+        public TabsPosition TabsPosition
+        {
+            get => _tabsPosition;
+            set => Set(ref _tabsPosition, value);
+        }
+
+        public ObservableCollection<TerminalViewModel> Terminals { get; } = new ObservableCollection<TerminalViewModel>();
+
+        public IApplicationView ApplicationView { get; }
+
+        public async Task AddConfigurableTerminal()
+        {
+            var profile = await _dialogService.ShowProfileSelectionDialogAsync();
+
+            if (profile == null)
+            {
+                if (Terminals.Count == 0)
+                {
+                    await ApplicationView.TryClose();
+                }
+
+                return;
+            }
+
+            await AddTerminalAsync(profile);
+        }
+
+        public async Task AddSshTabAsync()
+        {
+            SshProfile profile = await _dialogService.ShowSshConnectionInfoDialogAsync();
+            if (profile == null)
+            {
+                // User selected "Cancel"
+                if (Terminals.Count == 0)
+                {
+                    await ApplicationView.TryClose();
+                }
+            }
+            else
+            {
+                await AddTerminalAsync(profile);
+            }
+        }
+
+        public async Task AddCustomCommandTabAsync()
+        {
+            var profile = await _dialogService.ShowCustomCommandDialogAsync();
+            if (profile == null)
+            {
+                // User selected "Cancel"
+                if (Terminals.Count == 0)
+                {
+                    await ApplicationView.TryClose();
+                }
+            }
+            else
+            {
+                await AddTerminalAsync(profile);
+            }
+        }
+
+        public Task AddSshTabOrWindowAsync(Guid shellProfileId)
+        {
+            switch (_applicationSettings.NewTerminalLocation)
+            {
+                case NewTerminalLocation.Tab:
+                    var profile = _settingsService.GetSshProfile(shellProfileId);
+                    return AddTerminalAsync(profile);
+                case NewTerminalLocation.Window:
+                    NewWindow(NewWindowAction.StartSshTerminal, shellProfileId);
+                    return Task.FromResult(0);
+                default:
+                    throw new ArgumentException("unknown NewTerminalLocation");
+            }
+        }
+
+        public async Task AddSavedSshTerminalAsync()
+        {
+            ShellProfile profile = await _dialogService.ShowSshProfileSelectionDialogAsync();
+
+            if (profile == null)
+            {
+                // User selected "Cancel"
+                if (Terminals.Count == 0)
+                {
+                    await ApplicationView.TryClose();
+                }
+            }
+            else
+            {
+                await AddTerminalAsync(profile);
+            }
+        }
+
+        public Task AddLocalTabAsync()
+        {
+            var profile = _settingsService.GetDefaultShellProfile();
+            return AddTerminalAsync(profile);
+        }
+
+        public Task AddLocalTabOrWindowAsync(Guid shellProfileId)
+        {
+            switch (_applicationSettings.NewTerminalLocation)
+            {
+                case NewTerminalLocation.Tab:
+                    var profile = _settingsService.GetShellProfile(shellProfileId);
+                    return AddTerminalAsync(profile);
+                case NewTerminalLocation.Window:
+                    NewWindow(NewWindowAction.StartLocalTerminal, shellProfileId);
+                    return Task.FromResult(0);
+                default:
+                    throw new ArgumentException("unknown NewTerminalLocation");
+            }
+        }
+
+        public Task AddTerminalAsync(ShellProfile profile, string terminalState, int position)
+        {
+            return ApplicationView.RunOnDispatcherThread(() =>
+            {
+                var terminal = new TerminalViewModel(_settingsService, _trayProcessCommunicationService, _dialogService, _keyboardCommandService,
+                    _applicationSettings, profile, ApplicationView, _dispatcherTimer, _clipboardService, terminalState);
+
+                terminal.Closed += OnTerminalClosed;
+                terminal.ShellTitleChanged += Terminal_ShellTitleChanged;
+                terminal.CustomTitleChanged += Terminal_CustomTitleChanged;
+                terminal.CloseLeftTabsRequested += Terminal_CloseLeftTabsRequested;
+                terminal.CloseRightTabsRequested += Terminal_CloseRightTabsRequested;
+                terminal.CloseOtherTabsRequested += Terminal_CloseOtherTabsRequested;
+                terminal.DuplicateTabRequested += Terminal_DuplicateTabRequested;
+                Terminals.Insert(Math.Min(position, Terminals.Count), terminal);
+
+                SelectedTerminal = terminal;
+            });
+        }
+
+        private async void Terminal_DuplicateTabRequested(object sender, EventArgs e)
+        {
+            if (sender is TerminalViewModel terminal)
+            {
+                await AddTerminalAsync(terminal.ShellProfile.Clone());
+            }
+        }
+
+        private void Terminal_CloseOtherTabsRequested(object sender, EventArgs e)
+        {
+            if (sender is TerminalViewModel terminal)
+            {
+                Array.ForEach<TerminalViewModel>(Terminals.ToArray(),
+                    async t => {
+                        if (terminal != t)
+                        {
+                            Logger.Instance.Debug("Terminal with Id: {@id} closed.", t.Terminal.Id);
+                            await t.CloseCommand.ExecuteAsync();
+                        }
+                    });
+            }
+        }
+
+        private async void Terminal_CloseRightTabsRequested(object sender, EventArgs e)
+        {
+            if (sender is TerminalViewModel terminal)
+            {
+                for (int i = Terminals.Count - 1; i > Terminals.IndexOf(terminal); --i)
+                {
+                    var terminalToRemove = Terminals[i];
+                    Logger.Instance.Debug("Terminal with Id: {@id} closed.", terminalToRemove.Terminal.Id);
+                    await terminalToRemove.CloseCommand.ExecuteAsync();
+                }
+            }
+        }
+
+        private async void Terminal_CloseLeftTabsRequested(object sender, EventArgs e)
+        {
+            if (sender is TerminalViewModel terminal)
+            {
+                for(int i = Terminals.IndexOf(terminal) - 1; i >= 0; --i)
+                {
+                    var terminalToRemove = Terminals[i];
+                    Logger.Instance.Debug("Terminal with Id: {@id} closed.", terminalToRemove.Terminal.Id);
+                    await terminalToRemove.CloseCommand.ExecuteAsync();
+                }
+            }
+        }
+
+        public Task AddTerminalAsync(ShellProfile profile)
+        {
+            return AddTerminalAsync(profile, "", Terminals.Count);
+        }
+
+        public Task AddTerminalAsync(string terminalState, int position)
+        {
+            return AddTerminalAsync(new ShellProfile(), terminalState, position);
+        }
+
+        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.Closed -= OnTerminalClosed;
+                terminal.ShellTitleChanged -= Terminal_ShellTitleChanged;
+                terminal.CustomTitleChanged -= Terminal_CustomTitleChanged;
+                terminal.CloseLeftTabsRequested -= Terminal_CloseLeftTabsRequested;
+                terminal.CloseRightTabsRequested -= Terminal_CloseRightTabsRequested;
+                terminal.CloseOtherTabsRequested -= Terminal_CloseOtherTabsRequested;
+                terminal.DuplicateTabRequested -= Terminal_DuplicateTabRequested;
+                await terminal.Close();
+            }
+        }
+
+        private void CloseCurrentTab()
+        {
+            SelectedTerminal?.CloseCommand.ExecuteAsync();
+        }
+
+        private void NewWindow(NewWindowAction showSelection)
+        {
+            NewWindow(showSelection, Guid.Empty);
+        }
+
+        private void NewWindow(NewWindowAction showSelection, Guid profileId)
+        {
+            var args = new NewWindowRequestedEventArgs
+            {
+                Action = showSelection,
+                ProfileId = profileId
+            };
+            NewWindowRequested?.Invoke(this, args);
+        }
+
+        private async void OnApplicationSettingsChanged(ApplicationSettingsChangedMessage message)
+        {
+            await ApplicationView.RunOnDispatcherThread(() =>
+            {
+                _applicationSettings = message.ApplicationSettings;
+                TabsPosition = message.ApplicationSettings.TabsPosition;
+                RaisePropertyChanged(nameof(ShowTabsOnTop));
+                RaisePropertyChanged(nameof(ShowTabsOnBottom));
+
+                if (message.ApplicationSettings.ShowCustomTitleInTitlebar)
+                {
+                    WindowTitle = SelectedTerminal?.TabTitle;
+                }
+                else
+                {
+                    WindowTitle = SelectedTerminal?.ShellTitle;
+                }
+            });
+        }
+
+        private async Task OnCloseRequest(object sender, CancelableEventArgs e)
+        {
+            if (_applicationSettings.ConfirmClosingWindows)
+            {
+                var result = await _dialogService.ShowMessageDialogAsnyc(I18N.Translate("PleaseConfirm"), I18N.Translate("ConfirmCloseWindow"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(false);
+
+                if (result == DialogButton.OK)
+                {
+                    await CloseAllTerminals();
+                }
+                else
+                {
+                    e.Cancelled = true;
+                }
+            }
+            else
+            {
+                await CloseAllTerminals();
+            }
+        }
+
+        private async void OnCurrentThemeChanged(CurrentThemeChangedMessage message)
+        {
+            await ApplicationView.RunOnDispatcherThread(() =>
+            {
+                var currentTheme = _settingsService.GetTheme(message.ThemeId);
+                Background = currentTheme.Colors.Background;
+            });
+        }
+
+        private async void OnTerminalClosed(object sender, EventArgs e)
+        {
+            if (sender is TerminalViewModel terminal)
+            {
+                if (SelectedTerminal == terminal)
+                {
+                    SelectedTerminal = Terminals.LastOrDefault(t => t != terminal);
+                }
+                Logger.Instance.Debug("Terminal with Id: {@id} closed.", terminal.Terminal.Id);
+
+                terminal.Closed -= OnTerminalClosed;
+                terminal.ShellTitleChanged -= Terminal_ShellTitleChanged;
+                terminal.CustomTitleChanged -= Terminal_CustomTitleChanged;
+                terminal.CloseLeftTabsRequested -= Terminal_CloseLeftTabsRequested;
+                terminal.CloseRightTabsRequested -= Terminal_CloseRightTabsRequested;
+                terminal.CloseOtherTabsRequested -= Terminal_CloseOtherTabsRequested;
+                terminal.DuplicateTabRequested -= Terminal_DuplicateTabRequested;
+
+                Terminals.Remove(terminal);
+
+                if (Terminals.Count == 0)
+                {
+                    await ApplicationView.TryClose();
+                }
+            }
+        }
+
+        private async void OnTerminalOptionsChanged(TerminalOptionsChangedMessage message)
+        {
+            await ApplicationView.RunOnDispatcherThread(() =>
+            {
+                BackgroundOpacity = message.TerminalOptions.BackgroundOpacity;
+            });
+        }
+
+        private void SelectTabNumber(int tabNumber)
+        {
+            if (tabNumber < Terminals.Count)
+            {
+                SelectedTerminal = Terminals[tabNumber];
+            }
+        }
+
+        private void SelectNextTab()
+        {
+            var currentIndex = Terminals.IndexOf(SelectedTerminal);
+            var nextIndex = (currentIndex + 1) % Terminals.Count;
+            SelectedTerminal = Terminals[nextIndex];
+        }
+
+        private void SelectPreviousTab()
+        {
+            var currentIndex = Terminals.IndexOf(SelectedTerminal);
+            var previousIndex = (currentIndex - 1 + Terminals.Count) % Terminals.Count;
+            SelectedTerminal = Terminals[previousIndex];
+        }
+
+        private Task ShowAbout()
+        {
+            return _dialogService.ShowAboutDialogAsync();
+        }
+
+        private void ShowSettings()
+        {
+            ShowSettingsRequested?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void ToggleFullScreen()
+        {
+            ApplicationView.ToggleFullScreen();
+        }
+    }
 }

FluentTerminal.App.ViewModels/OverlayViewModel.cs

@@ -0,0 +1,53 @@
+using FluentTerminal.App.Services;
+using GalaSoft.MvvmLight;
+using System;
+
+namespace FluentTerminal.App.ViewModels
+{
+    public class OverlayViewModel : ViewModelBase
+    {
+        private readonly IDispatcherTimer _overlayTimer;
+        private bool _showOverlay;
+        private string _overlayContent;
+
+        public OverlayViewModel(IDispatcherTimer dispatcherTimer)
+        {
+            _overlayTimer = dispatcherTimer;
+            _overlayTimer.Interval = new TimeSpan(0, 0, 2);
+        }
+
+        public bool ShowOverlay
+        {
+            get => _showOverlay;
+            set => Set(ref _showOverlay, value);
+        }
+
+        public string OverlayContent
+        {
+            get => _overlayContent;
+            set => Set(ref _overlayContent, value);
+        }
+
+        public void Show(string message)
+        {
+            OverlayContent = message; 
+            ShowOverlay = true;
+
+            if (_overlayTimer.IsEnabled)
+            {
+                _overlayTimer.Stop();
+                _overlayTimer.Tick -= OnResizeOverlayTimerFinished;
+            }
+            _overlayTimer.Start();
+            _overlayTimer.Tick += OnResizeOverlayTimerFinished;
+        }
+
+        private void OnResizeOverlayTimerFinished(object sender, object e)
+        {
+            _overlayTimer.Stop();
+            _overlayTimer.Tick -= OnResizeOverlayTimerFinished;
+            ShowOverlay = false;
+        }
+
+    }
+}

FluentTerminal.App.ViewModels/Profiles/CommonProfileProviderViewModel.cs

@@ -0,0 +1,146 @@
+using System.Threading.Tasks;
+using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.App.ViewModels.Infrastructure;
+using FluentTerminal.Models;
+
+namespace FluentTerminal.App.ViewModels.Profiles
+{
+    /// <summary>
+    /// Used for common profiles (PowerShell, CMD, WSL).
+    /// </summary>
+    public class CommonProfileProviderViewModel : ProfileProviderViewModelBase
+    {
+        #region Fields
+
+        private readonly IFileSystemService _fileSystemService;
+
+        #endregion Fields
+
+        #region Properties
+
+        public bool PreInstalled { get; private set; }
+
+        private string _location;
+
+        public string Location
+        {
+            get => _location;
+            set => Set(ref _location, value);
+        }
+
+        private string _workingDirectory;
+
+        public string WorkingDirectory
+        {
+            get => _workingDirectory;
+            set => Set(ref _workingDirectory, value);
+        }
+
+        private string _arguments;
+
+        public string Arguments
+        {
+            get => _arguments;
+            set => Set(ref _arguments, value);
+        }
+
+        #endregion Properties
+
+        #region Commands
+
+        public IAsyncCommand BrowseForCustomShellCommand { get; }
+
+        public IAsyncCommand BrowseForWorkingDirectoryCommand { get; }
+
+        #endregion Commands
+
+        #region Constructor
+
+        public CommonProfileProviderViewModel(ISettingsService settingsService, IApplicationView applicationView,
+            IFileSystemService fileSystemService, ShellProfile original = null) : base(settingsService, applicationView,
+            true, original)
+        {
+            _fileSystemService = fileSystemService;
+
+            BrowseForCustomShellCommand = new AsyncCommand(BrowseForCustomShell);
+            BrowseForWorkingDirectoryCommand = new AsyncCommand(BrowseForWorkingDirectory);
+
+            Initialize(Model);
+        }
+
+        #endregion Constructor
+
+        #region Methods
+
+        private void Initialize(ShellProfile profile)
+        {
+            PreInstalled = profile.PreInstalled;
+            Location = profile.Location;
+            Arguments = profile.Arguments;
+            WorkingDirectory = profile.WorkingDirectory;
+        }
+
+        protected override void LoadFromProfile(ShellProfile profile)
+        {
+            base.LoadFromProfile(profile);
+
+            Initialize(profile);
+        }
+
+        protected override async Task CopyToProfileAsync(ShellProfile profile)
+        {
+            await base.CopyToProfileAsync(profile);
+
+            profile.Location = _location;
+            profile.Arguments = _arguments;
+            profile.WorkingDirectory = _workingDirectory;
+        }
+
+        public override async Task<string> ValidateAsync()
+        {
+            var error = await base.ValidateAsync();
+
+            if (!string.IsNullOrEmpty(error))
+            {
+                return error;
+            }
+
+            if (!string.IsNullOrEmpty(_location))
+            {
+                return null;
+            }
+
+            error = I18N.Translate("LocationCantBeEmpty");
+
+            return string.IsNullOrEmpty(error) ? "Location cannot be empty." : error;
+        }
+
+        public override bool HasChanges()
+        {
+            return base.HasChanges() || !Model.Location.NullableEqualTo(_location) ||
+                   !Model.WorkingDirectory.NullableEqualTo(_workingDirectory) ||
+                   !Model.Arguments.NullableEqualTo(_arguments);
+        }
+
+        private async Task BrowseForCustomShell()
+        {
+            var file = await _fileSystemService.OpenFile(new[] { ".exe" }).ConfigureAwait(true);
+            if (file != null)
+            {
+                Location = file.Path;
+            }
+        }
+
+        private async Task BrowseForWorkingDirectory()
+        {
+            var directory = await _fileSystemService.BrowseForDirectory().ConfigureAwait(true);
+            if (directory != null)
+            {
+                WorkingDirectory = directory;
+            }
+        }
+
+        #endregion Methods
+    }
+}

FluentTerminal.App.ViewModels/Profiles/ExecutedCommand.cs

@@ -0,0 +1,18 @@
+using System;
+using FluentTerminal.Models;
+
+namespace FluentTerminal.App.ViewModels.Profiles
+{
+    public class ExecutedCommand
+    {
+        public string Value { get; set; }
+
+        public bool IsProfile { get; set; }
+
+        public DateTime LastExecution { get; set; }
+
+        public int ExecutionCount { get; set; }
+
+        public ShellProfile ShellProfile { get; set; }
+    }
+}

FluentTerminal.App.ViewModels/Profiles/ProfileProviderViewModelBase.cs

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

FluentTerminal.App.ViewModels/Profiles/SshConnectViewModel.cs

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

FluentTerminal.App.ViewModels/Profiles/SshConnectionInfoValidationResult.cs

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

FluentTerminal.App.ViewModels/Settings/AboutPageViewModel.cs

@@ -0,0 +1,77 @@
+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 IUpdateService _updateService;
+        private string _latestVersion;
+        private readonly IApplicationView _applicationView;
+
+        public AboutPageViewModel(IUpdateService updateService, IApplicationView applicationView)
+        {
+            _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

@@ -1,28 +1,233 @@
 using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.App.ViewModels.Infrastructure;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.ViewModels.Settings
 {
     public class GeneralPageViewModel : ViewModelBase
     {
+        private readonly ApplicationSettings _applicationSettings;
         private readonly IDefaultValueProvider _defaultValueProvider;
         private readonly IDialogService _dialogService;
         private readonly ISettingsService _settingsService;
-        private readonly ApplicationSettings _applicationSettings;
-        private bool _editingNewTerminalLocation;
+        private readonly IStartupTaskService _startupTaskService;
+        private bool _canEnableStartupTask;
+        private bool _startupTaskEnabled;
+        private bool _shouldRestartForTrayMessage;
+        private string _startupTaskErrorMessage;
+        private bool _needsToRestart;
+        private readonly IApplicationLanguageService _applicationLanguageService;
+        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
+        private readonly IFileSystemService _fileSystemService;
 
-        public GeneralPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider)
+        public GeneralPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider,
+            IStartupTaskService startupTaskService, IApplicationLanguageService applicationLanguageService,
+            ITrayProcessCommunicationService trayProcessCommunicationService, IFileSystemService fileSystemService)
         {
             _settingsService = settingsService;
             _dialogService = dialogService;
             _defaultValueProvider = defaultValueProvider;
+            _startupTaskService = startupTaskService;
+            _applicationLanguageService = applicationLanguageService;
+            _trayProcessCommunicationService = trayProcessCommunicationService;
+            _fileSystemService = fileSystemService;
+
             _applicationSettings = _settingsService.GetApplicationSettings();
 
-            RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
+            RestoreDefaultsCommand = new AsyncCommand(RestoreDefaults);
+            BrowseLogDirectoryCommand = new AsyncCommand(BrowseLogDirectory);
+        }
+
+        public IEnumerable<string> Languages => _applicationLanguageService.Languages;
+
+        public bool NeedsToRestart
+        {
+            get => _needsToRestart;
+            set => Set(ref _needsToRestart, value);
+        }
+
+        public string SelectedLanguage
+        {
+            get => _applicationLanguageService.GetCurrentLanguage();
+            set
+            {
+                _applicationLanguageService.SetLanguage(value);
+                NeedsToRestart = true;
+            }
+        }
+
+        public async Task OnNavigatedTo()
+        {
+            var startupTaskStatus = await _startupTaskService.GetStatus();
+            SetStartupTaskPropertiesForStatus(startupTaskStatus);
+        }
+
+        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;
+            set
+            {
+                if (_applicationSettings.ShowNewOutputIndicator != value)
+                {
+                    _applicationSettings.ShowNewOutputIndicator = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public bool UseMoshByDefault
+        {
+            get => _applicationSettings.UseMoshByDefault;
+            set
+            {
+                if (_applicationSettings.UseMoshByDefault != value)
+                {
+                    _applicationSettings.UseMoshByDefault = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public bool AutoFallbackToWindowsUsernameInLinks
+        {
+            get => _applicationSettings.AutoFallbackToWindowsUsernameInLinks;
+            set
+            {
+                if (_applicationSettings.AutoFallbackToWindowsUsernameInLinks != value)
+                {
+                    _applicationSettings.AutoFallbackToWindowsUsernameInLinks = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public bool RTrimCopiedLines
+        {
+            get => _applicationSettings.RTrimCopiedLines;
+            set
+            {
+                if (_applicationSettings.RTrimCopiedLines != value)
+                {
+                    _applicationSettings.RTrimCopiedLines = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public bool MuteTerminalBeeps
+        {
+            get => _applicationSettings.MuteTerminalBeeps;
+            set
+            {
+                if (_applicationSettings.MuteTerminalBeeps != value)
+                {
+                    _applicationSettings.MuteTerminalBeeps = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+
+                    _trayProcessCommunicationService.MuteTerminal(value);
+                }
+            }
+        }
+        public bool EnableLogging
+        {
+            get => _applicationSettings.EnableLogging;
+            set
+            {
+                if (_applicationSettings.EnableLogging != value)
+                {
+                    _applicationSettings.EnableLogging = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public bool PrintableOutputOnly
+        {
+            get => _applicationSettings.PrintableOutputOnly;
+            set
+            {
+                if (_applicationSettings.PrintableOutputOnly != value)
+                {
+                    _applicationSettings.PrintableOutputOnly = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public string LogDirectoryPath
+        {
+            get => _applicationSettings.LogDirectoryPath;
+            set
+            {
+                if (_applicationSettings.LogDirectoryPath != value)
+                {
+                    _applicationSettings.LogDirectoryPath = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public bool BottomIsSelected
+        {
+            get => TabsPosition == TabsPosition.Bottom;
+            set { if (value) TabsPosition = TabsPosition.Bottom; }
+        }
+
+        public bool CanEnableStartupTask
+        {
+            get => _canEnableStartupTask;
+            set => Set(ref _canEnableStartupTask, value);
         }
 
         public bool ConfirmClosingTabs
@@ -53,6 +258,70 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
+        public NewTerminalLocation NewTerminalLocation
+        {
+            get => _applicationSettings.NewTerminalLocation;
+            set
+            {
+                if (_applicationSettings.NewTerminalLocation != value)
+                {
+                    _applicationSettings.NewTerminalLocation = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public IAsyncCommand RestoreDefaultsCommand { get; }
+
+        public IAsyncCommand BrowseLogDirectoryCommand { get; }
+
+        public bool StartupTaskEnabled
+        {
+            get => _startupTaskEnabled;
+            set
+            {
+                if (_startupTaskEnabled != value)
+                {
+                    _startupTaskEnabled = value;
+                    RaisePropertyChanged(nameof(StartupTaskEnabled));
+                    SetStartupTaskState(value);
+                }
+            }
+        }
+
+        public string StartupTaskErrorMessage
+        {
+            get => _startupTaskErrorMessage;
+            set => Set(ref _startupTaskErrorMessage, value);
+        }
+
+        public bool TabIsSelected
+        {
+            get => NewTerminalLocation == NewTerminalLocation.Tab;
+            set { if (value) NewTerminalLocation = NewTerminalLocation.Tab; }
+        }
+
+        public TabsPosition TabsPosition
+        {
+            get => _applicationSettings.TabsPosition;
+            set
+            {
+                if (_applicationSettings.TabsPosition != value)
+                {
+                    _applicationSettings.TabsPosition = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public bool TopIsSelected
+        {
+            get => TabsPosition == TabsPosition.Top;
+            set { if (value) TabsPosition = TabsPosition.Top; }
+        }
+
         public bool UnderlineSelectedTab
         {
             get => _applicationSettings.UnderlineSelectedTab;
@@ -67,41 +336,41 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        public NewTerminalLocation NewTerminalLocation
+        public bool BackgroundIsSelected
         {
-            get => _applicationSettings.NewTerminalLocation;
-            set
-            {
-                if (_applicationSettings.NewTerminalLocation != value && !_editingNewTerminalLocation)
-                {
-                    _editingNewTerminalLocation = true;
-                    _applicationSettings.NewTerminalLocation = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                    RaisePropertyChanged(nameof(WindowIsSelected));
-                    RaisePropertyChanged(nameof(TabIsSelected));
-                    _editingNewTerminalLocation = false;
-                }
-            }
+            get => InactiveTabColorMode == InactiveTabColorMode.Background;
+            set { if (value) InactiveTabColorMode = InactiveTabColorMode.Background; }
         }
 
-        public RelayCommand RestoreDefaultsCommand { get; }
-
-        public bool TabIsSelected
+        public bool UnderlinedIsSelected
         {
-            get => NewTerminalLocation == NewTerminalLocation.Tab;
-            set => NewTerminalLocation = NewTerminalLocation.Tab;
+            get => InactiveTabColorMode == InactiveTabColorMode.Underlined;
+            set { if (value) InactiveTabColorMode = InactiveTabColorMode.Underlined; }
+        }
+
+        public InactiveTabColorMode InactiveTabColorMode
+        {
+            get => _applicationSettings.InactiveTabColorMode;
+            set
+            {
+                if (_applicationSettings.InactiveTabColorMode != value)
+                {
+                    _applicationSettings.InactiveTabColorMode = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
         }
 
         public bool WindowIsSelected
         {
             get => NewTerminalLocation == NewTerminalLocation.Window;
-            set => NewTerminalLocation = NewTerminalLocation.Window;
+            set { if (value) NewTerminalLocation = NewTerminalLocation.Window; }
         }
 
         private async Task RestoreDefaults()
         {
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the general settings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(false);
+            var result = await _dialogService.ShowMessageDialogAsnyc(I18N.Translate("PleaseConfirm"), I18N.Translate("ConfirmRestoreGeneralSettings"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {
@@ -109,7 +378,73 @@ namespace FluentTerminal.App.ViewModels.Settings
                 ConfirmClosingWindows = defaults.ConfirmClosingWindows;
                 ConfirmClosingTabs = defaults.ConfirmClosingTabs;
                 UnderlineSelectedTab = defaults.UnderlineSelectedTab;
+                InactiveTabColorMode = defaults.InactiveTabColorMode;
                 NewTerminalLocation = defaults.NewTerminalLocation;
+                ShowNewOutputIndicator = defaults.ShowNewOutputIndicator;
+                EnableTrayIcon = defaults.EnableTrayIcon;
+                ShowCustomTitleInTitlebar = defaults.ShowCustomTitleInTitlebar;
+                UseMoshByDefault = defaults.UseMoshByDefault;
+                AutoFallbackToWindowsUsernameInLinks = defaults.AutoFallbackToWindowsUsernameInLinks;
+                RTrimCopiedLines = defaults.RTrimCopiedLines;
+                MuteTerminalBeeps = defaults.MuteTerminalBeeps;
+                EnableLogging = defaults.EnableLogging;
+                PrintableOutputOnly = defaults.PrintableOutputOnly;
+                LogDirectoryPath = defaults.LogDirectoryPath;
+            }
+        }
+
+        private void SetStartupTaskPropertiesForStatus(StartupTaskStatus startupTaskStatus)
+        {
+            switch (startupTaskStatus)
+            {
+                case StartupTaskStatus.Enabled:
+                    StartupTaskEnabled = true;
+                    StartupTaskErrorMessage = string.Empty;
+                    CanEnableStartupTask = true;
+                    break;
+
+                case StartupTaskStatus.Disabled:
+                    StartupTaskEnabled = false;
+                    StartupTaskErrorMessage = string.Empty;
+                    CanEnableStartupTask = true;
+                    break;
+
+                case StartupTaskStatus.DisabledByUser:
+                    StartupTaskEnabled = false;
+                    StartupTaskErrorMessage = I18N.Translate("DisabledByUser");
+                    CanEnableStartupTask = false;
+                    break;
+
+                case StartupTaskStatus.DisabledByPolicy:
+                    StartupTaskEnabled = false;
+                    StartupTaskErrorMessage = I18N.Translate("DisabledByPolicy");
+                    CanEnableStartupTask = false;
+                    break;
+            }
+        }
+
+        private async Task SetStartupTaskState(bool enabled)
+        {
+            StartupTaskStatus status;
+            if (enabled)
+            {
+                status = await _startupTaskService.EnableStartupTask();
+            }
+            else
+            {
+                await _startupTaskService.DisableStartupTask();
+                status = await _startupTaskService.GetStatus();
+            }
+            SetStartupTaskPropertiesForStatus(status);
+        }
+
+        private async Task BrowseLogDirectory()
+        {
+            var folder = await _fileSystemService.BrowseForDirectory();
+
+            if (folder != null)
+            {
+                LogDirectoryPath = folder;
             }
         }
     }

FluentTerminal.App.ViewModels/Settings/KeyBindingViewModel.cs

@@ -1,7 +1,8 @@
 using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.App.ViewModels.Infrastructure;
 using FluentTerminal.Models;
 using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
 using System;
 using System.Threading.Tasks;
 
@@ -11,18 +12,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 +66,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
         {
@@ -115,7 +119,7 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         private async Task Delete()
         {
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to delete this keybinding?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            var result = await _dialogService.ShowMessageDialogAsnyc(I18N.Translate("PleaseConfirm"), I18N.Translate("ConfirmDeleteKeybindings"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {

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;
@@ -13,32 +14,29 @@ namespace FluentTerminal.App.ViewModels.Settings
 {
     public class KeyBindingsPageViewModel : ViewModelBase
     {
-        private readonly IDefaultValueProvider _defaultValueProvider;
         private readonly IDialogService _dialogService;
         private readonly ISettingsService _settingsService;
         private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
-        private IDictionary<Command, ICollection<KeyBinding>> _keyBindings;
 
-        public KeyBindingsPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider, ITrayProcessCommunicationService trayProcessCommunicationService)
+        public KeyBindingsPageViewModel(ISettingsService settingsService, IDialogService dialogService, ITrayProcessCommunicationService trayProcessCommunicationService)
         {
             _settingsService = settingsService;
             _dialogService = dialogService;
-            _defaultValueProvider = defaultValueProvider;
             _trayProcessCommunicationService = trayProcessCommunicationService;
             RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
-            AddCommand = new RelayCommand<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,22 +49,24 @@ 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;
-
             ClearKeyBindings();
 
             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, I18N.Translate($"{nameof(Command)}.{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();
@@ -74,12 +74,12 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         private async Task RestoreDefaults()
         {
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the default keybindings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            var result = await _dialogService.ShowMessageDialogAsnyc(I18N.Translate("PleaseConfirm"), I18N.Translate("ConfirmRestoreKeybindings"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             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/MousePageViewModel.cs

@@ -0,0 +1,121 @@
+using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.ViewModels.Settings
+{
+    public class MousePageViewModel : ViewModelBase
+    {
+        private readonly ISettingsService _settingsService;
+        private readonly IDialogService _dialogService;
+        private readonly IDefaultValueProvider _defaultValueProvider;
+        private readonly ApplicationSettings _applicationSettings;
+
+        public MousePageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider)
+        {
+            _settingsService = settingsService;
+            _dialogService = dialogService;
+            _defaultValueProvider = defaultValueProvider;
+            _applicationSettings = _settingsService.GetApplicationSettings();
+
+            RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
+        }
+
+        public bool CopyOnSelect
+        {
+            get => _applicationSettings.CopyOnSelect;
+            set
+            {
+                if (_applicationSettings.CopyOnSelect != value)
+                {
+                    _applicationSettings.CopyOnSelect = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public MouseAction MouseRightClickAction
+        {
+            get => _applicationSettings.MouseRightClickAction;
+            set
+            {
+                if (_applicationSettings.MouseRightClickAction != value)
+                {
+                    _applicationSettings.MouseRightClickAction = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public bool MouseRightClickNoneIsSelected
+        {
+            get => MouseRightClickAction == MouseAction.None;
+            set { if (value) MouseRightClickAction = MouseAction.None; }
+        }
+
+        public bool MouseRightClickContextMenuIsSelected
+        {
+            get => MouseRightClickAction == MouseAction.ContextMenu;
+            set { if (value) MouseRightClickAction = MouseAction.ContextMenu; }
+        }
+
+        public bool MouseRightClickPasteIsSelected
+        {
+            get => MouseRightClickAction == MouseAction.Paste;
+            set { if (value) MouseRightClickAction = MouseAction.Paste; }
+        }
+
+        public MouseAction MouseMiddleClickAction
+        {
+            get => _applicationSettings.MouseMiddleClickAction;
+            set
+            {
+                if (_applicationSettings.MouseMiddleClickAction != value)
+                {
+                    _applicationSettings.MouseMiddleClickAction = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public bool MouseMiddleClickNoneIsSelected
+        {
+            get => MouseMiddleClickAction == MouseAction.None;
+            set { if (value) MouseMiddleClickAction = MouseAction.None; }
+        }
+
+        public bool MouseMiddleClickContextMenuIsSelected
+        {
+            get => MouseMiddleClickAction == MouseAction.ContextMenu;
+            set { if (value) MouseMiddleClickAction = MouseAction.ContextMenu; }
+        }
+
+        public bool MouseMiddleClickPasteIsSelected
+        {
+            get => MouseMiddleClickAction == MouseAction.Paste;
+            set { if (value) MouseMiddleClickAction = MouseAction.Paste; }
+        }
+
+        public RelayCommand RestoreDefaultsCommand { get; }
+
+        private async Task RestoreDefaults()
+        {
+            var result = await _dialogService.ShowMessageDialogAsnyc(I18N.Translate("PleaseConfirm"), I18N.Translate("ConfirmRestoreMouseSettings"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+
+            if (result == DialogButton.OK)
+            {
+                var defaults = _defaultValueProvider.GetDefaultApplicationSettings();
+                CopyOnSelect = defaults.CopyOnSelect;
+                MouseMiddleClickAction = defaults.MouseMiddleClickAction;
+                MouseRightClickAction = defaults.MouseRightClickAction;
+            }
+        }
+    }
+}

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,21 +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;
 
@@ -41,6 +44,7 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
 
             SelectedShellProfile = ShellProfiles.First(p => p.IsDefault);
+            
         }
 
         private void OnShellProfileSetAsDefault(object sender, EventArgs e)
@@ -77,18 +81,36 @@ 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 = shellProfile.ProfileVm.Model.Clone();
+
+            cloned.Id = Guid.NewGuid();
+            cloned.PreInstalled = false;
+            cloned.Name = $"Copy of {shellProfile.Name}";
+            cloned.KeyBindings = new List<KeyBinding>();
+
+            AddShellProfile(cloned);
+        }
+
+        private void AddShellProfile(ShellProfile shellProfile)
+        {
+            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/SshProfilesPageViewModel.cs

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

FluentTerminal.App.ViewModels/Settings/TerminalPageViewModel.cs

@@ -1,4 +1,6 @@
 using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.App.ViewModels.Utilities;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
@@ -15,43 +17,41 @@ namespace FluentTerminal.App.ViewModels.Settings
         private readonly ISettingsService _settingsService;
         private readonly IDialogService _dialogService;
         private readonly IDefaultValueProvider _defaultValueProvider;
-        private bool _isEditingCursorStyle;
-        private bool _isEditingScrollBarStyle;
 
         public bool BarIsSelected
         {
             get => CursorStyle == CursorStyle.Bar;
-            set => CursorStyle = CursorStyle.Bar;
+            set { if (value) CursorStyle = CursorStyle.Bar; }
         }
 
         public bool BlockIsSelected
         {
             get => CursorStyle == CursorStyle.Block;
-            set => CursorStyle = CursorStyle.Block;
+            set { if (value) CursorStyle = CursorStyle.Block; }
         }
 
         public bool UnderlineIsSelected
         {
             get => CursorStyle == CursorStyle.Underline;
-            set => CursorStyle = CursorStyle.Underline;
+            set { if (value) CursorStyle = CursorStyle.Underline; }
         }
 
         public bool HiddenIsSelected
         {
             get => ScrollBarStyle == ScrollBarStyle.Hidden;
-            set => ScrollBarStyle = ScrollBarStyle.Hidden;
+            set { if (value) ScrollBarStyle = ScrollBarStyle.Hidden; }
         }
 
         public bool AutoHidingIsSelected
         {
             get => ScrollBarStyle == ScrollBarStyle.AutoHiding;
-            set => ScrollBarStyle = ScrollBarStyle.AutoHiding;
+            set { if (value) ScrollBarStyle = ScrollBarStyle.AutoHiding; }
         }
 
         public bool VisibleIsSelected
         {
             get => ScrollBarStyle == ScrollBarStyle.Visible;
-            set => ScrollBarStyle = ScrollBarStyle.Visible;
+            set { if (value) ScrollBarStyle = ScrollBarStyle.Visible; }
         }
 
         public bool CursorBlink
@@ -96,12 +96,25 @@ 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();
             set
             {
-                var oldValue = _terminalOptions.ScrollBackLimit;
                 if (uint.TryParse(value, out uint intValue))
                 {
                     if (intValue == uint.MinValue)
@@ -122,7 +135,50 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        public IEnumerable<string> Fonts { get; }
+        public string WordSeparator
+        {
+            get => WebViewSpecialCharEncoder.Decode(_terminalOptions.WordSeparator);
+            set
+            {
+                value = WebViewSpecialCharEncoder.Encode(value);
+                if (_terminalOptions.WordSeparator != value)
+                {
+                    _terminalOptions.WordSeparator = value;
+                    _settingsService.SaveTerminalOptions(_terminalOptions);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public bool BoldText
+        {
+            get => _terminalOptions.BoldText;
+            set
+            {
+                if (_terminalOptions.BoldText != value)
+                {
+                    _terminalOptions.BoldText = value;
+                    _settingsService.SaveTerminalOptions(_terminalOptions);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public bool ShowTextCopied
+        {
+            get => _terminalOptions.ShowTextCopied;
+            set
+            {
+                if (_terminalOptions.ShowTextCopied != value)
+                {
+                    _terminalOptions.ShowTextCopied = value;
+                    _settingsService.SaveTerminalOptions(_terminalOptions);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public IEnumerable<FontInfo> Fonts { get; }
 
         public int FontSize
         {
@@ -147,16 +203,11 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _terminalOptions.CursorStyle;
             set
             {
-                if (_terminalOptions.CursorStyle != value && !_isEditingCursorStyle)
+                if (_terminalOptions.CursorStyle != value)
                 {
-                    _isEditingCursorStyle = true;
                     _terminalOptions.CursorStyle = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
                     RaisePropertyChanged();
-                    RaisePropertyChanged(nameof(BlockIsSelected));
-                    RaisePropertyChanged(nameof(BarIsSelected));
-                    RaisePropertyChanged(nameof(UnderlineIsSelected));
-                    _isEditingCursorStyle = false;
                 }
             }
         }
@@ -166,23 +217,18 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _terminalOptions.ScrollBarStyle;
             set
             {
-                if (_terminalOptions.ScrollBarStyle != value && !_isEditingScrollBarStyle)
+                if (_terminalOptions.ScrollBarStyle != value)
                 {
-                    _isEditingScrollBarStyle = true;
                     _terminalOptions.ScrollBarStyle = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
                     RaisePropertyChanged();
-                    RaisePropertyChanged(nameof(HiddenIsSelected));
-                    RaisePropertyChanged(nameof(AutoHidingIsSelected));
-                    RaisePropertyChanged(nameof(VisibleIsSelected));
-                    _isEditingScrollBarStyle = false;
                 }
             }
         }
 
         private async Task RestoreDefaults()
         {
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the default terminal options?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            var result = await _dialogService.ShowMessageDialogAsnyc(I18N.Translate("PleaseConfirm"), I18N.Translate("ConfirmRestoreTerminalOptions"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {
@@ -192,8 +238,11 @@ namespace FluentTerminal.App.ViewModels.Settings
                 ScrollBarStyle = defaults.ScrollBarStyle;
                 FontFamily = defaults.FontFamily;
                 FontSize = defaults.FontSize;
+                BoldText = defaults.BoldText;
                 BackgroundOpacity = defaults.BackgroundOpacity;
                 ScrollBackLimit = defaults.ScrollBackLimit.ToString();
+                ShowTextCopied = defaults.ShowTextCopied;
+                WordSeparator = defaults.WordSeparator;
             }
         }
 
@@ -205,10 +254,10 @@ 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

@@ -1,10 +1,14 @@
 using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.App.ViewModels.Infrastructure;
 using FluentTerminal.Models;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Threading.Tasks;
+using FluentTerminal.Models.Messages;
 
 namespace FluentTerminal.App.ViewModels.Settings
 {
@@ -30,16 +34,17 @@ namespace FluentTerminal.App.ViewModels.Settings
             _fileSystemService = fileSystemService;
 
             CreateThemeCommand = new RelayCommand(CreateTheme);
-            ImportThemeCommand = new RelayCommand(ImportTheme);
+            ImportThemeCommand = new AsyncCommand(ImportTheme);
+            CloneCommand = new RelayCommand<ThemeViewModel>(CloneTheme);
 
-            _settingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
+            MessengerInstance.Register<TerminalOptionsChangedMessage>(this, OnTerminalOptionsChanged);
 
             BackgroundOpacity = _settingsService.GetTerminalOptions().BackgroundOpacity;
 
             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;
 
@@ -54,7 +59,8 @@ namespace FluentTerminal.App.ViewModels.Settings
         }
 
         public RelayCommand CreateThemeCommand { get; }
-        public RelayCommand ImportThemeCommand { get; }
+        public IAsyncCommand ImportThemeCommand { get; }
+        public RelayCommand<ThemeViewModel> CloneCommand { get; set; }
 
         public double BackgroundOpacity
         {
@@ -81,6 +87,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,16 +110,10 @@ 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()
+        private async Task ImportTheme()
         {
             var file = await _fileSystemService.OpenFile(_themeParserFactory.SupportedFileTypes).ConfigureAwait(true);
             if (file != null)
@@ -110,7 +122,7 @@ namespace FluentTerminal.App.ViewModels.Settings
 
                 if (parser == null)
                 {
-                    await _dialogService.ShowMessageDialogAsnyc("Import theme failed", "No suitable parser found", DialogButton.OK).ConfigureAwait(false);
+                    await _dialogService.ShowMessageDialogAsnyc(I18N.Translate("ImportThemeFailed"), I18N.Translate("NoSuitableParserFound"), DialogButton.OK).ConfigureAwait(false);
                     return;
                 }
 
@@ -118,21 +130,27 @@ 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)
                 {
-                    await _dialogService.ShowMessageDialogAsnyc("Import theme failed", exception.Message, DialogButton.OK).ConfigureAwait(false);
+                    await _dialogService.ShowMessageDialogAsnyc(I18N.Translate("ImportThemeFailed"), exception.Message, DialogButton.OK).ConfigureAwait(false);
                 }
             }
         }
 
+        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)
@@ -165,9 +183,9 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        private void OnTerminalOptionsChanged(object sender, TerminalOptions e)
+        private void OnTerminalOptionsChanged(TerminalOptionsChangedMessage message)
         {
-            BackgroundOpacity = e.BackgroundOpacity;
+            BackgroundOpacity = message.TerminalOptions.BackgroundOpacity;
         }
 
         private void OnSelectedThemeBackgroundChanged(object sender, string e)

FluentTerminal.App.ViewModels/SettingsViewModel.cs

@@ -8,22 +8,29 @@ namespace FluentTerminal.App.ViewModels
     public class SettingsViewModel : ViewModelBase
     {
         public SettingsViewModel(ISettingsService settingsService, IDefaultValueProvider defaultValueProvider, IDialogService dialogService,
-            ITrayProcessCommunicationService trayProcessCommunicationService, IThemeParserFactory themeParserFactory, ISystemFontService systemFontService, IFileSystemService fileSystemService)
+            ITrayProcessCommunicationService trayProcessCommunicationService, IThemeParserFactory themeParserFactory, ISystemFontService systemFontService,
+            IFileSystemService fileSystemService, IStartupTaskService startupTaskService, IApplicationView applicationView,
+            IApplicationLanguageService applicationLanguageService, ApplicationDataContainers containers)
         {
-            KeyBindings = new KeyBindingsPageViewModel(settingsService, dialogService, defaultValueProvider, trayProcessCommunicationService);
-            General = new GeneralPageViewModel(settingsService, dialogService, defaultValueProvider);
-            Shell = new ProfilesPageViewModel(settingsService, dialogService, defaultValueProvider, fileSystemService);
+            KeyBindings = new KeyBindingsPageViewModel(settingsService, dialogService, trayProcessCommunicationService);
+            General = new GeneralPageViewModel(settingsService, dialogService, defaultValueProvider, startupTaskService, applicationLanguageService, trayProcessCommunicationService, fileSystemService);
+            Profiles = 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);
+            SshProfiles = new SshProfilesPageViewModel(settingsService, dialogService, fileSystemService,
+                applicationView, trayProcessCommunicationService, containers.HistoryContainer);
         }
 
         public event EventHandler Closed;
 
         public GeneralPageViewModel General { get; }
         public KeyBindingsPageViewModel KeyBindings { get; }
-        public ProfilesPageViewModel Shell { get; }
+        public ProfilesPageViewModel Profiles { get; }
         public TerminalPageViewModel Terminal { get; }
         public ThemesPageViewModel Themes { get; }
+        public MousePageViewModel Mouse { get; }
+        public SshProfilesPageViewModel SshProfiles { get; }
 
         public void Close()
         {