moved webSocket to App, tried to use NamedPipe between SystemTray and App, but cannot connect

.gitignore

@@ -2,7 +2,6 @@
 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.

FluentTerminal.App.Services.Test/DefaultValueProviderTests.cs

@@ -1,157 +0,0 @@
-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 AutoFixture;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+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,77 +20,41 @@ namespace FluentTerminal.App.Services.Test
         }
 
         [Fact]
-        public void ShowCreateKeyBindingDialog_Default_UsesCreateKeyBindingDialog()
-        {
-            var createKeyBindingDialog = new Mock<ICreateKeyBindingDialog>();
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, () => createKeyBindingDialog.Object);
-
-            dialogService.ShowCreateKeyBindingDialog();
-
-            createKeyBindingDialog.Verify(x => x.CreateKeyBinding(), Times.Once);
-        }
-
-        [Fact]
-        public void ShowMessageDialogAsnyc_TitleIsEmpty_ThrowsArgumentNullException()
+        public void ShowDialogAsync_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>());
 
-            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
+            Func<Task<DialogButton>> invoke = () => dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
 
-            showMessageDialogAsnyc.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("title");
+            invoke.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("title");
         }
 
         [Fact]
-        public void ShowMessageDialogAsnyc_ContentIsEmpty_ThrowsArgumentNullException()
+        public void ShowDialogAsync_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>());
 
-            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
+            Func<Task<DialogButton>> invoke = () => dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
 
-            showMessageDialogAsnyc.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("content");
+            invoke.Should().Throw<ArgumentNullException>().And.ParamName.Should().Be("content");
         }
 
         [Fact]
-        public void ShowMessageDialogAsnyc_NoButtonsPassed_ThrowsArgumentException()
+        public void ShowDialogAsync_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>());
 
-            Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content);
+            Func<Task<DialogButton>> invoke = () => dialogService.ShowMessageDialogAsnyc(title, content);
 
-            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>);
-
-            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>);
-
-            dialogService.ShowProfileSelectionDialogAsync();
-
-            shellProfileSelectionDialog.Verify(x => x.SelectProfile(), Times.Once);
+            invoke.Should().Throw<ArgumentException>().And.ParamName.Should().Be("buttons");
         }
     }
-}
+}

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

@@ -6,27 +6,16 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="TestData\AdventureTime.itermcolors" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="AutoFixture" Version="4.4.0" />
     <PackageReference Include="FluentAssertions" Version="5.4.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="Moq" Version="4.8.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <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>

FluentTerminal.App.Services.Test/FluentTerminalThemeParserTests.cs

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

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

FluentTerminal.App.Services.Test/SettingsServiceTests.cs

@@ -1,758 +0,0 @@
-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 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);
-            settingsService.CurrentThemeChanged += (s, e) => 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);
-            settingsService.CurrentThemeChanged += (s, e) => 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);
-            settingsService.TerminalOptionsChanged += (s, e) => 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);
-            settingsService.ApplicationSettingsChanged += (s, e) => 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>();
-            foreach (var command in commands)
-            {
-                keyBindingsContainer.Setup(x => x.ReadValueFromJson<Collection<KeyBinding>>(EnumHelper.GetEnumDescription(command), null)).Returns(new Collection<KeyBinding> { });
-            }
-            var applicationDataContainers = new ApplicationDataContainers
-            {
-                KeyBindings = keyBindingsContainer.Object,
-                RoamingSettings = Mock.Of<IApplicationDataContainer>(),
-                LocalSettings = Mock.Of<IApplicationDataContainer>(),
-                Themes = Mock.Of<IApplicationDataContainer>(),
-                ShellProfiles = Mock.Of<IApplicationDataContainer>()
-            };
-            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);
-            settingsService.KeyBindingsChanged += (s, e) => 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);
-            settingsService.KeyBindingsChanged += (s, e) => 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.Should().BeEquivalentTo(shellProfiles);
-            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

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

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

@@ -1,183 +0,0 @@
-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 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 Dictionary<string, string>
-            {
-                [MessageKeys.Type] = _fixture.Create<string>(),
-                [MessageKeys.Content] = JsonConvert.SerializeObject(response)
-            };
-            appServiceConnection.Setup(x => x.SendMessageAsync(It.IsAny<IDictionary<string, string>>())).Returns(Task.FromResult((IDictionary<string, string>)responseMessage));
-            var terminalSize = _fixture.Create<TerminalSize>();
-            var shellProfile = _fixture.Create<ShellProfile>();
-            var trayProcessCommunicationService = new TrayProcessCommunicationService(settingsService.Object);
-            trayProcessCommunicationService.Initialize(appServiceConnection.Object);
-
-            var result = await trayProcessCommunicationService.CreateTerminal(terminalSize, shellProfile);
-
-            result.Should().BeEquivalentTo(response);
-        }
-
-        [Fact]
-        public async Task ResizeTerminal_Default_SendsResizeTerminalRequest()
-        {
-            var terminalId = _fixture.Create<int>();
-            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<IDictionary<string, string>>(d => d[MessageKeys.Type] == nameof(ResizeTerminalRequest))), Times.Once);
-        }
-
-        [Fact]
-        public async Task WriteText_Default_SendsWriteTextRequest()
-        {
-            var terminalId = _fixture.Create<int>();
-            var text = _fixture.Create<string>();
-            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.WriteText(terminalId, text);
-
-            appServiceConnection.Verify(x => x.SendMessageAsync(It.Is<IDictionary<string, string>>(d => d[MessageKeys.Type] == nameof(WriteTextRequest))), Times.Once);
-        }
-
-        [Fact]
-        public async Task CloseTerminal_Default_SendsTerminalExitedRequest()
-        {
-            var terminalId = _fixture.Create<int>();
-            var settingsService = new Mock<ISettingsService>();
-            var keyBindings = _fixture.CreateMany<KeyBinding>(3);
-            settingsService.Setup(x => x.GetCommandKeyBindings()).Returns(new Dictionary<string, ICollection<KeyBinding>>
-            {
-                [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<IDictionary<string, string>>(d => d[MessageKeys.Type] == nameof(TerminalExitedRequest))), Times.Once);
-        }
-
-        [Fact]
-        public void OnMessageReceived_TerminalExitedRequest_InvokesTerminalExitedEvent()
-        {
-            var terminalId = _fixture.Create<int>();
-            var receivedTerminalId = 0;
-            var terminalExitedEventCalled = false;
-            var request = new TerminalExitedRequest
-            {
-                TerminalId = terminalId
-            };
-            var message = new Dictionary<string, string>
-            {
-                [MessageKeys.Type] = nameof(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, e) =>
-            {
-                terminalExitedEventCalled = true;
-                receivedTerminalId = e;
-            };
-
-            appServiceConnection.Raise(x => x.MessageReceived += null, null, message);
-
-            terminalExitedEventCalled.Should().BeTrue();
-            receivedTerminalId.Should().Be(terminalId);
-        }
-
-        [Fact]
-        public void OnMessageReceived_DisplayTerminalOutputRequest_InvokesCorrectOutputHandler()
-        {
-            var terminalId = _fixture.Create<int>();
-            var output = _fixture.Create<string>();
-            var receivedOutput = string.Empty;
-            var request = new DisplayTerminalOutputRequest
-            {
-                TerminalId = terminalId,
-                Output = output
-            };
-            var message = new Dictionary<string, string>
-            {
-                [MessageKeys.Type] = nameof(DisplayTerminalOutputRequest),
-                [MessageKeys.Content] = JsonConvert.SerializeObject(request)
-            };
-            var settingsService = new Mock<ISettingsService>();
-            var keyBindings = _fixture.CreateMany<KeyBinding>(3);
-            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().Be(output);
-        }
-    }
-}

FluentTerminal.App.Services/ApplicationDataContainers.cs

@@ -8,4 +8,4 @@
         public IApplicationDataContainer KeyBindings { get; set; }
         public IApplicationDataContainer ShellProfiles { get; set; }
     }
-}
+}

FluentTerminal.App.Services/Constants.cs

@@ -1,9 +0,0 @@
-namespace FluentTerminal.App.Services
-{
-    public static class Constants
-    {
-        public const string ThemesContainerName = "Themes";
-        public const string KeyBindingsContainerName = "KeyBindings";
-        public const string ShellProfilesContainerName = "ShellProfiles";
-    }
-}

FluentTerminal.App.Services/Dialogs/ICreateKeyBindingDialog.cs

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

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/EventArgs/CancelableEventArgs.cs

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

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

@@ -1,31 +1,24 @@
-<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="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="PListNet" Version="2.0.3" />
-    <PackageReference Include="RestSharp" Version="106.5.4" />
-    <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,13 +1,10 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.Services
 {
     public interface IAppServiceConnection
     {
-        event EventHandler<IDictionary<string, string>> MessageReceived;
-
         Task<IDictionary<string, string>> SendMessageAsync(IDictionary<string, string> message);
     }
-}
+}

FluentTerminal.App.Services/IApplicationDataContainer.cs

@@ -16,4 +16,4 @@ namespace FluentTerminal.App.Services
 
         IEnumerable<object> GetAll();
     }
-}
+}

FluentTerminal.App.Services/IApplicationView.cs

@@ -13,9 +13,7 @@ namespace FluentTerminal.App.Services
         string Title { get; set; }
 
         Task RunOnDispatcherThread(Action action);
-
         Task<bool> TryClose();
-
         bool ToggleFullScreen();
     }
-}
+}

FluentTerminal.App.Services/IClipboardService.cs

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

FluentTerminal.App.Services/IDefaultValueProvider.cs

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

FluentTerminal.App.Services/IDialogService.cs

@@ -17,4 +17,4 @@ namespace FluentTerminal.App.Services
 
         Task<KeyBinding> ShowCreateKeyBindingDialog();
     }
-}
+}

FluentTerminal.App.Services/IDispatcherTimer.cs

@@ -5,7 +5,6 @@ namespace FluentTerminal.App.Services
     public interface IDispatcherTimer
     {
         void Start();
-
         void Stop();
 
         TimeSpan Interval { get; set; }
@@ -13,4 +12,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,12 +1,11 @@
-using System;
+using FluentTerminal.Models.Enums;
+using System;
 
 namespace FluentTerminal.App.Services
 {
     public interface IKeyboardCommandService
     {
-        void RegisterCommandHandler(string command, Action handler);
-
-        void SendCommand(string command);
-        void DeregisterCommandHandler(string command);
+        void RegisterCommandHandler(Command command, Action handler);
+        void SendCommand(Command command);
     }
-}
+}

FluentTerminal.App.Services/INotificationService.cs

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

FluentTerminal.App.Services/ISettingsService.cs

@@ -1,4 +1,5 @@
 using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
 using System;
 using System.Collections.Generic;
 
@@ -6,36 +7,36 @@ namespace FluentTerminal.App.Services
 {
     public interface ISettingsService
     {
-        event EventHandler<ApplicationSettings> ApplicationSettingsChanged;
         event EventHandler<Guid> CurrentThemeChanged;
-        event EventHandler KeyBindingsChanged;
-        event EventHandler<ShellProfile> ShellProfileAdded;
-        event EventHandler<Guid> ShellProfileDeleted;
         event EventHandler<TerminalOptions> TerminalOptionsChanged;
-        event EventHandler<Guid> ThemeDeleted;
-        event EventHandler<TerminalTheme> ThemeAdded;
+        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);
-        void DeleteTheme(Guid id);
+
+        TerminalOptions GetTerminalOptions();
+        void SaveTerminalOptions(TerminalOptions terminalOptions);
+
         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();
-        Guid GetDefaultShellProfileId();
-        IDictionary<string, ICollection<KeyBinding>> GetCommandKeyBindings();
-        IEnumerable<ShellProfile> GetShellProfiles();
-        IEnumerable<TabTheme> GetTabThemes();
-        TerminalOptions GetTerminalOptions();
         TerminalTheme GetTheme(Guid id);
-        IEnumerable<TerminalTheme> GetThemes();
-        void ResetKeyBindings();
-        void SaveApplicationSettings(ApplicationSettings applicationSettings);
         void SaveCurrentThemeId(Guid id);
-        void SaveDefaultShellProfileId(Guid id);
-        void SaveKeyBindings(string command, ICollection<KeyBinding> keyBindings);
-        void SaveShellProfile(ShellProfile shellProfile, bool newShell = false);
-        void SaveTerminalOptions(TerminalOptions terminalOptions);
-        void SaveTheme(TerminalTheme theme, bool newTheme = false);
-        ShellProfile GetShellProfile(Guid id);
+
+        IEnumerable<TerminalTheme> GetThemes();
+        void SaveTheme(TerminalTheme theme);
+        void DeleteTheme(Guid id);
     }
-}
+}

FluentTerminal.App.Services/IStartupTaskService.cs

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

@@ -6,4 +6,4 @@ namespace FluentTerminal.App.Services
     {
         IEnumerable<string> GetSystemFontFamilies();
     }
-}
+}

FluentTerminal.App.Services/ITerminalView.cs

@@ -1,4 +1,5 @@
 using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -8,31 +9,20 @@ namespace FluentTerminal.App.Services
     public interface ITerminalView
     {
         event EventHandler<TerminalSize> TerminalSizeChanged;
-
         event EventHandler<string> TerminalTitleChanged;
-
-        event EventHandler<string> KeyboardCommandReceived;
+        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,26 +1,14 @@
 using FluentTerminal.Models;
 using FluentTerminal.Models.Responses;
-using System;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.Services
 {
     public interface ITrayProcessCommunicationService
     {
-        event EventHandler<int> TerminalExited;
-
-        void Initialize(IAppServiceConnection appServiceConnection);
-
+        Task Initialize(IAppServiceConnection appServiceConnection);
         Task<CreateTerminalResponse> CreateTerminal(TerminalSize size, ShellProfile shellProfile);
-
         Task ResizeTerminal(int id, TerminalSize size);
-
         Task UpdateToggleWindowKeyBindings();
-
-        Task WriteText(int terminalId, string text);
-
-        void SubscribeForTerminalOutput(int terminalId, Action<string> callback);
-
-        Task CloseTerminal(int terminalId);
     }
-}
+}

FluentTerminal.App.Services/IUpdateService.cs

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

@@ -14,15 +14,7 @@ namespace FluentTerminal.App.Services.Implementation
                 ConfirmClosingTabs = false,
                 ConfirmClosingWindows = false,
                 UnderlineSelectedTab = false,
-                InactiveTabColorMode = InactiveTabColorMode.Background,
-                NewTerminalLocation = NewTerminalLocation.Tab,
-                TabsPosition = TabsPosition.Top,
-                CopyOnSelect = false,
-                MouseMiddleClickAction = MouseAction.None,
-                MouseRightClickAction = MouseAction.ContextMenu,
-                AlwaysShowTabs = false,
-                ShowNewOutputIndicator = false,
-                EnableTrayIcon = true
+                NewTerminalLocation = NewTerminalLocation.Tab
             };
         }
 
@@ -31,11 +23,11 @@ namespace FluentTerminal.App.Services.Implementation
             switch (command)
             {
                 case Command.ToggleWindow:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.ToggleWindow),
+                        Command = Command.ToggleWindow,
                         Ctrl = false,
                         Alt = false,
                         Shift = false,
@@ -44,11 +36,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.NextTab:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.NextTab),
+                        Command = Command.NextTab,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -57,11 +49,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.PreviousTab:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.PreviousTab),
+                        Command = Command.PreviousTab,
                         Ctrl = true,
                         Alt = false,
                         Shift = true,
@@ -69,33 +61,12 @@ namespace FluentTerminal.App.Services.Implementation
                     }
                 };
 
-                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.ToString(),
-                        Ctrl = true,
-                        Alt = false,
-                        Shift = false,
-                        Key = (int)ExtendedVirtualKey.Number1 + (command - Command.SwitchToTerm1)
-                    }
-                };
-
                 case Command.NewTab:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.NewTab),
+                        Command = Command.NewTab,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -104,11 +75,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.ConfigurableNewTab:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.ConfigurableNewTab),
+                        Command = Command.ConfigurableNewTab,
                         Ctrl = true,
                         Alt = false,
                         Shift = true,
@@ -117,11 +88,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.CloseTab:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.CloseTab),
+                        Command = Command.CloseTab,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -130,11 +101,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.NewWindow:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.NewWindow),
+                        Command = Command.NewWindow,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -143,11 +114,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.ShowSettings:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.ShowSettings),
+                        Command = Command.ShowSettings,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -156,11 +127,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.Copy:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.Copy),
+                        Command = Command.Copy,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -169,11 +140,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.Paste:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.Paste),
+                        Command = Command.Paste,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -182,11 +153,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.Search:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.Search),
+                        Command = Command.Search,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -195,11 +166,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.ToggleFullScreen:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.ToggleFullScreen),
+                        Command = Command.ToggleFullScreen,
                         Ctrl = false,
                         Alt = true,
                         Shift = false,
@@ -208,11 +179,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.SelectAll:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.SelectAll),
+                        Command = Command.SelectAll,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -221,11 +192,11 @@ namespace FluentTerminal.App.Services.Implementation
                 };
 
                 case Command.Clear:
-                    return new List<KeyBinding>
+                return new List<KeyBinding>
                 {
                     new KeyBinding
                     {
-                        Command = nameof(Command.Clear),
+                        Command = Command.Clear,
                         Ctrl = true,
                         Alt = false,
                         Shift = false,
@@ -242,59 +213,6 @@ namespace FluentTerminal.App.Services.Implementation
             return Guid.Parse("813f2298-210a-481a-bdbf-c17bc637a3e2");
         }
 
-        public IEnumerable<TabTheme> GetDefaultTabThemes()
-        {
-            return new[]
-            {
-                new TabTheme
-                {
-                    Id = 0,
-                    Name = "None",
-                    BackgroundOpacity = double.NaN,
-                    BackgroundPointerOverOpacity = double.NaN,
-                    BackgroundPressedOpacity = double.NaN,
-                    BackgroundSelectedOpacity = double.NaN,
-                    BackgroundSelectedPointerOverOpacity = double.NaN,
-                    BackgroundSelectedPressedOpacity = double.NaN
-                },
-                new TabTheme
-                {
-                    Id = 1,
-                    Name = "Red",
-                    Color = "#E81123"
-                },
-                new TabTheme
-                {
-                    Id = 2,
-                    Name = "Green",
-                    Color = "#10893E"
-                },
-                new TabTheme
-                {
-                    Id = 3,
-                    Name = "Blue",
-                    Color = "#0078D7"
-                },
-                new TabTheme
-                {
-                    Id = 4,
-                    Name = "Purple",
-                    Color = "#881798"
-                },
-                new TabTheme
-                {
-                    Id = 5,
-                    Name = "Orange",
-                    Color = "#FF8C00"
-                },
-                new TabTheme
-                {
-                    Id = 6,
-                    Name = "Teal",
-                    Color = "#00B7C3"
-                }
-            };
-        }
         public TerminalOptions GetDefaultTerminalOptions()
         {
             return new TerminalOptions
@@ -306,7 +224,6 @@ namespace FluentTerminal.App.Services.Implementation
                 FontFamily = "Consolas",
                 FontSize = 13,
                 BackgroundOpacity = 0.8,
-                Padding = 12,
                 ScrollBackLimit = 1000
             };
         }
@@ -327,19 +244,7 @@ namespace FluentTerminal.App.Services.Implementation
                     Arguments = string.Empty,
                     Location = @"C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe",
                     PreInstalled = true,
