Merge branch 'master' into Dev/NativeRenderer

* Load terminal options and add the inital scroll viewer

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

.gitattributes

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

.gitignore

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

FluentTerminal.App.Services.Test/DialogServiceTests.cs

@@ -23,7 +23,7 @@ namespace FluentTerminal.App.Services.Test
         public void ShowCreateKeyBindingDialog_Default_UsesCreateKeyBindingDialog()
         {
             var createKeyBindingDialog = new Mock<ICreateKeyBindingDialog>();
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, () => createKeyBindingDialog.Object, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ISshProfileSelectionDialog>);
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, () => createKeyBindingDialog.Object, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
 
             dialogService.ShowCreateKeyBindingDialog();
 
@@ -36,7 +36,7 @@ namespace FluentTerminal.App.Services.Test
             var title = string.Empty;
             var content = _fixture.Create<string>();
             var buttons = _fixture.CreateMany<DialogButton>(2);
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ISshProfileSelectionDialog>);
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
 
             Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
 
@@ -49,7 +49,7 @@ namespace FluentTerminal.App.Services.Test
             var title = _fixture.Create<string>();
             var content = string.Empty;
             var buttons = _fixture.CreateMany<DialogButton>(2);
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ISshProfileSelectionDialog>);
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
 
             Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
 
@@ -61,7 +61,7 @@ namespace FluentTerminal.App.Services.Test
         {
             var title = _fixture.Create<string>();
             var content = _fixture.Create<string>();
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ISshProfileSelectionDialog>);
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
 
             Func<Task<DialogButton>> showMessageDialogAsnyc = () => dialogService.ShowMessageDialogAsnyc(title, content);
 
@@ -75,7 +75,7 @@ namespace FluentTerminal.App.Services.Test
             var content = _fixture.Create<string>();
             var buttons = _fixture.CreateMany<DialogButton>(2);
             var messageDialog = new Mock<IMessageDialog>();
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, () => messageDialog.Object, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ISshProfileSelectionDialog>);
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, () => messageDialog.Object, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
 
             dialogService.ShowMessageDialogAsnyc(title, content, buttons.ElementAt(0), buttons.ElementAt(1));
 
@@ -86,7 +86,7 @@ namespace FluentTerminal.App.Services.Test
         public void ShowProfileSelectionDialogAsync_Default_UsesShellProfileSelectionDialog()
         {
             var shellProfileSelectionDialog = new Mock<IShellProfileSelectionDialog>();
-            var dialogService = new DialogService(() => shellProfileSelectionDialog.Object, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ISshProfileSelectionDialog>);
+            var dialogService = new DialogService(() => shellProfileSelectionDialog.Object, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, Mock.Of<IInputDialog>, Mock.Of<ISshConnectionInfoDialog>);
 
             dialogService.ShowProfileSelectionDialogAsync();
 
@@ -98,7 +98,7 @@ namespace FluentTerminal.App.Services.Test
         {
             var title = "title";
             var inputDialog = new Mock<IInputDialog>();            
-            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, () => inputDialog.Object, Mock.Of<ISshConnectionInfoDialog>, Mock.Of<ISshProfileSelectionDialog>);
+            var dialogService = new DialogService(Mock.Of<IShellProfileSelectionDialog>, Mock.Of<IMessageDialog>, Mock.Of<ICreateKeyBindingDialog>, () => inputDialog.Object, Mock.Of<ISshConnectionInfoDialog>);
 
             dialogService.ShowInputDialogAsync(title);
 

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
@@ -11,11 +11,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.10.0" />
-    <PackageReference Include="FluentAssertions" Version="5.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Include="Moq" Version="4.12.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="AutoFixture" Version="4.8.0" />
+    <PackageReference Include="FluentAssertions" Version="5.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="Moq" Version="4.10.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
@@ -34,11 +34,4 @@
     <ProjectReference Include="..\FluentTerminal.App.Services\FluentTerminal.App.Services.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Windows.Foundation.FoundationContract">
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-
 </Project>

FluentTerminal.App.Services.Test/KeyboardCommandServiceTests.cs

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

FluentTerminal.App.Services.Test/SettingsServiceTests.cs

@@ -471,6 +471,10 @@ namespace FluentTerminal.App.Services.Test
             var commands = _fixture.CreateMany<Command>(5);
             var defaultValueProvider = new Mock<IDefaultValueProvider>();
             var keyBindingsContainer = new Mock<IApplicationDataContainer>();
+            foreach (var command in commands)
+            {
+                keyBindingsContainer.Setup(x => x.ReadValueFromJson<Collection<KeyBinding>>(EnumHelper.GetEnumDescription(command), null)).Returns(new Collection<KeyBinding> { });
+            }
             var applicationDataContainers = new ApplicationDataContainers
             {
                 KeyBindings = keyBindingsContainer.Object,

FluentTerminal.App.Services.Test/TrayProcessCommunicationServiceTests.cs

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

FluentTerminal.App.Services/ApplicationDataContainers.cs

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

FluentTerminal.App.Services/Constants.cs

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

FluentTerminal.App.Services/Dialogs/ISshConnectionInfo.cs

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

FluentTerminal.App.Services/Dialogs/ISshConnectionInfoDialog.cs

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

FluentTerminal.App.Services/Dialogs/ISshProfileSelectionDialog.cs

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

FluentTerminal.App.Services/EventArgs/NewWindowRequestedEventArgs.cs

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

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

@@ -7,10 +7,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="PListNet" Version="3.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="PListNet" Version="2.0.3" />
     <PackageReference Include="RestSharp" Version="106.6.9" />
-    <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
+    <PackageReference Include="Serilog.Sinks.Async" Version="1.3.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
     <PackageReference Include="System.Runtime.InteropServices.WindowsRuntime" Version="4.3.0" />
   </ItemGroup>

FluentTerminal.App.Services/IAppServiceConnection.cs

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

FluentTerminal.App.Services/IApplicationLanguageService.cs

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

FluentTerminal.App.Services/IApplicationView.cs

@@ -14,7 +14,7 @@ namespace FluentTerminal.App.Services
         int Id { get; }
         string Title { get; set; }
 
-        Task RunOnDispatcherThread(Action action, bool enforceNewSchedule = true);
+        Task RunOnDispatcherThread(Action action);
 
         Task<bool> TryClose();
 

FluentTerminal.App.Services/IDialogService.cs

@@ -1,5 +1,6 @@
 using FluentTerminal.Models;
 using System.Threading.Tasks;
+using FluentTerminal.App.Services.Dialogs;
 
 namespace FluentTerminal.App.Services
 {
@@ -18,8 +19,6 @@ namespace FluentTerminal.App.Services
         Task<KeyBinding> ShowCreateKeyBindingDialog();
         Task<string> ShowInputDialogAsync(string title);
 
-        Task<SshProfile> ShowSshConnectionInfoDialogAsync(SshProfile input = null);
-
-        Task<SshProfile> ShowSshProfileSelectionDialogAsync();
+        Task<ISshConnectionInfo> ShowSshConnectionInfoDialogAsync();
     }
 }

FluentTerminal.App.Services/ISettingsService.cs

@@ -11,25 +11,19 @@ namespace FluentTerminal.App.Services
         event EventHandler KeyBindingsChanged;
         event EventHandler<ShellProfile> ShellProfileAdded;
         event EventHandler<Guid> ShellProfileDeleted;
-        event EventHandler<SshProfile> SshProfileAdded;
-        event EventHandler<Guid> SshProfileDeleted;
         event EventHandler<TerminalOptions> TerminalOptionsChanged;
         event EventHandler<Guid> ThemeDeleted;
         event EventHandler<TerminalTheme> ThemeAdded;
 
         void DeleteShellProfile(Guid id);
-        void DeleteSshProfile(Guid id);
         void DeleteTheme(Guid id);
         ApplicationSettings GetApplicationSettings();
         TerminalTheme GetCurrentTheme();
         Guid GetCurrentThemeId();
         ShellProfile GetDefaultShellProfile();
-        SshProfile GetDefaultSshProfile();
         Guid GetDefaultShellProfileId();
-        Guid GetDefaultSshProfileId();
         IDictionary<string, ICollection<KeyBinding>> GetCommandKeyBindings();
         IEnumerable<ShellProfile> GetShellProfiles();
-        IEnumerable<SshProfile> GetSshProfiles();
         IEnumerable<TabTheme> GetTabThemes();
         TerminalOptions GetTerminalOptions();
         TerminalTheme GetTheme(Guid id);
@@ -38,15 +32,10 @@ namespace FluentTerminal.App.Services
         void SaveApplicationSettings(ApplicationSettings applicationSettings);
         void SaveCurrentThemeId(Guid id);
         void SaveDefaultShellProfileId(Guid id);
-        void SaveDefaultSshProfileId(Guid id);
         void SaveKeyBindings(string command, ICollection<KeyBinding> keyBindings);
         void SaveShellProfile(ShellProfile shellProfile, bool newShell = false);
-        void SaveSshProfile(SshProfile shellProfile, bool newShell = false);
         void SaveTerminalOptions(TerminalOptions terminalOptions);
         void SaveTheme(TerminalTheme theme, bool newTheme = false);
         ShellProfile GetShellProfile(Guid id);
-        SshProfile GetSshProfile(Guid id);
-        string ExportSettings();
-        void ImportSettings(string serializedSettings);
     }
 }

FluentTerminal.App.Services/ITrayProcessCommunicationService.cs

@@ -8,34 +8,22 @@ namespace FluentTerminal.App.Services
 {
     public interface ITrayProcessCommunicationService
     {
-        event EventHandler<TerminalExitStatus> TerminalExited;
+        event EventHandler<int> TerminalExited;
 
         void Initialize(IAppServiceConnection appServiceConnection);
 
-        Task<CreateTerminalResponse> CreateTerminal(byte id, TerminalSize size, ShellProfile shellProfile, SessionType sessionType);
+        Task<CreateTerminalResponse> CreateTerminal(int id, TerminalSize size, ShellProfile shellProfile, SessionType sessionType);
 
-        Task ResizeTerminal(byte id, TerminalSize size);
+        Task ResizeTerminal(int id, TerminalSize size);
 
         Task UpdateToggleWindowKeyBindings();
 
-        Task Write(byte terminalId, byte[] data);
+        Task Write(int terminalId, byte[] data);
 
-        void SubscribeForTerminalOutput(byte terminalId, Action<byte[]> callback);
+        void SubscribeForTerminalOutput(int terminalId, Action<byte[]> callback);
 
-        Task CloseTerminal(byte terminalId);
+        Task CloseTerminal(int terminalId);
         Task<GetAvailablePortResponse> GetAvailablePort();
-        byte GetNextTerminalId();
-
-        Task<string> GetUserName();
-
-        Task SaveTextFileAsync(string path, string content);
-
-        Task<string> GetSshConfigDirAsync();
-
-        Task<string[]> GetFilesFromSshConfigDirAsync();
-
-        Task<bool> CheckFileExistsAsync(string path);
-
-        void MuteTerminal(bool mute);
+        int GetNextTerminalId();
     }
 }

FluentTerminal.App.Services/Implementation/DefaultValueProvider.cs

@@ -1,9 +1,7 @@
-using FluentTerminal.App.Services.Utilities;
-using FluentTerminal.Models;
+using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using System;
 using System.Collections.Generic;
-using Windows.Foundation.Metadata;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -23,14 +21,10 @@ namespace FluentTerminal.App.Services.Implementation
                 MouseMiddleClickAction = MouseAction.None,
                 MouseRightClickAction = MouseAction.ContextMenu,
                 AlwaysShowTabs = false,
+                AlwaysUseWinPty = true,
                 ShowNewOutputIndicator = false,
                 EnableTrayIcon = true,
-                ShowCustomTitleInTitlebar = true,
-                UseMoshByDefault = true,
-                AutoFallbackToWindowsUsernameInLinks = true,
-                UseQuickSshConnectByDefault = false,
-                RTrimCopiedLines = true,
-                MuteTerminalBeeps = true
+                ShowCustomTitleInTitlebar = true
             };
         }
 
@@ -44,6 +38,9 @@ namespace FluentTerminal.App.Services.Implementation
                     new KeyBinding
                     {
                         Command = nameof(Command.ToggleWindow),
+                        Ctrl = false,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.Scroll
                     }
                 };
@@ -55,6 +52,8 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.NextTab),
                         Ctrl = true,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.Tab
                     }
                 };
@@ -66,6 +65,7 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.PreviousTab),
                         Ctrl = true,
+                        Alt = false,
                         Shift = true,
                         Key = (int)ExtendedVirtualKey.Tab
                     }
@@ -85,7 +85,9 @@ namespace FluentTerminal.App.Services.Implementation
                     new KeyBinding
                     {
                         Command = command.ToString(),
-                        Alt = true,
+                        Ctrl = true,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.Number1 + (command - Command.SwitchToTerm1)
                     }
                 };
@@ -97,7 +99,8 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.NewTab),
                         Ctrl = true,
-                        Shift = true,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.T
                     }
                 };
@@ -109,60 +112,25 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.ConfigurableNewTab),
                         Ctrl = true,
-                        Alt = true,
+                        Alt = false,
+                        Shift = true,
                         Key = (int)ExtendedVirtualKey.T
                     }
                 };
 
-                case Command.NewSshTab:
+                case Command.NewRemoteTab:
                     return new List<KeyBinding>
                     {
                         new KeyBinding
                         {
-                            Command = nameof(Command.NewSshTab),
-                            Ctrl = true,
-                            Shift = true,
-                            Key = (int)ExtendedVirtualKey.Y
-                        }
-                    };
-
-                case Command.NewSshWindow:
-                    return new List<KeyBinding>
-                    {
-                        new KeyBinding
-                        {
-                            Command = nameof(Command.NewSshWindow),
-                            Ctrl = true,
+                            Command = nameof(Command.NewRemoteTab),
+                            Ctrl = false,
                             Alt = true,
-                            Key = (int)ExtendedVirtualKey.Y
+                            Shift = false,
+                            Key = (int)ExtendedVirtualKey.T
                         }
                     };
 
-                case Command.SavedSshNewTab:
-                    return new List<KeyBinding>
-                    {
-                        new KeyBinding
-                        {
-                            Command = nameof(Command.SavedSshNewTab),
-                            Ctrl = true,
-                            Shift = true,
-                            Key = (int)ExtendedVirtualKey.U
-                        }
-                    };
-
-                case Command.SavedSshNewWindow:
-                    return new List<KeyBinding>
-                    {
-                        new KeyBinding
-                        {
-                            Command = nameof(Command.SavedSshNewWindow),
-                            Ctrl = true,
-                            Alt = true,
-                            Key = (int)ExtendedVirtualKey.U
-                        }
-                    };
-
-
                 case Command.ChangeTabTitle:
                     return new List<KeyBinding>
                 {
@@ -170,6 +138,7 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.ChangeTabTitle),
                         Ctrl = true,
+                        Alt = false,
                         Shift = true,
                         Key = (int)ExtendedVirtualKey.R
                     }
@@ -182,7 +151,8 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.CloseTab),
                         Ctrl = true,
-                        Shift = true,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.W
                     }
                 };
@@ -194,7 +164,8 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.NewWindow),
                         Ctrl = true,
-                        Shift = true,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.N
                     }
                 };
@@ -206,7 +177,8 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.ConfigurableNewWindow),
                         Ctrl = true,
-                        Alt = true,
+                        Alt = false,
+                        Shift = true,
                         Key = (int)ExtendedVirtualKey.N
                     }
                 };
@@ -218,7 +190,8 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.ShowSettings),
                         Ctrl = true,
-                        Shift = true,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.Comma
                     }
                 };
@@ -230,7 +203,8 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.Copy),
                         Ctrl = true,
-                        Shift = true,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.C
                     }
                 };
@@ -242,7 +216,8 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.Paste),
                         Ctrl = true,
-                        Shift = true,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.V
                     }
                 };
@@ -255,7 +230,8 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.PasteWithoutNewlines),
                         Ctrl = true,
-                        Alt = true,
+                        Alt = false,
+                        Shift = true,
                         Key = (int)ExtendedVirtualKey.V
                     }
                 };
@@ -267,7 +243,8 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.Search),
                         Ctrl = true,
-                        Shift = true,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.F
                     }
                 };
@@ -278,13 +255,10 @@ namespace FluentTerminal.App.Services.Implementation
                     new KeyBinding
                     {
                         Command = nameof(Command.ToggleFullScreen),
+                        Ctrl = false,
                         Alt = true,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.Enter
-                    },
-                    new KeyBinding
-                    {
-                        Command = nameof(Command.ToggleFullScreen),
-                        Key = (int)ExtendedVirtualKey.F11
                     }
                 };
 
@@ -295,7 +269,8 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.SelectAll),
                         Ctrl = true,
-                        Shift = true,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.A
                     }
                 };
@@ -307,11 +282,11 @@ namespace FluentTerminal.App.Services.Implementation
                     {
                         Command = nameof(Command.Clear),
                         Ctrl = true,
-                        Alt = true,
+                        Alt = false,
+                        Shift = false,
                         Key = (int)ExtendedVirtualKey.L
                     }
                 };
-
             }
 
             return null;
@@ -329,7 +304,7 @@ namespace FluentTerminal.App.Services.Implementation
                 new TabTheme
                 {
                     Id = 0,
-                    Name = I18N.Translate("TabTheme.None"),
+                    Name = "None",
                     BackgroundOpacity = double.NaN,
                     BackgroundPointerOverOpacity = double.NaN,
                     BackgroundPressedOpacity = double.NaN,
@@ -340,42 +315,41 @@ namespace FluentTerminal.App.Services.Implementation
                 new TabTheme
                 {
                     Id = 1,
-                    Name = I18N.Translate("TabTheme.Red"),
+                    Name = "Red",
                     Color = "#E81123"
                 },
                 new TabTheme
                 {
                     Id = 2,
-                    Name = I18N.Translate("TabTheme.Green"),
+                    Name = "Green",
                     Color = "#10893E"
                 },
                 new TabTheme
                 {
                     Id = 3,
-                    Name = I18N.Translate("TabTheme.Blue"),
+                    Name = "Blue",
                     Color = "#0078D7"
                 },
                 new TabTheme
                 {
                     Id = 4,
-                    Name = I18N.Translate("TabTheme.Purple"),
+                    Name = "Purple",
                     Color = "#881798"
                 },
                 new TabTheme
                 {
                     Id = 5,
-                    Name = I18N.Translate("TabTheme.Orange"),
+                    Name = "Orange",
                     Color = "#FF8C00"
                 },
                 new TabTheme
                 {
                     Id = 6,
-                    Name = I18N.Translate("TabTheme.Teal"),
+                    Name = "Teal",
                     Color = "#00B7C3"
                 }
             };
         }