-                    WorkingDirectory = string.Empty,
-                    KeyBindings = new []
-                    {
-                        new KeyBinding
-                        {
-                            Command = GetDefaultShellProfileId().ToString(),
-                            Ctrl=true,
-                            Alt=true,
-                            Shift=false,
-                            Meta=false,
-                            Key=(int)ExtendedVirtualKey.Number1
-                        }
-                    }
+                    WorkingDirectory = string.Empty
                 },
                 new ShellProfile
                 {
@@ -348,19 +253,7 @@ namespace FluentTerminal.App.Services.Implementation
                     Arguments = string.Empty,
                     Location = @"C:\Windows\System32\cmd.exe",
                     PreInstalled = true,
-                    WorkingDirectory = string.Empty,
-                    KeyBindings = new []
-                    {
-                        new KeyBinding
-                        {
-                            Command = "ab942a61-7673-4755-9bd8-765aff91d9a3",
-                            Ctrl=true,
-                            Alt=true,
-                            Shift=false,
-                            Meta=false,
-                            Key=(int)ExtendedVirtualKey.Number2
-                        }
-                    }
+                    WorkingDirectory = string.Empty
                 },
                 new ShellProfile
                 {
@@ -369,19 +262,7 @@ namespace FluentTerminal.App.Services.Implementation
                     Arguments = string.Empty,
                     Location = @"C:\windows\system32\wsl.exe",
                     PreInstalled = true,
-                    WorkingDirectory = string.Empty,
-                    KeyBindings = new []
-                    {
-                        new KeyBinding
-                        {
-                            Command = "e5785ad6-584f-40cb-bdcd-d5b3b3953e7f",
-                            Ctrl=true,
-                            Alt=true,
-                            Shift=false,
-                            Meta=false,
-                            Key=(int)ExtendedVirtualKey.Number3
-                        }
-                    }
+                    WorkingDirectory = string.Empty
                 }
             };
         }
@@ -530,18 +411,18 @@ namespace FluentTerminal.App.Services.Implementation
                     CursorAccent = "#000000",
                     Selection = "#4DABEDC1",
                     Black = "#300A24",
-                    Red = "#CC0000",
+                    Red = "#3465A4",
                     Green = "#4E9A06",
                     Yellow = "#06989A",
-                    Blue = "#3465A4",
+                    Blue = "#CC0000",
                     Magenta = "#75507B",
                     Cyan = "#C4A000",
                     White = "#D3D7CF",
                     BrightBlack = "#554E53",
-                    BrightRed = "#EF2929",
+                    BrightRed = "#729FCF",
                     BrightGreen = "#8AE234",
                     BrightYellow = "#34E2E2",
-                    BrightBlue = "#729FCF",
+                    BrightBlue = "#EF2929",
                     BrightMagenta = "#AD7FA8",
                     BrightCyan = "#FCE94F",
                     BrightWhite = "#EEEEEE"

FluentTerminal.App.Services/Implementation/DialogService.cs

@@ -1,7 +1,7 @@
-using FluentTerminal.App.Services.Dialogs;
-using FluentTerminal.Models;
-using System;
+using System;
 using System.Threading.Tasks;
+using FluentTerminal.App.Services.Dialogs;
+using FluentTerminal.Models;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -61,4 +61,4 @@ namespace FluentTerminal.App.Services.Implementation
             return dialog.SelectProfile();
         }
     }
-}
+}

FluentTerminal.App.Services/Implementation/FluentTerminalThemeParser.cs

@@ -1,9 +1,9 @@
-using FluentTerminal.Models;
-using Newtonsoft.Json;
-using System;
+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,16 +13,6 @@ 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();
@@ -35,4 +25,4 @@ namespace FluentTerminal.App.Services.Implementation
             }
         }
     }
-}
+}

FluentTerminal.App.Services/Implementation/ITermThemeParser.cs

@@ -53,16 +53,6 @@ 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));
-            }
-
             var node = PList.Load(fileContent) as DictionaryNode ?? throw new ParseThemeException("Root node was not a dictionary.");
 
             return new TerminalTheme
@@ -134,4 +124,4 @@ namespace FluentTerminal.App.Services.Implementation
             return (alpha / 256.0).ToString(CultureInfo.InvariantCulture);
         }
     }
-}
+}

FluentTerminal.App.Services/Implementation/KeyboardCommandService.cs

@@ -1,46 +1,38 @@
-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;
-            }
-
+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;
+            }
+
             // already registered by SystemTray's ToggleWindowService
-            if (command == nameof(Command.ToggleWindow))
+            if (command == Command.ToggleWindow)
             {
                 return;
-            }
-
-            throw new KeyNotFoundException($"No handler registered for command: {command}");
-        }
-    }
-}
+            }
+
+            throw new KeyNotFoundException($"No handler registered for command: {command}");
+        }
+    }
+}

FluentTerminal.App.Services/Implementation/SettingsService.cs

@@ -1,10 +1,10 @@
-using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
+using Newtonsoft.Json;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -14,11 +14,16 @@ namespace FluentTerminal.App.Services.Implementation
         public const string DefaultShellProfileKey = "DefaultShellProfile";
 
         private readonly IDefaultValueProvider _defaultValueProvider;
-        private readonly IApplicationDataContainer _keyBindings;
         private readonly IApplicationDataContainer _localSettings;
-        private readonly IApplicationDataContainer _roamingSettings;
-        private readonly IApplicationDataContainer _shellProfiles;
         private readonly IApplicationDataContainer _themes;
+        private readonly IApplicationDataContainer _keyBindings;
+        private readonly IApplicationDataContainer _shellProfiles;
+        private readonly IApplicationDataContainer _roamingSettings;
+
+        public event EventHandler<Guid> CurrentThemeChanged;
+        public event EventHandler<TerminalOptions> TerminalOptionsChanged;
+        public event EventHandler<ApplicationSettings> ApplicationSettingsChanged;
+        public event EventHandler KeyBindingsChanged;
 
         public SettingsService(IDefaultValueProvider defaultValueProvider, ApplicationDataContainers containers)
         {
@@ -32,72 +37,19 @@ namespace FluentTerminal.App.Services.Implementation
 
             foreach (var theme in _defaultValueProvider.GetPreInstalledThemes())
             {
-                if (GetTheme(theme.Id) == null)
-                {
-                    _themes.WriteValueAsJson(theme.Id.ToString(), theme);
-                }
+                _themes.WriteValueAsJson(theme.Id.ToString(), theme);
             }
 
             foreach (var shellProfile in _defaultValueProvider.GetPreinstalledShellProfiles())
             {
-                if (GetShellProfile(shellProfile.Id) == null)
-                {
-                    _shellProfiles.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile);
-                }
+                _shellProfiles.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile);
             }
         }
 
-        public event EventHandler<ApplicationSettings> ApplicationSettingsChanged;
-
-        public event EventHandler<TerminalTheme> ThemeAdded;
-        public event EventHandler<Guid> CurrentThemeChanged;
-        public event EventHandler<Guid> ThemeDeleted;
-
-        public event EventHandler KeyBindingsChanged;
-
-        public event EventHandler<ShellProfile> ShellProfileAdded;
-        public event EventHandler<Guid> ShellProfileDeleted;
-
-        public event EventHandler<TerminalOptions> TerminalOptionsChanged;
-
-        public void DeleteShellProfile(Guid id)
-        {
-            _shellProfiles.Delete(id.ToString());
-            ShellProfileDeleted?.Invoke(this, id);
-        }
-
-        public void DeleteTheme(Guid id)
-        {
-            _themes.Delete(id.ToString());
-
-            foreach (var profile in GetShellProfiles())
-            {
-                if (profile.TerminalThemeId == id)
-                {
-                    profile.TerminalThemeId = Guid.Empty;
-                    SaveShellProfile(profile);
-                }
-            }
-
-            ThemeDeleted?.Invoke(this, id);
-        }
-
-        public ApplicationSettings GetApplicationSettings()
-        {
-            return _roamingSettings.ReadValueFromJson(nameof(ApplicationSettings), _defaultValueProvider.GetDefaultApplicationSettings());
-        }
-
         public TerminalTheme GetCurrentTheme()
         {
             var id = GetCurrentThemeId();
-            var theme = GetTheme(id);
-            if (theme == null)
-            {
-                id = _defaultValueProvider.GetDefaultThemeId();
-                SaveCurrentThemeId(id);
-                theme = GetTheme(id);
-            }
-            return theme;
+            return GetTheme(id);
         }
 
         public Guid GetCurrentThemeId()
@@ -109,85 +61,6 @@ namespace FluentTerminal.App.Services.Implementation
             return _defaultValueProvider.GetDefaultThemeId();
         }
 
-        public ShellProfile GetDefaultShellProfile()
-        {
-            var id = GetDefaultShellProfileId();
-            var profile = _shellProfiles.ReadValueFromJson(id.ToString(), default(ShellProfile));
-            if (profile == null)
-            {
-                id = _defaultValueProvider.GetDefaultShellProfileId();
-                SaveDefaultShellProfileId(id);
-                profile = _shellProfiles.ReadValueFromJson(id.ToString(), default(ShellProfile));
-            }
-            return profile;
-        }
-
-        public ShellProfile GetShellProfile(Guid id)
-        {
-            return _shellProfiles.ReadValueFromJson(id.ToString(), default(ShellProfile));
-        }
-
-        public Guid GetDefaultShellProfileId()
-        {
-            if (_localSettings.TryGetValue(DefaultShellProfileKey, out object value))
-            {
-                return (Guid)value;
-            }
-            return _defaultValueProvider.GetDefaultShellProfileId();
-        }
-
-        public IDictionary<string, ICollection<KeyBinding>> GetCommandKeyBindings()
-        {
-            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()
-        {
-            return _shellProfiles.GetAll().Select(x => JsonConvert.DeserializeObject<ShellProfile>((string)x)).ToList();
-        }
-
-        public IEnumerable<TabTheme> GetTabThemes()
-        {
-            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));
-            }
-
-            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
-        }
-
-        public void SaveApplicationSettings(ApplicationSettings applicationSettings)
-        {
-            _roamingSettings.WriteValueAsJson(nameof(ApplicationSettings), applicationSettings);
-            ApplicationSettingsChanged?.Invoke(this, applicationSettings);
-        }
-
         public void SaveCurrentThemeId(Guid id)
         {
             _roamingSettings.SetValue(CurrentThemeKey, id);
@@ -195,33 +68,34 @@ namespace FluentTerminal.App.Services.Implementation
             CurrentThemeChanged?.Invoke(this, id);
         }
 
-        public void SaveDefaultShellProfileId(Guid id)
+        public void SaveTheme(TerminalTheme theme)
         {
-            _localSettings.SetValue(DefaultShellProfileKey, id);
+            _themes.WriteValueAsJson(theme.Id.ToString(), theme);
+
+            if (theme.Id == GetCurrentThemeId())
+            {
+                CurrentThemeChanged?.Invoke(this, theme.Id);
+            }
         }
 
-        public void SaveKeyBindings(string command, ICollection<KeyBinding> keyBindings)
+        public void DeleteTheme(Guid id)
         {
-            if (!Enum.IsDefined(typeof(Command), command))
-            {
-                throw new InvalidOperationException();
-            }
-
-            _keyBindings.WriteValueAsJson(command.ToString(), keyBindings);
-            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
+            _themes.Delete(id.ToString());
         }
 
-        public void SaveShellProfile(ShellProfile shellProfile, bool newShell = false)
+        public IEnumerable<TerminalTheme> GetThemes()
         {
-            _shellProfiles.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile);
+            return _themes.GetAll().Select(x => JsonConvert.DeserializeObject<TerminalTheme>((string)x)).ToList();
+        }
 
-            // When saving the shell profile, we also need to update keybindings for everywhere.
-            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
+        public TerminalTheme GetTheme(Guid id)
+        {
+            return _themes.ReadValueFromJson(id.ToString(), default(TerminalTheme));
+        }
 
-            if (newShell)
-            {
-                ShellProfileAdded?.Invoke(this, shellProfile);
-            }
+        public TerminalOptions GetTerminalOptions()
+        {
+            return _roamingSettings.ReadValueFromJson(nameof(TerminalOptions), _defaultValueProvider.GetDefaultTerminalOptions());
         }
 
         public void SaveTerminalOptions(TerminalOptions terminalOptions)
@@ -230,19 +104,80 @@ namespace FluentTerminal.App.Services.Implementation
             TerminalOptionsChanged?.Invoke(this, terminalOptions);
         }
 
-        public void SaveTheme(TerminalTheme theme, bool newTheme = false)
+        public ApplicationSettings GetApplicationSettings()
         {
-            _themes.WriteValueAsJson(theme.Id.ToString(), theme);
+            return _roamingSettings.ReadValueFromJson(nameof(ApplicationSettings), _defaultValueProvider.GetDefaultApplicationSettings());
+        }
 
-            if (theme.Id == GetCurrentThemeId())
+        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)))
             {
-                CurrentThemeChanged?.Invoke(this, theme.Id);
+                var command = (Command)value;
+                keyBindings.Add(command, _keyBindings.ReadValueFromJson<Collection<KeyBinding>>(command.ToString(), null) ?? _defaultValueProvider.GetDefaultKeyBindings(command));
             }
 
-            if (newTheme)
+            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)))
             {
-                ThemeAdded?.Invoke(this, theme);
+                var command = (Command)value;
+                _keyBindings.WriteValueAsJson(command.ToString(), _defaultValueProvider.GetDefaultKeyBindings(command));
             }
+
+            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
+        }
+
+        public Guid GetDefaultShellProfileId()
+        {
+            if (_roamingSettings.TryGetValue(DefaultShellProfileKey, out object value))
+            {
+                return (Guid)value;
+            }
+            return _defaultValueProvider.GetDefaultShellProfileId();
+        }
+
+        public ShellProfile GetDefaultShellProfile()
+        {
+            var id = GetDefaultShellProfileId();
+            return _shellProfiles.ReadValueFromJson(id.ToString(), default(ShellProfile));
+        }
+
+        public void SaveDefaultShellProfileId(Guid id)
+        {
+            _roamingSettings.SetValue(DefaultShellProfileKey, id);
+        }
+
+        public IEnumerable<ShellProfile> GetShellProfiles()
+        {
+            return _shellProfiles.GetAll().Select(x => JsonConvert.DeserializeObject<ShellProfile>((string)x)).ToList();
+        }
+
+        public void SaveShellProfile(ShellProfile shellProfile)
+        {
+            _shellProfiles.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile);
+        }
+
+        public void DeleteShellProfile(Guid id)
+        {
+            _shellProfiles.Delete(id.ToString());
         }
     }
 }

FluentTerminal.App.Services/Implementation/ThemeParserFactory.cs

@@ -20,4 +20,4 @@ namespace FluentTerminal.App.Services.Implementation
             return _parsers.FirstOrDefault(p => p.SupportedFileTypes.Contains(fileType));
         }
     }
-}
+}

FluentTerminal.App.Services/Implementation/TrayProcessCommunicationService.cs

@@ -1,12 +1,10 @@
-using FluentTerminal.Models;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+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.Diagnostics;
-using System.Threading.Tasks;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -14,14 +12,10 @@ namespace FluentTerminal.App.Services.Implementation
     {
         private readonly ISettingsService _settingsService;
         private IAppServiceConnection _appServiceConnection;
-        private Dictionary<int, Action<string>> _terminalOutputHandlers;
-
-        public event EventHandler<int> TerminalExited;
 
         public TrayProcessCommunicationService(ISettingsService settingsService)
         {
             _settingsService = settingsService;
-            _terminalOutputHandlers = new Dictionary<int, Action<string>>();
         }
 
         public async Task<CreateTerminalResponse> CreateTerminal(TerminalSize size, ShellProfile shellProfile)
@@ -32,41 +26,21 @@ namespace FluentTerminal.App.Services.Implementation
                 Profile = shellProfile
             };
 
-            var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(request));
+            var message = new Dictionary<string, string>
+            {
+                { MessageKeys.Type, MessageTypes.CreateTerminalRequest },
+                { MessageKeys.Content, JsonConvert.SerializeObject(request) }
+            };
+
+            var responseMessage = await _appServiceConnection.SendMessageAsync(message);
 
             return JsonConvert.DeserializeObject<CreateTerminalResponse>(responseMessage[MessageKeys.Content]);
         }
 
-        public void Initialize(IAppServiceConnection appServiceConnection)
+        public Task Initialize(IAppServiceConnection appServiceConnection)
         {
             _appServiceConnection = appServiceConnection;
-            _appServiceConnection.MessageReceived += OnMessageReceived;
-        }
-
-        private void OnMessageReceived(object sender, IDictionary<string, string> e)
-        {
-            var messageType = e[MessageKeys.Type];
-            var messageContent = e[MessageKeys.Content];
-
-            if (messageType == nameof(DisplayTerminalOutputRequest))
-            {
-                var request = JsonConvert.DeserializeObject<DisplayTerminalOutputRequest>(messageContent);
-
-                if (_terminalOutputHandlers.ContainsKey(request.TerminalId))
-                {
-                    _terminalOutputHandlers[request.TerminalId].Invoke(request.Output);
-                }
-                else
-                {
-                    Debug.WriteLine("output was not handled: " + request.Output);
-                }
-            }
-            else if (messageType == nameof(TerminalExitedRequest))
-            {
-                var request = JsonConvert.DeserializeObject<TerminalExitedRequest>(messageContent);
-
-                TerminalExited?.Invoke(this, request.TerminalId);
-            }
+            return UpdateToggleWindowKeyBindings();
         }
 
         public Task ResizeTerminal(int id, TerminalSize size)
@@ -77,54 +51,31 @@ namespace FluentTerminal.App.Services.Implementation
                 NewSize = size
             };
 
-            return _appServiceConnection.SendMessageAsync(CreateMessage(request));
-        }
+            var message = new Dictionary<string, string>
+            {
+                { MessageKeys.Type, MessageTypes.ResizeTerminalRequest },
+                { MessageKeys.Content, JsonConvert.SerializeObject(request) }
+            };
 
-        public void SubscribeForTerminalOutput(int terminalId, Action<string> callback)
-        {
-            _terminalOutputHandlers[terminalId] = callback;
+            return _appServiceConnection.SendMessageAsync(message);
         }
 
         public Task UpdateToggleWindowKeyBindings()
         {
-            var keyBindings = _settingsService.GetCommandKeyBindings()[nameof(Command.ToggleWindow)];
+            var keyBindings = _settingsService.GetKeyBindings()[Command.ToggleWindow];
 
             var request = new SetToggleWindowKeyBindingsRequest
             {
                 KeyBindings = keyBindings
             };
 
-            return _appServiceConnection.SendMessageAsync(CreateMessage(request));
-        }
-
-        public Task WriteText(int id, string text)
-        {
-            var request = new WriteTextRequest
+            var message = new Dictionary<string, string>
             {
-                TerminalId = id,
-                Text = text
+                { MessageKeys.Type, MessageTypes.SetToggleWindowKeyBindingsRequest },
+                { MessageKeys.Content, JsonConvert.SerializeObject(request) }
             };
 
-            return _appServiceConnection.SendMessageAsync(CreateMessage(request));
-        }
-
-        public Task CloseTerminal(int terminalId)
-        {
-            var request = new TerminalExitedRequest
-            {
-                TerminalId = terminalId
-            };
-
-            return _appServiceConnection.SendMessageAsync(CreateMessage(request));
-        }
-
-        private IDictionary<string, string> CreateMessage(object content)
-        {
-            return new Dictionary<string, string>
-            {
-                [MessageKeys.Type] = content.GetType().Name,
-                [MessageKeys.Content] = JsonConvert.SerializeObject(content)
-            };
+            return _appServiceConnection.SendMessageAsync(message);
         }
     }
-}
+}

FluentTerminal.App.Services/Implementation/UpdateService.cs

@@ -1,56 +0,0 @@
-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/Utilities/EnumHelper.cs

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

FluentTerminal.App.Services/Utilities/TerminalThemeContractResolver.cs

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

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

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

FluentTerminal.App.ViewModels/Infrastructure/AsyncCommand.cs

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

FluentTerminal.App.ViewModels/Infrastructure/IAsyncCommand.cs

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

FluentTerminal.App.ViewModels/Infrastructure/IErrorHandler.cs

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

FluentTerminal.App.ViewModels/MainViewModel.cs

@@ -6,7 +6,6 @@ using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
 using System;
 using System.Collections.ObjectModel;
-using System.Collections.Specialized;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -14,18 +13,23 @@ namespace FluentTerminal.App.ViewModels
 {
     public class MainViewModel : ViewModelBase
     {
-        private readonly IApplicationView _applicationView;
-        private readonly IClipboardService _clipboardService;
         private readonly IDialogService _dialogService;
-        private readonly IDispatcherTimer _dispatcherTimer;
         private readonly IKeyboardCommandService _keyboardCommandService;
         private readonly ISettingsService _settingsService;
         private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
         private ApplicationSettings _applicationSettings;
         private string _background;
         private double _backgroundOpacity;
+        private int _nextTerminalId;
         private TerminalViewModel _selectedTerminal;
-        private TabsPosition _tabsPosition;
+        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)
@@ -34,91 +38,46 @@ namespace FluentTerminal.App.ViewModels
             _settingsService.CurrentThemeChanged += OnCurrentThemeChanged;
             _settingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
             _settingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
-            _settingsService.ShellProfileAdded += OnShellProfileAdded;
-            _settingsService.ShellProfileDeleted += OnShellProfileDeleted;
-
             _trayProcessCommunicationService = trayProcessCommunicationService;
             _dialogService = dialogService;
             _applicationView = applicationView;
             _dispatcherTimer = dispatcherTimer;
             _clipboardService = clipboardService;
             _keyboardCommandService = keyboardCommandService;
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewTab), () => AddTerminal(null, false, Guid.Empty));
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ConfigurableNewTab), () => AddTerminal(null, true, Guid.Empty));
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.CloseTab), CloseCurrentTab);
-
-            // Add all of the commands for switching to a tab of a given ID, if there's one open there
-            for (int i = 0; i < 9; i++)
-            {
-                var switchCmd = Command.SwitchToTerm1 + i;
-                int tabNumber = i;
-                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);
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ShowSettings), ShowSettings);
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ToggleFullScreen), ToggleFullScreen);
-
-            foreach (ShellProfile profile in _settingsService.GetShellProfiles())
-            {
-                _keyboardCommandService.RegisterCommandHandler(profile.Id.ToString(), () => AddTerminal(profile.WorkingDirectory, false, profile.Id));
-            }
-
+            _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();
-            TabsPosition = _applicationSettings.TabsPosition;
 
-            AddTerminalCommand = new RelayCommand(() => AddTerminal(null, false, Guid.Empty));
-            ShowAboutCommand = new RelayCommand(ShowAbout);
+            AddTerminalCommand = new RelayCommand(() => AddTerminal(null, false));
             ShowSettingsCommand = new RelayCommand(ShowSettings);
 
-            _applicationView.CloseRequested += OnCloseRequest;
             Terminals.CollectionChanged += OnTerminalsCollectionChanged;
+
+            Title = "Fluent Terminal";
+
+            _applicationView.CloseRequested += OnCloseRequest;
         }
 
-        private void OnShellProfileDeleted(object sender, Guid e)
+        private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
         {
-            _keyboardCommandService.DeregisterCommandHandler(e.ToString());
+            await _applicationView.RunOnDispatcherThread(() =>
+            {
+                BackgroundOpacity = e.BackgroundOpacity;
+            });
         }
 
-        private void OnShellProfileAdded(object sender, ShellProfile e)
-        {
-            _keyboardCommandService.RegisterCommandHandler(e.Id.ToString(), () => AddTerminal(e.WorkingDirectory, false, e.Id));
-        }
-
-        private void OnTerminalsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            RaisePropertyChanged(nameof(ShowTabsOnTop));
-            RaisePropertyChanged(nameof(ShowTabsOnBottom));
-        }
-
-        public event EventHandler Closed;
-
-        public event EventHandler NewWindowRequested;
-
-        public event EventHandler ShowSettingsRequested;
-
-        public event EventHandler ShowAboutRequested;
-
         public RelayCommand AddTerminalCommand { get; }
 
-        public bool ShowTabsOnTop
-        {
-            get => TabsPosition == TabsPosition.Top && (Terminals.Count > 1 || _applicationSettings.AlwaysShowTabs);
-        }
-
-        public bool ShowTabsOnBottom
-        {
-            get => TabsPosition == TabsPosition.Bottom && (Terminals.Count > 1 || _applicationSettings.AlwaysShowTabs);
-        }
-
         public string Background
         {
             get => _background;
@@ -151,28 +110,21 @@ namespace FluentTerminal.App.ViewModels
             }
         }
 
-        public RelayCommand ShowAboutCommand { get; }
-
         public RelayCommand ShowSettingsCommand { get; }
 
-        public TabsPosition TabsPosition
-        {
-            get => _tabsPosition;
-            set => Set(ref _tabsPosition, value);
-        }
-
         public ObservableCollection<TerminalViewModel> Terminals { get; } = new ObservableCollection<TerminalViewModel>();
 
-        /// <summary>
-        /// Add a new terminal window, either with a specified terminal profile, with the default, or by showing the profile selection dialog.
-        /// </summary>
-        /// <returns></returns>
-        public Task AddTerminal(string startupDirectory, bool showProfileSelection, Guid profileId)
+        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();
@@ -182,17 +134,15 @@ namespace FluentTerminal.App.ViewModels
                         return;
                     }
                 }
-                else if (profileId == Guid.Empty)
+                else
                 {
                     profile = _settingsService.GetDefaultShellProfile();
-                } else
-                {
-                    profile = _settingsService.GetShellProfile(profileId);
                 }
 
-                var terminal = new TerminalViewModel(_settingsService, _trayProcessCommunicationService, _dialogService, _keyboardCommandService,
+                var terminal = new TerminalViewModel(GetNextTerminalId(), _settingsService, _trayProcessCommunicationService, _dialogService, _keyboardCommandService,
                     _applicationSettings, startupDirectory, profile, _applicationView, _dispatcherTimer, _clipboardService);
-                terminal.Closed += OnTerminalCloseRequested;
+                terminal.CloseRequested += OnTerminalCloseRequested;
+                terminal.TitleChanged += OnTitleChanged;
                 Terminals.Add(terminal);
 
                 SelectedTerminal = terminal;
@@ -212,6 +162,11 @@ namespace FluentTerminal.App.ViewModels
             SelectedTerminal?.CloseCommand.Execute(null);
         }
 
+        private int GetNextTerminalId()
+        {
+            return _nextTerminalId++;
+        }
+
         private void NewWindow()
         {
             NewWindowRequested?.Invoke(this, EventArgs.Empty);
@@ -219,13 +174,7 @@ namespace FluentTerminal.App.ViewModels
 
         private async void OnApplicationSettingsChanged(object sender, ApplicationSettings e)
         {
-            await _applicationView.RunOnDispatcherThread(() =>
-            {
-                _applicationSettings = e;
-                TabsPosition = e.TabsPosition;
-                RaisePropertyChanged(nameof(ShowTabsOnTop));
-                RaisePropertyChanged(nameof(ShowTabsOnBottom));
-            });
+            await _applicationView.RunOnDispatcherThread(() => _applicationSettings = e);
         }
 
         private async Task OnCloseRequest(object sender, CancelableEventArgs e)
@@ -279,19 +228,19 @@ namespace FluentTerminal.App.ViewModels
             }
         }
 
-        private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
+        private void OnTerminalsCollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
         {
-            await _applicationView.RunOnDispatcherThread(() =>
+            if (Terminals.Any())
             {
-                BackgroundOpacity = e.BackgroundOpacity;
-            });
+                Title = Terminals.First().Title;
+            }
         }
 
-        private void SelectTabNumber(int tabNumber)
+        private void OnTitleChanged(object sender, string e)
         {
-            if (tabNumber < Terminals.Count)
+            if (sender is TerminalViewModel terminal && Terminals.First() == terminal)
             {
-                SelectedTerminal = Terminals[tabNumber];
+                Title = e;
             }
         }
 
@@ -309,16 +258,11 @@ namespace FluentTerminal.App.ViewModels
             SelectedTerminal = Terminals[previousIndex];
         }
 
-        private void ShowAbout()
-        {
-            ShowAboutRequested?.Invoke(this, EventArgs.Empty);
-        }
-
         private void ShowSettings()
         {
             ShowSettingsRequested?.Invoke(this, EventArgs.Empty);
         }
-
+      
         private void ToggleFullScreen()
         {
             _applicationView.ToggleFullScreen();

FluentTerminal.App.ViewModels/Settings/AboutPageViewModel.cs

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

FluentTerminal.App.ViewModels/Settings/GeneralPageViewModel.cs

@@ -9,100 +9,22 @@ 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 IStartupTaskService _startupTaskService;
-        private bool _canEnableStartupTask;
+        private readonly ApplicationSettings _applicationSettings;
         private bool _editingNewTerminalLocation;
-        private bool _editingTabsPosition;
-        private bool _editingInactiveTabColorMode;
-        private bool _startupTaskEnabled;
-        private bool _shouldRestartForTrayMessage;
-        private string _startupTaskErrorMessage;
 
-        public GeneralPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider, IStartupTaskService startupTaskService)
+        public GeneralPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider)
         {
             _settingsService = settingsService;
             _dialogService = dialogService;
             _defaultValueProvider = defaultValueProvider;
-            _startupTaskService = startupTaskService;
-
             _applicationSettings = _settingsService.GetApplicationSettings();
 
             RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
         }
 
-        public async Task OnNavigatedTo()
-        {
-            var startupTaskStatus = await _startupTaskService.GetStatus();
-            SetStartupTaskPropertiesForStatus(startupTaskStatus);
-        }
-
-        public bool AlwaysShowTabs
-        {
-            get => _applicationSettings.AlwaysShowTabs;
-            set
-            {
-                if (_applicationSettings.AlwaysShowTabs != value)
-                {
-                    _applicationSettings.AlwaysShowTabs = 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 BottomIsSelected
-        {
-            get => TabsPosition == TabsPosition.Bottom;
-            set => TabsPosition = TabsPosition.Bottom;
-        }
-
-        public bool CanEnableStartupTask
-        {
-            get => _canEnableStartupTask;
-            set => Set(ref _canEnableStartupTask, value);
-        }
-
         public bool ConfirmClosingTabs
         {
             get => _applicationSettings.ConfirmClosingTabs;
@@ -131,6 +53,20 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
+        public bool UnderlineSelectedTab
+        {
+            get => _applicationSettings.UnderlineSelectedTab;
+            set
+            {
+                if (_applicationSettings.UnderlineSelectedTab != value)
+                {
+                    _applicationSettings.UnderlineSelectedTab = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
         public NewTerminalLocation NewTerminalLocation
         {
             get => _applicationSettings.NewTerminalLocation;
@@ -151,100 +87,12 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         public RelayCommand RestoreDefaultsCommand { 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 => NewTerminalLocation = NewTerminalLocation.Tab;
         }
 
-        public TabsPosition TabsPosition
-        {
-            get => _applicationSettings.TabsPosition;
-            set
-            {
-                if (_applicationSettings.TabsPosition != value && !_editingTabsPosition)
-                {
-                    _editingTabsPosition = true;
-                    _applicationSettings.TabsPosition = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                    RaisePropertyChanged(nameof(TopIsSelected));
-                    RaisePropertyChanged(nameof(BottomIsSelected));
-                    _editingTabsPosition = false;
-                }
-            }
-        }
-
-        public bool TopIsSelected
-        {
-            get => TabsPosition == TabsPosition.Top;
-            set => TabsPosition = TabsPosition.Top;
-        }
-
-        public bool UnderlineSelectedTab
-        {
-            get => _applicationSettings.UnderlineSelectedTab;
-            set
-            {
-                if (_applicationSettings.UnderlineSelectedTab != value)
-                {
-                    _applicationSettings.UnderlineSelectedTab = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public bool BackgroundIsSelected
-        {
-            get => InactiveTabColorMode == InactiveTabColorMode.Background;
-            set => InactiveTabColorMode = InactiveTabColorMode.Background;
-        }
-
-        public bool UnderlinedIsSelected
-        {
-            get => InactiveTabColorMode == InactiveTabColorMode.Underlined;
-            set => InactiveTabColorMode = InactiveTabColorMode.Underlined;
-        }
-
-        public InactiveTabColorMode InactiveTabColorMode
-        {
-            get => _applicationSettings.InactiveTabColorMode;
-            set
-            {
-                if (_applicationSettings.InactiveTabColorMode != value && !_editingInactiveTabColorMode)
-                {
-                    _editingInactiveTabColorMode = true;
-                    _applicationSettings.InactiveTabColorMode = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                    RaisePropertyChanged(nameof(BackgroundIsSelected));
-                    RaisePropertyChanged(nameof(UnderlinedIsSelected));
-                    _editingInactiveTabColorMode = false;
-                }
-            }
-        }
-
         public bool WindowIsSelected
         {
             get => NewTerminalLocation == NewTerminalLocation.Window;
@@ -253,7 +101,7 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         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(true);
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the general settings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(false);
 
             if (result == DialogButton.OK)
             {
@@ -261,57 +109,8 @@ namespace FluentTerminal.App.ViewModels.Settings
                 ConfirmClosingWindows = defaults.ConfirmClosingWindows;
                 ConfirmClosingTabs = defaults.ConfirmClosingTabs;
                 UnderlineSelectedTab = defaults.UnderlineSelectedTab;
-                InactiveTabColorMode = defaults.InactiveTabColorMode;
                 NewTerminalLocation = defaults.NewTerminalLocation;
-                AlwaysShowTabs = defaults.AlwaysShowTabs;
-                ShowNewOutputIndicator = defaults.ShowNewOutputIndicator;
-                EnableTrayIcon = defaults.EnableTrayIcon;
             }
         }
-
-        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 = "Disabled by user. Please reactivate it in the Startup tab of the Task Manager.";
-                    CanEnableStartupTask = false;
-                    break;
-
-                case StartupTaskStatus.DisabledByPolicy:
-                    StartupTaskEnabled = false;
-                    StartupTaskErrorMessage = "Disabled by policy.";
-                    CanEnableStartupTask = false;
-                    break;
-            }
-        }
-
-        private async Task SetStartupTaskState(bool enabled)
-        {
-            StartupTaskStatus status;
-            if (enabled)
-            {
-                status = await _startupTaskService.EnableStartupTask();
-            }
-            else
-            {
-                _startupTaskService.DisableStartupTask();
-                status = await _startupTaskService.GetStatus();
-            }
-            SetStartupTaskPropertiesForStatus(status);
-        }
     }
 }

FluentTerminal.App.ViewModels/Settings/KeyBindingViewModel.cs

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

FluentTerminal.App.ViewModels/Settings/KeyBindingsPageViewModel.cs

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

FluentTerminal.App.ViewModels/Settings/KeyBindingsViewModel.cs

@@ -1,10 +1,11 @@
 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
@@ -12,73 +13,62 @@ namespace FluentTerminal.App.ViewModels.Settings
     public class KeyBindingsViewModel : ViewModelBase
     {
         private readonly IDialogService _dialogService;
-        private bool _editable;
+        private readonly ICollection<KeyBinding> _keyBindings;
 
-        public KeyBindingsViewModel(string command, IDialogService dialogService, string commandName, bool editable)
+        public KeyBindingsViewModel(Command command, ICollection<KeyBinding> keyBindings, IDialogService dialogService)
         {
+            Command = command;
+            _keyBindings = keyBindings;
             _dialogService = dialogService;
 
-            Command = command;
-            CommandName = commandName;
-            Editable = editable;
-        }
+            CommandName = EnumHelper.GetEnumDescription(command);
 
-        public delegate void EditedEvent(string command, ICollection<KeyBinding> keyBindings);
-
-        public event EditedEvent Edited;
-
-        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 ShowAddKeyBindingDialog()
-        {
-            var newKeyBinding = new KeyBindingViewModel(new KeyBinding { Command = Command }, _dialogService, this);
-
-            if (await newKeyBinding.Edit().ConfigureAwait(true))
+            foreach (var binding in keyBindings)
             {
-                Add(newKeyBinding.Model);
+                var viewModel = new KeyBindingViewModel(binding, _dialogService);
+                viewModel.Deleted += ViewModel_Deleted;
+                viewModel.Edited += ViewModel_Edited;
+                KeyBindings.Add(viewModel);
             }
         }
 
-        public void Clear()
-        {
-            KeyBindings.Clear();
-        }
+        public delegate void EditedEvent(Command command, ICollection<KeyBinding> keyBindings);
 
-        public void Add(KeyBinding keyBinding)
-        {
-            var viewModel = new KeyBindingViewModel(keyBinding, _dialogService, this);
+        public event EditedEvent Edited;
 
-            viewModel.Deleted += ViewModel_Deleted;
-            viewModel.Edited += ViewModel_Edited;
-            KeyBindings.Add(viewModel);
-            Edited?.Invoke(Command, KeyBindings.Select(x => x.Model).ToList());
+        public Command Command { get; }
+
+        public string CommandName { get; }
+
+        public ObservableCollection<KeyBindingViewModel> KeyBindings { get; } = new ObservableCollection<KeyBindingViewModel>();
+
+        public async Task Add()
+        {
+            var newKeyBinding = new KeyBindingViewModel(new KeyBinding { Command = Command }, _dialogService);
+
+            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);
+            }
         }
 
         private void ViewModel_Deleted(object sender, EventArgs e)
         {
             if (sender is KeyBindingViewModel keyBinding)
             {
+                _keyBindings.Remove(keyBinding.Model);
                 KeyBindings.Remove(keyBinding);
-                Edited?.Invoke(Command, KeyBindings.Select(x => x.Model).ToList());
+                Edited?.Invoke(Command, _keyBindings);
             }
         }
 
         private void ViewModel_Edited(object sender, EventArgs e)
         {
-            Edited?.Invoke(Command, KeyBindings.Select(x => x.Model).ToList());
+            Edited?.Invoke(Command, _keyBindings);
         }
     }
 }

FluentTerminal.App.ViewModels/Settings/MousePageViewModel.cs

@@ -1,135 +0,0 @@
-using FluentTerminal.App.Services;
-using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FluentTerminal.App.ViewModels.Settings
-{
-    public class MousePageViewModel : ViewModelBase
-    {
-        private readonly ISettingsService _settingsService;
-        private readonly IDialogService _dialogService;
-        private readonly IDefaultValueProvider _defaultValueProvider;
-        private readonly ApplicationSettings _applicationSettings;
-        private bool _editingMouseRightClickAction;
-        private bool _editingMouseMiddleClickAction;
-
-        public MousePageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider)
-        {
-            _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 && !_editingMouseRightClickAction)
-                {
-                    _editingMouseRightClickAction = true;
-                    _applicationSettings.MouseRightClickAction = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                    RaisePropertyChanged(nameof(MouseRightClickNoneIsSelected));
-                    RaisePropertyChanged(nameof(MouseRightClickContextMenuIsSelected));
-                    RaisePropertyChanged(nameof(MouseRightClickPasteIsSelected));
-                    _editingMouseRightClickAction = false;
-                }
-            }
-        }
-
-        public bool MouseRightClickNoneIsSelected
-        {
-            get => MouseRightClickAction == MouseAction.None;
-            set => MouseRightClickAction = MouseAction.None;
-        }
-
-        public bool MouseRightClickContextMenuIsSelected
-        {
-            get => MouseRightClickAction == MouseAction.ContextMenu;
-            set => MouseRightClickAction = MouseAction.ContextMenu;
-        }
-
-        public bool MouseRightClickPasteIsSelected
-        {
-            get => MouseRightClickAction == MouseAction.Paste;
-            set => MouseRightClickAction = MouseAction.Paste;
-        }
-
-        public MouseAction MouseMiddleClickAction
-        {
-            get => _applicationSettings.MouseMiddleClickAction;
-            set
-            {
-                if (_applicationSettings.MouseMiddleClickAction != value && !_editingMouseMiddleClickAction)
-                {
-                    _editingMouseMiddleClickAction = true;
-                    _applicationSettings.MouseMiddleClickAction = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                    RaisePropertyChanged(nameof(MouseMiddleClickNoneIsSelected));
-                    RaisePropertyChanged(nameof(MouseMiddleClickContextMenuIsSelected));
-                    RaisePropertyChanged(nameof(MouseMiddleClickPasteIsSelected));
-                    _editingMouseMiddleClickAction = false;
-                }
-            }
-        }
-
-        public bool MouseMiddleClickNoneIsSelected
-        {
-            get => MouseMiddleClickAction == MouseAction.None;
-            set => MouseMiddleClickAction = MouseAction.None;
-        }
-
-        public bool MouseMiddleClickContextMenuIsSelected
-        {
-            get => MouseMiddleClickAction == MouseAction.ContextMenu;
-            set => MouseMiddleClickAction = MouseAction.ContextMenu;
-        }
-
-        public bool MouseMiddleClickPasteIsSelected
-        {
-            get => MouseMiddleClickAction == MouseAction.Paste;
-            set => MouseMiddleClickAction = MouseAction.Paste;
-        }
-
-        public RelayCommand RestoreDefaultsCommand { get; }
-
-        private async Task RestoreDefaults()
-        {
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the mouse settings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
-
-            if (result == DialogButton.OK)
-            {
-                var defaults = _defaultValueProvider.GetDefaultApplicationSettings();
-                CopyOnSelect = defaults.CopyOnSelect;
-                MouseMiddleClickAction = defaults.MouseMiddleClickAction;
-                MouseRightClickAction = defaults.MouseRightClickAction;
-            }
-        }
-    }
-}

FluentTerminal.App.ViewModels/Settings/ProfilesPageViewModel.cs

@@ -4,7 +4,6 @@ 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
@@ -16,23 +15,21 @@ 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, IApplicationView applicationView)
+        public ProfilesPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider, IFileSystemService fileSystemService)
         {
             _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, applicationView, defaultValueProvider);