-
         public TerminalOptions GetDefaultTerminalOptions()
         {
             return new TerminalOptions
@@ -411,7 +385,6 @@ namespace FluentTerminal.App.Services.Implementation
                     PreInstalled = true,
                     WorkingDirectory = string.Empty,
                     LineEndingTranslation = LineEndingStyle.DoNotModify,
-                    UseConPty = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8), // Windows 10 1903+
                     KeyBindings = new []
                     {
                         new KeyBinding
@@ -434,7 +407,6 @@ namespace FluentTerminal.App.Services.Implementation
                     PreInstalled = true,
                     WorkingDirectory = string.Empty,
                     LineEndingTranslation = LineEndingStyle.DoNotModify,
-                    UseConPty = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 7), // Windows 10 1809+
                     KeyBindings = new []
                     {
                         new KeyBinding
@@ -456,8 +428,7 @@ namespace FluentTerminal.App.Services.Implementation
                     Location = @"C:\windows\system32\wsl.exe",
                     PreInstalled = true,
                     WorkingDirectory = string.Empty,
-                    LineEndingTranslation = LineEndingStyle.ToLF,
-                    UseConPty = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 7), // Windows 10 1809+
+                    LineEndingTranslation = LineEndingStyle.DoNotModify,
                     KeyBindings = new []
                     {
                         new KeyBinding

FluentTerminal.App.Services/Implementation/DialogService.cs

@@ -12,19 +12,16 @@ namespace FluentTerminal.App.Services.Implementation
         private readonly Func<ICreateKeyBindingDialog> _createKeyBindingDialogFactory;
         private readonly Func<IInputDialog> _inputDialogFactory;
         private readonly Func<ISshConnectionInfoDialog> _sshConnectionInfoDialogFactory;
-        private readonly Func<ISshProfileSelectionDialog> _sshProfileSelectionDialogFactory;
 
         public DialogService(Func<IShellProfileSelectionDialog> shellProfileSelectionDialogFactory,
             Func<IMessageDialog> messageDialogFactory, Func<ICreateKeyBindingDialog> createKeyBindingDialogFactory,
-            Func<IInputDialog> inputDialogFactory, Func<ISshConnectionInfoDialog> sshConnectionInfoDialogFactory,
-            Func<ISshProfileSelectionDialog> sshProfileSelectionDialogFactory)
+            Func<IInputDialog> inputDialogFactory, Func<ISshConnectionInfoDialog> sshConnectionInfoDialogFactory)
         {
             _shellProfileSelectionDialogFactory = shellProfileSelectionDialogFactory;
             _messageDialogFactory = messageDialogFactory;
             _createKeyBindingDialogFactory = createKeyBindingDialogFactory;
             _inputDialogFactory = inputDialogFactory;
             _sshConnectionInfoDialogFactory = sshConnectionInfoDialogFactory;
-            _sshProfileSelectionDialogFactory = sshProfileSelectionDialogFactory;
         }
 
         public Task<KeyBinding> ShowCreateKeyBindingDialog()
@@ -78,14 +75,7 @@ namespace FluentTerminal.App.Services.Implementation
             return dialog.SelectProfile();
         }
 
-        public Task<SshProfile> ShowSshConnectionInfoDialogAsync(SshProfile input = null) =>
-            _sshConnectionInfoDialogFactory().GetSshConnectionInfoAsync(input);
-
-        public Task<SshProfile> ShowSshProfileSelectionDialogAsync()
-        {
-            var dialog = _sshProfileSelectionDialogFactory();
-
-            return dialog.SelectProfile();
-        }
+        public Task<ISshConnectionInfo> ShowSshConnectionInfoDialogAsync() =>
+            _sshConnectionInfoDialogFactory().GetSshConnectionInfoAsync();
     }
 }

FluentTerminal.App.Services/Implementation/SettingsService.cs

@@ -12,14 +12,12 @@ namespace FluentTerminal.App.Services.Implementation
     {
         public const string CurrentThemeKey = "CurrentTheme";
         public const string DefaultShellProfileKey = "DefaultShellProfile";
-        public const string DefaultSshProfileKey = "DefaultSshProfile";
 
         private readonly IDefaultValueProvider _defaultValueProvider;
         private readonly IApplicationDataContainer _keyBindings;
         private readonly IApplicationDataContainer _localSettings;
         private readonly IApplicationDataContainer _roamingSettings;
         private readonly IApplicationDataContainer _shellProfiles;
-        private readonly IApplicationDataContainer _sshProfiles;
         private readonly IApplicationDataContainer _themes;
 
         public SettingsService(IDefaultValueProvider defaultValueProvider, ApplicationDataContainers containers)
@@ -31,8 +29,6 @@ namespace FluentTerminal.App.Services.Implementation
             _themes = containers.Themes;
             _keyBindings = containers.KeyBindings;
             _shellProfiles = containers.ShellProfiles;
-            _sshProfiles = containers.SshProfiles;
-
 
             foreach (var theme in _defaultValueProvider.GetPreInstalledThemes())
             {
@@ -51,101 +47,6 @@ namespace FluentTerminal.App.Services.Implementation
             }
         }
 
-        public string ExportSettings()
-        {
-            var config = new
-            {
-                App = GetApplicationSettings(),
-                KeyBindings = GetCommandKeyBindings(),
-                TerminalOptions = GetTerminalOptions(),
-                Themes = new List<TerminalTheme>(),
-                Profiles = new List<ShellProfile>(),
-                SshProfiles = new List<SshProfile>()
-            };
-
-            foreach (var theme in GetThemes().Where(x => !x.PreInstalled))
-            {
-                config.Themes.Add(theme);
-            }
-
-            foreach (var profile in GetShellProfiles().Where(x => !x.PreInstalled))
-            {
-                config.Profiles.Add(profile);
-            }
-
-            foreach (var profile in GetSshProfiles())
-            {
-                config.SshProfiles.Add(profile);
-            }
-
-            return JsonConvert.SerializeObject(config);
-        }
-
-        public void ImportSettings(string serializedSettings)
-        {
-            var config = new
-            {
-                App = GetApplicationSettings(),
-                KeyBindings = new Dictionary<string, ICollection<KeyBinding>>(),
-                Themes = new List<TerminalTheme>(),
-                Profiles = new List<ShellProfile>(),
-                SshProfiles = new List<SshProfile>(),
-                TerminalOptions = GetTerminalOptions()
-            };
-
-            JsonConvert.PopulateObject(serializedSettings, config);
-
-            SaveApplicationSettings(config.App);
-
-            // Since we set each command sepaartely, we don't need all existing settings
-            foreach (var pair in config.KeyBindings)
-            {
-                SaveKeyBindings(pair.Key, pair.Value);
-            }
-
-            // Can't create/modify pre-installed themes
-            foreach (var theme in config.Themes.Where(x => !x.PreInstalled))
-            {
-                var existingTheme = GetTheme(theme.Id);
-                if (existingTheme?.PreInstalled == true)
-                {
-                    continue;
-                }
-                SaveTheme(theme, existingTheme != null);
-            }
-
-            // Can't create pre-installed profiles
-            foreach (var profile in config.Profiles.Where(x => !x.PreInstalled))
-            {
-                var existingProfile = GetShellProfile(profile.Id);
-                var isNew = existingProfile.EqualTo(default);
-
-                // You can only edit certain parts of preinstalled profiles
-                if (!isNew && existingProfile.PreInstalled)
-                {
-                    existingProfile.WorkingDirectory = profile.WorkingDirectory;
-                    existingProfile.Arguments = profile.Arguments;
-                    existingProfile.TabThemeId = profile.TabThemeId;
-                    existingProfile.TerminalThemeId = profile.TerminalThemeId;
-                    existingProfile.LineEndingTranslation = profile.LineEndingTranslation;
-                    existingProfile.KeyBindings = profile.KeyBindings;
-                    SaveShellProfile(profile, isNew);
-                    continue;
-                }
-                SaveShellProfile(profile, isNew);
-            }
-
-            foreach (var profile in config.SshProfiles)
-            {
-                var existingProfile = GetSshProfile(profile.Id);
-                var isNew = existingProfile.EqualTo(default(SshProfile));
-
-                SaveSshProfile(profile, isNew);
-            }
-
-            SaveTerminalOptions(config.TerminalOptions);
-        }
-
         public event EventHandler<ApplicationSettings> ApplicationSettingsChanged;
 
         public event EventHandler<TerminalTheme> ThemeAdded;
@@ -157,9 +58,6 @@ namespace FluentTerminal.App.Services.Implementation
         public event EventHandler<ShellProfile> ShellProfileAdded;
         public event EventHandler<Guid> ShellProfileDeleted;
 
-        public event EventHandler<SshProfile> SshProfileAdded;
-        public event EventHandler<Guid> SshProfileDeleted;
-
         public event EventHandler<TerminalOptions> TerminalOptionsChanged;
 
         public void DeleteShellProfile(Guid id)
@@ -168,14 +66,6 @@ namespace FluentTerminal.App.Services.Implementation
             ShellProfileDeleted?.Invoke(this, id);
         }
 
-        public void DeleteSshProfile(Guid id)
-        {
-            _sshProfiles.Delete(id.ToString());
-            SshProfileDeleted?.Invoke(this, id);
-            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
-        }
-
-
         public void DeleteTheme(Guid id)
         {
             _themes.Delete(id.ToString());
@@ -231,22 +121,11 @@ namespace FluentTerminal.App.Services.Implementation
             }
             return profile;
         }
-        public SshProfile GetDefaultSshProfile()
-        {
-            var id = GetDefaultSshProfileId();
-            var profile = _sshProfiles.ReadValueFromJson(id.ToString(), default(SshProfile));
-
-            return profile;
-        }
 
         public ShellProfile GetShellProfile(Guid id)
         {
             return _shellProfiles.ReadValueFromJson(id.ToString(), default(ShellProfile));
         }
-        public SshProfile GetSshProfile(Guid id)
-        {
-            return _sshProfiles.ReadValueFromJson(id.ToString(), default(SshProfile));
-        }
 
         public Guid GetDefaultShellProfileId()
         {
@@ -256,14 +135,6 @@ namespace FluentTerminal.App.Services.Implementation
             }
             return _defaultValueProvider.GetDefaultShellProfileId();
         }
-        public Guid GetDefaultSshProfileId()
-        {
-            if (_localSettings.TryGetValue(DefaultSshProfileKey, out object value))
-            {
-                return (Guid)value;
-            }
-            return System.Guid.Empty;
-        }
 
         public IDictionary<string, ICollection<KeyBinding>> GetCommandKeyBindings()
         {
@@ -280,14 +151,6 @@ namespace FluentTerminal.App.Services.Implementation
         {
             return _shellProfiles.GetAll().Select(x => JsonConvert.DeserializeObject<ShellProfile>((string)x)).ToList();
         }
-        public IEnumerable<SshProfile> GetSshProfiles()
-        {
-            if (_sshProfiles == null)
-                return new List<SshProfile>();
-            else
-                return _sshProfiles.GetAll()
-                    .Select(x => JsonConvert.DeserializeObject<SshProfile>((string) x)).ToList();
-        }
 
         public IEnumerable<TabTheme> GetTabThemes()
         {
@@ -336,19 +199,15 @@ namespace FluentTerminal.App.Services.Implementation
         {
             _localSettings.SetValue(DefaultShellProfileKey, id);
         }
-        public void SaveDefaultSshProfileId(Guid id)
-        {
-            _localSettings.SetValue(DefaultSshProfileKey, id);
-        }
 
         public void SaveKeyBindings(string command, ICollection<KeyBinding> keyBindings)
         {
-            if (!Enum.TryParse<Command>(command, true, out var enumValue))
+            if (!Enum.IsDefined(typeof(Command), command))
             {
                 throw new InvalidOperationException();
             }
 
-            _keyBindings.WriteValueAsJson(enumValue.ToString(), keyBindings);
+            _keyBindings.WriteValueAsJson(command.ToString(), keyBindings);
             KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
         }
 
@@ -364,18 +223,6 @@ namespace FluentTerminal.App.Services.Implementation
                 ShellProfileAdded?.Invoke(this, shellProfile);
             }
         }
-        public void SaveSshProfile(SshProfile sshProfile, bool newShell = false)
-        {
-            _sshProfiles.WriteValueAsJson(sshProfile.Id.ToString(), sshProfile);
-
-            // When saving the shell profile, we also need to update keybindings for everywhere.
-            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
-
-            if (newShell)
-            {
-                SshProfileAdded?.Invoke(this, sshProfile);
-            }
-        }
 
         public void SaveTerminalOptions(TerminalOptions terminalOptions)
         {

FluentTerminal.App.Services/Implementation/TrayProcessCommunicationService.cs

@@ -6,7 +6,6 @@ using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Windows.Foundation.Collections;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -14,18 +13,18 @@ namespace FluentTerminal.App.Services.Implementation
     {
         private readonly ISettingsService _settingsService;
         private IAppServiceConnection _appServiceConnection;
-        private readonly Dictionary<byte, Action<byte[]>> _terminalOutputHandlers;
-        private byte _nextTerminalId = 0;
+        private readonly Dictionary<int, Action<byte[]>> _terminalOutputHandlers;
+        private int _nextTerminalId = 0;
 
-        public event EventHandler<TerminalExitStatus> TerminalExited;
+        public event EventHandler<int> TerminalExited;
 
         public TrayProcessCommunicationService(ISettingsService settingsService)
         {
             _settingsService = settingsService;
-            _terminalOutputHandlers = new Dictionary<byte, Action<byte[]>>();
+            _terminalOutputHandlers = new Dictionary<int, Action<byte[]>>();
         }
 
-        public byte GetNextTerminalId()
+        public int GetNextTerminalId()
         {
             return _nextTerminalId++;
         }
@@ -35,115 +34,14 @@ namespace FluentTerminal.App.Services.Implementation
             var request = new GetAvailablePortRequest();
 
             var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(request));
-            var response = JsonConvert.DeserializeObject<GetAvailablePortResponse>((string)responseMessage[MessageKeys.Content]);
+            var response = JsonConvert.DeserializeObject<GetAvailablePortResponse>(responseMessage[MessageKeys.Content]);
 
             Logger.Instance.Debug("Received GetAvailablePortResponse: {@response}", response);
 
             return response;
         }
 
-        private string _userName;
-
-        public async Task<string> GetUserName()
-        {
-            if (!string.IsNullOrEmpty(_userName))
-            {
-                // Returning the username from cache
-                return _userName;
-            }
-
-            GetUserNameResponse response;
-
-            // No need to crash for username, so try/catch
-            try
-            {
-                var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(new GetUserNameRequest()));
-                response = JsonConvert.DeserializeObject<GetUserNameResponse>((string)responseMessage[MessageKeys.Content]);
-            }
-            catch (Exception e)
-            {
-                Logger.Instance.Error(e, "Error while trying to get username.");
-
-                return null;
-            }
-
-            Logger.Instance.Debug("Received GetUserNameResponse: {@response}", response);
-
-            _userName = response.UserName;
-
-            return _userName;
-        }
-
-        public async Task SaveTextFileAsync(string path, string content)
-        {
-            var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(new SaveTextFileRequest {Path = path, Content = content}));
-
-            var response = JsonConvert.DeserializeObject<CommonResponse>((string)responseMessage[MessageKeys.Content]);
-
-            if (!response.Success)
-            {
-                throw new Exception(string.IsNullOrEmpty(response.Error) ? "Failed to save the file." : response.Error);
-            }
-        }
-
-        private static string _sshConfigDir;
-
-        public async Task<string> GetSshConfigDirAsync()
-        {
-            if (string.IsNullOrEmpty(_sshConfigDir))
-            {
-                var response = await GetSshConfigFolderAsync(false);
-
-                if (response?.Success ?? false)
-                {
-                    _sshConfigDir = response.Path;
-                }
-            }
-
-            return _sshConfigDir;
-        }
-
-        public async Task<string[]> GetFilesFromSshConfigDirAsync()
-        {
-            var response = await GetSshConfigFolderAsync(false);
-
-            if (response == null || !response.Success)
-            {
-                return null;
-            }
-
-            if (string.IsNullOrEmpty(_sshConfigDir))
-            {
-                _sshConfigDir = response.Path;
-            }
-
-            return response.Files;
-        }
-
-        private async Task<GetSshConfigFolderResponse> GetSshConfigFolderAsync(bool includeContent)
-        {
-            var responseMessage =
-                await _appServiceConnection.SendMessageAsync(CreateMessage(new GetSshConfigFolderRequest
-                    {IncludeContent = includeContent}));
-
-            return JsonConvert.DeserializeObject<GetSshConfigFolderResponse>(
-                (string) responseMessage[MessageKeys.Content]);
-        }
-
-        public async Task<bool> CheckFileExistsAsync(string path)
-        {
-            var responseMessage =
-                await _appServiceConnection.SendMessageAsync(CreateMessage(new CheckFileExistsRequest {Path = path}));
-
-            return JsonConvert.DeserializeObject<CommonResponse>((string) responseMessage[MessageKeys.Content]).Success;
-        }
-
-        public void MuteTerminal(bool mute)
-        {
-            _appServiceConnection.SendMessageAsync(CreateMessage(new MuteTerminalRequest { Mute = mute }));
-        }
-
-        public async Task<CreateTerminalResponse> CreateTerminal(byte id, TerminalSize size, ShellProfile shellProfile, SessionType sessionType)
+        public async Task<CreateTerminalResponse> CreateTerminal(int id, TerminalSize size, ShellProfile shellProfile, SessionType sessionType)
         {
             var request = new CreateTerminalRequest
             {
@@ -156,7 +54,7 @@ namespace FluentTerminal.App.Services.Implementation
             Logger.Instance.Debug("Sending CreateTerminalRequest: {@request}", request);
 
             var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(request));
-            var response = JsonConvert.DeserializeObject<CreateTerminalResponse>((string)responseMessage[MessageKeys.Content]);
+            var response = JsonConvert.DeserializeObject<CreateTerminalResponse>(responseMessage[MessageKeys.Content]);
 
             Logger.Instance.Debug("Received CreateTerminalResponse: {@response}", response);
 
@@ -169,38 +67,35 @@ namespace FluentTerminal.App.Services.Implementation
             _appServiceConnection.MessageReceived += OnMessageReceived;
         }
 
-        private void OnMessageReceived(object sender, IDictionary<string, object> e)
+        private void OnMessageReceived(object sender, IDictionary<string, string> e)
         {
-            var messageType = (byte)e[MessageKeys.Type];
+            var messageType = e[MessageKeys.Type];
             var messageContent = e[MessageKeys.Content];
 
-            switch (messageType)
+            if (messageType == nameof(DisplayTerminalOutputRequest))
             {
-                case Constants.TerminalBufferRequestIdentifier:
-                    var terminalId = (byte)e[MessageKeys.TerminalId];
+                var request = JsonConvert.DeserializeObject<DisplayTerminalOutputRequest>(messageContent);
 
-                    if (_terminalOutputHandlers.ContainsKey(terminalId))
-                    {
-                        _terminalOutputHandlers[terminalId].Invoke((byte[])messageContent);
-                    }
-                    else
-                    {
-                        Logger.Instance.Error("Received output for unknown terminal Id {id}", terminalId);
-                    }
-                    break;
-                case TerminalExitedRequest.Identifier:
-                    var request = JsonConvert.DeserializeObject<TerminalExitedRequest>((string)messageContent);
-                    Logger.Instance.Debug("Received TerminalExitedRequest: {@request}", request);
+                if (_terminalOutputHandlers.ContainsKey(request.TerminalId))
+                {
+                    _terminalOutputHandlers[request.TerminalId].Invoke(request.Output);
+                }
+                else
+                {
+                    Logger.Instance.Error("Received output for unknown terminal Id {id}", request.TerminalId);
+                }
+            }
+            else if (messageType == nameof(TerminalExitedRequest))
+            {
+                var request = JsonConvert.DeserializeObject<TerminalExitedRequest>(messageContent);
 
-                    TerminalExited?.Invoke(this, request.ToStatus());
-                    break;
-                default:
-                    Logger.Instance.Error("Received unknown message type: {messageType}", messageType);
-                    break;
+                Logger.Instance.Debug("Received TerminalExitedRequest: {@request}", request);
+
+                TerminalExited?.Invoke(this, request.TerminalId);
             }
         }
 
-        public Task ResizeTerminal(byte id, TerminalSize size)
+        public Task ResizeTerminal(int id, TerminalSize size)
         {
             var request = new ResizeTerminalRequest
             {
@@ -211,7 +106,7 @@ namespace FluentTerminal.App.Services.Implementation
             return _appServiceConnection.SendMessageAsync(CreateMessage(request));
         }
 
-        public void SubscribeForTerminalOutput(byte terminalId, Action<byte[]> callback)
+        public void SubscribeForTerminalOutput(int terminalId, Action<byte[]> callback)
         {
             _terminalOutputHandlers[terminalId] = callback;
         }
@@ -228,32 +123,34 @@ namespace FluentTerminal.App.Services.Implementation
             return _appServiceConnection.SendMessageAsync(CreateMessage(request));
         }
 
-        public Task Write(byte id, byte[] data)
+        public Task Write(int id, byte[] data)
         {
-            var message = new ValueSet
+            var request = new WriteDataRequest
             {
-                [MessageKeys.Type] = Constants.TerminalBufferRequestIdentifier,
-                [MessageKeys.TerminalId] = id,
-                [MessageKeys.Content] = data
+                TerminalId = id,
+                Data = data
             };
 
-            return _appServiceConnection.SendMessageAsync(message);
+            return _appServiceConnection.SendMessageAsync(CreateMessage(request));
         }
 