+                var viewModel = new ShellProfileViewModel(shellProfile, settingsService, dialogService, fileSystemService);
                 viewModel.Deleted += OnShellProfileDeleted;
                 viewModel.SetAsDefault += OnShellProfileSetAsDefault;
 
@@ -44,7 +41,6 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
 
             SelectedShellProfile = ShellProfiles.First(p => p.IsDefault);
-            
         }
 
         private void OnShellProfileSetAsDefault(object sender, EventArgs e)
@@ -81,38 +77,18 @@ 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",
-                KeyBindings = new List<KeyBinding>()
+                Name = "New profile"
             };
 
-            AddShellProfile(shellProfile);
-        }
+            _settingsService.SaveShellProfile(shellProfile);
 
-        private void Clone(ShellProfileViewModel shellProfile)
-        {
-            var cloned = new ShellProfile(shellProfile.Model)
-            {
-                Id = Guid.NewGuid(),
-                PreInstalled = false,
-                Name = $"Copy of {shellProfile.Name}"
-            };
-
-            AddShellProfile(cloned);
-        }
-
-        private void AddShellProfile(ShellProfile shellProfile)
-        {
-            _settingsService.SaveShellProfile(shellProfile, true);
-
-            var viewModel = new ShellProfileViewModel(shellProfile, _settingsService, _dialogService, _fileSystemService, _applicationView, _defaultValueProvider);
+            var viewModel = new ShellProfileViewModel(shellProfile, _settingsService, _dialogService, _fileSystemService);
             viewModel.EditCommand.Execute(null);
             viewModel.SetAsDefault += OnShellProfileSetAsDefault;
             viewModel.Deleted += OnShellProfileDeleted;

FluentTerminal.App.ViewModels/Settings/TerminalPageViewModel.cs

@@ -1,17 +1,15 @@
 using FluentTerminal.App.Services;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
+using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
-using ReactiveUI;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reactive.Linq;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.ViewModels.Settings
 {
-    public class TerminalPageViewModel : ReactiveObject
+    public class TerminalPageViewModel : ViewModelBase
     {
         private readonly TerminalOptions _terminalOptions;
         private readonly ISettingsService _settingsService;
@@ -65,7 +63,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 {
                     _terminalOptions.CursorBlink = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
-                    this.RaisePropertyChanged();
+                    RaisePropertyChanged();
                 }
             }
         }
@@ -79,7 +77,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 {
                     _terminalOptions.FontFamily = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
-                    this.RaisePropertyChanged();
+                    RaisePropertyChanged();
                 }
             }
         }
@@ -92,20 +90,8 @@ namespace FluentTerminal.App.ViewModels.Settings
                 if (_terminalOptions.BackgroundOpacity != value)
                 {
                     _terminalOptions.BackgroundOpacity = value;
-                    this.RaisePropertyChanged();
-                }
-            }
-        }
-
-        public int Padding
-        {
-            get => _terminalOptions.Padding;
-            set
-            {
-                if (_terminalOptions.Padding != value)
-                {
-                    _terminalOptions.Padding = value;
-                    this.RaisePropertyChanged();
+                    _settingsService.SaveTerminalOptions(_terminalOptions);
+                    RaisePropertyChanged();
                 }
             }
         }
@@ -126,12 +112,12 @@ namespace FluentTerminal.App.ViewModels.Settings
                     {
                         _terminalOptions.ScrollBackLimit = intValue;
                         _settingsService.SaveTerminalOptions(_terminalOptions);
-                        this.RaisePropertyChanged();
+                        RaisePropertyChanged();
                     }
                 }
                 else
                 {
-                    this.RaisePropertyChanged();
+                    RaisePropertyChanged();
                 }
             }
         }
@@ -147,7 +133,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 {
                     _terminalOptions.FontSize = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
-                    this.RaisePropertyChanged();
+                    RaisePropertyChanged();
                 }
             }
         }
@@ -166,10 +152,10 @@ namespace FluentTerminal.App.ViewModels.Settings
                     _isEditingCursorStyle = true;
                     _terminalOptions.CursorStyle = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
-                    this.RaisePropertyChanged();
-                    this.RaisePropertyChanged(nameof(BlockIsSelected));
-                    this.RaisePropertyChanged(nameof(BarIsSelected));
-                    this.RaisePropertyChanged(nameof(UnderlineIsSelected));
+                    RaisePropertyChanged();
+                    RaisePropertyChanged(nameof(BlockIsSelected));
+                    RaisePropertyChanged(nameof(BarIsSelected));
+                    RaisePropertyChanged(nameof(UnderlineIsSelected));
                     _isEditingCursorStyle = false;
                 }
             }
@@ -185,10 +171,10 @@ namespace FluentTerminal.App.ViewModels.Settings
                     _isEditingScrollBarStyle = true;
                     _terminalOptions.ScrollBarStyle = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
-                    this.RaisePropertyChanged();
-                    this.RaisePropertyChanged(nameof(HiddenIsSelected));
-                    this.RaisePropertyChanged(nameof(AutoHidingIsSelected));
-                    this.RaisePropertyChanged(nameof(VisibleIsSelected));
+                    RaisePropertyChanged();
+                    RaisePropertyChanged(nameof(HiddenIsSelected));
+                    RaisePropertyChanged(nameof(AutoHidingIsSelected));
+                    RaisePropertyChanged(nameof(VisibleIsSelected));
                     _isEditingScrollBarStyle = false;
                 }
             }
@@ -223,15 +209,6 @@ namespace FluentTerminal.App.ViewModels.Settings
             Sizes = Enumerable.Range(1, 72);
 
             _terminalOptions = _settingsService.GetTerminalOptions();
-
-            this.ObservableForProperty(x => x.BackgroundOpacity).Throttle(TimeSpan.FromMilliseconds(800)).ObserveOn(RxApp.MainThreadScheduler).Subscribe(x =>
-            {
-                _settingsService.SaveTerminalOptions(_terminalOptions);
-            });
-            this.ObservableForProperty(x => x.Padding).Throttle(TimeSpan.FromMilliseconds(800)).ObserveOn(RxApp.MainThreadScheduler).Subscribe(x =>
-            {
-                _settingsService.SaveTerminalOptions(_terminalOptions);
-            });
         }
     }
-}
+}

FluentTerminal.App.ViewModels/Settings/ThemesPageViewModel.cs

@@ -92,7 +92,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 Colors = new TerminalColors(defaultTheme.Colors)
             };
 
-            _settingsService.SaveTheme(theme, true);
+            _settingsService.SaveTheme(theme);
 
             var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, _fileSystemService);
             viewModel.Activated += OnThemeActivated;
@@ -118,7 +118,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 {
                     var theme = await parser.Parse(file.Name, file.Content).ConfigureAwait(true);
 
-                    _settingsService.SaveTheme(theme, true);
+                    _settingsService.SaveTheme(theme);
 
                     var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, _fileSystemService);
                     viewModel.Activated += OnThemeActivated;

FluentTerminal.App.ViewModels/SettingsViewModel.cs

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

FluentTerminal.App.ViewModels/ShellProfileViewModel.cs

@@ -1,133 +1,69 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.ViewModels.Infrastructure;
-using FluentTerminal.App.ViewModels.Settings;
 using FluentTerminal.Models;
 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 ShellProfileViewModel : ViewModelBase
     {
+        private readonly ShellProfile _shellProfile;
+        private string _name;
+        private string _arguments;
+        private string _location;
+        private string _workingDirectory;
+        private string _fallbackName;
+        private string _fallbackArguments;
+        private string _fallbackLocation;
+        private string _fallbackWorkingDirectory;
+        private bool _isDefault;
+        private bool _inEditMode;
+        private readonly ISettingsService _settingsService;
         private readonly IDialogService _dialogService;
         private readonly IFileSystemService _fileSystemService;
-        private readonly ISettingsService _settingsService;
-        private string _arguments;
-        private ShellProfile _fallbackProfile;
-        private bool _inEditMode;
-        private bool _isDefault;
-        private string _location;
-        private string _name;
-        private TabTheme _selectedTabTheme;
-        private TerminalTheme _selectedTerminalTheme;
-        private string _workingDirectory;
-        private readonly IApplicationView _applicationView;
-        private readonly IDefaultValueProvider _defaultValueProvider;
 
-        public ShellProfileViewModel(ShellProfile shellProfile, ISettingsService settingsService, IDialogService dialogService, IFileSystemService fileSystemService, IApplicationView applicationView, IDefaultValueProvider defaultValueProvider)
+        public ShellProfileViewModel(ShellProfile shellProfile, ISettingsService settingsService, IDialogService dialogService, IFileSystemService fileSystemService)
         {
-            Model = shellProfile;
+            _shellProfile = shellProfile;
             _settingsService = settingsService;
             _dialogService = dialogService;
             _fileSystemService = fileSystemService;
-            _applicationView = applicationView;
-            _defaultValueProvider = defaultValueProvider;
 
-            _settingsService.ThemeAdded += OnThemeAdded;
-            _settingsService.ThemeDeleted += OnThemeDeleted;
-
-            TabThemes = new ObservableCollection<TabTheme>(settingsService.GetTabThemes());
-
-            TerminalThemes = new ObservableCollection<TerminalTheme>();
-            TerminalThemes.Add(new TerminalTheme
-            {
-                Id = Guid.Empty,
-                Name = "Default"
-            });
-            foreach (var theme in _settingsService.GetThemes())
-            {
-                TerminalThemes.Add(theme);
-            }
-
-            KeyBindings = new KeyBindingsViewModel(shellProfile.Id.ToString(), _dialogService, string.Empty, false);
-
-            InitializeViewModelProperties(shellProfile);
-
-            SetDefaultCommand = new RelayCommand(SetDefault);
-            DeleteCommand = new AsyncCommand(Delete, CanDelete);
-            EditCommand = new RelayCommand(Edit);
-            CancelEditCommand = new AsyncCommand(CancelEdit);
-            SaveChangesCommand = new RelayCommand(SaveChanges);
-            AddKeyboardShortcutCommand = new AsyncCommand(AddKeyboardShortcut);
-            BrowseForCustomShellCommand = new AsyncCommand(BrowseForCustomShell);
-            BrowseForWorkingDirectoryCommand = new AsyncCommand(BrowseForWorkingDirectory);
-            RestoreDefaultsCommand = new AsyncCommand(RestoreDefaults);
-        }
-
-        private void InitializeViewModelProperties(ShellProfile shellProfile)
-        {
-            SelectedTerminalTheme = TerminalThemes.FirstOrDefault(t => t.Id == shellProfile.TerminalThemeId);
             Id = shellProfile.Id;
             Name = shellProfile.Name;
             Arguments = shellProfile.Arguments;
             Location = shellProfile.Location;
             WorkingDirectory = shellProfile.WorkingDirectory;
-            SelectedTabTheme = TabThemes.FirstOrDefault(t => t.Id == shellProfile.TabThemeId);
-            PreInstalled = shellProfile.PreInstalled;
 
-            KeyBindings.Clear();
-            foreach (var keyBinding in shellProfile.KeyBindings.Select(x => new KeyBinding(x)).ToList())
-            {
-                KeyBindings.Add(keyBinding);
-            }
-        }
-
-        private void OnThemeAdded(object sender, TerminalTheme e)
-        {
-            _applicationView.RunOnDispatcherThread(() =>
-            {
-                TerminalThemes.Add(e);
-            });
-        }
-
-        private void OnThemeDeleted(object sender, Guid e)
-        {
-            if (SelectedTerminalTheme.Id == e)
-            {
-                _applicationView.RunOnDispatcherThread(() =>
-                {
-                    SelectedTerminalTheme = TerminalThemes.FirstOrDefault(x => x.Id == Guid.Empty);
-                    Model.TerminalThemeId = Guid.Empty;
-                    if (_fallbackProfile != null)
-                    {
-                        _fallbackProfile.TerminalThemeId = Guid.Empty;
-                    }
-                });
-            }
+            SetDefaultCommand = new RelayCommand(SetDefault);
+            DeleteCommand = new RelayCommand(async () => await Delete().ConfigureAwait(false), CanDelete);
+            EditCommand = new RelayCommand(Edit, CanEdit);
+            CancelEditCommand = new RelayCommand(async () => await CancelEdit().ConfigureAwait(false));
+            SaveChangesCommand = new RelayCommand(SaveChanges);
+            BrowseForCustomShellCommand = new RelayCommand(async () => await BrowseForCustomShell().ConfigureAwait(false));
+            BrowseForWorkingDirectoryCommand = new RelayCommand(async () => await BrowseForWorkingDirectory().ConfigureAwait(false));
         }
 
         public event EventHandler Deleted;
         public event EventHandler SetAsDefault;
 
-        public IAsyncCommand BrowseForCustomShellCommand { get; }
-        public IAsyncCommand BrowseForWorkingDirectoryCommand { get; }
-        public IAsyncCommand CancelEditCommand { get; }
-        public IAsyncCommand DeleteCommand { get; }
+        public RelayCommand DeleteCommand { get; }
         public RelayCommand EditCommand { get; }
         public RelayCommand SaveChangesCommand { get; }
+        public RelayCommand CancelEditCommand { get; }
         public RelayCommand SetDefaultCommand { get; }
-        public IAsyncCommand RestoreDefaultsCommand { get; }
-        public IAsyncCommand AddKeyboardShortcutCommand { get; }
-        public ObservableCollection<TabTheme> TabThemes { get; }
-        public KeyBindingsViewModel KeyBindings { get; }
+        public RelayCommand BrowseForCustomShellCommand { get; }
+        public RelayCommand BrowseForWorkingDirectoryCommand { get; }
 
-        public ObservableCollection<TerminalTheme> TerminalThemes { get; }
-        public ShellProfile Model { get; private set; }
-        public bool PreInstalled { get; private set; }
+        public Guid Id { get; }
+
+        public string Name
+        {
+            get => _name;
+            set => Set(ref _name, value);
+        }
 
         public string Arguments
         {
@@ -135,97 +71,89 @@ namespace FluentTerminal.App.ViewModels
             set => Set(ref _arguments, value);
         }
 
-        public Guid Id { get; private set; }
-
-        public bool InEditMode
-        {
-            get => _inEditMode;
-            set => Set(ref _inEditMode, value);
-        }
-
-        public bool IsDefault
-        {
-            get => _isDefault;
-            set => Set(ref _isDefault, value);
-        }
-
         public string Location
         {
             get => _location;
             set => Set(ref _location, value);
         }
 
-        public string Name
-        {
-            get => _name;
-            set => Set(ref _name, value);
-        }
-
-        public TabTheme SelectedTabTheme
-        {
-            get => _selectedTabTheme;
-            set
-            {
-                if (value != null)
-                {
-                    Set(ref _selectedTabTheme, value);
-                }
-            }
-        }
-
-        public TerminalTheme SelectedTerminalTheme
-        {
-            get => _selectedTerminalTheme;
-            set
-            {
-                if (value != null)
-                {
-                    Set(ref _selectedTerminalTheme, value);
-                }
-            }
-        }
-
         public string WorkingDirectory
         {
             get => _workingDirectory;
             set => Set(ref _workingDirectory, value);
         }
 
+        public bool IsDefault
+        {
+            get => _isDefault;
+            set => Set(ref _isDefault, value);
+        }
+
+        public bool InEditMode
+        {
+            get => _inEditMode;
+            set => Set(ref _inEditMode, value);
+        }
+
         public void SaveChanges()
         {
-            Model.Arguments = Arguments;
-            Model.Location = Location;
-            Model.Name = Name;
-            Model.WorkingDirectory = WorkingDirectory;
-            Model.TabThemeId = SelectedTabTheme.Id;
-            Model.TerminalThemeId = SelectedTerminalTheme.Id;
-            Model.KeyBindings = KeyBindings.KeyBindings.Select(x => x.Model).ToList();
-            _settingsService.SaveShellProfile(Model);
+            _shellProfile.Arguments = Arguments;
+            _shellProfile.Location = Location;
+            _shellProfile.Name = Name;
+            _shellProfile.WorkingDirectory = WorkingDirectory;
+
+            _settingsService.SaveShellProfile(_shellProfile);
 
-            KeyBindings.Editable = false;
             InEditMode = false;
         }
 
-        private async Task RestoreDefaults()
+        private async Task CancelEdit()
         {
-            if (InEditMode || !PreInstalled)
-            {
-                throw new InvalidOperationException();
-            }
-
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore this profile?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to discard all changes?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {
-                Model = _defaultValueProvider.GetPreinstalledShellProfiles().FirstOrDefault(x => x.Id == Model.Id);
-                InitializeViewModelProperties(Model);
-                _settingsService.SaveShellProfile(Model);
+                Arguments = _fallbackArguments;
+                Location = _fallbackLocation;
+                Name = _fallbackName;
+                WorkingDirectory = _fallbackWorkingDirectory;
+
+                InEditMode = false;
             }
         }
 
-        public Task AddKeyboardShortcut()
+        private void Edit()
         {
-            return KeyBindings.ShowAddKeyBindingDialog();
+            _fallbackArguments = Arguments;
+            _fallbackLocation = Location;
+            _fallbackName = Name;
+            _fallbackWorkingDirectory = WorkingDirectory;
+            InEditMode = true;
+        }
+
+        private bool CanDelete()
+        {
+            return !_shellProfile.PreInstalled;
+        }
+
+        private bool CanEdit()
+        {
+            return !_shellProfile.PreInstalled;
+        }
+
+        private async Task Delete()
+        {
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to delete this theme?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+
+            if (result == DialogButton.OK)
+            {
+                Deleted?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        private void SetDefault()
+        {
+            SetAsDefault?.Invoke(this, EventArgs.Empty);
         }
 
         private async Task BrowseForCustomShell()
@@ -245,66 +173,5 @@ namespace FluentTerminal.App.ViewModels
                 WorkingDirectory = directory;
             }
         }
-
-        private async Task CancelEdit()
-        {
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to discard all changes?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
-
-            if (result == DialogButton.OK)
-            {
-                Arguments = _fallbackProfile.Arguments;
-                Location = _fallbackProfile.Location;
-                Name = _fallbackProfile.Name;
-                WorkingDirectory = _fallbackProfile.WorkingDirectory;
-                SelectedTerminalTheme = TerminalThemes.FirstOrDefault(t => t.Id == _fallbackProfile.TerminalThemeId);
-                SelectedTabTheme = TabThemes.FirstOrDefault(t => t.Id == _fallbackProfile.TabThemeId);
-
-                KeyBindings.KeyBindings.Clear();
-                foreach (var keyBinding in Model.KeyBindings.Select(x => new KeyBinding(x)).ToList())
-                {
-                    KeyBindings.Add(keyBinding);
-                }
-
-                KeyBindings.Editable = false;
-                InEditMode = false;
-            }
-        }
-
-        private bool CanDelete()
-        {
-            return !Model.PreInstalled;
-        }
-
-        private async Task Delete()
-        {
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to delete this theme?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
-
-            if (result == DialogButton.OK)
-            {
-                Deleted?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
-        private void Edit()
-        {
-            // todo write copy ctor
-            _fallbackProfile = new ShellProfile
-            {
-                Arguments = Model.Arguments,
-                Location = Model.Location,
-                Name = Model.Name,
-                WorkingDirectory = Model.WorkingDirectory,
-                TabThemeId = Model.TabThemeId,
-                TerminalThemeId = Model.TerminalThemeId
-            };
-
-            KeyBindings.Editable = true;
-            InEditMode = true;
-        }
-
-        private void SetDefault()
-        {
-            SetAsDefault?.Invoke(this, EventArgs.Empty);
-        }
     }
-}
+}

FluentTerminal.App.ViewModels/TerminalViewModel.cs

@@ -6,109 +6,87 @@ using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
+using System.IO;
+using System.IO.Pipes;
 using System.Linq;
-using System.Threading;
+using System.Net.NetworkInformation;
+using System.Text;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.ViewModels
 {
     public class TerminalViewModel : ViewModelBase
     {
-        private readonly IApplicationView _applicationView;
-        private readonly IClipboardService _clipboardService;
-        private readonly ManualResetEventSlim _connectedEvent;
         private readonly IDialogService _dialogService;
         private readonly IKeyboardCommandService _keyboardCommandService;
-        private readonly IDispatcherTimer _resizeOverlayTimer;
         private readonly ISettingsService _settingsService;
-        private readonly ShellProfile _shellProfile;
-        private readonly string _startupDirectory;
         private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
-        private bool _isSelected;
-        private bool _newOutput;
+        private ApplicationSettings _applicationSettings;
         private string _resizeOverlayContent;
-        private string _searchText;
         private bool _showResizeOverlay;
-        private bool _showSearchPanel;
-        private TabTheme _tabTheme;
-        private TerminalTheme _terminalTheme;
+        private readonly string _startupDirectory;
         private int _terminalId;
         private ITerminalView _terminalView;
         private string _title;
+        private readonly ShellProfile _shellProfile;
+        private bool _showSearchPanel;
+        private string _searchText;
+        private bool _isSelected;
+        private readonly IApplicationView _applicationView;
+        private readonly IDispatcherTimer _resizeOverlayTimer;
+        private readonly IClipboardService _clipboardService;
         private IWebSocketConnection _webSocket;
+        private NamedPipeClientStream _namedPipe;
 
-        public TerminalViewModel(ISettingsService settingsService, ITrayProcessCommunicationService trayProcessCommunicationService, IDialogService dialogService,
+        public TerminalViewModel(int id, ISettingsService settingsService, ITrayProcessCommunicationService trayProcessCommunicationService, IDialogService dialogService,
             IKeyboardCommandService keyboardCommandService, ApplicationSettings applicationSettings, string startupDirectory, ShellProfile shellProfile,
             IApplicationView applicationView, IDispatcherTimer dispatcherTimer, IClipboardService clipboardService)
         {
+            Id = id;
             Title = DefaultTitle;
 
-            _connectedEvent = new ManualResetEventSlim(false);
-
             _settingsService = settingsService;
             _settingsService.CurrentThemeChanged += OnCurrentThemeChanged;
             _settingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
             _settingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
             _settingsService.KeyBindingsChanged += OnKeyBindingsChanged;
-
             _trayProcessCommunicationService = trayProcessCommunicationService;
-            _trayProcessCommunicationService.TerminalExited += OnTerminalExited;
-
             _dialogService = dialogService;
             _keyboardCommandService = keyboardCommandService;
-            ApplicationSettings = applicationSettings;
+            _applicationSettings = applicationSettings;
             _startupDirectory = startupDirectory;
             _shellProfile = shellProfile;
             _applicationView = applicationView;
             _clipboardService = clipboardService;
-
-            TerminalTheme = shellProfile.TerminalThemeId == Guid.Empty ? _settingsService.GetCurrentTheme() : _settingsService.GetTheme(shellProfile.TerminalThemeId);
-
-            TabThemes = new ObservableCollection<TabTheme>(_settingsService.GetTabThemes());
-            TabTheme = TabThemes.FirstOrDefault(t => t.Id == _shellProfile.TabThemeId);
-
             _resizeOverlayTimer = dispatcherTimer;
             _resizeOverlayTimer.Interval = new TimeSpan(0, 0, 2);
             _resizeOverlayTimer.Tick += OnResizeOverlayTimerFinished;
 
-            CloseCommand = new RelayCommand(async () => await TryClose().ConfigureAwait(false));
+            CloseCommand = new RelayCommand(async () => await InvokeCloseRequested().ConfigureAwait(false));
             FindNextCommand = new RelayCommand(async () => await FindNext().ConfigureAwait(false));
             FindPreviousCommand = new RelayCommand(async () => await FindPrevious().ConfigureAwait(false));
             CloseSearchPanelCommand = new RelayCommand(CloseSearchPanel);
-            SelectTabThemeCommand = new RelayCommand<string>(SelectTabTheme);
+            
         }
 
-        public event EventHandler Closed;
-
-        public ApplicationSettings ApplicationSettings { get; private set; }
-
-        public TabTheme BackgroundTabTheme
+        private async void OnKeyBindingsChanged(object sender, EventArgs e)
         {
-            // The effective background theme depends on whether it is selected (use the theme), or if it is inactive
-            // (if we're set to underline inactive tabs, use the null theme).
-            get => IsSelected || (!IsSelected && ApplicationSettings.InactiveTabColorMode == InactiveTabColorMode.Background) ?
-                _tabTheme :
-                _settingsService.GetTabThemes().FirstOrDefault(t => t.Color == null);
+            var keyBindings = _settingsService.GetKeyBindings();
+            await _applicationView.RunOnDispatcherThread(async () =>
+            {
+                await _terminalView.ChangeKeyBindings(FlattenKeyBindings(keyBindings)).ConfigureAwait(false);
+            });
         }
 
-        public TerminalTheme TerminalTheme
-        {
-            get => _terminalTheme;
-            set => Set(ref _terminalTheme, value);
-        }
+        public event EventHandler CloseRequested;
+
+        public event EventHandler<string> TitleChanged;
 
         public RelayCommand CloseCommand { get; }
 
-        public RelayCommand CloseSearchPanelCommand { get; }
-
-        public string DefaultTitle { get; private set; } = string.Empty;
-
-        public RelayCommand FindNextCommand { get; }
-
         public RelayCommand FindPreviousCommand { get; }
-
-        public bool Initialized { get; private set; }
+        public RelayCommand FindNextCommand { get; }
+        public RelayCommand CloseSearchPanelCommand { get; }
 
         public bool IsSelected
         {
@@ -117,31 +95,18 @@ namespace FluentTerminal.App.ViewModels
             {
                 if (Set(ref _isSelected, value))
                 {
-                    if (IsSelected)
-                    {
-                        _applicationView.Title = Title;
-                        _applicationView.RunOnDispatcherThread(() => NewOutput = false);
-                    }
                     RaisePropertyChanged(nameof(IsUnderlined));
-                    RaisePropertyChanged(nameof(BackgroundTabTheme));
                 }
             }
         }
 
-        public bool IsUnderlined => (IsSelected && ApplicationSettings.UnderlineSelectedTab) ||
-            (!IsSelected && ApplicationSettings.InactiveTabColorMode == InactiveTabColorMode.Underlined && TabTheme.Color != null);
+        public bool IsUnderlined => IsSelected && _applicationSettings.UnderlineSelectedTab;
 
-        public bool NewOutput
-        {
-            get => _newOutput;
-            set => Set(ref _newOutput, value);
-        }
+        public int Id { get; }
 
-        public string ResizeOverlayContent
-        {
-            get => _resizeOverlayContent;
-            set => Set(ref _resizeOverlayContent, value);
-        }
+        public bool Initialized { get; private set; }
+
+        public string DefaultTitle { get; private set; } = "Fluent Terminal";
 
         public string SearchText
         {
@@ -149,7 +114,17 @@ namespace FluentTerminal.App.ViewModels
             set => Set(ref _searchText, value);
         }
 
-        public RelayCommand<string> SelectTabThemeCommand { get; }
+        public bool ShowSearchPanel
+        {
+            get => _showSearchPanel;
+            set => Set(ref _showSearchPanel, value);
+        }
+
+        public string ResizeOverlayContent
+        {
+            get => _resizeOverlayContent;
+            set => Set(ref _resizeOverlayContent, value);
+        }
 
         public bool ShowResizeOverlay
         {
@@ -168,25 +143,6 @@ namespace FluentTerminal.App.ViewModels
             }
         }
 
-        public bool ShowSearchPanel
-        {
-            get => _showSearchPanel;
-            set => Set(ref _showSearchPanel, value);
-        }
-
-        public TabTheme TabTheme
-        {
-            get => _tabTheme;
-            set
-            {
-                Set(ref _tabTheme, value);
-                RaisePropertyChanged(nameof(IsUnderlined));
-                RaisePropertyChanged(nameof(BackgroundTabTheme));
-            }
-        }
-
-        public ObservableCollection<TabTheme> TabThemes { get; }
-
         public string Title
         {
             get => _title;
@@ -194,22 +150,16 @@ namespace FluentTerminal.App.ViewModels
             {
                 value = string.IsNullOrWhiteSpace(value) ? DefaultTitle : value;
 
-                if (Set(ref _title, value) && IsSelected)
+                if (Set(ref _title, value))
                 {
-                    _applicationView.Title = Title;
+                    TitleChanged?.Invoke(this, Title);
                 }
             }
         }
 
-        public async Task CloseView()
+        public void CloseView()
         {
             _terminalView.Close();
-            await _trayProcessCommunicationService.CloseTerminal(_terminalId).ConfigureAwait(true);
-        }
-
-        public void CopyText(string text)
-        {
-            _clipboardService.SetText(text);
         }
 
         public Task FocusTerminal()
@@ -222,10 +172,10 @@ namespace FluentTerminal.App.ViewModels
             _terminalView = terminalView;
 
             var options = _settingsService.GetTerminalOptions();
-            var keyBindings = _settingsService.GetCommandKeyBindings();
-            var profiles = _settingsService.GetShellProfiles();
+            var theme = _settingsService.GetCurrentTheme();
+            var keyBindings = _settingsService.GetKeyBindings();
 
-            var size = await _terminalView.CreateTerminal(options, TerminalTheme.Colors, FlattenKeyBindings(keyBindings, profiles)).ConfigureAwait(true);
+            var size = await _terminalView.CreateTerminal(options, theme.Colors, FlattenKeyBindings(keyBindings)).ConfigureAwait(true);
 
             if (!string.IsNullOrWhiteSpace(_startupDirectory))
             {
@@ -241,28 +191,39 @@ namespace FluentTerminal.App.ViewModels
                 _terminalView.TerminalTitleChanged += OnTerminalTitleChanged;
                 _terminalView.KeyboardCommandReceived += OnKeyboardCommandReceived;
 
-                _trayProcessCommunicationService.SubscribeForTerminalOutput(_terminalId, t =>
-                {
-                    _connectedEvent.Wait();
-                    _webSocket.Send(t);
-                    if (!IsSelected && ApplicationSettings.ShowNewOutputIndicator)
-                    {
-                        _applicationView.RunOnDispatcherThread(() => NewOutput = true);
-                    }
-                });
-
                 DefaultTitle = response.ShellExecutableName;
                 Title = DefaultTitle;
 
-                var webSocketUrl = "ws://127.0.0.1:" + response.Id;
+                _namedPipe = new NamedPipeClientStream(".", response.PipeName, PipeDirection.InOut, PipeOptions.None);
+                if (!_namedPipe.IsConnected)
+                {
+                    _namedPipe.Connect();
+                }
+
+                var webSocketUrl = "ws://127.0.0.1:" + response.Port;
                 var webSocketServer = new WebSocketServer(webSocketUrl);
                 webSocketServer.Start(socket =>
                 {
                     _webSocket = socket;
-                    socket.OnOpen = () => _connectedEvent.Set();
-                    socket.OnMessage = message => _trayProcessCommunicationService.WriteText(_terminalId, message);
+                    socket.OnOpen = () =>
+                    {
+                        Console.WriteLine("open");
+                        //_connectedEvent.Set();
+                    };
+                    socket.OnClose = () =>
+                    {
+                        Console.WriteLine("closing");
+                        _namedPipe.Close();
+                    };
+                    socket.OnMessage = message =>
+                    {
+                        var bytes = Encoding.UTF8.GetBytes(message);
+                        _namedPipe.Write(bytes, 0, bytes.Length);
+                    };
                 });
 
+                ListenToNamedPipe();
+
                 await _terminalView.ConnectToSocket(webSocketUrl).ConfigureAwait(true);
                 Initialized = true;
             }
@@ -274,35 +235,47 @@ namespace FluentTerminal.App.ViewModels
             await FocusTerminal().ConfigureAwait(true);
         }
 
-        private void CloseSearchPanel()
+        private void ListenToNamedPipe()
         {
-            SearchText = string.Empty;
-            ShowSearchPanel = false;
-            _terminalView.FocusTerminal();
+            Task.Run(async () =>
+            {
+                var reader = new StreamReader(_namedPipe);
+                do
+                {
+                    var offset = 0;
+                    var buffer = new char[1024];
+                    var readChars = await reader.ReadAsync(buffer, offset, buffer.Length - offset);
+                    if (readChars > 0)
+                    {
+                        await _webSocket.Send(new String(buffer));
+                    }
+                }
+                while (!reader.EndOfStream);
+                _webSocket.Close();
+            });
         }
 
-        private Task FindNext()
+        private async Task InvokeCloseRequested()
         {
-            return _terminalView.FindNext(SearchText);
-        }
+            if (_applicationSettings.ConfirmClosingTabs)
+            {
+                var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to close this tab?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
-        private Task FindPrevious()
-        {
-            return _terminalView.FindPrevious(SearchText);
-        }
+                if (result == DialogButton.Cancel)
+                {
+                    return;
+                }
+            }
 
-        private IEnumerable<KeyBinding> FlattenKeyBindings(IDictionary<string, ICollection<KeyBinding>> commandKeyBindings, IEnumerable<ShellProfile> profiles)
-        {
-            return commandKeyBindings.Values.SelectMany(k => k).Concat(profiles.SelectMany(x => x.KeyBindings));
+            CloseRequested?.Invoke(this, EventArgs.Empty);
         }
 
         private async void OnApplicationSettingsChanged(object sender, ApplicationSettings e)
         {
             await _applicationView.RunOnDispatcherThread(() =>
             {
-                ApplicationSettings = e;
+                _applicationSettings = e;
                 RaisePropertyChanged(nameof(IsUnderlined));
-                RaisePropertyChanged(nameof(BackgroundTabTheme));
             });
         }
 
@@ -310,42 +283,27 @@ namespace FluentTerminal.App.ViewModels
         {
             await _applicationView.RunOnDispatcherThread(async () =>
             {
-                // only change theme if not overwritten by profile
-                if (_shellProfile.TerminalThemeId == Guid.Empty)
-                {
-                    var currentTheme = _settingsService.GetTheme(e);
-                    TerminalTheme = currentTheme;
-                    await _terminalView.ChangeTheme(currentTheme.Colors).ConfigureAwait(true);
-                }
+                var currentTheme = _settingsService.GetTheme(e);
+                await _terminalView.ChangeTheme(currentTheme.Colors).ConfigureAwait(true);
             });
         }
 
-        private async void OnKeyBindingsChanged(object sender, EventArgs e)
+        private async void OnKeyboardCommandReceived(object sender, Command e)
         {
-            var keyBindings = _settingsService.GetCommandKeyBindings();
-            var profiles = _settingsService.GetShellProfiles();
-            await _applicationView.RunOnDispatcherThread(async () =>
-            {
-                await _terminalView.ChangeKeyBindings(FlattenKeyBindings(keyBindings, profiles)).ConfigureAwait(false);
-            });
-        }
-
-        private async void OnKeyboardCommandReceived(object sender, string command)
-        {
-            if (command == nameof(Command.Copy))
+            if (e == Command.Copy)
             {
                 var selection = await _terminalView.GetSelection().ConfigureAwait(true);
                 _clipboardService.SetText(selection);
             }
-            else if (command == nameof(Command.Paste))
+            else if (e == Command.Paste)
             {
                 var content = await _clipboardService.GetText().ConfigureAwait(true);
                 if (content != null)
                 {
-                    await _trayProcessCommunicationService.WriteText(_terminalId, content).ConfigureAwait(true);
+                    await _terminalView.Write(content).ConfigureAwait(true);
                 }
             }
-            else if (command == nameof(Command.Search))
+            else if (e == Command.Search)
             {
                 ShowSearchPanel = !ShowSearchPanel;
                 if (ShowSearchPanel)
@@ -355,7 +313,7 @@ namespace FluentTerminal.App.ViewModels
             }
             else
             {
-                _keyboardCommandService.SendCommand(command);
+                _keyboardCommandService.SendCommand(e);
             }
         }
 
@@ -365,14 +323,6 @@ namespace FluentTerminal.App.ViewModels
             ShowResizeOverlay = false;
         }
 
-        private void OnTerminalExited(object sender, int e)
-        {
-            if (e == _terminalId)
-            {
-                _applicationView.RunOnDispatcherThread(() => Closed?.Invoke(this, EventArgs.Empty));
-            }
-        }
-
         private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
         {
             await _applicationView.RunOnDispatcherThread(async () =>
@@ -397,25 +347,55 @@ namespace FluentTerminal.App.ViewModels
             Title = e;
         }
 
-        private void SelectTabTheme(string name)
+        private IEnumerable<KeyBinding> FlattenKeyBindings(IDictionary<Command, ICollection<KeyBinding>> keyBindings)
         {
-            TabTheme = TabThemes.FirstOrDefault(t => t.Name == name);
+            return keyBindings.Values.SelectMany(k => k);
         }
 
-        private async Task TryClose()
+        private Task FindNext()
         {
-            if (ApplicationSettings.ConfirmClosingTabs)
-            {
-                var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to close this tab?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            return _terminalView.FindNext(SearchText);
+        }
 
-                if (result == DialogButton.Cancel)
+        private Task FindPrevious()
+        {
+            return _terminalView.FindPrevious(SearchText);
+        }
+
+        private void CloseSearchPanel()
+        {
+            SearchText = string.Empty;
+            ShowSearchPanel = false;
+            _terminalView.FocusTerminal();
+        }
+
+        private const int FirstDynamicPort = 49151;
+
+        public static int? GetAvailablePort()
+        {
+            var usedPorts = new List<int>();
+
+            var properties = IPGlobalProperties.GetIPGlobalProperties();
+
+            var connections = properties.GetActiveTcpConnections();
+            usedPorts.AddRange(connections.Where(c => c.LocalEndPoint.Port >= FirstDynamicPort).Select(c => c.LocalEndPoint.Port));
+
+            var endPoints = properties.GetActiveTcpListeners();
+            usedPorts.AddRange(endPoints.Where(e => e.Port >= FirstDynamicPort).Select(e => e.Port));
+
+            endPoints = properties.GetActiveUdpListeners();
+            usedPorts.AddRange(endPoints.Where(e => e.Port >= FirstDynamicPort).Select(e => e.Port));
+
+            usedPorts.Sort();
+
+            for (var i = FirstDynamicPort; i < UInt16.MaxValue; i++)
+            {
+                if (!usedPorts.Contains(i))
                 {
-                    return;
+                    return i;
                 }
             }
-
-            await _trayProcessCommunicationService.CloseTerminal(_terminalId).ConfigureAwait(true);
-            Closed?.Invoke(this, EventArgs.Empty);
+            return null;
         }
     }
 }