-        public Task CloseTerminal(byte terminalId)
+        public Task CloseTerminal(int terminalId)
         {
-            var request = new TerminalExitedRequest(terminalId, -1);
+            var request = new TerminalExitedRequest
+            {
+                TerminalId = terminalId
+            };
 
             Logger.Instance.Debug("Sending TerminalExitedRequest: {@request}", request);
 
             return _appServiceConnection.SendMessageAsync(CreateMessage(request));
         }
 
-        private ValueSet CreateMessage(IMessage content)
+        private IDictionary<string, string> CreateMessage(object content)
         {
-            return new ValueSet
+            return new Dictionary<string, string>
             {
-                [MessageKeys.Type] = content.Identifier,
+                [MessageKeys.Type] = content.GetType().Name,
                 [MessageKeys.Content] = JsonConvert.SerializeObject(content)
             };
         }

FluentTerminal.App.Services/Logger.cs

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

FluentTerminal.App.Services/Terminal.cs

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

FluentTerminal.App.Services/Utilities/I18N.cs

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

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

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fleck" Version="1.1.0" />
+    <PackageReference Include="Fleck" Version="1.0.3" />
     <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
   </ItemGroup>
 

FluentTerminal.App.ViewModels/MainViewModel.cs

@@ -1,502 +1,442 @@
-using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.EventArgs;
-using FluentTerminal.App.Services.Utilities;
-using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
-using System;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace FluentTerminal.App.ViewModels
-{
-    public class MainViewModel : ViewModelBase
-    {
-        private readonly IClipboardService _clipboardService;
-        private readonly IDialogService _dialogService;
-        private readonly IDispatcherTimer _dispatcherTimer;
-        private readonly IKeyboardCommandService _keyboardCommandService;
-        private readonly ISettingsService _settingsService;
-        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
-        private ApplicationSettings _applicationSettings;
-        private string _background;
-        private double _backgroundOpacity;
-        private TerminalViewModel _selectedTerminal;
-        private TabsPosition _tabsPosition;
-        private string _windowTitle;
-
-        public MainViewModel(ISettingsService settingsService, ITrayProcessCommunicationService trayProcessCommunicationService, IDialogService dialogService, IKeyboardCommandService keyboardCommandService,
-            IApplicationView applicationView, IDispatcherTimer dispatcherTimer, IClipboardService clipboardService)
-        {
-            _settingsService = settingsService;
-            _settingsService.CurrentThemeChanged += OnCurrentThemeChanged;
-            _settingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
-            _settingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
-            _settingsService.ShellProfileAdded += OnShellProfileAdded;
-            _settingsService.ShellProfileDeleted += OnShellProfileDeleted;
-            _settingsService.SshProfileAdded += OnSshProfileAdded;
-            _settingsService.SshProfileDeleted += OnSshProfileDeleted;
-
-            _trayProcessCommunicationService = trayProcessCommunicationService;
-            _dialogService = dialogService;
-            ApplicationView = applicationView;
-            _dispatcherTimer = dispatcherTimer;
-            _clipboardService = clipboardService;
-            _keyboardCommandService = keyboardCommandService;
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewTab), async () => await AddLocalTabAsync());
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewSshTab), async () => await AddSshTabAsync());
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ConfigurableNewTab), async () => await AddConfigurableTerminal());
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ChangeTabTitle), async () => await SelectedTerminal.EditTitle());
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.CloseTab), CloseCurrentTab);
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.SavedSshNewTab), async () => await AddSavedSshTerminalAsync());
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.SavedSshNewWindow), () => NewWindow(NewWindowAction.ShowSshProfileSelection));
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewSshWindow), () => NewWindow(NewWindowAction.ShowSshInfoDialog));
-
-            // Add all of the commands for switching to a tab of a given ID, if there's one open there
-            for (int i = 0; i < 9; i++)
-            {
-                var switchCmd = Command.SwitchToTerm1 + i;
-                int tabNumber = i;
-                // ReSharper disable once InconsistentNaming
-                void handler() => SelectTabNumber(tabNumber);
-                _keyboardCommandService.RegisterCommandHandler(switchCmd.ToString(), handler);
-            }
-
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NextTab), SelectNextTab);
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.PreviousTab), SelectPreviousTab);
-
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewWindow), () => NewWindow(NewWindowAction.StartDefaultLocalTerminal));
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ConfigurableNewWindow), () => NewWindow(NewWindowAction.ShowProfileSelection));
-
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ShowSettings), ShowSettings);
-            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ToggleFullScreen), ToggleFullScreen);
-
-            foreach (ShellProfile profile in _settingsService.GetShellProfiles())
-            {
-                _keyboardCommandService.RegisterCommandHandler(profile.Id.ToString(), async () => await AddLocalTabOrWindowAsync(profile.Id));
-            }
-
-            foreach (SshProfile profile in _settingsService.GetSshProfiles())
-            {
-                _keyboardCommandService.RegisterCommandHandler(profile.Id.ToString(), async () => await AddSshTabOrWindowAsync(profile.Id));
-            }
-
-            var currentTheme = _settingsService.GetCurrentTheme();
-            var options = _settingsService.GetTerminalOptions();
-            Background = currentTheme.Colors.Background;
-            BackgroundOpacity = options.BackgroundOpacity;
-            _applicationSettings = _settingsService.GetApplicationSettings();
-            TabsPosition = _applicationSettings.TabsPosition;
-
-            AddLocalShellCommand = new RelayCommand(async () => await AddLocalTabAsync());
-            AddRemoteShellCommand = new RelayCommand(async () => await AddSshTabAsync());
-            ShowAboutCommand = new RelayCommand(ShowAbout);
-            ShowSettingsCommand = new RelayCommand(ShowSettings);
-
-            ApplicationView.CloseRequested += OnCloseRequest;
-            ApplicationView.Closed += OnClosed;
-            Terminals.CollectionChanged += OnTerminalsCollectionChanged;
-        }
-
-        private void OnClosed(object sender, EventArgs e)
-        {
-            Closed?.Invoke(this, e);
-        }
-
-        private void OnShellProfileDeleted(object sender, Guid e)
-        {
-            _keyboardCommandService.DeregisterCommandHandler(e.ToString());
-        }
-
-        private void OnShellProfileAdded(object sender, ShellProfile e)
-        {
-            _keyboardCommandService.RegisterCommandHandler(e.Id.ToString(), () => AddLocalTabOrWindowAsync(e.Id));
-        }
-
-        private void OnSshProfileAdded(object sender, ShellProfile e)
-        {
-            _keyboardCommandService.RegisterCommandHandler(e.Id.ToString(), () => AddSshTabOrWindowAsync(e.Id));
-        }
-        private void OnSshProfileDeleted(object sender, Guid e)
-        {
-            _keyboardCommandService.DeregisterCommandHandler(e.ToString());
-        }
-        
-        private void OnTerminalsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            RaisePropertyChanged(nameof(ShowTabsOnTop));
-            RaisePropertyChanged(nameof(ShowTabsOnBottom));
-        }
-
-        public event EventHandler Closed;
-
-        public event EventHandler<NewWindowRequestedEventArgs> NewWindowRequested;
-
-        public event EventHandler ShowSettingsRequested;
-
-        public event EventHandler ShowAboutRequested;
-
-        public event EventHandler ActivatedMv;
-
-        public void FocusWindow()
-        {
-            ActivatedMv?.Invoke(this, EventArgs.Empty);
-        }
-
-        public RelayCommand AddLocalShellCommand { get; }
-        public RelayCommand AddRemoteShellCommand { get; }
-
-        public string WindowTitle
-        {
-            get => _windowTitle;
-            set
-            {
-                if (Set(ref _windowTitle, value))
-                {
-                    ApplicationView.Title = value;
-                }
-            }
-        }
-
-        public bool ShowTabsOnTop
-        {
-            get => TabsPosition == TabsPosition.Top && (Terminals.Count > 1 || _applicationSettings.AlwaysShowTabs);
-        }
-
-        public bool ShowTabsOnBottom
-        {
-            get => TabsPosition == TabsPosition.Bottom && (Terminals.Count > 1 || _applicationSettings.AlwaysShowTabs);
-        }
-
-        public string Background
-        {
-            get => _background;
-            set => Set(ref _background, value);
-        }
-
-        public double BackgroundOpacity
-        {
-            get => _backgroundOpacity;
-            set => Set(ref _backgroundOpacity, value);
-        }
-
-        public TerminalViewModel SelectedTerminal
-        {
-            get => _selectedTerminal;
-            set
-            {
-                if (SelectedTerminal != null)
-                {
-                    _selectedTerminal.IsSelected = false;
-                }
-                if (Set(ref _selectedTerminal, value))
-                {
-                    SelectedTerminal?.FocusTerminal();
-                    if (SelectedTerminal != null)
-                    {
-                        SelectedTerminal.IsSelected = true;
-                        if (_applicationSettings.ShowCustomTitleInTitlebar)
-                        {
-                            WindowTitle = SelectedTerminal.TabTitle;
-                        }
-                        else
-                        {
-                            WindowTitle = SelectedTerminal.ShellTitle;
-                        }
-                    }
-                }
-            }
-        }
-
-        public 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>();
-
-        public IApplicationView ApplicationView { get; }
-
-        public async Task AddConfigurableTerminal()
-        {
-            var profile = await _dialogService.ShowProfileSelectionDialogAsync();
-
-            if (profile == null)
-            {
-                if (Terminals.Count == 0)
-                {
-                    await ApplicationView.TryClose();
-                }
-
-                return;
-            }
-
-            await AddTerminalAsync(profile);
-        }
-
-        public async Task AddSshTabAsync()
-        {
-            SshProfile profile = await _dialogService.ShowSshConnectionInfoDialogAsync();
-            if (profile == null)
-            {
-                // User selected "Cancel"
-                if (Terminals.Count == 0)
-                {
-                    await ApplicationView.TryClose();
-                }
-            }
-            else
-            {
-                await AddTerminalAsync(profile);
-            }
-        }
-
-        public Task AddSshTabOrWindowAsync(Guid shellProfileId)
-        {
-            switch (_applicationSettings.NewTerminalLocation)
-            {
-                case NewTerminalLocation.Tab:
-                    var profile = _settingsService.GetSshProfile(shellProfileId);
-                    return AddTerminalAsync(profile);
-                case NewTerminalLocation.Window:
-                    NewWindow(NewWindowAction.StartSshTerminal, shellProfileId);
-                    return Task.FromResult(0);
-                default:
-                    throw new ArgumentException("unknown NewTerminalLocation");
-            }
-        }
-
-        public async Task AddSavedSshTerminalAsync()
-        {
-            ShellProfile profile = await _dialogService.ShowSshProfileSelectionDialogAsync();
-
-            if (profile == null)
-            {
-                // User selected "Cancel"
-                if (Terminals.Count == 0)
-                {
-                    await ApplicationView.TryClose();
-                }
-            }
-            else
-            {
-                await AddTerminalAsync(profile);
-            }
-        }
-
-        public Task AddLocalTabAsync()
-        {
-            var profile = _settingsService.GetDefaultShellProfile();
-            return AddTerminalAsync(profile);
-        }
-
-        public Task AddLocalTabOrWindowAsync(Guid shellProfileId)
-        {
-            switch (_applicationSettings.NewTerminalLocation)
-            {
-                case NewTerminalLocation.Tab:
-                    var profile = _settingsService.GetShellProfile(shellProfileId);
-                    return AddTerminalAsync(profile);
-                case NewTerminalLocation.Window:
-                    NewWindow(NewWindowAction.StartLocalTerminal, shellProfileId);
-                    return Task.FromResult(0);
-                default:
-                    throw new ArgumentException("unknown NewTerminalLocation");
-            }
-        }
-
-        public Task AddTerminalAsync(ShellProfile profile)
-        {
-            return ApplicationView.RunOnDispatcherThread(() =>
-            {
-                var terminal = new TerminalViewModel(_settingsService, _trayProcessCommunicationService, _dialogService, _keyboardCommandService,
-                    _applicationSettings, profile, ApplicationView, _dispatcherTimer, _clipboardService);
-
-                terminal.Closed += OnTerminalClosed;
-                terminal.ShellTitleChanged += Terminal_ShellTitleChanged;
-                terminal.CustomTitleChanged += Terminal_CustomTitleChanged;
-                Terminals.Add(terminal);
-
-                SelectedTerminal = terminal;
-            });
-        }
-
-        private void Terminal_CustomTitleChanged(object sender, string e)
-        {
-            if (sender is TerminalViewModel terminal)
-            {
-                if (terminal.IsSelected && _applicationSettings.ShowCustomTitleInTitlebar)
-                {
-                    if (string.IsNullOrWhiteSpace(e))
-                    {
-                        WindowTitle = terminal.ShellTitle;
-                    }
-                    else
-                    {
-                        WindowTitle = e;
-                    }
-                }
-            }
-        }
-
-        private void Terminal_ShellTitleChanged(object sender, string e)
-        {
-            if (sender is TerminalViewModel terminal && terminal.IsSelected && !_applicationSettings.ShowCustomTitleInTitlebar)
-            {
-                WindowTitle = e;
-            }
-        }
-
-        public async Task CloseAllTerminals()
-        {
-            foreach (var terminal in Terminals)
-            {
-                terminal.Closed -= OnTerminalClosed;
-                terminal.ShellTitleChanged -= Terminal_ShellTitleChanged;
-                terminal.CustomTitleChanged -= Terminal_CustomTitleChanged;
-                await terminal.Close();
-            }
-        }
-
-        private void CloseCurrentTab()
-        {
-            SelectedTerminal?.CloseCommand.Execute(null);
-        }
-
-        private void NewWindow(NewWindowAction showSelection)
-        {
-            NewWindow(showSelection, Guid.Empty);
-        }
-
-        private void NewWindow(NewWindowAction showSelection, Guid profileId)
-        {
-            var args = new NewWindowRequestedEventArgs
-            {
-                Action = showSelection,
-                ProfileId = profileId
-            };
-            NewWindowRequested?.Invoke(this, args);
-        }
-
-        private async void OnApplicationSettingsChanged(object sender, ApplicationSettings e)
-        {
-            await ApplicationView.RunOnDispatcherThread(() =>
-            {
-                _applicationSettings = e;
-                TabsPosition = e.TabsPosition;
-                RaisePropertyChanged(nameof(ShowTabsOnTop));
-                RaisePropertyChanged(nameof(ShowTabsOnBottom));
-
-                if (e.ShowCustomTitleInTitlebar)
-                {
-                    WindowTitle = SelectedTerminal?.TabTitle;
-                }
-                else
-                {
-                    WindowTitle = SelectedTerminal?.ShellTitle;
-                }
-            });
-        }
-
-        private async Task OnCloseRequest(object sender, CancelableEventArgs e)
-        {
-            if (_applicationSettings.ConfirmClosingWindows)
-            {
-                var result = await _dialogService.ShowMessageDialogAsnyc(I18N.Translate("PleaseConfirm"), I18N.Translate("ConfirmCloseWindow"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(false);
-
-                if (result == DialogButton.OK)
-                {
-                    await CloseAllTerminals();
-                }
-                else
-                {
-                    e.Cancelled = true;
-                }
-            }
-            else
-            {
-                await CloseAllTerminals();
-            }
-        }
-
-        private async void OnCurrentThemeChanged(object sender, Guid e)
-        {
-            await ApplicationView.RunOnDispatcherThread(() =>
-             {
-                 var currentTheme = _settingsService.GetTheme(e);
-                 Background = currentTheme.Colors.Background;
-             });
-        }
-
-        private async void OnTerminalClosed(object sender, EventArgs e)
-        {
-            if (sender is TerminalViewModel terminal)
-            {
-                if (SelectedTerminal == terminal)
-                {
-                    SelectedTerminal = Terminals.LastOrDefault(t => t != terminal);
-                }
-                Logger.Instance.Debug("Terminal with Id: {@id} closed.", terminal.Terminal.Id);
-                Terminals.Remove(terminal);
-
-                if (Terminals.Count == 0)
-                {
-                    await ApplicationView.TryClose();
-                }
-            }
-        }
-
-        private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
-        {
-            await ApplicationView.RunOnDispatcherThread(() =>
-            {
-                BackgroundOpacity = e.BackgroundOpacity;
-            });
-        }
-
-        private void SelectTabNumber(int tabNumber)
-        {
-            if (tabNumber < Terminals.Count)
-            {
-                SelectedTerminal = Terminals[tabNumber];
-            }
-        }
-
-        private void SelectNextTab()
-        {
-            var currentIndex = Terminals.IndexOf(SelectedTerminal);
-            var nextIndex = (currentIndex + 1) % Terminals.Count;
-            SelectedTerminal = Terminals[nextIndex];
-        }
-
-        private void SelectPreviousTab()
-        {
-            var currentIndex = Terminals.IndexOf(SelectedTerminal);
-            var previousIndex = (currentIndex - 1 + Terminals.Count) % Terminals.Count;
-            SelectedTerminal = Terminals[previousIndex];
-        }
-
-        private void ShowAbout()
-        {
-            ShowAboutRequested?.Invoke(this, EventArgs.Empty);
-        }
-
-        private void ShowSettings()
-        {
-            ShowSettingsRequested?.Invoke(this, EventArgs.Empty);
-        }
-
-        private void ToggleFullScreen()
-        {
-            ApplicationView.ToggleFullScreen();
-        }
-    }
+using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.EventArgs;
+using FluentTerminal.Models;
+using FluentTerminal.Models.Enums;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using System;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Threading.Tasks;
+using FluentTerminal.App.Services.Implementation;
+
+namespace FluentTerminal.App.ViewModels
+{
+    public class MainViewModel : ViewModelBase
+    {
+        private readonly IClipboardService _clipboardService;
+        private readonly IDialogService _dialogService;
+        private readonly IDispatcherTimer _dispatcherTimer;
+        private readonly IKeyboardCommandService _keyboardCommandService;
+        private readonly ISettingsService _settingsService;
+        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
+        private readonly IDefaultValueProvider _defaultValueProvider;
+        private ApplicationSettings _applicationSettings;
+        private string _background;
+        private double _backgroundOpacity;
+        private TerminalViewModel _selectedTerminal;
+        private TabsPosition _tabsPosition;
+        private string _windowTitle;
+
+        public MainViewModel(ISettingsService settingsService, ITrayProcessCommunicationService trayProcessCommunicationService, IDialogService dialogService, IKeyboardCommandService keyboardCommandService,
+            IApplicationView applicationView, IDispatcherTimer dispatcherTimer, IClipboardService clipboardService, IDefaultValueProvider defaultValueProvider)
+        {
+            _settingsService = settingsService;
+            _settingsService.CurrentThemeChanged += OnCurrentThemeChanged;
+            _settingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
+            _settingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
+            _settingsService.ShellProfileAdded += OnShellProfileAdded;
+            _settingsService.ShellProfileDeleted += OnShellProfileDeleted;
+
+            _trayProcessCommunicationService = trayProcessCommunicationService;
+            _dialogService = dialogService;
+            ApplicationView = applicationView;
+            _dispatcherTimer = dispatcherTimer;
+            _clipboardService = clipboardService;
+            _defaultValueProvider = defaultValueProvider;
+            _keyboardCommandService = keyboardCommandService;
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewTab), () => AddTerminal());
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewRemoteTab), () => AddRemoteTerminal());
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ConfigurableNewTab), () => AddConfigurableTerminal());
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ChangeTabTitle), () => SelectedTerminal.EditTitle());
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.CloseTab), CloseCurrentTab);
+
+            // Add all of the commands for switching to a tab of a given ID, if there's one open there
+            for (int i = 0; i < 9; i++)
+            {
+                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(false));
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ConfigurableNewWindow), () => NewWindow(true));
+
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ShowSettings), ShowSettings);
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.ToggleFullScreen), ToggleFullScreen);
+
+            foreach (ShellProfile profile in _settingsService.GetShellProfiles())
+            {
+                _keyboardCommandService.RegisterCommandHandler(profile.Id.ToString(), () => AddTerminal(profile.Id));
+            }
+
+            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());
+            ShowAboutCommand = new RelayCommand(ShowAbout);
+            ShowSettingsCommand = new RelayCommand(ShowSettings);
+
+            ApplicationView.CloseRequested += OnCloseRequest;
+            ApplicationView.Closed += OnClosed;
+            Terminals.CollectionChanged += OnTerminalsCollectionChanged;
+        }
+
+        private void OnClosed(object sender, EventArgs e)
+        {
+            Closed?.Invoke(this, e);
+        }
+
+        private void OnShellProfileDeleted(object sender, Guid e)
+        {
+            _keyboardCommandService.DeregisterCommandHandler(e.ToString());
+        }
+
+        private void OnShellProfileAdded(object sender, ShellProfile e)
+        {
+            _keyboardCommandService.RegisterCommandHandler(e.Id.ToString(), () => AddTerminal(e.Id));
+        }
+
+        private void OnTerminalsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            RaisePropertyChanged(nameof(ShowTabsOnTop));
+            RaisePropertyChanged(nameof(ShowTabsOnBottom));
+        }
+
+        public event EventHandler Closed;
+
+        public event EventHandler<NewWindowRequestedEventArgs> NewWindowRequested;
+
+        public event EventHandler ShowSettingsRequested;
+
+        public event EventHandler ShowAboutRequested;
+
+        public RelayCommand AddTerminalCommand { get; }
+
+        public string WindowTitle
+        {
+            get => _windowTitle;
+            set
+            {
+                if (Set(ref _windowTitle, value))
+                {
+                    ApplicationView.Title = value;
+                }
+            }
+        }
+
+        public bool ShowTabsOnTop
+        {
+            get => TabsPosition == TabsPosition.Top && (Terminals.Count > 1 || _applicationSettings.AlwaysShowTabs);
+        }
+
+        public bool ShowTabsOnBottom
+        {
+            get => TabsPosition == TabsPosition.Bottom && (Terminals.Count > 1 || _applicationSettings.AlwaysShowTabs);
+        }
+
+        public string Background
+        {
+            get => _background;
+            set => Set(ref _background, value);
+        }
+
+        public double BackgroundOpacity
+        {
+            get => _backgroundOpacity;
+            set => Set(ref _backgroundOpacity, value);
+        }
+
+        public TerminalViewModel SelectedTerminal
+        {
+            get => _selectedTerminal;
+            set
+            {
+                if (SelectedTerminal != null)
+                {
+                    _selectedTerminal.IsSelected = false;
+                }
+                if (Set(ref _selectedTerminal, value))
+                {
+                    SelectedTerminal?.FocusTerminal();
+                    if (SelectedTerminal != null)
+                    {
+                        SelectedTerminal.IsSelected = true;
+                        if (_applicationSettings.ShowCustomTitleInTitlebar)
+                        {
+                            WindowTitle = SelectedTerminal.TabTitle;
+                        }
+                        else
+                        {
+                            WindowTitle = SelectedTerminal.ShellTitle;
+                        }
+                    }
+                }
+            }
+        }
+
+        public 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>();
+
+        public IApplicationView ApplicationView { get; }
+
+        public Task AddConfigurableTerminal()
+        {
+            return ApplicationView.RunOnDispatcherThread(async () =>
+            {
+                var profile = await _dialogService.ShowProfileSelectionDialogAsync();
+
+                if (profile == null)
+                {
+                    if (Terminals.Count == 0)
+                    {
+                        await ApplicationView.TryClose();
+                    }
+
+                    return;
+                }
+
+                AddTerminal(profile);
+            });
+        }
+
+        public Task AddRemoteTerminal()
+        {
+            return ApplicationView.RunOnDispatcherThread(async () =>
+            {
+                var connectionInfo = await _dialogService.ShowSshConnectionInfoDialogAsync();
+
+                if (connectionInfo == null)
+                {
+                    if (Terminals.Count == 0)
+                    {
+                        await ApplicationView.TryClose();
+                    }
+
+                    return;
+                }
+
+                var profile = new ShellProfile
+                {
+                    Arguments = $"-p {connectionInfo.Port:#####} {connectionInfo.Username}@{connectionInfo.Host}",
+                    Location = @"C:\Windows\System32\OpenSSH\ssh.exe",
+                    WorkingDirectory = string.Empty,
+                    LineEndingTranslation = LineEndingStyle.DoNotModify,
+                };
+
+                AddTerminal(profile);
+            });
+        }
+
+        public void AddTerminal()
+        {
+            var profile = _settingsService.GetDefaultShellProfile();
+            AddTerminal(profile);
+        }
+
+        public void AddTerminal(Guid shellProfileId)
+        {
+            var profile = _settingsService.GetShellProfile(shellProfileId);
+            AddTerminal(profile);
+        }
+
+        public void AddTerminal(ShellProfile profile)
+        {
+            ApplicationView.RunOnDispatcherThread(() =>
+            {
+                var terminal = new TerminalViewModel(_settingsService, _trayProcessCommunicationService, _dialogService, _keyboardCommandService,
+                    _applicationSettings, profile, ApplicationView, _dispatcherTimer, _clipboardService);
+
+                terminal.Closed += OnTerminalClosed;
+                terminal.ShellTitleChanged += Terminal_ShellTitleChanged;
+                terminal.CustomTitleChanged += Terminal_CustomTitleChanged;
+                Terminals.Add(terminal);
+
+                SelectedTerminal = terminal;
+            });
+        }
+
+        private void Terminal_CustomTitleChanged(object sender, string e)
+        {
+            if (sender is TerminalViewModel terminal)
+            {
+                if (terminal.IsSelected && _applicationSettings.ShowCustomTitleInTitlebar)
+                {
+                    if (string.IsNullOrWhiteSpace(e))
+                    {
+                        WindowTitle = terminal.ShellTitle;
+                    }
+                    else
+                    {
+                        WindowTitle = e;
+                    }
+                }
+            }
+        }
+
+        private void Terminal_ShellTitleChanged(object sender, string e)
+        {
+            if (sender is TerminalViewModel terminal && terminal.IsSelected && !_applicationSettings.ShowCustomTitleInTitlebar)
+            {
+                WindowTitle = e;
+            }
+        }
+
+        public async Task CloseAllTerminals()
+        {
+            foreach (var terminal in Terminals)
+            {
+                terminal.Closed -= OnTerminalClosed;
+                terminal.ShellTitleChanged -= Terminal_ShellTitleChanged;
+                terminal.CustomTitleChanged -= Terminal_CustomTitleChanged;
+                await terminal.Close();
+            }
+        }
+
+        private void CloseCurrentTab()
+        {
+            SelectedTerminal?.CloseCommand.Execute(null);
+        }
+
+        private void NewWindow(bool showProfileSelection)
+        {
+            var args = new NewWindowRequestedEventArgs
+            {
+                ShowProfileSelection = showProfileSelection
+            };
+
+            NewWindowRequested?.Invoke(this, args);
+        }
+
+        private async void OnApplicationSettingsChanged(object sender, ApplicationSettings e)
+        {
+            await ApplicationView.RunOnDispatcherThread(() =>
+            {
+                _applicationSettings = e;
+                TabsPosition = e.TabsPosition;
+                RaisePropertyChanged(nameof(ShowTabsOnTop));
+                RaisePropertyChanged(nameof(ShowTabsOnBottom));
+
+                if (e.ShowCustomTitleInTitlebar)
+                {
+                    WindowTitle = SelectedTerminal?.TabTitle;
+                }
+                else
+                {
+                    WindowTitle = SelectedTerminal?.ShellTitle;
+                }
+            });
+        }
+
+        private async Task OnCloseRequest(object sender, CancelableEventArgs e)
+        {
+            if (_applicationSettings.ConfirmClosingWindows)
+            {
+                var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to close this window?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(false);
+
+                if (result == DialogButton.OK)
+                {
+                    await CloseAllTerminals();
+                }
+                else
+                {
+                    e.Cancelled = true;
+                }
+            }
+            else
+            {
+                await CloseAllTerminals();
+            }
+        }
+
+        private async void OnCurrentThemeChanged(object sender, Guid e)
+        {
+            await ApplicationView.RunOnDispatcherThread(() =>
+             {
+                 var currentTheme = _settingsService.GetTheme(e);
+                 Background = currentTheme.Colors.Background;
+             });
+        }
+
+        private async void OnTerminalClosed(object sender, EventArgs e)
+        {
+            if (sender is TerminalViewModel terminal)
+            {
+                if (SelectedTerminal == terminal)
+                {
+                    SelectedTerminal = Terminals.LastOrDefault(t => t != terminal);
+                }
+                Logger.Instance.Debug("Terminal with Id: {@id} closed.", terminal.Terminal.Id);
+                Terminals.Remove(terminal);
+
+                if (Terminals.Count == 0)
+                {
+                    await ApplicationView.TryClose();
+                }
+            }
+        }
+
+        private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
+        {
+            await ApplicationView.RunOnDispatcherThread(() =>
+            {
+                BackgroundOpacity = e.BackgroundOpacity;
+            });
+        }
+
+        private void SelectTabNumber(int tabNumber)
+        {
+            if (tabNumber < Terminals.Count)
+            {
+                SelectedTerminal = Terminals[tabNumber];
+            }
+        }
+
+        private void SelectNextTab()
+        {
+            var currentIndex = Terminals.IndexOf(SelectedTerminal);
+            var nextIndex = (currentIndex + 1) % Terminals.Count;
+            SelectedTerminal = Terminals[nextIndex];
+        }
+
+        private void SelectPreviousTab()
+        {
+            var currentIndex = Terminals.IndexOf(SelectedTerminal);
+            var previousIndex = (currentIndex - 1 + Terminals.Count) % Terminals.Count;
+            SelectedTerminal = Terminals[previousIndex];
+        }
+
+        private void ShowAbout()
+        {
+            ShowAboutRequested?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void ShowSettings()
+        {
+            ShowSettingsRequested?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void ToggleFullScreen()
+        {
+            ApplicationView.ToggleFullScreen();
+        }
+    }
 }