FluentTerminal.App.ViewModels/Utilities/TaskUtilities.cs

@@ -1,23 +0,0 @@
-using FluentTerminal.App.ViewModels.Infrastructure;
-using System;
-using System.Threading.Tasks;
-
-namespace FluentTerminal.App.ViewModels.Utilities
-{
-    public static class TaskUtilities
-    {
-        #pragma warning disable RECS0165 // Asynchronous methods should return a Task instead of void
-        public static async void FireAndForgetSafeAsync(this Task task, IErrorHandler handler = null)
-        #pragma warning restore RECS0165 // Asynchronous methods should return a Task instead of void
-        {
-            try
-            {
-                await task;
-            }
-            catch (Exception ex)
-            {
-                handler?.HandleError(ex);
-            }
-        }
-    }
-}

FluentTerminal.App/Adapters/AppServiceConnectionAdapter.cs

@@ -1,5 +1,4 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.Models;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -12,24 +11,9 @@ namespace FluentTerminal.App.Adapters
     {
         private readonly AppServiceConnection _appServiceConnection;
 
-        public event EventHandler<IDictionary<string, string>> MessageReceived;
-
         public AppServiceConnectionAdapter(AppServiceConnection appServiceConnection)
         {
             _appServiceConnection = appServiceConnection;
-            _appServiceConnection.RequestReceived += OnRequestReceived;
-        }
-
-        private void OnRequestReceived(AppServiceConnection sender, AppServiceRequestReceivedEventArgs args)
-        {
-            var messageType = (string)args.Request.Message[MessageKeys.Type];
-            var messageContent = (string)args.Request.Message[MessageKeys.Content];
-
-            MessageReceived?.Invoke(this, new Dictionary<string, string>
-            {
-                [MessageKeys.Type] = messageType,
-                [MessageKeys.Content] = messageContent
-            });
         }
 
         public async Task<IDictionary<string, string>> SendMessageAsync(IDictionary<string, string> message)
@@ -55,4 +39,4 @@ namespace FluentTerminal.App.Adapters
             return null;
         }
     }
-}
+}

FluentTerminal.App/Adapters/ApplicationDataContainerAdapter.cs

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

FluentTerminal.App/Adapters/ApplicationViewAdapter.cs

@@ -57,14 +57,12 @@ namespace FluentTerminal.App.Adapters
             var deferral = e.GetDeferral();
 
             var args = new CancelableEventArgs();
-            if (CloseRequested != null)
-            {
-                await CloseRequested.Invoke(this, args);
-            }
+            await CloseRequested?.Invoke(this, args);
 
             e.Handled = args.Cancelled;
 
             deferral.Complete();
         }
     }
-}
+}
+

FluentTerminal.App/Adapters/DispatcherTimerAdapter.cs

@@ -1,5 +1,5 @@
-using FluentTerminal.App.Services;
-using System;
+using System;
+using FluentTerminal.App.Services;
 using Windows.UI.Xaml;
 
 namespace FluentTerminal.App.Adapters
@@ -39,4 +39,4 @@ namespace FluentTerminal.App.Adapters
             _dispatcherTimer.Stop();
         }
     }
-}
+}

FluentTerminal.App/App.xaml

@@ -8,10 +8,6 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Styles\Custom.xaml" />
             </ResourceDictionary.MergedDictionaries>
-            <LinearGradientBrush x:Key="MissingColorSelectionBrush" StartPoint="0,0" EndPoint="1,1">
-                <GradientStop Offset="0" Color="Black" />
-                <GradientStop Offset="1.0" Color="White" />
-            </LinearGradientBrush>
             <converters:IntToVisibilityConverter
                 x:Key="OneToVisibleConverter"
                 Else="Collapsed"
@@ -25,7 +21,6 @@
             <converters:NegateConverter x:Key="NegateConverter" />
             <converters:FalseToVisibleConverter x:Key="FalseToVisibleConverter" />
             <converters:TrueToVisibleConverter x:Key="TrueToVisibleConverter" />
-            <converters:TabColorFallbackConverter x:Key="TabColorFallbackConverter" />
             <converters:IntToVisibilityConverter
                 x:Key="ZeroToCollapsedConverter"
                 Else="Visible"
@@ -34,9 +29,6 @@
             <converters:IntToExtendedVirtualKeyConverter x:Key="IntToExtendedVirtualKeyConverter" />
             <converters:BackgroundToApplicationThemeConverter x:Key="BackgroundToApplicationThemeConverter" />
             <converters:StringToColorConverter x:Key="StringToColorConverter" />
-            <converters:EnumValueToVisibiltyConverter x:Key="EnumValueToVisibiltyConverter" />
-            <converters:TabThemeSelectedConverter x:Key="TabThemeSelectedConverter" />
-            <converters:ColorResourceKeyFallbackConverter x:Key="ColorResourceKeyFallbackConverter" />
         </ResourceDictionary>
     </Application.Resources>
-</Application>
+</Application>

FluentTerminal.App/App.xaml.cs

@@ -2,7 +2,6 @@
 using FluentTerminal.App.Adapters;
 using FluentTerminal.App.Dialogs;
 using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Adapters;
 using FluentTerminal.App.Services.Dialogs;
 using FluentTerminal.App.Services.Implementation;
 using FluentTerminal.App.ViewModels;
@@ -30,6 +29,10 @@ namespace FluentTerminal.App
 {
     public sealed partial class App : Application
     {
+        public const string ThemesContainerName = "Themes";
+        public const string KeyBindingsContainerName = "KeyBindings";
+        public const string ShellProfilesContainerName = "ShellProfiles";
+
         public TaskCompletionSource<int> _trayReady = new TaskCompletionSource<int>();
         private readonly ISettingsService _settingsService;
         private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
@@ -52,9 +55,9 @@ namespace FluentTerminal.App
             {
                 LocalSettings = new ApplicationDataContainerAdapter(ApplicationData.Current.LocalSettings),
                 RoamingSettings = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings),
-                KeyBindings = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings.CreateContainer(Constants.KeyBindingsContainerName, ApplicationDataCreateDisposition.Always)),
-                ShellProfiles = new ApplicationDataContainerAdapter(ApplicationData.Current.LocalSettings.CreateContainer(Constants.ShellProfilesContainerName, ApplicationDataCreateDisposition.Always)),
-                Themes = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings.CreateContainer(Constants.ThemesContainerName, ApplicationDataCreateDisposition.Always))
+                KeyBindings = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings.CreateContainer(KeyBindingsContainerName, ApplicationDataCreateDisposition.Always)),
+                ShellProfiles = new ApplicationDataContainerAdapter(ApplicationData.Current.LocalSettings.CreateContainer(ShellProfilesContainerName, ApplicationDataCreateDisposition.Always)),
+                Themes = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings.CreateContainer(ThemesContainerName, ApplicationDataCreateDisposition.Always))
             };
 
             var builder = new ContainerBuilder();
@@ -63,8 +66,6 @@ namespace FluentTerminal.App
             builder.RegisterType<TrayProcessCommunicationService>().As<ITrayProcessCommunicationService>().SingleInstance();
             builder.RegisterType<DialogService>().As<IDialogService>().SingleInstance();
             builder.RegisterType<KeyboardCommandService>().As<IKeyboardCommandService>().InstancePerDependency();
-            builder.RegisterType<NotificationService>().As<INotificationService>().InstancePerDependency();
-            builder.RegisterType<UpdateService>().As<IUpdateService>().InstancePerDependency();
             builder.RegisterType<MainViewModel>().InstancePerDependency();
             builder.RegisterType<SettingsViewModel>().InstancePerDependency();
             builder.RegisterType<ThemeParserFactory>().As<IThemeParserFactory>().SingleInstance();
@@ -78,7 +79,6 @@ namespace FluentTerminal.App
             builder.RegisterType<MessageDialogAdapter>().As<IMessageDialog>().InstancePerDependency();
             builder.RegisterType<ApplicationViewAdapter>().As<IApplicationView>().InstancePerDependency();
             builder.RegisterType<DispatcherTimerAdapter>().As<IDispatcherTimer>().InstancePerDependency();
-            builder.RegisterType<StartupTaskService>().As<IStartupTaskService>().SingleInstance();
             builder.RegisterInstance(applicationDataContainers);
 
             _container = builder.Build();
@@ -114,7 +114,7 @@ namespace FluentTerminal.App
                     {
                         if (_applicationSettings.NewTerminalLocation == NewTerminalLocation.Tab && _mainViewModels.Count > 0)
                         {
-                            await _mainViewModels.Last().AddTerminal(parameter, false, Guid.Empty).ConfigureAwait(true);
+                            await _mainViewModels.Last().AddTerminal(parameter, false).ConfigureAwait(true);
                         }
                         else
                         {
@@ -132,7 +132,7 @@ namespace FluentTerminal.App
                     else if (command == "new")
                     {
                         var viewModel = _container.Resolve<MainViewModel>();
-                        await viewModel.AddTerminal(parameter, false, Guid.Empty).ConfigureAwait(true);
+                        await viewModel.AddTerminal(parameter, false).ConfigureAwait(true);
                         await CreateMainView(typeof(MainPage), viewModel, true).ConfigureAwait(true);
                     }
                 }
@@ -144,7 +144,7 @@ namespace FluentTerminal.App
             if (!_alreadyLaunched)
             {
                 var viewModel = _container.Resolve<MainViewModel>();
-                await viewModel.AddTerminal(null, false, Guid.Empty).ConfigureAwait(true);
+                await viewModel.AddTerminal(null, false).ConfigureAwait(true);
                 await CreateMainView(typeof(MainPage), viewModel, true).ConfigureAwait(true);
                 Window.Current.Activate();
             }
@@ -201,7 +201,6 @@ namespace FluentTerminal.App
                     mainViewModel.Closed += OnMainViewModelClosed;
                     mainViewModel.NewWindowRequested += OnNewWindowRequested;
                     mainViewModel.ShowSettingsRequested += OnShowSettingsRequested;
-                    mainViewModel.ShowAboutRequested += OnShowAboutRequested;
                     _mainViewModels.Add(mainViewModel);
                 }
 
@@ -239,9 +238,8 @@ namespace FluentTerminal.App
                 mainViewModel.Closed += OnMainViewModelClosed;
                 mainViewModel.NewWindowRequested += OnNewWindowRequested;
                 mainViewModel.ShowSettingsRequested += OnShowSettingsRequested;
-                mainViewModel.ShowAboutRequested += OnShowAboutRequested;
                 _mainViewModels.Add(mainViewModel);
-                await mainViewModel.AddTerminal(directory, false, Guid.Empty).ConfigureAwait(true);
+                await mainViewModel.AddTerminal(directory, false).ConfigureAwait(true);
             }
 
             if (viewModel is SettingsViewModel settingsViewModel)
@@ -282,22 +280,11 @@ namespace FluentTerminal.App
             _settingsWindowId = null;
         }
 
-        private void OnShowAboutRequested(object sender, EventArgs e)
-        {
-            ShowAbout().ConfigureAwait(true);
-        }
-
         private async void OnShowSettingsRequested(object sender, EventArgs e)
         {
             await ShowSettings().ConfigureAwait(true);
         }
 
-        private async Task ShowAbout()
-        {
-            await ShowSettings().ConfigureAwait(true);
-            _settingsViewModel.NavigateToAboutPage();
-        }
-
         private async Task ShowSettings()
         {
             if (_settingsViewModel == null)
@@ -309,10 +296,10 @@ namespace FluentTerminal.App
 
         private async Task StartSystemTray()
         {
-            var launch = FullTrustProcessLauncher.LaunchFullTrustProcessForCurrentAppAsync("AppLaunchedParameterGroup").AsTask();
+            var launch = FullTrustProcessLauncher.LaunchFullTrustProcessForCurrentAppAsync().AsTask();
             var clearCache = WebView.ClearTemporaryWebDataAsync().AsTask();
             await Task.WhenAll(launch, clearCache, _trayReady.Task).ConfigureAwait(true);
-            _trayProcessCommunicationService.Initialize(_appServiceConnection);
+            await _trayProcessCommunicationService.Initialize(_appServiceConnection).ConfigureAwait(true);
         }
     }
 }

FluentTerminal.App/Converters/BackgroundToApplicationThemeConverter.cs

@@ -14,8 +14,7 @@ namespace FluentTerminal.App.Converters
             if (value is string colorString)
             {
                 color = colorString.ToColor();
-            }
-            else if (value is Color)
+            } else if (value is Color)
             {
                 color = (Color)value;
             }
@@ -33,4 +32,4 @@ namespace FluentTerminal.App.Converters
             throw new NotImplementedException();
         }
     }
-}
+}

FluentTerminal.App/Converters/ColorResourceKeyFallbackConverter.cs

@@ -1,30 +0,0 @@
-using Microsoft.Toolkit.Uwp.Helpers;
-using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Media;
-
-namespace FluentTerminal.App.Converters
-{
-    public class ColorResourceKeyFallbackConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value == null)
-            {
-                return Application.Current.Resources[(string)parameter];
-            }
-            else if (value is string hex)
-            {
-                var color = hex.ToColor();
-                return new SolidColorBrush(color);
-            }
-            return null;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

FluentTerminal.App/Converters/EnumValueToVisibiltyConverter.cs

@@ -1,23 +0,0 @@
-using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Data;
-
-namespace FluentTerminal.App.Converters
-{
-    public class EnumValueToVisibiltyConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value.GetType().IsEnum && Enum.TryParse(value.GetType(), parameter.ToString(), true, out object result))
-            {
-                return Equals(value, result) ? Visibility.Visible : Visibility.Collapsed;
-            }
-            return null;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

FluentTerminal.App/Converters/FalseToVisibleConverter.cs

@@ -24,4 +24,4 @@ namespace FluentTerminal.App.Converters
             return null;
         }
     }
-}
+}

FluentTerminal.App/Converters/IntToExtendedVirtualKeyConverter.cs

@@ -21,4 +21,4 @@ namespace FluentTerminal.App.Converters
             throw new NotImplementedException();
         }
     }
-}
+}

FluentTerminal.App/Converters/NegateConverter.cs

@@ -19,4 +19,4 @@ namespace FluentTerminal.App.Converters
             throw new NotImplementedException();
         }
     }
-}
+}

FluentTerminal.App/Converters/StringToColorConverter.cs

@@ -13,7 +13,6 @@ namespace FluentTerminal.App.Converters
             {
                 return colorString.FromString();
             }
-
             return null;
         }
 
@@ -26,4 +25,4 @@ namespace FluentTerminal.App.Converters
             return null;
         }
     }
-}
+}

FluentTerminal.App/Converters/TabColorFallbackConverter.cs

@@ -1,82 +0,0 @@
-using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
-using Microsoft.Toolkit.Uwp.Helpers;
-using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Media;
-
-namespace FluentTerminal.App.Converters
-{
-    public class TabColorFallbackConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is TabTheme theme && Enum.TryParse<TabThemeKey>((string)parameter, true, out TabThemeKey tabThemeKey))
-            {
-                switch (tabThemeKey)
-                {
-                    case TabThemeKey.Background:
-                        return GetBrush(tabThemeKey, theme.Color, theme.BackgroundOpacity);
-                    case TabThemeKey.BackgroundPointerOver:
-                        return GetBrush(tabThemeKey, theme.Color, theme.BackgroundPointerOverOpacity);
-                    case TabThemeKey.BackgroundPressed:
-                        return GetBrush(tabThemeKey, theme.Color, theme.BackgroundPressedOpacity);
-                    case TabThemeKey.BackgroundSelected:
-                        return GetBrush(tabThemeKey, theme.Color, theme.BackgroundSelectedOpacity);
-                    case TabThemeKey.BackgroundSelectedPointerOver:
-                        return GetBrush(tabThemeKey, theme.Color, theme.BackgroundSelectedPointerOverOpacity);
-                    case TabThemeKey.BackgroundSelectedPressed:
-                        return GetBrush(tabThemeKey, theme.Color, theme.BackgroundSelectedPressedOpacity);
-                }
-            }
-            return null;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-
-        private Brush GetBrush(TabThemeKey tabThemeKey, string color, double opacity)
-        {
-            if (double.IsNaN(opacity))
-            {
-                return (Brush)Application.Current.Resources[GetFallbackRessourceKey(tabThemeKey)];
-            }
-            else
-            {
-                return CreateBrush(color, opacity);
-            }
-        }
-
-        private Brush CreateBrush(string hex, double opacity)
-        {
-            var color = hex.ToColor();
-            return new SolidColorBrush(color)
-            {
-                Opacity = opacity
-            };
-        }
-
-        private string GetFallbackRessourceKey(TabThemeKey tabThemeKey)
-        {
-            switch (tabThemeKey)
-            {
-                case TabThemeKey.Background:
-                    return "SystemControlTransparentBrush";
-                case TabThemeKey.BackgroundPointerOver:
-                    return "SystemControlHighlightListLowBrush";
-                case TabThemeKey.BackgroundPressed:
-                    return "SystemControlHighlightListMediumBrush";
-                case TabThemeKey.BackgroundSelected:
-                    return "SystemControlHighlightListAccentLowBrush";
-                case TabThemeKey.BackgroundSelectedPointerOver:
-                    return "SystemControlHighlightListAccentMediumBrush";
-                case TabThemeKey.BackgroundSelectedPressed:
-                    return "SystemControlHighlightListAccentHighBrush";
-            }
-            return null;
-        }
-    }
-}

FluentTerminal.App/Converters/TabThemeSelectedConverter.cs

@@ -1,23 +0,0 @@
-using FluentTerminal.Models;
-using System;
-using Windows.UI.Xaml.Data;
-
-namespace FluentTerminal.App.Converters
-{
-    public class TabThemeSelectedConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is TabTheme theme && parameter is string name)
-            {
-                return theme.Name == name;
-            }
-            return null;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

FluentTerminal.App/Converters/TerminalViewModelToViewConverter.cs

@@ -8,24 +8,24 @@ namespace FluentTerminal.App.Converters
 {
     internal class TerminalViewModelToViewConverter : IValueConverter
     {
-        private readonly Dictionary<TerminalViewModel, TerminalView> _viewDictionary;
+        private readonly Dictionary<int, TerminalView> _viewDictionary;
 
         public TerminalViewModelToViewConverter()
         {
-            _viewDictionary = new Dictionary<TerminalViewModel, TerminalView>();
+            _viewDictionary = new Dictionary<int, TerminalView>();
         }
 
         public object Convert(object value, Type targetType, object parameter, string language)
         {
             if (value is TerminalViewModel terminal)
             {
-                if (_viewDictionary.TryGetValue(terminal, out TerminalView view))
+                if (_viewDictionary.TryGetValue(terminal.Id, out TerminalView view))
                 {
                     return view;
                 }
 
                 var newView = new TerminalView(terminal);
-                _viewDictionary.Add(terminal, newView);
+                _viewDictionary.Add(terminal.Id, newView);
                 return newView;
             }
             return null;

FluentTerminal.App/Converters/ToolTipValueToPixelConverter.cs

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

FluentTerminal.App/Converters/TrueToVisibleConverter.cs

@@ -24,4 +24,4 @@ namespace FluentTerminal.App.Converters
             return null;
         }
     }
-}
+}