FluentTerminal.App.ViewModels/OverlayViewModel.cs

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

FluentTerminal.App.ViewModels/Profiles/CommandHistory.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace FluentTerminal.App.ViewModels.Profiles
-{
-    public class ExecutedCommand
-    {
-        public string Command { get; set; }
-
-        public string Args { get; set; }
-
-        public DateTime LastExecution { get; set; }
-
-        public int ExecutionCount { get; set; }
-    }
-
-    public class ExecutedCommandHistory
-    {
-        public List<ExecutedCommand> ExecutedCommands { get; set; }
-    }
-}

FluentTerminal.App.ViewModels/Profiles/CommonProfileProviderViewModel.cs

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

FluentTerminal.App.ViewModels/Profiles/ProfileProviderViewModelBase.cs

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

FluentTerminal.App.ViewModels/Profiles/SshConnectViewModel.cs

@@ -1,860 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Web;
-using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
-using FluentTerminal.App.ViewModels.Infrastructure;
-using FluentTerminal.Models;
-
-namespace FluentTerminal.App.ViewModels.Profiles
-{
-    /// <summary>
-    /// View-model for rich-UI based SSH profiles.
-    /// </summary>
-    public class SshConnectViewModel : ProfileProviderViewModelBase
-    {
-        #region Static
-
-        private static readonly Regex CommandValidationRx = new Regex(@"^(?<cmd>[^\s\.]+)(\.exe)?(\s+(?<args>\S.*))?$",
-            RegexOptions.Compiled | RegexOptions.IgnoreCase);
-
-        private static readonly string[] AcceptableCommands = { Constants.SshCommandName };
-
-        public static string GetErrorString(SshConnectionInfoValidationResult result, string separator = "; ") =>
-            string.Join(separator, GetErrors(result));
-
-        public static IEnumerable<string> GetErrors(SshConnectionInfoValidationResult result)
-        {
-            if (result == SshConnectionInfoValidationResult.Valid)
-            {
-                yield break;
-            }
-
-            foreach (var value in Enum.GetValues(typeof(SshConnectionInfoValidationResult))
-                .Cast<SshConnectionInfoValidationResult>().Where(r => r != SshConnectionInfoValidationResult.Valid))
-            {
-                if ((value & result) == value)
-                {
-                    yield return I18N.Translate($"{nameof(SshConnectionInfoValidationResult)}.{value}");
-                }
-            }
-        }
-
-        #endregion Static
-
-        #region Fields
-
-        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
-        private readonly IFileSystemService _fileSystemService;
-        private readonly IApplicationDataContainer _historyContainer;
-
-        private bool _commandInputOriginal;
-
-        // To prevent validating the existence of the same file multiple times because it's kinda expensive
-        private string _validatedIdentityFile;
-
-        #endregion Fields
-
-        #region Properties
-
-        private bool _commandInput;
-
-        public bool CommandInput
-        {
-            get => _commandInput;
-            set
-            {
-                if (Set(ref _commandInput, value) && _useMosh)
-                {
-                    RaisePropertyChanged(nameof(MoshVisible));
-                }
-            }
-        }
-
-        #region Quick SSH properties
-
-        private string _command;
-
-        public string Command
-        {
-            get => _command;
-            set => Set(ref _command, value);
-        }
-
-        #endregion Quick SSH properties
-
-        #region Full UI properties
-
-        private string _host;
-
-        public string Host
-        {
-            get => _host;
-            set => Set(ref _host, value);
-        }
-
-        private ushort _sshPort;
-
-        public ushort SshPort
-        {
-            get => _sshPort;
-            set => Set(ref _sshPort, value);
-        }
-
-        private string _username;
-
-        public string Username
-        {
-            get => _username;
-            set => Set(ref _username, value);
-        }
-
-        private string _identityFile;
-
-        public string IdentityFile
-        {
-            get => _identityFile;
-            set => Set(ref _identityFile, value);
-        }
-
-        private bool _useMosh;
-
-        public bool UseMosh
-        {
-            get => _useMosh;
-            set
-            {
-                if (Set(ref _useMosh, value) && !_commandInput)
-                {
-                    RaisePropertyChanged(nameof(MoshVisible));
-                }
-            }
-        }
-
-        private ushort _moshPortFrom;
-
-        public ushort MoshPortFrom
-        {
-            get => _moshPortFrom;
-            set => Set(ref _moshPortFrom, value);
-        }
-
-        private ushort _moshPortTo;
-
-        public ushort MoshPortTo
-        {
-            get => _moshPortTo;
-            set => Set(ref _moshPortTo, value);
-        }
-
-        #endregion Full UI properties
-
-        public bool MoshVisible => _useMosh && !_commandInput;
-
-        public ObservableCollection<string> CommandHistory { get; private set; }
-
-        #endregion Properties
-
-        #region Commands
-
-        public IAsyncCommand BrowseForIdentityFileCommand { get; }
-
-        #endregion Commands
-
-        #region Constructors
-
-        public SshConnectViewModel(ISettingsService settingsService, IApplicationView applicationView,
-            ITrayProcessCommunicationService trayProcessCommunicationService, IFileSystemService fileSystemService,
-            IApplicationDataContainer historyContainer, SshProfile original = null) : base(settingsService, applicationView,
-            original ?? new SshProfile { UseMosh = settingsService.GetApplicationSettings().UseMoshByDefault })
-        {
-            _trayProcessCommunicationService = trayProcessCommunicationService;
-            _fileSystemService = fileSystemService;
-            _historyContainer = historyContainer;
-
-            if (string.IsNullOrEmpty(Model.Location))
-            {
-                _commandInput = settingsService.GetApplicationSettings().UseQuickSshConnectByDefault;
-            }
-            else if (string.IsNullOrEmpty(((SshProfile)Model).Host))
-            {
-                _commandInput = true;
-            }
-            else
-            {
-                _commandInput = false;
-            }
-
-            _commandInputOriginal = _commandInput;
-
-            FillCommandHistory();
-
-            Initialize((SshProfile)Model);
-
-            BrowseForIdentityFileCommand = new AsyncCommand(BrowseForIdentityFile);
-        }
-
-        private SshConnectViewModel(ISettingsService settingsService, IApplicationView applicationView,
-            ITrayProcessCommunicationService trayProcessCommunicationService, IFileSystemService fileSystemService,
-            IApplicationDataContainer historyContainer, bool useCommandInput) : base(settingsService, applicationView,
-            new SshProfile { UseMosh = settingsService.GetApplicationSettings().UseMoshByDefault })
-        {
-            _trayProcessCommunicationService = trayProcessCommunicationService;
-            _fileSystemService = fileSystemService;
-            _historyContainer = historyContainer;
-            _commandInput = useCommandInput;
-            _commandInputOriginal = useCommandInput;
-
-            FillCommandHistory();
-
-            Initialize((SshProfile)Model);
-
-            BrowseForIdentityFileCommand = new AsyncCommand(BrowseForIdentityFile);
-        }
-
-        #endregion Constructors
-
-        #region Methods
-
-        // Fills the view model properties from the input sshProfile
-        private void Initialize(SshProfile sshProfile)
-        {
-            Command = string.IsNullOrEmpty(sshProfile.Location) ? string.Empty : $"{sshProfile.Location} {sshProfile.Arguments}";
-
-            Host = sshProfile.Host;
-            SshPort = sshProfile.SshPort;
-
-            Username = sshProfile.Username;
-
-            if (string.IsNullOrEmpty(Username))
-            {
-                _trayProcessCommunicationService.GetUserName().ContinueWith(t =>
-                {
-                    var username = t.Result;
-
-                    if (string.IsNullOrEmpty(Username) && !string.IsNullOrEmpty(username))
-                    {
-                        ApplicationView.RunOnDispatcherThread(() => Username = username, false);
-                    }
-                }, TaskContinuationOptions.OnlyOnRanToCompletion);
-            }
-
-            IdentityFile = sshProfile.IdentityFile;
-            UseMosh = sshProfile.UseMosh;
-            MoshPortFrom = sshProfile.MoshPortFrom;
-            MoshPortTo = sshProfile.MoshPortTo;
-        }
-
-        private async Task BrowseForIdentityFile()
-        {
-            var file = await _fileSystemService.OpenFile(new[] { "*" });
-            if (file != null)
-            {
-                IdentityFile = file.Path;
-            }
-        }
-
-        private string GetArgumentsString()
-        {
-            StringBuilder sb = new StringBuilder();
-
-            if (_sshPort != SshProfile.DefaultSshPort)
-                sb.Append($"-p {_sshPort:#####} ");
-
-            if (!string.IsNullOrEmpty(_identityFile))
-                sb.Append($"-i \"{_identityFile}\" ");
-
-            sb.Append($"{_username}@{_host}");
-
-            if (_useMosh)
-                sb.Append($" {_moshPortFrom}:{_moshPortTo}");
-
-            return sb.ToString();
-        }
-
-        protected override void LoadFromProfile(ShellProfile profile)
-        {
-            base.LoadFromProfile(profile);
-
-            CommandInput = _commandInputOriginal;
-
-            Initialize((SshProfile)profile);
-        }
-
-        protected override void CopyToProfile(ShellProfile profile)
-        {
-            base.CopyToProfile(profile);
-
-            _commandInputOriginal = _commandInput;
-
-            if (_commandInput)
-            {
-                CopyToProfileQuick((SshProfile)profile);
-            }
-            else
-            {
-                CopyToProfileFull((SshProfile)profile);
-            }
-        }
-
-        private void CopyToProfileFull(SshProfile sshProfile)
-        {
-            sshProfile.Location = _useMosh ? Constants.MoshCommandName : Constants.SshCommandName;
-            sshProfile.Arguments = GetArgumentsString();
-
-            sshProfile.WorkingDirectory = null;
-
-            sshProfile.Host = _host;
-            sshProfile.SshPort = _sshPort;
-            sshProfile.Username = _username;
-            sshProfile.IdentityFile = _identityFile;
-            sshProfile.UseMosh = _useMosh;
-            sshProfile.MoshPortFrom = _moshPortFrom;
-            sshProfile.MoshPortTo = _moshPortTo;
-        }
-
-        private void CopyToProfileQuick(SshProfile sshProfile)
-        {
-            var command = _command?.Trim();
-
-            if (string.IsNullOrEmpty(command))
-            {
-                sshProfile.Location = null;
-                sshProfile.Arguments = null;
-
-                return;
-            }
-
-            var match = CommandValidationRx.Match(command);
-
-            if (!match.Success)
-            {
-                // Should not happen ever because this method gets called only if validation succeeds.
-                throw new Exception("Invalid command.");
-            }
-
-            sshProfile.Location = match.Groups["cmd"].Value;
-            sshProfile.Arguments = match.Groups["args"].Success ? match.Groups["args"].Value.Trim() : null;
-
-            sshProfile.WorkingDirectory = null;
-
-            sshProfile.Host = null;
-            sshProfile.SshPort = 0;
-            sshProfile.Username = null;
-            sshProfile.IdentityFile = null;
-            sshProfile.UseMosh = false;
-            sshProfile.MoshPortFrom = 0;
-            sshProfile.MoshPortTo = 0;
-        }
-
-        public override Task<string> ValidateAsync()
-        {
-            return _commandInput ? ValidateQuickAsync() : ValidateFullAsync();
-        }
-
-        private async Task<string> ValidateFullAsync()
-        {
-            var error = await base.ValidateAsync();
-
-            if (!string.IsNullOrEmpty(error))
-            {
-                return error;
-            }
-
-            var result = await GetSshInfoValidationResultAsync();
-
-            if (result == SshConnectionInfoValidationResult.Valid)
-            {
-                return null;
-            }
-
-            error = GetErrorString(result, Environment.NewLine);
-
-            if (string.IsNullOrEmpty(error))
-            {
-                error = "Invalid input.";
-            }
-
-            return error;
-        }
-
-        private async Task<string> ValidateQuickAsync()
-        {
-            var error = await base.ValidateAsync();
-
-            if (!string.IsNullOrEmpty(error))
-            {
-                return error;
-            }
-
-            var match = CommandValidationRx.Match(_command?.Trim() ?? string.Empty);
-
-            if (!match.Success)
-            {
-                error = I18N.Translate("InvalidCommand");
-
-                return string.IsNullOrEmpty(error) ? "Invalid command." : error;
-            }
-
-            if (!AcceptableCommands.Any(c => c.Equals(match.Groups["cmd"].Value, StringComparison.OrdinalIgnoreCase)))
-            {
-                error = I18N.Translate("UnsupportedCommand");
-
-                return string.IsNullOrEmpty(error)
-                    ? $"Unsupported command: {match.Groups["cmd"]}."
-                    : $"{error} {match.Groups["cmd"]}";
-            }
-
-            if (!match.Groups["args"].Success)
-            {
-                error = I18N.Translate("CommandArgumentsMandatory");
-
-                return string.IsNullOrEmpty(error) ? "Command arguments are missing." : error;
-            }
-
-            return null;
-        }
-
-        public override bool HasChanges()
-        {
-            // ReSharper disable once ArrangeRedundantParentheses
-            if (base.HasChanges() || (_commandInput != _commandInputOriginal))
-            {
-                return true;
-            }
-
-            if (_commandInput)
-            {
-                return !_command.NullableEqualTo($"{Model.Location} {Model.Arguments}");
-            }
-
-            var original = (SshProfile)Model;
-
-            return base.HasChanges() || !original.Host.NullableEqualTo(_host) || original.SshPort != _sshPort ||
-                   !original.Username.NullableEqualTo(_username) ||
-                   !original.IdentityFile.NullableEqualTo(_identityFile) || original.UseMosh != _useMosh ||
-                   original.MoshPortFrom != _moshPortFrom || original.MoshPortTo != _moshPortTo;
-        }
-
-        public async Task<SshConnectionInfoValidationResult> GetSshInfoValidationResultAsync()
-        {
-            var result = SshConnectionInfoValidationResult.Valid;
-
-            if (string.IsNullOrEmpty(_username))
-            {
-                result |= SshConnectionInfoValidationResult.UsernameEmpty;
-            }
-
-            if (string.IsNullOrEmpty(_host))
-            {
-                result |= SshConnectionInfoValidationResult.HostEmpty;
-            }
-
-            if (_sshPort < 1)
-            {
-                result |= SshConnectionInfoValidationResult.SshPortZeroOrNegative;
-            }
-
-            if (!await CheckIdentityFileExistsAsync())
-            {
-                result |= SshConnectionInfoValidationResult.IdentityFileDoesNotExist;
-            }
-
-            if (!_useMosh)
-            {
-                return result;
-            }
-
-            if (_moshPortFrom < 1)
-            {
-                result |= SshConnectionInfoValidationResult.MoshPortZeroOrNegative;
-            }
-
-            if (_moshPortFrom > _moshPortTo)
-            {
-                result |= SshConnectionInfoValidationResult.MoshPortRangeInvalid;
-            }
-
-            return result;
-        }
-
-        private async Task<bool> CheckIdentityFileExistsAsync()
-        {
-            var identityFile = _identityFile;
-
-            if (string.IsNullOrEmpty(identityFile) ||
-                identityFile.Equals(_validatedIdentityFile, StringComparison.OrdinalIgnoreCase))
-            {
-                return true;
-            }
-
-            // Here we need to take into account that files from ssh config dir can be provided by name, without full path.
-            string fullPath;
-
-            if (Path.IsPathRooted(identityFile))
-            {
-                fullPath = identityFile;
-            }
-            else
-            {
-                var sshConfigDir = await _trayProcessCommunicationService.GetSshConfigDirAsync();
-
-                if (string.IsNullOrEmpty(sshConfigDir))
-                {
-                    return false;
-                }
-
-                fullPath = Path.Combine(sshConfigDir, identityFile);
-            }
-
-            if (await _trayProcessCommunicationService.CheckFileExistsAsync(fullPath))
-            {
-                _validatedIdentityFile = identityFile;
-
-                IdentityFile = fullPath;
-
-                return true;
-            }
-
-            return false;
-        }
-
-        public void SetValidatedIdentityFile(string identityFile)
-        {
-            _validatedIdentityFile = identityFile;
-            IdentityFile = identityFile;
-        }
-
-        #endregion Methods
-
-        #region Command history
-
-        private const string ExecutedCommandsKey = "ExecutedCommands";
-        private const int CommandHistoryLimit = 20;
-
-        private void FillCommandHistory()
-        {
-            var commands = _historyContainer.ReadValueFromJson<ExecutedCommandHistory>(ExecutedCommandsKey, null)
-                ?.ExecutedCommands;
-
-            CommandHistory = commands == null
-                ? new ObservableCollection<string>()
-                : new ObservableCollection<string>(commands.Select(c => $"{c.Command} {c.Args}"));
-        }
-
-        public void SaveCommand(string cmd, string args)
-        {
-            cmd = cmd?.Trim();
-
-            if (string.IsNullOrEmpty(cmd))
-            {
-                throw new ArgumentNullException(nameof(cmd));
-            }
-
-            var commandHistory =
-                _historyContainer.ReadValueFromJson<ExecutedCommandHistory>(ExecutedCommandsKey, null) ??
-                new ExecutedCommandHistory { ExecutedCommands = new List<ExecutedCommand>() };
-
-            var command = commandHistory.ExecutedCommands.FirstOrDefault(c =>
-                string.Equals(cmd, c.Command, StringComparison.Ordinal) && args.NullableEqualTo(c.Args));
-
-            if (command == null)
-            {
-                command = new ExecutedCommand
-                { Command = cmd, Args = args, ExecutionCount = 1, LastExecution = DateTime.UtcNow };
-            }
-            else
-            {
-                command.ExecutionCount++;
-
-                command.LastExecution = DateTime.UtcNow;
-
-                commandHistory.ExecutedCommands.Remove(command);
-            }
-
-            commandHistory.ExecutedCommands.Insert(0, command);
-
-            while (commandHistory.ExecutedCommands.Count > CommandHistoryLimit)
-            {
-                commandHistory.ExecutedCommands.RemoveAt(CommandHistoryLimit);
-            }
-
-            _historyContainer.WriteValueAsJson(ExecutedCommandsKey, commandHistory);
-        }
-
-        #endregion Command history
-
-        #region Links/shortcuts related
-
-        // Resources:
-        // https://tools.ietf.org/html/draft-ietf-secsh-scp-sftp-ssh-uri-04#section-3
-        // https://man.openbsd.org/ssh
-
-        private const string SshUriScheme = "ssh";
-        private const string MoshUriScheme = "mosh";
-
-        private const string CustomSshUriScheme = "sshft";
-        private const string CustomUriHost = "fluent.terminal";
-        private const string CustomCommandQueryStringName = "cmd";
-        private const string CustomArgumentsQueryStringName = "args";
-
-        // Constant derived from https://man.openbsd.org/ssh
-        private const string IdentityFileOptionName = "IdentityFile";
-
-        private static readonly string[] ValidMoshPortsNames = { "mosh_ports", "mosh-ports" };
-
-        private static readonly Regex MoshRangeRx =
-            new Regex(@"^(?<from>\d{1,5})[:-](?<to>\d{1,5})$", RegexOptions.Compiled);
-
-        public static bool CheckScheme(Uri uri) => CheckSchemeStandard(uri) || CheckSchemeCustom(uri);
-
-        private static bool CheckSchemeStandard(Uri uri) =>
-            SshUriScheme.Equals(uri?.Scheme, StringComparison.OrdinalIgnoreCase) ||
-            MoshUriScheme.Equals(uri?.Scheme, StringComparison.OrdinalIgnoreCase);
-
-        private static bool CheckSchemeCustom(Uri uri) =>
-            CustomSshUriScheme.Equals(uri?.Scheme, StringComparison.OrdinalIgnoreCase);
-
-        public static SshConnectViewModel ParseUri(Uri uri, ISettingsService settingsService,
-            IApplicationView applicationView, ITrayProcessCommunicationService trayProcessCommunicationService,
-            IFileSystemService fileSystemService, IApplicationDataContainer historyContainer)
-        {
-            if (CheckSchemeStandard(uri))
-            {
-                return ParseUriStandard(uri, settingsService, applicationView, trayProcessCommunicationService,
-                    fileSystemService, historyContainer);
-            }
-
-            if (CheckSchemeCustom(uri))
-            {
-                return ParseUriCustom(uri, settingsService, applicationView, trayProcessCommunicationService,
-                    fileSystemService, historyContainer);
-            }
-
-            // Won't happen ever
-            throw new Exception($"Unsupported URI scheme: {uri.Scheme}");
-        }
-
-        private static SshConnectViewModel ParseUriStandard(Uri uri, ISettingsService settingsService,
-            IApplicationView applicationView, ITrayProcessCommunicationService trayProcessCommunicationService,
-            IFileSystemService fileSystemService, IApplicationDataContainer historyContainer)
-        {
-            var vm = new SshConnectViewModel(settingsService, applicationView, trayProcessCommunicationService,
-                fileSystemService, historyContainer, false)
-            {
-                Host = uri.Host,
-                UseMosh = MoshUriScheme.Equals(uri.Scheme, StringComparison.OrdinalIgnoreCase)
-            };
-
-            if (uri.Port >= 0)
-                vm.SshPort = (ushort)uri.Port;
-
-            if (!string.IsNullOrEmpty(uri.UserInfo))
-            {
-                string[] parts = uri.UserInfo.Split(';');
-
-                if (parts.Length > 2)
-                    throw new FormatException($"UserInfo part contains {parts.Length} elements.");
-
-                vm.Username = HttpUtility.UrlDecode(parts[0]);
-
-                if (parts.Length > 1)
-                {
-                    // For now we are only interested in IdentityFile option
-                    Tuple<string, string> identityFileOption = ParseParams(parts[1], ',').FirstOrDefault(p =>
-                        string.Equals(p.Item1, IdentityFileOptionName, StringComparison.OrdinalIgnoreCase));
-
-                    vm.IdentityFile = identityFileOption?.Item2;
-                }
-            }
-
-            // ReSharper disable once ConstantConditionalAccessQualifier
-            string queryString = uri.Query?.Trim();
-
-            if (string.IsNullOrEmpty(queryString))
-            {
-                return vm;
-            }
-
-            if (queryString.StartsWith("?", StringComparison.Ordinal))
-            {
-                queryString = queryString.Substring(1);
-            }
-
-            var queryStringParams = ParseParams(queryString, '&').ToList();
-
-            var moshPorts = queryStringParams.FirstOrDefault(p =>
-                ValidMoshPortsNames.Any(n => string.Equals(p.Item1, n, StringComparison.OrdinalIgnoreCase)));
-
-            if (moshPorts != null)
-            {
-                Match match = MoshRangeRx.Match(moshPorts.Item2);
-
-                if (match.Success)
-                {
-                    vm.MoshPortFrom = ushort.Parse(match.Groups["from"].Value);
-                    vm.MoshPortTo = ushort.Parse(match.Groups["to"].Value);
-                }
-            }
-
-            vm.LoadBaseFromQueryString(queryStringParams);
-
-            return vm;
-        }
-
-        private static SshConnectViewModel ParseUriCustom(Uri uri, ISettingsService settingsService,
-            IApplicationView applicationView, ITrayProcessCommunicationService trayProcessCommunicationService,
-            IFileSystemService fileSystemService, IApplicationDataContainer historyContainer)
-        {
-            var vm = new SshConnectViewModel(settingsService, applicationView, trayProcessCommunicationService,
-                fileSystemService, historyContainer, true);
-
-            // ReSharper disable once ConstantConditionalAccessQualifier
-            string queryString = uri.Query?.Trim();
-
-            if (string.IsNullOrEmpty(queryString))
-            {
-                return vm;
-            }
-
-            if (queryString.StartsWith("?", StringComparison.Ordinal))
-            {
-                queryString = queryString.Substring(1);
-            }
-
-            var queryStringParams = ParseParams(queryString, '&').ToList();
-
-            var cmdParam = queryStringParams.FirstOrDefault(t =>
-                CustomCommandQueryStringName.Equals(t.Item1, StringComparison.OrdinalIgnoreCase));
-
-            var argsParam = queryStringParams.FirstOrDefault(t =>
-                CustomArgumentsQueryStringName.Equals(t.Item1, StringComparison.OrdinalIgnoreCase));
-
-            vm._command =
-                $"{(string.IsNullOrEmpty(cmdParam?.Item2) ? Constants.SshCommandName : cmdParam.Item2)} {argsParam?.Item2}"
-                    .Trim();
-
-            vm.LoadBaseFromQueryString(queryStringParams);
-
-            return vm;
-        }
-
-        public override Task<Tuple<bool, string>> GetUrlAsync()
-        {
-            return _commandInput ? GetUrlQuickAsync() : GetUrlFullAsync();
-        }
-
-        private async Task<Tuple<bool, string>> GetUrlFullAsync()
-        {
-            var error = await base.ValidateAsync();
-
-            if (!string.IsNullOrEmpty(error))
-            {
-                return Tuple.Create(false, error);
-            }
-
-            var result = await GetSshInfoValidationResultAsync();
-
-            if (result != SshConnectionInfoValidationResult.Valid &&
-                // For links we can ignore missing username
-                result != SshConnectionInfoValidationResult.UsernameEmpty)
-            {
-
-                error = GetErrorString(result, Environment.NewLine);
-
-                if (string.IsNullOrEmpty(error))
-                {
-                    error = "Invalid input.";
-                }
-
-                return Tuple.Create(false, error);
-            }
-
-            StringBuilder sb = new StringBuilder(_useMosh ? MoshUriScheme : SshUriScheme);
-
-            sb.Append("://");
-
-            bool containsUserInfo = false;
-
-            if (!string.IsNullOrEmpty(_username))
-            {
-                sb.Append(HttpUtility.UrlEncode(_username));
-
-                containsUserInfo = true;
-            }
-
-            if (!string.IsNullOrEmpty(_identityFile))
-            {
-                sb.Append(";");
-
-                if (!string.IsNullOrEmpty(_identityFile))
-                {
-                    sb.Append($"{IdentityFileOptionName}={HttpUtility.UrlEncode(_identityFile)}");
-                }
-
-                containsUserInfo = true;
-            }
-
-            if (containsUserInfo)
-                sb.Append("@");
-
-            sb.Append(_host);
-
-            if (_sshPort != SshProfile.DefaultSshPort)
-            {
-                sb.Append($":{_sshPort:#####}");
-            }
-
-            sb.Append("/");
-
-            bool queryStringAdded = false;
-
-            if (_useMosh)
-            {
-                sb.Append(
-                    $"?{ValidMoshPortsNames[0]}={_moshPortFrom:#####}-{_moshPortTo:#####}");
-
-                queryStringAdded = true;
-            }
-
-            var terminalInfoQueryString = GetBaseQueryString();
-
-            if (!string.IsNullOrEmpty(terminalInfoQueryString))
-            {
-                sb.Append($"{(queryStringAdded ? "&" : "?")}{terminalInfoQueryString}");
-            }
-
-            return Tuple.Create(true, sb.ToString());
-        }
-
-        private async Task<Tuple<bool, string>> GetUrlQuickAsync()
-        {
-            var error = await base.ValidateAsync();
-
-            if (!string.IsNullOrEmpty(error))
-            {
-                return Tuple.Create(false, error);
-            }
-
-            var match = CommandValidationRx.Match(_command);
-
-            if (!match.Success)
-            {
-                error = I18N.Translate("InvalidCommand");
-
-                return Tuple.Create(false, string.IsNullOrEmpty(error) ? "Invalid command." : error);
-            }
-
-            return Tuple.Create(true,
-                $"{CustomSshUriScheme}://{CustomUriHost}/?{CustomCommandQueryStringName}={Constants.SshCommandName}&{CustomArgumentsQueryStringName}={HttpUtility.UrlEncode(match.Groups["args"].Value.Trim())}&{GetBaseQueryString()}");
-        }
-
-        #endregion Links/shortcuts related
-    }
-}

FluentTerminal.App.ViewModels/Profiles/SshConnectionInfoValidationResult.cs

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

FluentTerminal.App.ViewModels/Settings/GeneralPageViewModel.cs

@@ -1,10 +1,8 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.ViewModels.Settings
@@ -17,46 +15,25 @@ namespace FluentTerminal.App.ViewModels.Settings
         private readonly ISettingsService _settingsService;
         private readonly IStartupTaskService _startupTaskService;
         private bool _canEnableStartupTask;
+        private bool _editingNewTerminalLocation;
+        private bool _editingTabsPosition;
+        private bool _editingInactiveTabColorMode;
         private bool _startupTaskEnabled;
         private bool _shouldRestartForTrayMessage;
         private string _startupTaskErrorMessage;
-        private bool _needsToRestart;
-        private readonly IApplicationLanguageService _applicationLanguageService;
-        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
 
-        public GeneralPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider,
-            IStartupTaskService startupTaskService, IApplicationLanguageService applicationLanguageService, ITrayProcessCommunicationService trayProcessCommunicationService)
+        public GeneralPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider, IStartupTaskService startupTaskService)
         {
             _settingsService = settingsService;
             _dialogService = dialogService;
             _defaultValueProvider = defaultValueProvider;
             _startupTaskService = startupTaskService;
-            _applicationLanguageService = applicationLanguageService;
-            _trayProcessCommunicationService = trayProcessCommunicationService;
 
             _applicationSettings = _settingsService.GetApplicationSettings();
 
             RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
         }
 