FluentTerminal.App/Dialogs/CreateKeyBindingDialog.xaml

@@ -76,4 +76,4 @@
                 PreviewKeyDown="OnResetButtonPreviewKeyDown" />
         </StackPanel>
     </StackPanel>
-</ContentDialog>
+</ContentDialog>

FluentTerminal.App/Dialogs/CreateKeyBindingDialog.xaml.cs

@@ -1,13 +1,13 @@
-using FluentTerminal.App.Services.Dialogs;
-using FluentTerminal.Models;
-using GalaSoft.MvvmLight.Command;
-using System;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using FluentTerminal.App.Services.Dialogs;
+using FluentTerminal.Models;
+using GalaSoft.MvvmLight.Command;
 using Windows.System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using System;
 
 namespace FluentTerminal.App.Dialogs
 {
@@ -92,20 +92,16 @@ namespace FluentTerminal.App.Dialogs
                 case VirtualKey.Control:
                     Ctrl = true;
                     break;
-
                 case VirtualKey.Shift:
                     Shift = true;
                     break;
-
                 case VirtualKey.Menu:
                     Alt = true;
                     break;
-
                 case VirtualKey.LeftWindows:
                 case VirtualKey.RightWindows:
                     Meta = true;
                     break;
-
                 default:
                     Key = (int)e.Key;
                     break;

FluentTerminal.App/Dialogs/ShellProfileSelectionDialog.xaml

@@ -14,4 +14,4 @@
         DisplayMemberPath="Name"
         ItemsSource="{x:Bind Profiles}"
         SelectedItem="{x:Bind SelectedProfile, Mode=TwoWay}" />
-</ContentDialog>
+</ContentDialog>

FluentTerminal.App/Dialogs/ShellProfileSelectionDialog.xaml.cs

@@ -1,8 +1,8 @@
-using FluentTerminal.App.Services;
+using System;
+using FluentTerminal.App.Services;
 using FluentTerminal.App.Services.Dialogs;
 using FluentTerminal.App.Utilities;
 using FluentTerminal.Models;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -35,4 +35,4 @@ namespace FluentTerminal.App.Dialogs
             return null;
         }
     }
-}
+}

FluentTerminal.App/FluentTerminal.App.csproj

@@ -25,7 +25,6 @@
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
     <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
-    <AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -104,6 +103,7 @@
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="Adapters\ApplicationDataContainerAdapter.cs" />
     <Compile Include="Adapters\ApplicationViewAdapter.cs" />
     <Compile Include="Adapters\AppServiceConnectionAdapter.cs" />
     <Compile Include="Adapters\DispatcherTimerAdapter.cs" />
@@ -112,17 +112,12 @@
     </Compile>
     <Compile Include="Behaviors\MiddleClickBehavior.cs" />
     <Compile Include="Converters\BackgroundToApplicationThemeConverter.cs" />
-    <Compile Include="Converters\ColorResourceKeyFallbackConverter.cs" />
-    <Compile Include="Converters\TabColorFallbackConverter.cs" />
-    <Compile Include="Converters\EnumValueToVisibiltyConverter.cs" />
     <Compile Include="Converters\FalseToVisibleConverter.cs" />
     <Compile Include="Converters\IntToExtendedVirtualKeyConverter.cs" />
     <Compile Include="Converters\IntToVisibilityConverter.cs" />
     <Compile Include="Converters\NegateConverter.cs" />
     <Compile Include="Converters\StringToColorConverter.cs" />
-    <Compile Include="Converters\TabThemeSelectedConverter.cs" />
     <Compile Include="Converters\TerminalViewModelToViewConverter.cs" />
-    <Compile Include="Converters\ToolTipValueToPixelConverter.cs" />
     <Compile Include="Converters\TrueToVisibleConverter.cs" />
     <Compile Include="Adapters\MessageDialogAdapter.cs" />
     <Compile Include="Dialogs\ShellProfileSelectionDialog.xaml.cs">
@@ -130,7 +125,6 @@
     </Compile>
     <Compile Include="Services\ClipboardService.cs" />
     <Compile Include="Services\FileSystemService.cs" />
-    <Compile Include="Services\StartupTaskService.cs" />
     <Compile Include="Services\SystemFontService.cs" />
     <Compile Include="Utilities\ColorExtensions.cs" />
     <Compile Include="Utilities\ContrastHelper.cs" />
@@ -147,12 +141,6 @@
     <Compile Include="Views\SettingsPage.xaml.cs">
       <DependentUpon>SettingsPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\SettingsPages\About.xaml.cs">
-      <DependentUpon>About.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\SettingsPages\MouseSettings.xaml.cs">
-      <DependentUpon>MouseSettings.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\SettingsPages\ThemeSettings.xaml.cs">
       <DependentUpon>ThemeSettings.xaml</DependentUpon>
     </Compile>
@@ -168,15 +156,9 @@
     <Compile Include="Views\SettingsPages\ShellProfileSettings.xaml.cs">
       <DependentUpon>ShellProfileSettings.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\TabBar.xaml.cs">
-      <DependentUpon>TabBar.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\TabBarBackgroundBindingHelper.cs" />
-    <Compile Include="Views\TabThemeTemplateSelector.cs" />
     <Compile Include="Views\TerminalColorPicker.xaml.cs">
       <DependentUpon>TerminalColorPicker.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\TerminalThemeTemplateSelector.cs" />
     <Compile Include="Views\TerminalView.xaml.cs">
       <DependentUpon>TerminalView.xaml</DependentUpon>
     </Compile>
@@ -185,18 +167,15 @@
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
-    <Content Include="Assets\AppIcons\Square106x106Logo.black.png" />
     <Content Include="Assets\settingsicons.ttf" />
     <Content Include="Win32\Autofac.dll" />
-    <Content Include="Win32\FluentTerminal.App.Services.dll" />
-    <Content Include="Win32\FluentTerminal.App.Services.pdb" />
+    <Content Include="Win32\Fleck.dll" />
     <Content Include="Win32\FluentTerminal.Models.dll" />
     <Content Include="Win32\FluentTerminal.Models.pdb" />
     <Content Include="Win32\FluentTerminal.SystemTray.exe" />
     <Content Include="Win32\FluentTerminal.SystemTray.pdb" />
     <Content Include="Win32\GlobalHotKey.dll" />
     <Content Include="Win32\Newtonsoft.Json.dll" />
-    <Content Include="Win32\RestSharp.dll" />
     <Content Include="Win32\System.Data.Common.dll" />
     <Content Include="Win32\System.Diagnostics.StackTrace.dll" />
     <Content Include="Win32\System.Diagnostics.Tracing.dll" />
@@ -300,14 +279,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\SettingsPages\About.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\SettingsPages\MouseSettings.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Views\SettingsPages\ThemeSettings.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -328,10 +299,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\TabBar.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Views\TerminalColorPicker.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

FluentTerminal.App/Package.StoreAssociation.xml.dev