-        public IEnumerable<string> Languages => _applicationLanguageService.Languages;
-
-        public bool NeedsToRestart
-        {
-            get => _needsToRestart;
-            set => Set(ref _needsToRestart, value);
-        }
-
-        public string SelectedLanguage
-        {
-            get => _applicationLanguageService.GetCurrentLanguage();
-            set
-            {
-                _applicationLanguageService.SetLanguage(value);
-                NeedsToRestart = true;
-            }
-        }
-
         public async Task OnNavigatedTo()
         {
             var startupTaskStatus = await _startupTaskService.GetStatus();
@@ -77,6 +54,20 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
+        public bool AlwaysUseWinPty
+        {
+            get => _applicationSettings.AlwaysUseWinPty;
+            set
+            {
+                if (_applicationSettings.AlwaysUseWinPty != value)
+                {
+                    _applicationSettings.AlwaysUseWinPty = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
         public bool ShowCustomTitleInTitlebar
         {
             get => _applicationSettings.ShowCustomTitleInTitlebar;
@@ -128,82 +119,10 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        public bool UseMoshByDefault
-        {
-            get => _applicationSettings.UseMoshByDefault;
-            set
-            {
-                if (_applicationSettings.UseMoshByDefault != value)
-                {
-                    _applicationSettings.UseMoshByDefault = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public bool AutoFallbackToWindowsUsernameInLinks
-        {
-            get => _applicationSettings.AutoFallbackToWindowsUsernameInLinks;
-            set
-            {
-                if (_applicationSettings.AutoFallbackToWindowsUsernameInLinks != value)
-                {
-                    _applicationSettings.AutoFallbackToWindowsUsernameInLinks = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public bool UseQuickSshConnectByDefault
-        {
-            get => _applicationSettings.UseQuickSshConnectByDefault;
-            set
-            {
-                if (_applicationSettings.UseQuickSshConnectByDefault != value)
-                {
-                    _applicationSettings.UseQuickSshConnectByDefault = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public bool RTrimCopiedLines
-        {
-            get => _applicationSettings.RTrimCopiedLines;
-            set
-            {
-                if (_applicationSettings.RTrimCopiedLines != value)
-                {
-                    _applicationSettings.RTrimCopiedLines = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public bool MuteTerminalBeeps
-        {
-            get => _applicationSettings.MuteTerminalBeeps;
-            set
-            {
-                if (_applicationSettings.MuteTerminalBeeps != value)
-                {
-                    _applicationSettings.MuteTerminalBeeps = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-
-                    _trayProcessCommunicationService.MuteTerminal(value);
-                }
-            }
-        }
-
         public bool BottomIsSelected
         {
             get => TabsPosition == TabsPosition.Bottom;
-            set { if (value) TabsPosition = TabsPosition.Bottom; }
+            set => TabsPosition = TabsPosition.Bottom;
         }
 
         public bool CanEnableStartupTask
@@ -245,11 +164,15 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _applicationSettings.NewTerminalLocation;
             set
             {
-                if (_applicationSettings.NewTerminalLocation != value)
+                if (_applicationSettings.NewTerminalLocation != value && !_editingNewTerminalLocation)
                 {
+                    _editingNewTerminalLocation = true;
                     _applicationSettings.NewTerminalLocation = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
                     RaisePropertyChanged();
+                    RaisePropertyChanged(nameof(WindowIsSelected));
+                    RaisePropertyChanged(nameof(TabIsSelected));
+                    _editingNewTerminalLocation = false;
                 }
             }
         }
@@ -279,7 +202,7 @@ namespace FluentTerminal.App.ViewModels.Settings
         public bool TabIsSelected
         {
             get => NewTerminalLocation == NewTerminalLocation.Tab;
-            set { if (value) NewTerminalLocation = NewTerminalLocation.Tab; }
+            set => NewTerminalLocation = NewTerminalLocation.Tab;
         }
 
         public TabsPosition TabsPosition
@@ -287,11 +210,15 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _applicationSettings.TabsPosition;
             set
             {
-                if (_applicationSettings.TabsPosition != value)
+                if (_applicationSettings.TabsPosition != value && !_editingTabsPosition)
                 {
+                    _editingTabsPosition = true;
                     _applicationSettings.TabsPosition = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
                     RaisePropertyChanged();
+                    RaisePropertyChanged(nameof(TopIsSelected));
+                    RaisePropertyChanged(nameof(BottomIsSelected));
+                    _editingTabsPosition = false;
                 }
             }
         }
@@ -299,7 +226,7 @@ namespace FluentTerminal.App.ViewModels.Settings
         public bool TopIsSelected
         {
             get => TabsPosition == TabsPosition.Top;
-            set { if (value) TabsPosition = TabsPosition.Top; }
+            set => TabsPosition = TabsPosition.Top;
         }
 
         public bool UnderlineSelectedTab
@@ -319,13 +246,13 @@ namespace FluentTerminal.App.ViewModels.Settings
         public bool BackgroundIsSelected
         {
             get => InactiveTabColorMode == InactiveTabColorMode.Background;
-            set { if (value) InactiveTabColorMode = InactiveTabColorMode.Background; }
+            set => InactiveTabColorMode = InactiveTabColorMode.Background;
         }
 
         public bool UnderlinedIsSelected
         {
             get => InactiveTabColorMode == InactiveTabColorMode.Underlined;
-            set { if (value) InactiveTabColorMode = InactiveTabColorMode.Underlined; }
+            set => InactiveTabColorMode = InactiveTabColorMode.Underlined;
         }
 
         public InactiveTabColorMode InactiveTabColorMode
@@ -333,11 +260,15 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _applicationSettings.InactiveTabColorMode;
             set
             {
-                if (_applicationSettings.InactiveTabColorMode != value)
+                if (_applicationSettings.InactiveTabColorMode != value && !_editingInactiveTabColorMode)
                 {
+                    _editingInactiveTabColorMode = true;
                     _applicationSettings.InactiveTabColorMode = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
                     RaisePropertyChanged();
+                    RaisePropertyChanged(nameof(BackgroundIsSelected));
+                    RaisePropertyChanged(nameof(UnderlinedIsSelected));
+                    _editingInactiveTabColorMode = false;
                 }
             }
         }
@@ -345,12 +276,12 @@ namespace FluentTerminal.App.ViewModels.Settings
         public bool WindowIsSelected
         {
             get => NewTerminalLocation == NewTerminalLocation.Window;
-            set { if (value) NewTerminalLocation = NewTerminalLocation.Window; }
+            set => NewTerminalLocation = NewTerminalLocation.Window;
         }
 
         private async Task RestoreDefaults()
         {
-            var result = await _dialogService.ShowMessageDialogAsnyc(I18N.Translate("PleaseConfirm"), I18N.Translate("ConfirmRestoreGeneralSettings"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the general settings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {
@@ -361,13 +292,10 @@ namespace FluentTerminal.App.ViewModels.Settings
                 InactiveTabColorMode = defaults.InactiveTabColorMode;
                 NewTerminalLocation = defaults.NewTerminalLocation;
                 AlwaysShowTabs = defaults.AlwaysShowTabs;
+                AlwaysUseWinPty = defaults.AlwaysUseWinPty;
                 ShowNewOutputIndicator = defaults.ShowNewOutputIndicator;
                 EnableTrayIcon = defaults.EnableTrayIcon;
                 ShowCustomTitleInTitlebar = defaults.ShowCustomTitleInTitlebar;
-                UseMoshByDefault = defaults.UseMoshByDefault;
-                AutoFallbackToWindowsUsernameInLinks = defaults.AutoFallbackToWindowsUsernameInLinks;
-                RTrimCopiedLines = defaults.RTrimCopiedLines;
-                MuteTerminalBeeps = defaults.MuteTerminalBeeps;
             }
         }
 
@@ -389,13 +317,13 @@ namespace FluentTerminal.App.ViewModels.Settings
 
                 case StartupTaskStatus.DisabledByUser:
                     StartupTaskEnabled = false;
-                    StartupTaskErrorMessage = I18N.Translate("DisabledByUser");
+                    StartupTaskErrorMessage = "Disabled by user. Please reactivate it in the Startup tab of the Task Manager.";
                     CanEnableStartupTask = false;
                     break;
 
                 case StartupTaskStatus.DisabledByPolicy:
                     StartupTaskEnabled = false;
-                    StartupTaskErrorMessage = I18N.Translate("DisabledByPolicy");
+                    StartupTaskErrorMessage = "Disabled by policy.";
                     CanEnableStartupTask = false;
                     break;
             }
@@ -410,7 +338,7 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
             else
             {
-                await _startupTaskService.DisableStartupTask();
+                _startupTaskService.DisableStartupTask();
                 status = await _startupTaskService.GetStatus();
             }
             SetStartupTaskPropertiesForStatus(status);

FluentTerminal.App.ViewModels/Settings/KeyBindingViewModel.cs

@@ -1,5 +1,4 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.App.ViewModels.Infrastructure;
 using FluentTerminal.Models;
 using GalaSoft.MvvmLight;
@@ -119,7 +118,7 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         private async Task Delete()
         {
-            var result = await _dialogService.ShowMessageDialogAsnyc(I18N.Translate("PleaseConfirm"), I18N.Translate("ConfirmDeleteKeybindings"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to delete this keybinding?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {

FluentTerminal.App.ViewModels/Settings/KeyBindingsPageViewModel.cs

@@ -61,7 +61,7 @@ namespace FluentTerminal.App.ViewModels.Settings
             foreach (var value in Enum.GetValues(typeof(Command)))
             {
                 var command = (Command)value;
-                var viewModel = new KeyBindingsViewModel(command.ToString(), _dialogService, I18N.Translate($"{nameof(Command)}.{command}"), true);
+                var viewModel = new KeyBindingsViewModel(command.ToString(), _dialogService, EnumHelper.GetEnumDescription(command), true);
                 foreach (var keyBinding in _keyBindings[command.ToString()])
                 {
                     viewModel.Add(keyBinding);
@@ -79,7 +79,7 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         private async Task RestoreDefaults()
         {
-            var result = await _dialogService.ShowMessageDialogAsnyc(I18N.Translate("PleaseConfirm"), I18N.Translate("ConfirmRestoreKeybindings"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the default keybindings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {

FluentTerminal.App.ViewModels/Settings/MousePageViewModel.cs

@@ -1,9 +1,11 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
+using System;
+using System.Collections.Generic;
+using System.Text;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.ViewModels.Settings
@@ -14,6 +16,8 @@ namespace FluentTerminal.App.ViewModels.Settings
         private readonly IDialogService _dialogService;
         private readonly IDefaultValueProvider _defaultValueProvider;
         private readonly ApplicationSettings _applicationSettings;
+        private bool _editingMouseRightClickAction;
+        private bool _editingMouseMiddleClickAction;
 
         public MousePageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider)
         {
@@ -44,11 +48,16 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _applicationSettings.MouseRightClickAction;
             set
             {
-                if (_applicationSettings.MouseRightClickAction != value)
+                if (_applicationSettings.MouseRightClickAction != value && !_editingMouseRightClickAction)
                 {
+                    _editingMouseRightClickAction = true;
                     _applicationSettings.MouseRightClickAction = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
                     RaisePropertyChanged();
+                    RaisePropertyChanged(nameof(MouseRightClickNoneIsSelected));
+                    RaisePropertyChanged(nameof(MouseRightClickContextMenuIsSelected));
+                    RaisePropertyChanged(nameof(MouseRightClickPasteIsSelected));
+                    _editingMouseRightClickAction = false;
                 }
             }
         }
@@ -56,19 +65,19 @@ namespace FluentTerminal.App.ViewModels.Settings
         public bool MouseRightClickNoneIsSelected
         {
             get => MouseRightClickAction == MouseAction.None;
-            set { if (value) MouseRightClickAction = MouseAction.None; }
+            set => MouseRightClickAction = MouseAction.None;
         }
 
         public bool MouseRightClickContextMenuIsSelected
         {
             get => MouseRightClickAction == MouseAction.ContextMenu;
-            set { if (value) MouseRightClickAction = MouseAction.ContextMenu; }
+            set => MouseRightClickAction = MouseAction.ContextMenu;
         }
 
         public bool MouseRightClickPasteIsSelected
         {
             get => MouseRightClickAction == MouseAction.Paste;
-            set { if (value) MouseRightClickAction = MouseAction.Paste; }
+            set => MouseRightClickAction = MouseAction.Paste;
         }
 
         public MouseAction MouseMiddleClickAction
@@ -76,11 +85,16 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _applicationSettings.MouseMiddleClickAction;
             set
             {
-                if (_applicationSettings.MouseMiddleClickAction != value)
+                if (_applicationSettings.MouseMiddleClickAction != value && !_editingMouseMiddleClickAction)
                 {
+                    _editingMouseMiddleClickAction = true;
                     _applicationSettings.MouseMiddleClickAction = value;
                     _settingsService.SaveApplicationSettings(_applicationSettings);
                     RaisePropertyChanged();
+                    RaisePropertyChanged(nameof(MouseMiddleClickNoneIsSelected));
+                    RaisePropertyChanged(nameof(MouseMiddleClickContextMenuIsSelected));
+                    RaisePropertyChanged(nameof(MouseMiddleClickPasteIsSelected));
+                    _editingMouseMiddleClickAction = false;
                 }
             }
         }
@@ -88,26 +102,26 @@ namespace FluentTerminal.App.ViewModels.Settings
         public bool MouseMiddleClickNoneIsSelected
         {
             get => MouseMiddleClickAction == MouseAction.None;
-            set { if (value) MouseMiddleClickAction = MouseAction.None; }
+            set => MouseMiddleClickAction = MouseAction.None;
         }
 
         public bool MouseMiddleClickContextMenuIsSelected
         {
             get => MouseMiddleClickAction == MouseAction.ContextMenu;
-            set { if (value) MouseMiddleClickAction = MouseAction.ContextMenu; }
+            set => MouseMiddleClickAction = MouseAction.ContextMenu;
         }
 
         public bool MouseMiddleClickPasteIsSelected
         {
             get => MouseMiddleClickAction == MouseAction.Paste;
-            set { if (value) MouseMiddleClickAction = MouseAction.Paste; }
+            set => MouseMiddleClickAction = MouseAction.Paste;
         }
 
         public RelayCommand RestoreDefaultsCommand { get; }
 
         private async Task RestoreDefaults()
         {
-            var result = await _dialogService.ShowMessageDialogAsnyc(I18N.Translate("PleaseConfirm"), I18N.Translate("ConfirmRestoreMouseSettings"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the mouse settings?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {

FluentTerminal.App.ViewModels/Settings/ProfilesPageViewModel.cs

@@ -98,17 +98,20 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         private void Clone(ShellProfileViewModel shellProfile)
         {
-            var cloned = shellProfile.ProfileVm.Model.Clone();
-
-            cloned.Id = Guid.NewGuid();
-            cloned.PreInstalled = false;
-            cloned.Name = $"Copy of {shellProfile.Name}";
+            var cloned = new ShellProfile(shellProfile.Model)
+            {
+                Id = Guid.NewGuid(),
+                PreInstalled = false,
+                Name = $"Copy of {shellProfile.Name}"
+            };
 
             AddShellProfile(cloned);
         }
 
         private void AddShellProfile(ShellProfile shellProfile)
         {
+            _settingsService.SaveShellProfile(shellProfile, true);
+
             var viewModel = new ShellProfileViewModel(shellProfile, _settingsService, _dialogService, _fileSystemService, _applicationView, _defaultValueProvider, true);
             viewModel.EditCommand.Execute(null);
             viewModel.SetAsDefault += OnShellProfileSetAsDefault;

FluentTerminal.App.ViewModels/Settings/SshProfilesPageViewModel.cs

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

FluentTerminal.App.ViewModels/Settings/TerminalPageViewModel.cs

@@ -1,5 +1,4 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
@@ -16,41 +15,43 @@ namespace FluentTerminal.App.ViewModels.Settings
         private readonly ISettingsService _settingsService;
         private readonly IDialogService _dialogService;
         private readonly IDefaultValueProvider _defaultValueProvider;
+        private bool _isEditingCursorStyle;
+        private bool _isEditingScrollBarStyle;
 
         public bool BarIsSelected
         {
             get => CursorStyle == CursorStyle.Bar;
-            set { if (value) CursorStyle = CursorStyle.Bar; }
+            set => CursorStyle = CursorStyle.Bar;
         }
 
         public bool BlockIsSelected
         {
             get => CursorStyle == CursorStyle.Block;
-            set { if (value) CursorStyle = CursorStyle.Block; }
+            set => CursorStyle = CursorStyle.Block;
         }
 
         public bool UnderlineIsSelected
         {
             get => CursorStyle == CursorStyle.Underline;
-            set { if (value) CursorStyle = CursorStyle.Underline; }
+            set => CursorStyle = CursorStyle.Underline;
         }
 
         public bool HiddenIsSelected
         {
             get => ScrollBarStyle == ScrollBarStyle.Hidden;
-            set { if (value) ScrollBarStyle = ScrollBarStyle.Hidden; }
+            set => ScrollBarStyle = ScrollBarStyle.Hidden;
         }
 
         public bool AutoHidingIsSelected
         {
             get => ScrollBarStyle == ScrollBarStyle.AutoHiding;
-            set { if (value) ScrollBarStyle = ScrollBarStyle.AutoHiding; }
+            set => ScrollBarStyle = ScrollBarStyle.AutoHiding;
         }
 
         public bool VisibleIsSelected
         {
             get => ScrollBarStyle == ScrollBarStyle.Visible;
-            set { if (value) ScrollBarStyle = ScrollBarStyle.Visible; }
+            set => ScrollBarStyle = ScrollBarStyle.Visible;
         }
 
         public bool CursorBlink
@@ -149,20 +150,6 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        public bool ShowTextCopied
-        {
-            get => _terminalOptions.ShowTextCopied;
-            set
-            {
-                if (_terminalOptions.ShowTextCopied != value)
-                {
-                    _terminalOptions.ShowTextCopied = value;
-                    _settingsService.SaveTerminalOptions(_terminalOptions);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
         public IEnumerable<FontInfo> Fonts { get; }
 
         public int FontSize
@@ -188,11 +175,16 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _terminalOptions.CursorStyle;
             set
             {
-                if (_terminalOptions.CursorStyle != value)
+                if (_terminalOptions.CursorStyle != value && !_isEditingCursorStyle)
                 {
+                    _isEditingCursorStyle = true;
                     _terminalOptions.CursorStyle = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
                     RaisePropertyChanged();
+                    RaisePropertyChanged(nameof(BlockIsSelected));
+                    RaisePropertyChanged(nameof(BarIsSelected));
+                    RaisePropertyChanged(nameof(UnderlineIsSelected));
+                    _isEditingCursorStyle = false;
                 }
             }
         }
@@ -202,18 +194,23 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _terminalOptions.ScrollBarStyle;
             set
             {
-                if (_terminalOptions.ScrollBarStyle != value)
+                if (_terminalOptions.ScrollBarStyle != value && !_isEditingScrollBarStyle)
                 {
+                    _isEditingScrollBarStyle = true;
                     _terminalOptions.ScrollBarStyle = value;
                     _settingsService.SaveTerminalOptions(_terminalOptions);
                     RaisePropertyChanged();
+                    RaisePropertyChanged(nameof(HiddenIsSelected));
+                    RaisePropertyChanged(nameof(AutoHidingIsSelected));
+                    RaisePropertyChanged(nameof(VisibleIsSelected));
+                    _isEditingScrollBarStyle = false;
                 }
             }
         }
 
         private async Task RestoreDefaults()
         {
-            var result = await _dialogService.ShowMessageDialogAsnyc(I18N.Translate("PleaseConfirm"), I18N.Translate("ConfirmRestoreTerminalOptions"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to restore the default terminal options?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {
@@ -226,7 +223,6 @@ namespace FluentTerminal.App.ViewModels.Settings
                 BoldText = defaults.BoldText;
                 BackgroundOpacity = defaults.BackgroundOpacity;
                 ScrollBackLimit = defaults.ScrollBackLimit.ToString();
-                ShowTextCopied = defaults.ShowTextCopied;
             }
         }
 

FluentTerminal.App.ViewModels/Settings/ThemesPageViewModel.cs

@@ -1,5 +1,4 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.Models;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
@@ -119,7 +118,7 @@ namespace FluentTerminal.App.ViewModels.Settings
 
                 if (parser == null)
                 {
-                    await _dialogService.ShowMessageDialogAsnyc(I18N.Translate("ImportThemeFailed"), I18N.Translate("NoSuitableParserFound"), DialogButton.OK).ConfigureAwait(false);
+                    await _dialogService.ShowMessageDialogAsnyc("Import theme failed", "No suitable parser found", DialogButton.OK).ConfigureAwait(false);
                     return;
                 }
 
@@ -131,7 +130,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 }
                 catch (Exception exception)
                 {
-                    await _dialogService.ShowMessageDialogAsnyc(I18N.Translate("ImportThemeFailed"), exception.Message, DialogButton.OK).ConfigureAwait(false);
+                    await _dialogService.ShowMessageDialogAsnyc("Import theme failed", exception.Message, DialogButton.OK).ConfigureAwait(false);
                 }
             }
         }

FluentTerminal.App.ViewModels/SettingsViewModel.cs

@@ -9,18 +9,15 @@ namespace FluentTerminal.App.ViewModels
     {
         public SettingsViewModel(ISettingsService settingsService, IDefaultValueProvider defaultValueProvider, IDialogService dialogService,
             ITrayProcessCommunicationService trayProcessCommunicationService, IThemeParserFactory themeParserFactory, ISystemFontService systemFontService,
-            IFileSystemService fileSystemService, IStartupTaskService startupTaskService, IUpdateService updateService, IApplicationView applicationView, 
-            IApplicationLanguageService applicationLanguageService, ApplicationDataContainers containers)
+            IFileSystemService fileSystemService, IStartupTaskService startupTaskService, IUpdateService updateService, IApplicationView applicationView)
         {
             About = new AboutPageViewModel(settingsService, updateService, applicationView);
             KeyBindings = new KeyBindingsPageViewModel(settingsService, dialogService, defaultValueProvider, trayProcessCommunicationService);
-            General = new GeneralPageViewModel(settingsService, dialogService, defaultValueProvider, startupTaskService, applicationLanguageService, trayProcessCommunicationService);
-            Profiles = new ProfilesPageViewModel(settingsService, dialogService, defaultValueProvider, fileSystemService, applicationView);
+            General = new GeneralPageViewModel(settingsService, dialogService, defaultValueProvider, startupTaskService);
+            Shell = new ProfilesPageViewModel(settingsService, dialogService, defaultValueProvider, fileSystemService, applicationView);
             Terminal = new TerminalPageViewModel(settingsService, dialogService, defaultValueProvider, systemFontService);
             Themes = new ThemesPageViewModel(settingsService, dialogService, defaultValueProvider, themeParserFactory, fileSystemService);
             Mouse = new MousePageViewModel(settingsService, dialogService, defaultValueProvider);
-            SshProfiles = new SshProfilesPageViewModel(settingsService, dialogService, fileSystemService,
-                applicationView, trayProcessCommunicationService, containers.HistoryContainer);
         }
 
         public event EventHandler Closed;
@@ -28,12 +25,11 @@ namespace FluentTerminal.App.ViewModels
 
         public GeneralPageViewModel General { get; }
         public KeyBindingsPageViewModel KeyBindings { get; }
-        public ProfilesPageViewModel Profiles { get; }
+        public ProfilesPageViewModel Shell { get; }
         public TerminalPageViewModel Terminal { get; }
         public ThemesPageViewModel Themes { get; }
         public MousePageViewModel Mouse { get; }
         public AboutPageViewModel About { get; }
-        public SshProfilesPageViewModel SshProfiles { get; }
 
         public void NavigateToAboutPage()
         {

FluentTerminal.App.ViewModels/ShellProfileViewModel.cs

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

FluentTerminal.App.ViewModels/ShellProfileViewModelBase.cs

@@ -1,219 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
-using FluentTerminal.App.ViewModels.Infrastructure;
-using FluentTerminal.App.ViewModels.Profiles;
-using FluentTerminal.App.ViewModels.Settings;
-using FluentTerminal.Models;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
-
-namespace FluentTerminal.App.ViewModels
-{
-    /// <summary>
-    /// Base class for all shell profile view models. Implements logic for saving, editing, resetting, etc.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public abstract class ShellProfileViewModelBase<T> : ViewModelBase where T : ProfileProviderViewModelBase
-    {
-        #region Fields
-
-        protected readonly IDialogService DialogService;
-        protected readonly ISettingsService SettingsService;
-
-        private List<KeyBinding> _bindingsBeforeEdit;
-        private string _nameBeforeEdit;
-
-        #endregion Fields
-
-        #region Properties
-
-        protected bool IsNew { get; private set; }
-
-        public Guid Id { get; private set; }
-
-        private bool _inEditMode;
-
-        public bool InEditMode
-        {
-            get => _inEditMode;
-            set => Set(ref _inEditMode, value);
-        }
-
-        private string _name;
-
-        public string Name
-        {
-            get => _name;
-            set => Set(ref _name, value);
-        }
-
-        public KeyBindingsViewModel KeyBindings { get; }
-
-        public T ProfileVm { get; protected set; }
-
-        #endregion Properties
-
-        #region Events
-
-        public event EventHandler Deleted;
-
-        #endregion Events
-
-        #region Commands
-
-        public IAsyncCommand CancelEditCommand { get; }
-
-        public IAsyncCommand DeleteCommand { get; }
-
-        public RelayCommand EditCommand { get; }
-
-        public IAsyncCommand SaveChangesCommand { get; }
-
-        public IAsyncCommand AddKeyboardShortcutCommand { get; }
-
-        #endregion Commands
-
-        #region Constructor
-
-        protected ShellProfileViewModelBase(ShellProfile shellProfile, ISettingsService settingsService, IDialogService dialogService, bool isNew)
-        {
-            SettingsService = settingsService;
-            DialogService = dialogService;
-            IsNew = isNew;
-
-            KeyBindings = new KeyBindingsViewModel(shellProfile.Id.ToString(), dialogService, string.Empty, false);
-
-            Initialize(shellProfile);
-
-            DeleteCommand = new AsyncCommand(Delete, CanDelete);
-            EditCommand = new RelayCommand(Edit);
-            CancelEditCommand = new AsyncCommand(CancelEdit);
-            SaveChangesCommand = new AsyncCommand(SaveChangesAsync);
-            AddKeyboardShortcutCommand = new AsyncCommand(AddKeyboardShortcut);
-        }
-
-        #endregion Constructor
-
-        #region Methods
-
-        // Loads view model properties from the input shellProfile
-        protected void Initialize(ShellProfile shellProfile)
-        {
-            Id = shellProfile.Id;
-            Name = shellProfile.Name;
-
-            KeyBindings.Clear();
-            foreach (var keyBinding in shellProfile.KeyBindings.Select(x => new KeyBinding(x)).ToList())
-            {
-                KeyBindings.Add(keyBinding);
-            }
-        }
-
-        protected virtual bool HasChanges()
-        {
-            return ProfileVm.HasChanges() || !_nameBeforeEdit.NullableEqualTo(_name) ||
-                   !(_bindingsBeforeEdit?.SequenceEqual(KeyBindings.KeyBindings.Select(x => x.Model).ToList()) ??
-                     false);
-        }
-
-        private async Task Delete()
-        {
-            var result = await DialogService.ShowMessageDialogAsnyc(I18N.Translate("PleaseConfirm"),
-                I18N.Translate("ConfirmDeleteProfile"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
-
-            if (result == DialogButton.OK)
-            {
-                Deleted?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
-        protected abstract bool CanDelete();
-
-        private void Edit()
-        {
-            if (InEditMode)
-            {
-                return;
-            }
-
-            _bindingsBeforeEdit = KeyBindings.KeyBindings.Select(x => x.Model).ToList();
-            _nameBeforeEdit = _name;
-
-            KeyBindings.Editable = true;
-            InEditMode = true;
-        }
-
-        private async Task CancelEdit()
-        {
-            if (IsNew)
-            {
-                await Delete();
-            }
-            else
-            {
-                if (HasChanges())
-                {
-                    var result = await DialogService.ShowMessageDialogAsnyc(I18N.Translate("PleaseConfirm"),
-                            I18N.Translate("ConfirmDiscardChanges"), DialogButton.OK, DialogButton.Cancel)
-                        .ConfigureAwait(true);
-
-                    if (result == DialogButton.OK)
-                    {
-                        // Cancelled, so rollback
-                        ProfileVm.RejectChanges();
-
-                        KeyBindings.Editable = false;
-                        InEditMode = false;
-                    }
-                }
-                else
-                {
-                    KeyBindings.Editable = false;
-                    InEditMode = false;
-                }
-            }
-        }
-
-        public virtual async Task SaveChangesAsync()
-        {
-            var error = await ProfileVm.AcceptChangesAsync();
-
-            if (!string.IsNullOrEmpty(error))
-            {
-                await DialogService.ShowMessageDialogAsnyc(I18N.Translate("InvalidInput"), error, DialogButton.OK);
-
-                return;
-            }
-
-            var profile = ProfileVm.Model;
-
-            profile.Id = Id;
-            profile.Name = _name;
-            profile.KeyBindings = KeyBindings.KeyBindings.Select(x => x.Model).ToList();
-
-            if (profile is SshProfile sshProfile)
-            {
-                SettingsService.SaveSshProfile(sshProfile, IsNew);
-            }
-            else
-            {
-                SettingsService.SaveShellProfile(profile, IsNew);
-            }
-
-            KeyBindings.Editable = false;
-            InEditMode = false;
-            IsNew = false;
-        }
-
-        public Task AddKeyboardShortcut()
-        {
-            return KeyBindings.ShowAddKeyBindingDialog();
-        }
-
-        #endregion Methods
-    }
-}

FluentTerminal.App.ViewModels/SshConnectionInfoViewModel.cs

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

FluentTerminal.App.ViewModels/SshProfileViewModel.cs

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

FluentTerminal.App.ViewModels/TerminalViewModel.cs

@@ -1,5 +1,4 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
 using FluentTerminal.App.ViewModels.Infrastructure;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
@@ -9,28 +8,22 @@ using System;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.ViewModels
 {
     public class TerminalViewModel : ViewModelBase
     {
-        #region Static
-
-        private static readonly Regex SshTitleRx = new Regex(@"^\w+@\S+:", RegexOptions.Compiled);
-
-        #endregion Static
-
         private readonly IKeyboardCommandService _keyboardCommandService;
+        private readonly IDispatcherTimer _resizeOverlayTimer;
         private bool _isSelected;
         private bool _hasNewOutput;
-        private bool _hasExitedWithError;
+        private string _resizeOverlayContent;
         private string _searchText;
+        private bool _showResizeOverlay;
         private bool _showSearchPanel;
         private TabTheme _tabTheme;
         private TerminalTheme _terminalTheme;
-        private TerminalOptions _terminalOptions;
         private string _tabTitle;
         private string _shellTitle;
         private bool _hasCustomTitle;
@@ -45,8 +38,6 @@ namespace FluentTerminal.App.ViewModels
             SettingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
             SettingsService.KeyBindingsChanged += OnKeyBindingsChanged;
 
-            _terminalOptions = SettingsService.GetTerminalOptions();
-
             TrayProcessCommunicationService = trayProcessCommunicationService;
 
             DialogService = dialogService;
@@ -61,6 +52,10 @@ namespace FluentTerminal.App.ViewModels
             TabThemes = new ObservableCollection<TabTheme>(SettingsService.GetTabThemes());
             TabTheme = TabThemes.FirstOrDefault(t => t.Id == ShellProfile.TabThemeId);
 
+            _resizeOverlayTimer = dispatcherTimer;
+            _resizeOverlayTimer.Interval = new TimeSpan(0, 0, 2);
+            _resizeOverlayTimer.Tick += OnResizeOverlayTimerFinished;
+
             CloseCommand = new RelayCommand(async () => await TryClose().ConfigureAwait(false));
             FindNextCommand = new RelayCommand(FindNext);
             FindPreviousCommand = new RelayCommand(FindPrevious);
@@ -73,11 +68,7 @@ namespace FluentTerminal.App.ViewModels
             Terminal.OutputReceived += Terminal_OutputReceived;
             Terminal.SizeChanged += Terminal_SizeChanged;
             Terminal.TitleChanged += Terminal_TitleChanged;
-            Terminal.Exited += Terminal_Exited;
             Terminal.Closed += Terminal_Closed;
-
-            Overlay = new OverlayViewModel(dispatcherTimer);
-
         }
 
         public event EventHandler Activated;
@@ -144,16 +135,10 @@ namespace FluentTerminal.App.ViewModels
             set => Set(ref _hasNewOutput, value);
         }
 
-        public bool HasExitedWithError
+        public string ResizeOverlayContent
         {
-            get => _hasExitedWithError;
-            set
-            {
-                if (Set(ref _hasExitedWithError, value) && value)
-                {
-                    HasNewOutput = false;
-                }
-            }
+            get => _resizeOverlayContent;
+            set => Set(ref _resizeOverlayContent, value);
         }
 
         public string SearchText
@@ -168,6 +153,23 @@ namespace FluentTerminal.App.ViewModels
 
         public ShellProfile ShellProfile { get; }
 
+        public bool ShowResizeOverlay
+        {
+            get => _showResizeOverlay;
+            set
+            {
+                Set(ref _showResizeOverlay, value);
+                if (value)
+                {
+                    if (_resizeOverlayTimer.IsEnabled)
+                    {
+                        _resizeOverlayTimer.Stop();
+                    }
+                    _resizeOverlayTimer.Start();
+                }
+            }
+        }
+
         public bool ShowSearchPanel
         {
             get => _showSearchPanel;
@@ -189,8 +191,6 @@ namespace FluentTerminal.App.ViewModels
 
         public Terminal Terminal { get; private set; }
 
-        public OverlayViewModel Overlay { get; private set; }
-
         public TerminalTheme TerminalTheme
         {
             get => _terminalTheme;
@@ -202,30 +202,9 @@ namespace FluentTerminal.App.ViewModels
             get => _tabTitle;
             set
             {
-                var title = value?.Trim() ?? string.Empty;
-
-                if (ShellProfile is SshProfile)
+                if (Set(ref _tabTitle, value))
                 {
-                    // For SshProfile we are adjusting title.
-                    if (title.Equals("ssh", StringComparison.OrdinalIgnoreCase) ||
-                        title.EndsWith("\\ssh.exe", StringComparison.OrdinalIgnoreCase))
-                    {
-                        title = $"[ssh] {I18N.Translate("Authenticate")}";
-                    }
-                    else if (title.Equals("mosh", StringComparison.OrdinalIgnoreCase) ||
-                             title.EndsWith("\\mosh.exe", StringComparison.OrdinalIgnoreCase))
-                    {
-                        title = $"[mosh] {I18N.Translate("Authenticate")}";
-                    }
-                    else if (SshTitleRx.IsMatch(title))
-                    {
-                        title = $"[ssh] {title}";
-                    }
-                }
-
-                if (Set(ref _tabTitle, title))
-                {
-                    CustomTitleChanged?.Invoke(this, title);
+                    CustomTitleChanged?.Invoke(this, value);
                 }
             }
         }
@@ -260,7 +239,7 @@ namespace FluentTerminal.App.ViewModels
 
         public async Task EditTitle()
         {
-            var result = await DialogService.ShowInputDialogAsync(I18N.Translate("EditTitleString"));
+            var result = await DialogService.ShowInputDialogAsync("Edit Title");
             if (result != null)
             {
                 if (string.IsNullOrWhiteSpace(result))
@@ -327,20 +306,20 @@ namespace FluentTerminal.App.ViewModels
             await ApplicationView.RunOnDispatcherThread(() => KeyBindingsChanged?.Invoke(this, EventArgs.Empty));
         }
 
+        private void OnResizeOverlayTimerFinished(object sender, object e)
+        {
+            _resizeOverlayTimer.Stop();
+            ShowResizeOverlay = false;
+        }
+
         private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
         {
-            _terminalOptions = e;
             await ApplicationView.RunOnDispatcherThread(() => OptionsChanged?.Invoke(this, e));
         }
 
-        private void SelectTabTheme(string id)
+        private void SelectTabTheme(string name)
         {
-            TabTheme = TabThemes.FirstOrDefault(t => t.Id == int.Parse(id));
-        }
-
-        private void Terminal_Exited(object sender, int exitCode)
-        {
-            ApplicationView.RunOnDispatcherThread(() => HasExitedWithError = exitCode > 0);
+            TabTheme = TabThemes.FirstOrDefault(t => t.Name == name);
         }
 
         private void Terminal_Closed(object sender, EventArgs e)
@@ -356,10 +335,6 @@ namespace FluentTerminal.App.ViewModels
                     {
                         var selection = await Terminal.GetSelectedText().ConfigureAwait(true);
                         ClipboardService.SetText(selection);
-                        if(_terminalOptions.ShowTextCopied)
-                        {
-                            Overlay.Show(I18N.Translate("TextCopied"));
-                        }
                         break;
                     }
                 case nameof(Command.Paste):
@@ -409,7 +384,8 @@ namespace FluentTerminal.App.ViewModels
 
         private void Terminal_SizeChanged(object sender, TerminalSize e)
         {
-            Overlay.Show($"{e.Columns} x {e.Rows}");
+            ResizeOverlayContent = $"{e.Columns} x {e.Rows}";
+            ShowResizeOverlay = true;
         }
 
         private void Terminal_TitleChanged(object sender, string e)
@@ -422,7 +398,7 @@ namespace FluentTerminal.App.ViewModels
         {
             if (ApplicationSettings.ConfirmClosingTabs)
             {
-                var result = await DialogService.ShowMessageDialogAsnyc(I18N.Translate("PleaseConfirm"), I18N.Translate("ConfirmCloseTab"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+                var result = await DialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to close this tab?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
                 if (result == DialogButton.Cancel)
                 {

FluentTerminal.App.ViewModels/ThemeViewModel.cs

@@ -344,7 +344,7 @@ namespace FluentTerminal.App.ViewModels
 
                 if (!_fallbackTheme.Equals(changedTheme))
                 {
-                    var result = await _dialogService.ShowMessageDialogAsnyc(I18N.Translate("PleaseConfirm"), I18N.Translate("ConfirmDiscardChanges"), 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)
                     {
@@ -392,7 +392,7 @@ namespace FluentTerminal.App.ViewModels
 
         private async Task Delete()
         {
-            var result = await _dialogService.ShowMessageDialogAsnyc(I18N.Translate("PleaseConfirm"), I18N.Translate("ConfirmDeleteTheme"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to delete this theme?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
             if (result == DialogButton.OK)
             {

FluentTerminal.App/Adapters/AppServiceConnectionAdapter.cs

@@ -12,7 +12,7 @@ namespace FluentTerminal.App.Adapters
     {
         private readonly AppServiceConnection _appServiceConnection;
 
-        public event EventHandler<ValueSet> MessageReceived;
+        public event EventHandler<IDictionary<string, string>> MessageReceived;
 
         public AppServiceConnectionAdapter(AppServiceConnection appServiceConnection)
         {
@@ -22,16 +22,35 @@ namespace FluentTerminal.App.Adapters
 
         private void OnRequestReceived(AppServiceConnection sender, AppServiceRequestReceivedEventArgs args)
         {
-            MessageReceived?.Invoke(this, args.Request.Message);
+            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<ValueSet> SendMessageAsync(ValueSet message)
+        public async Task<IDictionary<string, string>> SendMessageAsync(IDictionary<string, string> message)
         {
-            var response = await _appServiceConnection.SendMessageAsync(message).AsTask();
+            var valueSet = new ValueSet();
+
+            foreach (var pair in message)
+            {
+                valueSet.Add(pair.Key, pair.Value);
+            }
+
+            var response = await _appServiceConnection.SendMessageAsync(valueSet).AsTask();
 
             if (response.Status == AppServiceResponseStatus.Success)
             {
-                return response.Message;
+                var responseDict = new Dictionary<string, string>();
+                foreach (var pair in response.Message)
+                {
+                    responseDict.Add(pair.Key, (string)pair.Value);
+                }
+                return responseDict;
             }
             return null;
         }

FluentTerminal.App/Adapters/ApplicationViewAdapter.cs

@@ -47,15 +47,8 @@ namespace FluentTerminal.App.Adapters
             return ApiInformation.IsApiContractPresent(api, version);
         }
 
-        public Task RunOnDispatcherThread(Action action, bool enforceNewSchedule = true)
+        public Task RunOnDispatcherThread(Action action)
         {
-            if (!enforceNewSchedule && _dispatcher.HasThreadAccess)
-            {
-                action();
-
-                return Task.CompletedTask;
-            }
-
             return _dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => action()).AsTask();
         }
 

FluentTerminal.App/Adapters/MessageDialogAdapter.cs

@@ -1,6 +1,5 @@
 using FluentTerminal.App.Services;
 using FluentTerminal.App.Services.Dialogs;
-using FluentTerminal.App.Services.Utilities;
 using System;
 using System.Threading.Tasks;
 using Windows.UI.Popups;
@@ -30,19 +29,14 @@ namespace FluentTerminal.App.Adapters
 
         public void AddButton(DialogButton button)
         {
-            var command = new UICommand
-            {
-                Label = I18N.Translate(button.ToString()),
-                Id = button
-            };
-            _messageDialog.Commands.Add(command);
+            _messageDialog.Commands.Add(new UICommand(button.ToString()));
         }
 
         public async Task<DialogButton> ShowAsync()
         {
             var result = await _messageDialog.ShowAsync();
 
-            return (DialogButton)result.Id;
+            return Enum.Parse<DialogButton>(result.Label);
         }
     }
 }

FluentTerminal.App/App.xaml

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

FluentTerminal.App/App.xaml.cs

@@ -28,26 +28,19 @@ using Windows.ApplicationModel.Background;
 using Windows.ApplicationModel.Core;
 using Windows.Storage;
 using Windows.UI.Core;
-using Windows.UI.Popups;
 using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using FluentTerminal.App.Utilities;
 using IContainer = Autofac.IContainer;
-using FluentTerminal.App.Services.Utilities;
-using FluentTerminal.App.ViewModels.Profiles;
 
 namespace FluentTerminal.App
 {
-    // ReSharper disable once RedundantExtendsListEntry
     public sealed partial class App : Application
     {
-        private readonly TaskCompletionSource<int> _trayReady = new TaskCompletionSource<int>();
+        public TaskCompletionSource<int> _trayReady = new TaskCompletionSource<int>();
         private readonly ISettingsService _settingsService;
         private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
-        private readonly IDialogService _dialogService;
         private bool _alreadyLaunched;
-        private bool _isLaunching;
         private ApplicationSettings _applicationSettings;
         private readonly IContainer _container;
         private readonly List<MainViewModel> _mainViewModels;
@@ -56,7 +49,6 @@ namespace FluentTerminal.App
         private IAppServiceConnection _appServiceConnection;
         private BackgroundTaskDeferral _appServiceDeferral;
         private Parser _commandLineParser;
-        private int? _activeWindowId;
 
         public App()
         {
@@ -72,10 +64,9 @@ namespace FluentTerminal.App
                 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)),
-                SshProfiles = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings.CreateContainer(Constants.SshProfilesContainerName, ApplicationDataCreateDisposition.Always)), 
-                HistoryContainer = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings.CreateContainer(Constants.ExecutedCommandsContainerName, ApplicationDataCreateDisposition.Always))
+                Themes = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings.CreateContainer(Constants.ThemesContainerName, ApplicationDataCreateDisposition.Always))
             };
+
             var builder = new ContainerBuilder();
             builder.RegisterType<SettingsService>().As<ISettingsService>().SingleInstance();
             builder.RegisterType<DefaultValueProvider>().As<IDefaultValueProvider>().SingleInstance();
@@ -93,7 +84,6 @@ namespace FluentTerminal.App
             builder.RegisterType<FileSystemService>().As<IFileSystemService>().SingleInstance();
             builder.RegisterType<SystemFontService>().As<ISystemFontService>().SingleInstance();
             builder.RegisterType<ShellProfileSelectionDialog>().As<IShellProfileSelectionDialog>().InstancePerDependency();
-            builder.RegisterType<SshProfileSelectionDialog>().As<ISshProfileSelectionDialog>().InstancePerDependency();
             builder.RegisterType<CreateKeyBindingDialog>().As<ICreateKeyBindingDialog>().InstancePerDependency();
             builder.RegisterType<InputDialog>().As<IInputDialog>().InstancePerDependency();
             builder.RegisterType<MessageDialogAdapter>().As<IMessageDialog>().InstancePerDependency();
@@ -101,7 +91,6 @@ namespace FluentTerminal.App
             builder.RegisterType<ApplicationViewAdapter>().As<IApplicationView>().InstancePerDependency();
             builder.RegisterType<DispatcherTimerAdapter>().As<IDispatcherTimer>().InstancePerDependency();
             builder.RegisterType<StartupTaskService>().As<IStartupTaskService>().SingleInstance();
-            builder.RegisterType<ApplicationLanguageService>().As<IApplicationLanguageService>().SingleInstance();
             builder.RegisterInstance(applicationDataContainers);
 
             _container = builder.Build();
@@ -111,8 +100,6 @@ namespace FluentTerminal.App
 
             _trayProcessCommunicationService = _container.Resolve<ITrayProcessCommunicationService>();
 
-            _dialogService = _container.Resolve<IDialogService>();
-
             _applicationSettings = _settingsService.GetApplicationSettings();
 
             JsonConvert.DefaultSettings = () =>
@@ -162,104 +149,8 @@ namespace FluentTerminal.App
             }
         }
 
-        protected override async void OnActivated(IActivatedEventArgs args)
+        protected override void OnActivated(IActivatedEventArgs args)
         {
-            if (args is ProtocolActivatedEventArgs protocolActivated)
-            {
-                MainViewModel mainViewModel = null;
-                // IApplicationView to use for creating view models
-                IApplicationView applicationView;
-
-                if (_alreadyLaunched)
-                {
-                    applicationView =
-                        (_mainViewModels.FirstOrDefault(o => o.ApplicationView.Id == _activeWindowId) ??
-                         _mainViewModels.Last()).ApplicationView;
-                }
-                else
-                {
-                    // App wasn't launched before double clicking a shortcut, so we have to create a window
-                    // in order to be able to communicate with user.
-                    mainViewModel = _container.Resolve<MainViewModel>();
-
-                    await CreateMainView(typeof(MainPage), mainViewModel, true);
-
-                    applicationView = mainViewModel.ApplicationView;
-                }
-
-                bool isSsh;
-
-                try
-                {
-                    isSsh = SshConnectViewModel.CheckScheme(protocolActivated.Uri);
-                }
-                catch (Exception ex)
-                {
-                    await new MessageDialog($"Invalid link: {ex.Message}", "Invalid Link").ShowAsync();
-
-                    mainViewModel?.ApplicationView.TryClose();
-
-                    return;
-                }
-
-                if (isSsh)
-                {
-                    SshConnectViewModel vm;
-
-                    try
-                    {
-                        vm = SshConnectViewModel.ParseUri(protocolActivated.Uri, _settingsService, applicationView,
-                            _trayProcessCommunicationService, _container.Resolve<IFileSystemService>(),
-                            _container.Resolve<ApplicationDataContainers>().HistoryContainer);
-                    }
-                    catch (Exception ex)
-                    {
-                        await new MessageDialog($"Invalid link: {ex.Message}", "Invalid Link").ShowAsync();
-
-                        mainViewModel?.ApplicationView.TryClose();
-
-                        return;
-                    }
-
-                    if (!vm.CommandInput && _applicationSettings.AutoFallbackToWindowsUsernameInLinks &&
-                        string.IsNullOrEmpty(vm.Username))
-                    {
-                        vm.Username = await _trayProcessCommunicationService.GetUserName();
-                    }
-
-                    var error = await vm.AcceptChangesAsync(true);
-
-                    SshProfile profile = (SshProfile) vm.Model;
-
-                    if (!string.IsNullOrEmpty(error))
-                    {
-                        // Link is valid, but incomplete (i.e. username missing), so we need to show dialog.
-                        profile = await _dialogService.ShowSshConnectionInfoDialogAsync(profile);
-
-                        if (profile == null)
-                        {
-                            // User clicked "Cancel" in the dialog.
-                            mainViewModel?.ApplicationView.TryClose();
-
-                            return;
-                        }
-                    }
-
-                    if (mainViewModel == null)
-                        await CreateTerminal(profile, _applicationSettings.NewTerminalLocation);
-                    else
-                        await mainViewModel.AddTerminalAsync(profile);
-
-                    return;
-                }
-
-                await new MessageDialog($"Invalid link: {protocolActivated.Uri}", "Invalid Link").ShowAsync();
-
-                mainViewModel?.ApplicationView.TryClose();
-
-                return;
-            }
-
             if (args is CommandLineActivatedEventArgs commandLineActivated)
             {
                 if (string.IsNullOrWhiteSpace(commandLineActivated.Operation.Arguments))
@@ -269,27 +160,9 @@ namespace FluentTerminal.App
 
                 _commandLineParser.ParseArguments(SplitArguments(commandLineActivated.Operation.Arguments), typeof(NewVerb), typeof(RunVerb), typeof(SettingsVerb)).WithParsed(async verb =>
                 {
-                    if (verb is SettingsVerb settingsVerb)
+                    if (verb is SettingsVerb)
                     {
-                        if (!settingsVerb.Import && !settingsVerb.Export)
-                        {
-                            await ShowSettings().ConfigureAwait(true);
-                        }
-                        else if (settingsVerb.Export)
-                        {
-                            var exportFile = await ApplicationData.Current.LocalFolder.CreateFileAsync("config.json", CreationCollisionOption.OpenIfExists);
-
-                            var settings = _settingsService.ExportSettings();
-                            await FileIO.WriteTextAsync(exportFile, settings);
-                            await new MessageDialog($"{I18N.Translate("SettingsExported")} {exportFile.Path}").ShowAsync();
-                        }
-                        else if (settingsVerb.Import)
-                        {
-                            var file = await ApplicationData.Current.LocalFolder.GetFileAsync("config.json");
-                            var content = await FileIO.ReadTextAsync(file);
-                            _settingsService.ImportSettings(content);
-                            await new MessageDialog($"{I18N.Translate("SettingsImported")} {file.Path}").ShowAsync();
-                        }
+                        await ShowSettings().ConfigureAwait(true);
                     }
                     else if (verb is NewVerb newVerb)
                     {
@@ -351,28 +224,25 @@ namespace FluentTerminal.App
 
         protected override async void OnLaunched(LaunchActivatedEventArgs args)
         {
-            if (_isLaunching)
-            {
-                return;
-            }
-
-            _isLaunching = true;
             if (!_alreadyLaunched)
             {
-                await InitializeLogger();
+                var logDirectory = await ApplicationData.Current.LocalCacheFolder.CreateFolderAsync("Logs", CreationCollisionOption.OpenIfExists);
+                var logFile = Path.Combine(logDirectory.Path, "fluentterminal.app.log");
+                var configFile = await logDirectory.CreateFileAsync("config.json", CreationCollisionOption.OpenIfExists);
+                var configContent = await FileIO.ReadTextAsync(configFile);
 
-                // TODO: Check the reason for such strange using of tasks!
-                Task.Run(async () => await JumpListHelper.Update(_settingsService.GetShellProfiles()));
+                if (string.IsNullOrWhiteSpace(configContent))
+                {
+                    configContent = JsonConvert.SerializeObject(new Logger.Configuration());
+                    await FileIO.WriteTextAsync(configFile, configContent);
+                }
+
+                var config = JsonConvert.DeserializeObject<Logger.Configuration>(configContent) ?? new Logger.Configuration();
+
+                Logger.Instance.Initialize(logFile, config);
 
                 var viewModel = _container.Resolve<MainViewModel>();
-                if (args.Arguments.StartsWith(JumpListHelper.ShellProfileFlag))
-                {
-                    await viewModel.AddLocalTabOrWindowAsync(Guid.Parse(args.Arguments.Replace(JumpListHelper.ShellProfileFlag, string.Empty)));
-                }
-                else
-                {
-                    await viewModel.AddLocalTabAsync();
-                }
+                viewModel.AddTerminal();
                 await CreateMainView(typeof(MainPage), viewModel, true).ConfigureAwait(true);
                 Window.Current.Activate();
             }
@@ -380,32 +250,6 @@ namespace FluentTerminal.App
             {
                 await CreateSecondaryView<MainViewModel>(typeof(MainPage), true).ConfigureAwait(true);
             }
-            else if (args.Arguments.StartsWith(JumpListHelper.ShellProfileFlag))
-            {
-                var location = _applicationSettings.NewTerminalLocation;
-                var profile = _settingsService.GetShellProfile(Guid.Parse(args.Arguments.Replace(JumpListHelper.ShellProfileFlag, string.Empty)));
-                await CreateTerminal(profile, location).ConfigureAwait(true);
-            }
-            _isLaunching = false;
-        }
-
-        private static async Task InitializeLogger()
-        {
-            var logDirectory = await ApplicationData.Current.LocalCacheFolder.CreateFolderAsync("Logs", CreationCollisionOption.OpenIfExists);
-            var logFile = Path.Combine(logDirectory.Path, "fluentterminal.app.log");
-            var configFile = await logDirectory.CreateFileAsync("config.json", CreationCollisionOption.OpenIfExists);
-            var configContent = await FileIO.ReadTextAsync(configFile);
-
-
-            if (string.IsNullOrWhiteSpace(configContent))
-            {
-                configContent = JsonConvert.SerializeObject(new Logger.Configuration());
-                await FileIO.WriteTextAsync(configFile, configContent);
-            }
-
-            var config = JsonConvert.DeserializeObject<Logger.Configuration>(configContent) ?? new Logger.Configuration();
-
-            Logger.Instance.Initialize(logFile, config);
         }
 
         protected override void OnBackgroundActivated(BackgroundActivatedEventArgs args)
@@ -432,7 +276,6 @@ namespace FluentTerminal.App
             _appServiceDeferral = null;
             _appServiceConnection = null;
 
-            // ReSharper disable once ArrangeStaticMemberQualifier
             Application.Current.Exit();
         }
 
@@ -440,7 +283,8 @@ namespace FluentTerminal.App
         {
             await StartSystemTray().ConfigureAwait(true);
 
-            if (!(Window.Current.Content is Frame rootFrame))
+            Frame rootFrame = Window.Current.Content as Frame;
+            if (rootFrame == null)
             {
                 rootFrame = new Frame();
                 Window.Current.Content = rootFrame;
@@ -456,7 +300,6 @@ namespace FluentTerminal.App
                     mainViewModel.NewWindowRequested += OnNewWindowRequested;
                     mainViewModel.ShowSettingsRequested += OnShowSettingsRequested;
                     mainViewModel.ShowAboutRequested += OnShowAboutRequested;
-                    mainViewModel.ActivatedMv += OnMainViewActivated;
                     _mainViewModels.Add(mainViewModel);
                 }
 
@@ -473,13 +316,12 @@ namespace FluentTerminal.App
             viewModel.NewWindowRequested += OnNewWindowRequested;
             viewModel.ShowSettingsRequested += OnShowSettingsRequested;
             viewModel.ShowAboutRequested += OnShowAboutRequested;
-            viewModel.ActivatedMv += OnMainViewActivated;
             _mainViewModels.Add(viewModel);
 
             return viewModel;
         }
 
-        private async Task<TViewModel> CreateSecondaryView<TViewModel>(Type pageType, bool extendViewIntoTitleBar)
+        private async Task<TViewModel> CreateSecondaryView<TViewModel>(Type pageType, bool ExtendViewIntoTitleBar)
         {
             int windowId = 0;
             TViewModel viewModel = default;
@@ -487,7 +329,7 @@ namespace FluentTerminal.App
             {
                 viewModel = _container.Resolve<TViewModel>();
 
-                CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = extendViewIntoTitleBar;
+                CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = ExtendViewIntoTitleBar;
                 var frame = new Frame();
                 frame.Navigate(pageType, viewModel);
                 Window.Current.Content = frame;
@@ -523,81 +365,27 @@ namespace FluentTerminal.App
                 viewModel.NewWindowRequested -= OnNewWindowRequested;
                 viewModel.ShowSettingsRequested -= OnShowSettingsRequested;
                 viewModel.ShowAboutRequested -= OnShowAboutRequested;
-                viewModel.ActivatedMv -= OnMainViewActivated;
-                if (_activeWindowId == viewModel.ApplicationView.Id)
-                {
-                    _activeWindowId = 0;
-                }
 
                 _mainViewModels.Remove(viewModel);
             }
         }
 
-        private void OnMainViewActivated(object sender, EventArgs e)
-        {
-            if (sender is MainViewModel viewModel)
-            {
-                Logger.Instance.Debug("MainViewModel with ApplicationView Id: {@id} activated.", viewModel.ApplicationView.Id);
-                _activeWindowId = viewModel.ApplicationView.Id;
-            }
-        }
-
         private async void OnNewWindowRequested(object sender, NewWindowRequestedEventArgs e)
         {
-            ShellProfile profile = null;
-            switch (e.Action)
-            {
-                case NewWindowAction.StartDefaultLocalTerminal:
-                    break;
-                case NewWindowAction.ShowProfileSelection:
-                    profile = await _dialogService.ShowProfileSelectionDialogAsync();
-                    if (profile == null)
-                    {
-                        // Nothing to do if user cancels.
-                        return;
-                    }
-                    break;
-                case NewWindowAction.ShowSshProfileSelection:
-                    profile = await _dialogService.ShowSshProfileSelectionDialogAsync();
-                    if (profile == null)
-                    {
-                        // Nothing to do if user cancels.
-                        return;
-                    }
-                    break;
-                case NewWindowAction.ShowSshInfoDialog:
-                    profile = await _dialogService.ShowSshConnectionInfoDialogAsync();
-                    if (profile == null)
-                    {
-                        // Nothing to do if user cancels.
-                        return;
-                    }
-                    break;
-                case NewWindowAction.StartLocalTerminal:
-                    profile = _settingsService.GetShellProfile(e.ProfileId);
-                    break;
-                case NewWindowAction.StartSshTerminal:
-                    profile = _settingsService.GetSshProfile(e.ProfileId);
-                    break;
-                default:
-                    throw new NotImplementedException("this ProfileSelection not implemented yet");
-            }
-
             var viewModel = await CreateNewTerminalWindow().ConfigureAwait(true);
 
-            if (profile == null)
+            if (e.ShowProfileSelection)
             {
-                await viewModel.AddLocalTabAsync();
+                await viewModel.AddConfigurableTerminal().ConfigureAwait(true);
             }
             else
             {
-                await viewModel.AddTerminalAsync(profile);
+                viewModel.AddTerminal();
             }
         }
 
         private void OnSettingsClosed(object sender, EventArgs e)
         {
-            Task.Run(async () => await JumpListHelper.Update(_settingsService.GetShellProfiles()));
             _settingsViewModel.Closed -= OnSettingsClosed;
             _settingsViewModel = null;
             _settingsWindowId = null;
@@ -624,26 +412,17 @@ namespace FluentTerminal.App
             if (!_alreadyLaunched)
             {
                 var viewModel = _container.Resolve<MainViewModel>();
-                await viewModel.AddTerminalAsync(profile);
+                viewModel.AddTerminal(profile);
                 await CreateMainView(typeof(MainPage), viewModel, true).ConfigureAwait(true);
             }
             else if (location == NewTerminalLocation.Tab && _mainViewModels.Count > 0)
             {
-
-                MainViewModel item = _mainViewModels.FirstOrDefault(o => o.ApplicationView.Id == _activeWindowId);
-                if (item != null)
-                {
-                    await item.AddTerminalAsync(profile);
-                }
-                else
-                {
-                    await _mainViewModels.Last().AddTerminalAsync(profile);
-                }
+                _mainViewModels.Last().AddTerminal(profile);
             }
             else
             {
                 var viewModel = await CreateNewTerminalWindow().ConfigureAwait(true);
-                await viewModel.AddTerminalAsync(profile);
+                viewModel.AddTerminal(profile);
             }
         }
 
@@ -671,4 +450,4 @@ namespace FluentTerminal.App
             _trayProcessCommunicationService.Initialize(_appServiceConnection);
         }
     }
-}
+}