@@ -1,360 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<StoreAssociation xmlns="http://schemas.microsoft.com/appx/2010/storeassociation">
-  <Publisher>CN=BDC72197-B634-438A-B863-16DCB7D90C85</Publisher>
-  <NamespacePrefix>53621FSApps</NamespacePrefix>
-  <PublisherDisplayName>FS Apps</PublisherDisplayName>
-  <GeneratePackageHash>http://www.w3.org/2001/04/xmlenc#sha256</GeneratePackageHash>
-  <SupportedLocales>
-    <Language Code="af" InMinimumRequirementSet="false" />
-    <Language Code="af-za" InMinimumRequirementSet="false" />
-    <Language Code="am" InMinimumRequirementSet="false" />
-    <Language Code="am-et" InMinimumRequirementSet="false" />
-    <Language Code="ar" InMinimumRequirementSet="true" />
-    <Language Code="ar-ae" InMinimumRequirementSet="true" />
-    <Language Code="ar-bh" InMinimumRequirementSet="true" />
-    <Language Code="ar-dz" InMinimumRequirementSet="true" />
-    <Language Code="ar-eg" InMinimumRequirementSet="true" />
-    <Language Code="ar-iq" InMinimumRequirementSet="true" />
-    <Language Code="ar-jo" InMinimumRequirementSet="true" />
-    <Language Code="ar-kw" InMinimumRequirementSet="true" />
-    <Language Code="ar-lb" InMinimumRequirementSet="true" />
-    <Language Code="ar-ly" InMinimumRequirementSet="true" />
-    <Language Code="ar-ma" InMinimumRequirementSet="true" />
-    <Language Code="ar-om" InMinimumRequirementSet="true" />
-    <Language Code="ar-qa" InMinimumRequirementSet="true" />
-    <Language Code="ar-sa" InMinimumRequirementSet="true" />
-    <Language Code="ar-sy" InMinimumRequirementSet="true" />
-    <Language Code="ar-tn" InMinimumRequirementSet="true" />
-    <Language Code="ar-ye" InMinimumRequirementSet="true" />
-    <Language Code="as" InMinimumRequirementSet="false" />
-    <Language Code="as-in" InMinimumRequirementSet="false" />
-    <Language Code="az" InMinimumRequirementSet="false" />
-    <Language Code="az-arab" InMinimumRequirementSet="false" />
-    <Language Code="az-arab-az" InMinimumRequirementSet="false" />
-    <Language Code="az-cyrl" InMinimumRequirementSet="false" />
-    <Language Code="az-cyrl-az" InMinimumRequirementSet="false" />
-    <Language Code="az-latn" InMinimumRequirementSet="false" />
-    <Language Code="az-latn-az" InMinimumRequirementSet="false" />
-    <Language Code="be" InMinimumRequirementSet="false" />
-    <Language Code="be-by" InMinimumRequirementSet="false" />
-    <Language Code="bg" InMinimumRequirementSet="true" />
-    <Language Code="bg-bg" InMinimumRequirementSet="true" />
-    <Language Code="bn" InMinimumRequirementSet="false" />
-    <Language Code="bn-bd" InMinimumRequirementSet="false" />
-    <Language Code="bn-in" InMinimumRequirementSet="false" />
-    <Language Code="bs" InMinimumRequirementSet="false" />
-    <Language Code="bs-cyrl" InMinimumRequirementSet="false" />
-    <Language Code="bs-cyrl-ba" InMinimumRequirementSet="false" />
-    <Language Code="bs-latn" InMinimumRequirementSet="false" />
-    <Language Code="bs-latn-ba" InMinimumRequirementSet="false" />
-    <Language Code="ca" InMinimumRequirementSet="false" />
-    <Language Code="ca-es" InMinimumRequirementSet="false" />
-    <Language Code="ca-es-valencia" InMinimumRequirementSet="false" />
-    <Language Code="chr-cher" InMinimumRequirementSet="false" />
-    <Language Code="chr-cher-us" InMinimumRequirementSet="false" />
-    <Language Code="chr-latn" InMinimumRequirementSet="false" />
-    <Language Code="cs" InMinimumRequirementSet="true" />
-    <Language Code="cs-cz" InMinimumRequirementSet="true" />
-    <Language Code="cy" InMinimumRequirementSet="false" />
-    <Language Code="cy-gb" InMinimumRequirementSet="false" />
-    <Language Code="da" InMinimumRequirementSet="true" />
-    <Language Code="da-dk" InMinimumRequirementSet="true" />
-    <Language Code="de" InMinimumRequirementSet="true" />
-    <Language Code="de-at" InMinimumRequirementSet="true" />
-    <Language Code="de-ch" InMinimumRequirementSet="true" />
-    <Language Code="de-de" InMinimumRequirementSet="true" />
-    <Language Code="de-li" InMinimumRequirementSet="true" />
-    <Language Code="de-lu" InMinimumRequirementSet="true" />
-    <Language Code="el" InMinimumRequirementSet="true" />
-    <Language Code="el-gr" InMinimumRequirementSet="true" />
-    <Language Code="en" InMinimumRequirementSet="true" />
-    <Language Code="en-au" InMinimumRequirementSet="true" />
-    <Language Code="en-bz" InMinimumRequirementSet="true" />
-    <Language Code="en-ca" InMinimumRequirementSet="true" />
-    <Language Code="en-gb" InMinimumRequirementSet="true" />
-    <Language Code="en-hk" InMinimumRequirementSet="true" />
-    <Language Code="en-id" InMinimumRequirementSet="true" />
-    <Language Code="en-ie" InMinimumRequirementSet="true" />
-    <Language Code="en-in" InMinimumRequirementSet="true" />
-    <Language Code="en-jm" InMinimumRequirementSet="true" />
-    <Language Code="en-kz" InMinimumRequirementSet="true" />
-    <Language Code="en-mt" InMinimumRequirementSet="true" />
-    <Language Code="en-my" InMinimumRequirementSet="true" />
-    <Language Code="en-nz" InMinimumRequirementSet="true" />
-    <Language Code="en-ph" InMinimumRequirementSet="true" />
-    <Language Code="en-pk" InMinimumRequirementSet="true" />
-    <Language Code="en-sg" InMinimumRequirementSet="true" />
-    <Language Code="en-tt" InMinimumRequirementSet="true" />
-    <Language Code="en-us" InMinimumRequirementSet="true" />
-    <Language Code="en-vn" InMinimumRequirementSet="true" />
-    <Language Code="en-za" InMinimumRequirementSet="true" />
-    <Language Code="es" InMinimumRequirementSet="true" />
-    <Language Code="es-ar" InMinimumRequirementSet="true" />
-    <Language Code="es-bo" InMinimumRequirementSet="true" />
-    <Language Code="es-cl" InMinimumRequirementSet="true" />
-    <Language Code="es-co" InMinimumRequirementSet="true" />
-    <Language Code="es-cr" InMinimumRequirementSet="true" />
-    <Language Code="es-do" InMinimumRequirementSet="true" />
-    <Language Code="es-ec" InMinimumRequirementSet="true" />
-    <Language Code="es-es" InMinimumRequirementSet="true" />
-    <Language Code="es-gt" InMinimumRequirementSet="true" />
-    <Language Code="es-hn" InMinimumRequirementSet="true" />
-    <Language Code="es-mx" InMinimumRequirementSet="true" />
-    <Language Code="es-ni" InMinimumRequirementSet="true" />
-    <Language Code="es-pa" InMinimumRequirementSet="true" />
-    <Language Code="es-pe" InMinimumRequirementSet="true" />
-    <Language Code="es-pr" InMinimumRequirementSet="true" />
-    <Language Code="es-py" InMinimumRequirementSet="true" />
-    <Language Code="es-sv" InMinimumRequirementSet="true" />
-    <Language Code="es-us" InMinimumRequirementSet="true" />
-    <Language Code="es-uy" InMinimumRequirementSet="true" />
-    <Language Code="es-ve" InMinimumRequirementSet="true" />
-    <Language Code="et" InMinimumRequirementSet="true" />
-    <Language Code="et-ee" InMinimumRequirementSet="true" />
-    <Language Code="eu" InMinimumRequirementSet="false" />
-    <Language Code="eu-es" InMinimumRequirementSet="false" />
-    <Language Code="fa" InMinimumRequirementSet="false" />
-    <Language Code="fa-ir" InMinimumRequirementSet="false" />
-    <Language Code="fi" InMinimumRequirementSet="true" />
-    <Language Code="fi-fi" InMinimumRequirementSet="true" />
-    <Language Code="fil" InMinimumRequirementSet="false" />
-    <Language Code="fil-latn" InMinimumRequirementSet="false" />
-    <Language Code="fil-ph" InMinimumRequirementSet="false" />
-    <Language Code="fr" InMinimumRequirementSet="true" />
-    <Language Code="fr-015" InMinimumRequirementSet="true" />
-    <Language Code="fr-be" InMinimumRequirementSet="true" />
-    <Language Code="fr-ca" InMinimumRequirementSet="true" />
-    <Language Code="fr-cd" InMinimumRequirementSet="true" />
-    <Language Code="fr-ch" InMinimumRequirementSet="true" />
-    <Language Code="fr-ci" InMinimumRequirementSet="true" />
-    <Language Code="fr-cm" InMinimumRequirementSet="true" />
-    <Language Code="fr-fr" InMinimumRequirementSet="true" />
-    <Language Code="fr-ht" InMinimumRequirementSet="true" />
-    <Language Code="fr-lu" InMinimumRequirementSet="true" />
-    <Language Code="fr-ma" InMinimumRequirementSet="true" />
-    <Language Code="fr-mc" InMinimumRequirementSet="true" />
-    <Language Code="fr-ml" InMinimumRequirementSet="true" />
-    <Language Code="fr-re" InMinimumRequirementSet="true" />
-    <Language Code="frc" InMinimumRequirementSet="true" />
-    <Language Code="frc-latn" InMinimumRequirementSet="true" />
-    <Language Code="frp" InMinimumRequirementSet="true" />
-    <Language Code="frp-latn" InMinimumRequirementSet="true" />
-    <Language Code="ga" InMinimumRequirementSet="false" />
-    <Language Code="ga-ie" InMinimumRequirementSet="false" />
-    <Language Code="gd" InMinimumRequirementSet="false" />
-    <Language Code="gd-gb" InMinimumRequirementSet="false" />
-    <Language Code="gd-latn" InMinimumRequirementSet="false" />
-    <Language Code="gl" InMinimumRequirementSet="false" />
-    <Language Code="gl-es" InMinimumRequirementSet="false" />
-    <Language Code="gu" InMinimumRequirementSet="false" />
-    <Language Code="gu-in" InMinimumRequirementSet="false" />
-    <Language Code="ha-latn" InMinimumRequirementSet="false" />
-    <Language Code="ha-latn-ng" InMinimumRequirementSet="false" />
-    <Language Code="he" InMinimumRequirementSet="true" />
-    <Language Code="he-il" InMinimumRequirementSet="true" />
-    <Language Code="hi" InMinimumRequirementSet="true" />
-    <Language Code="hi-in" InMinimumRequirementSet="true" />
-    <Language Code="hr" InMinimumRequirementSet="true" />
-    <Language Code="hr-ba" InMinimumRequirementSet="true" />
-    <Language Code="hr-hr" InMinimumRequirementSet="true" />
-    <Language Code="hu" InMinimumRequirementSet="true" />
-    <Language Code="hu-hu" InMinimumRequirementSet="true" />
-    <Language Code="hy" InMinimumRequirementSet="false" />
-    <Language Code="hy-am" InMinimumRequirementSet="false" />
-    <Language Code="id" InMinimumRequirementSet="true" />
-    <Language Code="id-id" InMinimumRequirementSet="true" />
-    <Language Code="ig" InMinimumRequirementSet="false" />
-    <Language Code="ig-latn" InMinimumRequirementSet="false" />
-    <Language Code="ig-ng" InMinimumRequirementSet="false" />
-    <Language Code="is" InMinimumRequirementSet="false" />
-    <Language Code="is-is" InMinimumRequirementSet="false" />
-    <Language Code="it" InMinimumRequirementSet="true" />
-    <Language Code="it-ch" InMinimumRequirementSet="true" />
-    <Language Code="it-it" InMinimumRequirementSet="true" />
-    <Language Code="iu-cans" InMinimumRequirementSet="false" />
-    <Language Code="iu-latn" InMinimumRequirementSet="false" />
-    <Language Code="iu-latn-ca" InMinimumRequirementSet="false" />
-    <Language Code="ja" InMinimumRequirementSet="true" />
-    <Language Code="ja-jp" InMinimumRequirementSet="true" />
-    <Language Code="ka" InMinimumRequirementSet="false" />
-    <Language Code="ka-ge" InMinimumRequirementSet="false" />
-    <Language Code="kk" InMinimumRequirementSet="false" />
-    <Language Code="kk-kz" InMinimumRequirementSet="false" />
-    <Language Code="km" InMinimumRequirementSet="false" />
-    <Language Code="km-kh" InMinimumRequirementSet="false" />
-    <Language Code="kn" InMinimumRequirementSet="false" />
-    <Language Code="kn-in" InMinimumRequirementSet="false" />
-    <Language Code="ko" InMinimumRequirementSet="true" />
-    <Language Code="ko-kr" InMinimumRequirementSet="true" />
-    <Language Code="kok" InMinimumRequirementSet="false" />
-    <Language Code="kok-in" InMinimumRequirementSet="false" />
-    <Language Code="ku-arab" InMinimumRequirementSet="false" />
-    <Language Code="ku-arab-iq" InMinimumRequirementSet="false" />
-    <Language Code="ky" InMinimumRequirementSet="false" />
-    <Language Code="ky-cyrl" InMinimumRequirementSet="false" />
-    <Language Code="ky-kg" InMinimumRequirementSet="false" />
-    <Language Code="lb" InMinimumRequirementSet="false" />
-    <Language Code="lb-lu" InMinimumRequirementSet="false" />
-    <Language Code="lt" InMinimumRequirementSet="true" />
-    <Language Code="lt-lt" InMinimumRequirementSet="true" />
-    <Language Code="lv" InMinimumRequirementSet="true" />
-    <Language Code="lv-lv" InMinimumRequirementSet="true" />
-    <Language Code="mi" InMinimumRequirementSet="false" />
-    <Language Code="mi-latn" InMinimumRequirementSet="false" />
-    <Language Code="mi-nz" InMinimumRequirementSet="false" />
-    <Language Code="mk" InMinimumRequirementSet="false" />
-    <Language Code="mk-mk" InMinimumRequirementSet="false" />
-    <Language Code="ml" InMinimumRequirementSet="false" />
-    <Language Code="ml-in" InMinimumRequirementSet="false" />
-    <Language Code="mn" InMinimumRequirementSet="false" />
-    <Language Code="mn-cyrl" InMinimumRequirementSet="false" />
-    <Language Code="mn-mn" InMinimumRequirementSet="false" />
-    <Language Code="mn-mong" InMinimumRequirementSet="false" />
-    <Language Code="mn-phag" InMinimumRequirementSet="false" />
-    <Language Code="mr" InMinimumRequirementSet="false" />
-    <Language Code="mr-in" InMinimumRequirementSet="false" />
-    <Language Code="ms" InMinimumRequirementSet="false" />
-    <Language Code="ms-bn" InMinimumRequirementSet="false" />
-    <Language Code="ms-my" InMinimumRequirementSet="false" />
-    <Language Code="mt" InMinimumRequirementSet="false" />
-    <Language Code="mt-mt" InMinimumRequirementSet="false" />
-    <Language Code="nb" InMinimumRequirementSet="true" />
-    <Language Code="nb-no" InMinimumRequirementSet="true" />
-    <Language Code="ne" InMinimumRequirementSet="false" />
-    <Language Code="ne-np" InMinimumRequirementSet="false" />
-    <Language Code="nl" InMinimumRequirementSet="true" />
-    <Language Code="nl-be" InMinimumRequirementSet="true" />
-    <Language Code="nl-nl" InMinimumRequirementSet="true" />
-    <Language Code="nn" InMinimumRequirementSet="false" />
-    <Language Code="nn-no" InMinimumRequirementSet="false" />
-    <Language Code="no" InMinimumRequirementSet="true" />
-    <Language Code="no-no" InMinimumRequirementSet="true" />
-    <Language Code="nso" InMinimumRequirementSet="false" />
-    <Language Code="nso-za" InMinimumRequirementSet="false" />
-    <Language Code="or" InMinimumRequirementSet="false" />
-    <Language Code="or-in" InMinimumRequirementSet="false" />
-    <Language Code="pa" InMinimumRequirementSet="false" />
-    <Language Code="pa-arab" InMinimumRequirementSet="false" />
-    <Language Code="pa-arab-pk" InMinimumRequirementSet="false" />
-    <Language Code="pa-deva" InMinimumRequirementSet="false" />
-    <Language Code="pa-in" InMinimumRequirementSet="false" />
-    <Language Code="pl" InMinimumRequirementSet="true" />
-    <Language Code="pl-pl" InMinimumRequirementSet="true" />
-    <Language Code="prs" InMinimumRequirementSet="false" />
-    <Language Code="prs-af" InMinimumRequirementSet="false" />
-    <Language Code="prs-arab" InMinimumRequirementSet="false" />
-    <Language Code="pt" InMinimumRequirementSet="true" />
-    <Language Code="pt-br" InMinimumRequirementSet="true" />
-    <Language Code="pt-pt" InMinimumRequirementSet="true" />
-    <Language Code="quc" InMinimumRequirementSet="false" />
-    <Language Code="quc-latn" InMinimumRequirementSet="false" />
-    <Language Code="qut" InMinimumRequirementSet="false" />
-    <Language Code="qut-gt" InMinimumRequirementSet="false" />
-    <Language Code="qut-latn" InMinimumRequirementSet="false" />
-    <Language Code="quz" InMinimumRequirementSet="false" />
-    <Language Code="quz-bo" InMinimumRequirementSet="false" />
-    <Language Code="quz-ec" InMinimumRequirementSet="false" />
-    <Language Code="quz-pe" InMinimumRequirementSet="false" />
-    <Language Code="ro" InMinimumRequirementSet="true" />
-    <Language Code="ro-ro" InMinimumRequirementSet="true" />
-    <Language Code="ru" InMinimumRequirementSet="true" />
-    <Language Code="ru-ru" InMinimumRequirementSet="true" />
-    <Language Code="rw" InMinimumRequirementSet="false" />
-    <Language Code="rw-rw" InMinimumRequirementSet="false" />
-    <Language Code="sd-arab" InMinimumRequirementSet="false" />
-    <Language Code="sd-arab-pk" InMinimumRequirementSet="false" />
-    <Language Code="sd-deva" InMinimumRequirementSet="false" />
-    <Language Code="si" InMinimumRequirementSet="false" />
-    <Language Code="si-lk" InMinimumRequirementSet="false" />
-    <Language Code="sk" InMinimumRequirementSet="true" />
-    <Language Code="sk-sk" InMinimumRequirementSet="true" />
-    <Language Code="sl" InMinimumRequirementSet="true" />
-    <Language Code="sl-si" InMinimumRequirementSet="true" />
-    <Language Code="sq" InMinimumRequirementSet="false" />
-    <Language Code="sq-al" InMinimumRequirementSet="false" />
-    <Language Code="sr" InMinimumRequirementSet="true" />
-    <Language Code="sr-cyrl" InMinimumRequirementSet="false" />
-    <Language Code="sr-cyrl-ba" InMinimumRequirementSet="false" />
-    <Language Code="sr-cyrl-cs" InMinimumRequirementSet="false" />
-    <Language Code="sr-cyrl-me" InMinimumRequirementSet="false" />
-    <Language Code="sr-cyrl-rs" InMinimumRequirementSet="false" />
-    <Language Code="sr-latn" InMinimumRequirementSet="true" />
-    <Language Code="sr-latn-ba" InMinimumRequirementSet="true" />
-    <Language Code="sr-latn-cs" InMinimumRequirementSet="true" />
-    <Language Code="sr-latn-me" InMinimumRequirementSet="true" />
-    <Language Code="sr-latn-rs" InMinimumRequirementSet="true" />
-    <Language Code="sv" InMinimumRequirementSet="true" />
-    <Language Code="sv-fi" InMinimumRequirementSet="true" />
-    <Language Code="sv-se" InMinimumRequirementSet="true" />
-    <Language Code="sw" InMinimumRequirementSet="false" />
-    <Language Code="sw-ke" InMinimumRequirementSet="false" />
-    <Language Code="ta" InMinimumRequirementSet="false" />
-    <Language Code="ta-in" InMinimumRequirementSet="false" />
-    <Language Code="te" InMinimumRequirementSet="false" />
-    <Language Code="te-in" InMinimumRequirementSet="false" />
-    <Language Code="tg-arab" InMinimumRequirementSet="false" />
-    <Language Code="tg-cyrl" InMinimumRequirementSet="false" />
-    <Language Code="tg-cyrl-tj" InMinimumRequirementSet="false" />
-    <Language Code="tg-latn" InMinimumRequirementSet="false" />
-    <Language Code="th" InMinimumRequirementSet="true" />
-    <Language Code="th-th" InMinimumRequirementSet="true" />
-    <Language Code="ti" InMinimumRequirementSet="false" />
-    <Language Code="ti-et" InMinimumRequirementSet="false" />
-    <Language Code="tk" InMinimumRequirementSet="false" />
-    <Language Code="tk-cyrl" InMinimumRequirementSet="false" />
-    <Language Code="tk-latn" InMinimumRequirementSet="false" />
-    <Language Code="tk-tm" InMinimumRequirementSet="false" />
-    <Language Code="tk-tr" InMinimumRequirementSet="false" />
-    <Language Code="tn" InMinimumRequirementSet="false" />
-    <Language Code="tn-bw" InMinimumRequirementSet="false" />
-    <Language Code="tn-za" InMinimumRequirementSet="false" />
-    <Language Code="tr" InMinimumRequirementSet="true" />
-    <Language Code="tr-tr" InMinimumRequirementSet="true" />
-    <Language Code="tt" InMinimumRequirementSet="false" />
-    <Language Code="tt-arab" InMinimumRequirementSet="false" />
-    <Language Code="tt-cyrl" InMinimumRequirementSet="false" />
-    <Language Code="tt-latn" InMinimumRequirementSet="false" />
-    <Language Code="tt-ru" InMinimumRequirementSet="false" />
-    <Language Code="ug" InMinimumRequirementSet="false" />
-    <Language Code="ug-arab" InMinimumRequirementSet="false" />
-    <Language Code="ug-cn" InMinimumRequirementSet="false" />
-    <Language Code="ug-cyrl" InMinimumRequirementSet="false" />
-    <Language Code="ug-latn" InMinimumRequirementSet="false" />
-    <Language Code="uk" InMinimumRequirementSet="true" />
-    <Language Code="uk-ua" InMinimumRequirementSet="true" />
-    <Language Code="ur" InMinimumRequirementSet="false" />
-    <Language Code="ur-pk" InMinimumRequirementSet="false" />
-    <Language Code="uz-cyrl" InMinimumRequirementSet="false" />
-    <Language Code="uz-latn" InMinimumRequirementSet="false" />
-    <Language Code="uz-latn-uz" InMinimumRequirementSet="false" />
-    <Language Code="vi" InMinimumRequirementSet="false" />
-    <Language Code="vi-vn" InMinimumRequirementSet="false" />
-    <Language Code="wo" InMinimumRequirementSet="false" />
-    <Language Code="wo-sn" InMinimumRequirementSet="false" />
-    <Language Code="xh" InMinimumRequirementSet="false" />
-    <Language Code="xh-za" InMinimumRequirementSet="false" />
-    <Language Code="yo" InMinimumRequirementSet="false" />
-    <Language Code="yo-latn" InMinimumRequirementSet="false" />
-    <Language Code="yo-ng" InMinimumRequirementSet="false" />
-    <Language Code="zh-cn" InMinimumRequirementSet="true" />
-    <Language Code="zh-hans" InMinimumRequirementSet="true" />
-    <Language Code="zh-hans-cn" InMinimumRequirementSet="true" />
-    <Language Code="zh-hans-sg" InMinimumRequirementSet="true" />
-    <Language Code="zh-hant" InMinimumRequirementSet="true" />
-    <Language Code="zh-hant-hk" InMinimumRequirementSet="true" />
-    <Language Code="zh-hant-mo" InMinimumRequirementSet="true" />
-    <Language Code="zh-hant-tw" InMinimumRequirementSet="true" />
-    <Language Code="zh-hk" InMinimumRequirementSet="true" />
-    <Language Code="zh-tw" InMinimumRequirementSet="true" />
-    <Language Code="zu" InMinimumRequirementSet="false" />
-    <Language Code="zu-za" InMinimumRequirementSet="false" />
-  </SupportedLocales>
-  <ProductReservedInfo>
-    <MainPackageIdentityName>53621FSApps.FluentTerminal</MainPackageIdentityName>
-    <ReservedNames>
-      <ReservedName>Fluent Terminal</ReservedName>
-    </ReservedNames>
-  </ProductReservedInfo>
-  <AccountPackageIdentityNames />
-  <PackageInfoList LandingUrl="https://appdev.microsoft.com:443/StorePortals/Developer/Catalog/ReleaseAnchor/f9c07088-9f3e-4312-ad5b-0f3b4aeb9b37" />
-</StoreAssociation>

FluentTerminal.App/Package.appxmanifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" IgnorableNamespaces="uap mp desktop rescap">
-  <Identity Name="53621FSApps.FluentTerminal" Publisher="CN=BDC72197-B634-438A-B863-16DCB7D90C85" Version="0.3.0.0" />
+  <Identity Name="53621FSApps.FluentTerminal" Publisher="CN=BDC72197-B634-438A-B863-16DCB7D90C85" Version="0.1.11.0" />
   <mp:PhoneIdentity PhoneProductId="f7225014-f405-4342-ad2e-ebf6ac60ea2c" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Fluent Terminal</DisplayName>
@@ -26,19 +26,12 @@
         <uap:SplashScreen Image="Assets\AppIcons\SplashScreen.png" uap5:Optional="true" />
       </uap:VisualElements>
       <Extensions>
-        <desktop:Extension Category="windows.fullTrustProcess" Executable="Win32\FluentTerminal.SystemTray.exe">
-          <desktop:FullTrustProcess>
-            <desktop:ParameterGroup GroupId="AppLaunchedParameterGroup" Parameters="appLaunched" />
-          </desktop:FullTrustProcess>
-        </desktop:Extension>
+        <desktop:Extension Category="windows.fullTrustProcess" Executable="Win32\FluentTerminal.SystemTray.exe" />
         <uap5:Extension Category="windows.appExecutionAlias" Executable="FluentTerminal.App.exe" EntryPoint="FluentTerminal.App.App">
           <uap5:AppExecutionAlias>
             <uap5:ExecutionAlias Alias="flute.exe" />
           </uap5:AppExecutionAlias>
         </uap5:Extension>
-        <desktop:Extension Category="windows.startupTask" Executable="Win32\FluentTerminal.SystemTray.exe" EntryPoint="Windows.FullTrustApplication">
-          <desktop:StartupTask TaskId="FluentTerminalStartupTask" Enabled="false" DisplayName="Fluent Terminal" />
-        </desktop:Extension>
         <uap:Extension Category="windows.appService">
           <uap:AppService Name="FluentTerminalAppService" />
         </uap:Extension>

FluentTerminal.App/Properties/AssemblyInfo.cs

@@ -1,7 +1,8 @@
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
+// General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("FluentTerminal.App")]
@@ -16,11 +17,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version
+//      Minor Version 
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers
+// You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]

FluentTerminal.App/Properties/Default.rd.xml

@@ -6,7 +6,7 @@
     Laufzeitdirektiven sind hier dokumentiert: https://go.microsoft.com/fwlink/?LinkID=391919
 
     Vollständige Aktivierung der Reflektion von "App1.MyClass" und allen zugehörigen öffentlichen/privaten Membern:
-    <Type Name="App1.MyClass" Dynamic="Required All" />
+    <Type Name="App1.MyClass" Dynamic="Required All"/>
 
     Aktivierung der dynamischen Erstellung der spezifischen Instanziierung von "AppClass<T>" über "System.Int32":
     <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
@@ -22,7 +22,10 @@
       Anwendungspaket. Die Sternchen sind keine Platzhalter.
     -->
     <Assembly Name="*Application*" Dynamic="Required All" />
-
+    
+    
     <!-- Fügen Sie hier Ihre anwendungsspezifischen Laufzeitdirektiven ein. -->
+
+
   </Application>
 </Directives>

FluentTerminal.App/Services/ClipboardService.cs

@@ -13,8 +13,7 @@ namespace FluentTerminal.App.Services
             {
                 return content.GetTextAsync().AsTask();
             }
-            // Otherwise return a new task that just sends an empty string.
-            return Task.FromResult(string.Empty);
+            return null;
         }
 
         public void SetText(string text)
@@ -24,4 +23,4 @@ namespace FluentTerminal.App.Services
             Clipboard.SetContent(dataPackage);
         }
     }
-}
+}

FluentTerminal.App/Services/FileSystemService.cs

@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
@@ -58,4 +59,4 @@ namespace FluentTerminal.App.Services
             }
         }
     }
-}
+}

FluentTerminal.App/Services/StartupTaskService.cs

@@ -1,47 +0,0 @@
-using FluentTerminal.Models.Enums;
-using System;
-using System.Threading.Tasks;
-using Windows.ApplicationModel;
-
-namespace FluentTerminal.App.Services
-{
-    public class StartupTaskService : IStartupTaskService
-    {
-        public const string StartupTaskname = "FluentTerminalStartupTask";
-
-        public async Task<StartupTaskStatus> GetStatus()
-        {
-            var startupTask = await StartupTask.GetAsync(StartupTaskname);
-            return ConvertState(startupTask.State);
-        }
-
-        public async Task<StartupTaskStatus> EnableStartupTask()
-        {
-            var startupTask = await StartupTask.GetAsync(StartupTaskname);
-            var newState = await startupTask.RequestEnableAsync();
-            return ConvertState(newState);
-        }
-
-        public async Task DisableStartupTask()
-        {
-            var startupTask = await StartupTask.GetAsync(StartupTaskname);
-            startupTask.Disable();
-        }
-
-        private StartupTaskStatus ConvertState(StartupTaskState state)
-        {
-            switch (state)
-            {
-                case StartupTaskState.Disabled:
-                    return StartupTaskStatus.Disabled;
-                case StartupTaskState.DisabledByUser:
-                    return StartupTaskStatus.DisabledByUser;
-                case StartupTaskState.Enabled:
-                    return StartupTaskStatus.Enabled;
-                case StartupTaskState.DisabledByPolicy:
-                    return StartupTaskStatus.DisabledByPolicy;
-            }
-            throw new NotImplementedException();
-        }
-    }
-}

FluentTerminal.App/Services/SystemFontService.cs

@@ -10,4 +10,4 @@ namespace FluentTerminal.App.Services
             return CanvasTextFormat.GetSystemFontFamilies();
         }
     }
-}
+}

FluentTerminal.App/Styles/Custom.xaml

@@ -65,70 +65,6 @@
         </Setter>
     </Style>
 
-    <Style x:Key="TitleBarRepeatButtonStyle" TargetType="RepeatButton">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-        <Setter Property="UseSystemFocusVisuals" Value="True" />
-        <Setter Property="Width" Value="47" />
-        <Setter Property="Height" Value="32" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="RepeatButton">
-                    <Grid x:Name="RootGrid" Background="{TemplateBinding Background}">
-                        <ContentPresenter
-                            x:Name="ContentPresenter"
-                            Padding="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            AutomationProperties.AccessibilityView="Raw"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            ContentTransitions="{TemplateBinding ContentTransitions}" />
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Transparent" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="PointerOver">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemListLowColor}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemListMediumColor}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlDisabledBaseLowBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
     <Style x:Key="ColorPreviewButtonStyle" TargetType="Button">
         <Setter Property="Width" Value="24" />
         <Setter Property="Height" Value="24" />
@@ -159,4 +95,5 @@
             </Setter.Value>
         </Setter>
     </Style>
-</ResourceDictionary>
+
+</ResourceDictionary>

FluentTerminal.App/Utilities/ColorExtensions.cs

@@ -46,4 +46,4 @@ namespace FluentTerminal.App.Utilities
             }
         }
     }
-}
+}