Increase version

* ThemeAdded and ThemeRemoved events replaced by MVVMLight Messenger.

* ApplicationSettingsChanged event replaced by MVVMLight Messenger implementation.

* CurrentThemeChanged event replaced by MVVMLight Messenger implementation.

* SettingsService.KeyBindingsChanged event replaced with MVVMLight Messenger implementation.

* Further simplifying KeyBindingsChangedMessage propagation.

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

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>, Mock.Of<ICustomCommandDialog>, Mock.Of<ISshProfileSelectionDialog>, Mock.Of<IAboutDialog>);
 
             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>, Mock.Of<ICustomCommandDialog>, Mock.Of<ISshProfileSelectionDialog>, Mock.Of<IAboutDialog>);
 
             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>, Mock.Of<ICustomCommandDialog>, Mock.Of<ISshProfileSelectionDialog>, Mock.Of<IAboutDialog>);
 
             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>, Mock.Of<ICustomCommandDialog>, Mock.Of<ISshProfileSelectionDialog>, Mock.Of<IAboutDialog>);
 
             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>, Mock.Of<ICustomCommandDialog>, Mock.Of<ISshProfileSelectionDialog>, Mock.Of<IAboutDialog>);
 
             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>, Mock.Of<ICustomCommandDialog>, Mock.Of<ISshProfileSelectionDialog>, Mock.Of<IAboutDialog>);
 
             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>, Mock.Of<ICustomCommandDialog>, Mock.Of<ISshProfileSelectionDialog>, Mock.Of<IAboutDialog>);
 
             dialogService.ShowInputDialogAsync(title);
 

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

@@ -11,10 +11,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.10.0" />
-    <PackageReference Include="FluentAssertions" Version="5.7.0" />
+    <PackageReference Include="AutoFixture" Version="4.11.0" />
+    <PackageReference Include="FluentAssertions" Version="5.9.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Include="Moq" Version="4.12.0" />
+    <PackageReference Include="Moq" Version="4.13.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">

FluentTerminal.App.Services.Test/SettingsServiceTests.cs

@@ -10,6 +10,8 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using FluentTerminal.Models.Messages;
+using GalaSoft.MvvmLight.Messaging;
 using Xunit;
 
 namespace FluentTerminal.App.Services.Test
@@ -159,7 +161,8 @@ namespace FluentTerminal.App.Services.Test
             };
             var currentThemeChangedEventInvoked = false;
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            settingsService.CurrentThemeChanged += (s, e) => currentThemeChangedEventInvoked = true;
+            Messenger.Default.Register<CurrentThemeChangedMessage>(this,
+                message => currentThemeChangedEventInvoked = true);
 
             settingsService.SaveCurrentThemeId(currentThemeId);
 
@@ -206,7 +209,8 @@ namespace FluentTerminal.App.Services.Test
                 ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            settingsService.CurrentThemeChanged += (s, e) => currentThemeChangedEventInvoked = true;
+            Messenger.Default.Register<CurrentThemeChangedMessage>(this,
+                message => currentThemeChangedEventInvoked = true);
 
             settingsService.SaveTheme(theme);
 
@@ -363,7 +367,8 @@ namespace FluentTerminal.App.Services.Test
                 ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            settingsService.TerminalOptionsChanged += (s, e) => terminalOptionsChangedEventInvoked = true;
+            Messenger.Default.Register<TerminalOptionsChangedMessage>(this,
+                message => terminalOptionsChangedEventInvoked = true);
 
             settingsService.SaveTerminalOptions(terminalOptions);
 
@@ -430,7 +435,8 @@ namespace FluentTerminal.App.Services.Test
                 ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            settingsService.ApplicationSettingsChanged += (s, e) => applicationSettingsChangedEventInvoked = true;
+            Messenger.Default.Register<ApplicationSettingsChangedMessage>(this,
+                a => applicationSettingsChangedEventInvoked = true);
 
             settingsService.SaveApplicationSettings(applicationSettings);
 
@@ -528,7 +534,8 @@ namespace FluentTerminal.App.Services.Test
                 ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            settingsService.KeyBindingsChanged += (s, e) => keyBindingsChangedEventInvoked = true;
+            Messenger.Default.Register<KeyBindingsChangedMessage>(this,
+                message => keyBindingsChangedEventInvoked = true);
 
             settingsService.SaveKeyBindings(command.ToString(), keyBindings);
 
@@ -574,7 +581,8 @@ namespace FluentTerminal.App.Services.Test
                 ShellProfiles = Mock.Of<IApplicationDataContainer>()
             };
             var settingsService = new SettingsService(defaultValueProvider, applicationDataContainers);
-            settingsService.KeyBindingsChanged += (s, e) => keyBindingsChangedEventInvoked = true;
+            Messenger.Default.Register<KeyBindingsChangedMessage>(this,
+                message => keyBindingsChangedEventInvoked = true);
 
             settingsService.ResetKeyBindings();
 
@@ -649,7 +657,7 @@ namespace FluentTerminal.App.Services.Test
 
             var result = settingsService.GetShellProfiles();
 
-            result.Should().BeEquivalentTo(shellProfiles);
+            result.Select(p => p.EqualTo(shellProfiles.FirstOrDefault(x => x.Id == p.Id)).Should().BeTrue());
             shellProfilesContainer.Verify(x => x.GetAll(), Times.Once);
         }
 

FluentTerminal.App.Services.Test/TrayProcessCommunicationServiceTests.cs

@@ -70,7 +70,7 @@ 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<ValueSet>(d => (byte)d[MessageKeys.Type] == (byte)MessageIdentifiers.ResizeTerminalRequest)), Times.Once);
         }
 
         [Fact]
@@ -109,7 +109,7 @@ 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<ValueSet>(d => (byte)d[MessageKeys.Type] == (byte)MessageIdentifiers.TerminalExitedRequest)), Times.Once);
         }
 
         [Fact]
@@ -121,7 +121,7 @@ namespace FluentTerminal.App.Services.Test
 
             var message = new ValueSet
             {
-                [MessageKeys.Type] = TerminalExitedRequest.Identifier,
+                [MessageKeys.Type] = (byte) MessageIdentifiers.TerminalExitedRequest,
                 [MessageKeys.Content] = JsonConvert.SerializeObject(request)
             };
             var settingsService = new Mock<ISettingsService>();

FluentTerminal.App.Services/Adapters/ApplicationDataContainerAdapter.cs

@@ -20,6 +20,11 @@ namespace FluentTerminal.App.Services.Adapters
             _applicationDataContainer.Values.Remove(key);
         }
 
+        public void Clear()
+        {
+            _applicationDataContainer.Values.Clear();
+        }
+
         public IEnumerable<object> GetAll()
         {
             return _applicationDataContainer.Values.Select(x => x.Value);

FluentTerminal.App.Services/ApplicationDataContainers.cs

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

@@ -7,5 +7,9 @@
         public const string ShellProfilesContainerName = "ShellProfiles";
         public const string SshProfilesContainerName = "SshProfiles";
         public const byte TerminalBufferRequestIdentifier = 0;
+        public const string SshCommandName = "ssh";
+        public const string MoshCommandName = "mosh";
+        public const string ExecutedCommandsContainerName = "HistoryContainer";
+        public const string TerminalViewModelStateId = "TerminalViewModelState";
     }
 }

FluentTerminal.App.Services/Dialogs/IAboutDialog.cs

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

FluentTerminal.App.Services/Dialogs/ICustomCommandDialog.cs

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

FluentTerminal.App.Services/Dialogs/ISshConnectionInfoDialog.cs

@@ -5,6 +5,6 @@ namespace FluentTerminal.App.Services.Dialogs
 {
     public interface ISshConnectionInfoDialog
     {
-        Task<ISshConnectionInfo> GetSshConnectionInfoAsync(ISshConnectionInfo input);
+        Task<SshProfile> GetSshConnectionInfoAsync(SshProfile input = null);
     }
 }

FluentTerminal.App.Services/EventArgs/NewTabRequestedEventArgs.cs

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

FluentTerminal.App.Services/Exceptions/SaveTextFileException.cs

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

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

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

FluentTerminal.App.Services/IApplicationDataContainer.cs

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

FluentTerminal.App.Services/IApplicationView.cs

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

FluentTerminal.App.Services/IDialogService.cs

@@ -18,8 +18,12 @@ namespace FluentTerminal.App.Services
         Task<KeyBinding> ShowCreateKeyBindingDialog();
         Task<string> ShowInputDialogAsync(string title);
 
-        Task<ISshConnectionInfo> ShowSshConnectionInfoDialogAsync(ISshConnectionInfo input);
+        Task<SshProfile> ShowSshConnectionInfoDialogAsync(SshProfile input = null);
+
+        Task<ShellProfile> ShowCustomCommandDialogAsync(ShellProfile input = null);
 
         Task<SshProfile> ShowSshProfileSelectionDialogAsync();
+
+        Task ShowAboutDialogAsync();
     }
 }

FluentTerminal.App.Services/IKeyboardCommandService.cs

@@ -8,5 +8,6 @@ namespace FluentTerminal.App.Services
 
         void SendCommand(string command);
         void DeregisterCommandHandler(string command);
+        void ClearCommandHandlers();
     }
 }

FluentTerminal.App.Services/ISettingsService.cs

@@ -6,17 +6,6 @@ namespace FluentTerminal.App.Services
 {
     public interface ISettingsService
     {
-        event EventHandler<ApplicationSettings> ApplicationSettingsChanged;
-        event EventHandler<Guid> CurrentThemeChanged;
-        event EventHandler KeyBindingsChanged;
-        event EventHandler<ShellProfile> ShellProfileAdded;
-        event EventHandler<Guid> ShellProfileDeleted;
-        event EventHandler<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);
@@ -36,12 +25,13 @@ namespace FluentTerminal.App.Services
         IEnumerable<TerminalTheme> GetThemes();
         void ResetKeyBindings();
         void SaveApplicationSettings(ApplicationSettings applicationSettings);
+        void NotifyApplicationSettingsChanged(ApplicationSettings applicationSettings);
         void SaveCurrentThemeId(Guid id);
         void SaveDefaultShellProfileId(Guid id);
         void SaveDefaultSshProfileId(Guid id);
         void SaveKeyBindings(string command, ICollection<KeyBinding> keyBindings);
         void SaveShellProfile(ShellProfile shellProfile, bool newShell = false);
-        void SaveSshProfile(SshProfile shellProfile, bool newShell = false);
+        void SaveSshProfile(SshProfile sshProfile, bool newShell = false);
         void SaveTerminalOptions(TerminalOptions terminalOptions);
         void SaveTheme(TerminalTheme theme, bool newTheme = false);
         ShellProfile GetShellProfile(Guid id);

FluentTerminal.App.Services/IShellProfileMigrationService.cs

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

FluentTerminal.App.Services/ISshHelperService.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using FluentTerminal.Models;
-
-namespace FluentTerminal.App.Services
-{
-    public interface ISshHelperService
-    {
-        bool IsSsh(Uri uri);
-
-        ISshConnectionInfo ParseSsh(Uri uri);
-
-        Task<SshProfile> GetSshProfileAsync(SshProfile profile);
-
-        Task<SshProfile> GetSavedSshProfileAsync();
-
-        Task<string> ConvertToUriAsync(ISshConnectionInfo sshConnectionInfo);
-    }
-}

FluentTerminal.App.Services/ITrayProcessCommunicationService.cs

@@ -14,6 +14,8 @@ namespace FluentTerminal.App.Services
 
         Task<CreateTerminalResponse> CreateTerminal(byte id, TerminalSize size, ShellProfile shellProfile, SessionType sessionType);
 
+        Task<PauseTerminalOutputResponse> PauseTerminalOutput(byte id, bool pause);
+
         Task ResizeTerminal(byte id, TerminalSize size);
 
         Task UpdateToggleWindowKeyBindings();
@@ -22,8 +24,9 @@ namespace FluentTerminal.App.Services
 
         void SubscribeForTerminalOutput(byte terminalId, Action<byte[]> callback);
 
+        void UnsubscribeFromTerminalOutput(byte terminalId);
+
         Task CloseTerminal(byte terminalId);
-        Task<GetAvailablePortResponse> GetAvailablePort();
         byte GetNextTerminalId();
 
         Task<string> GetUserName();
@@ -35,5 +38,11 @@ namespace FluentTerminal.App.Services
         Task<string[]> GetFilesFromSshConfigDirAsync();
 
         Task<bool> CheckFileExistsAsync(string path);
+
+        void MuteTerminal(bool mute);
+
+        void UpdateSettings(ApplicationSettings settings);
+
+        Task<string> GetCommandPathAsync(string command);
     }
 }

FluentTerminal.App.Services/Implementation/DefaultValueProvider.cs

@@ -4,6 +4,7 @@ using FluentTerminal.Models.Enums;
 using System;
 using System.Collections.Generic;
 using Windows.Foundation.Metadata;
+using Windows.Storage;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -11,6 +12,14 @@ namespace FluentTerminal.App.Services.Implementation
     {
         public ApplicationSettings GetDefaultApplicationSettings()
         {
+            var logDirectoryPath = string.Empty;
+            try
+            {
+                // Accessing ApplicationData.Current during run of unit tests causes
+                // "System.InvalidOperationException : The process has no package identity" exception.
+                logDirectoryPath = ApplicationData.Current.LocalCacheFolder.Path;
+            } catch (InvalidOperationException) { }
+
             return new ApplicationSettings
             {
                 ConfirmClosingTabs = false,
@@ -22,13 +31,16 @@ namespace FluentTerminal.App.Services.Implementation
                 CopyOnSelect = false,
                 MouseMiddleClickAction = MouseAction.None,
                 MouseRightClickAction = MouseAction.ContextMenu,
-                AlwaysShowTabs = false,
                 ShowNewOutputIndicator = false,
                 EnableTrayIcon = true,
                 ShowCustomTitleInTitlebar = true,
                 UseMoshByDefault = true,
                 AutoFallbackToWindowsUsernameInLinks = true,
-                RTrimCopiedLines = true
+                RTrimCopiedLines = true,
+                MuteTerminalBeeps = true,
+                EnableLogging = false,
+                PrintableOutputOnly = true,
+                LogDirectoryPath = logDirectoryPath
             };
         }
 
@@ -88,6 +100,18 @@ namespace FluentTerminal.App.Services.Implementation
                     }
                 };
 
+                case Command.DuplicateTab:
+                    return new List<KeyBinding>
+                {
+                    new KeyBinding
+                    {
+                        Command = nameof(Command.DuplicateTab),
+                        Ctrl = true,
+                        Shift = true,
+                        Key = (int)ExtendedVirtualKey.D
+                    }
+                };
+
                 case Command.NewTab:
                     return new List<KeyBinding>
                 {
@@ -136,6 +160,30 @@ namespace FluentTerminal.App.Services.Implementation
                         }
                     };
 
+                case Command.NewCustomCommandTab:
+                    return new List<KeyBinding>
+                    {
+                        new KeyBinding
+                        {
+                            Command = nameof(Command.NewCustomCommandTab),
+                            Ctrl = true,
+                            Shift = true,
+                            Key = (int)ExtendedVirtualKey.Q
+                        }
+                    };
+
+                case Command.NewCustomCommandWindow:
+                    return new List<KeyBinding>
+                    {
+                        new KeyBinding
+                        {
+                            Command = nameof(Command.NewCustomCommandWindow),
+                            Ctrl = true,
+                            Alt = true,
+                            Key = (int)ExtendedVirtualKey.Q
+                        }
+                    };
+
                 case Command.SavedSshNewTab:
                     return new List<KeyBinding>
                     {
@@ -310,9 +358,9 @@ namespace FluentTerminal.App.Services.Implementation
                     }
                 };
 
+                default:
+                    throw new InvalidOperationException($"Default keybindings for Command '{command}' are missing");
             }
-
-            return null;
         }
 
         public Guid GetDefaultShellProfileId()
@@ -387,7 +435,8 @@ namespace FluentTerminal.App.Services.Implementation
                 BoldText = false,
                 BackgroundOpacity = 0.8,
                 Padding = 12,
-                ScrollBackLimit = 1000
+                ScrollBackLimit = 1000,
+                WordSeparator = " ()[]{}:;|│!&*<>@&quot;&squo;"
             };
         }
 
@@ -404,12 +453,17 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     Id = GetDefaultShellProfileId(),
                     Name = "Powershell",
+                    MigrationVersion = ShellProfile.CurrentMigrationVersion,
                     Arguments = string.Empty,
                     Location = @"C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe",
                     PreInstalled = true,
                     WorkingDirectory = string.Empty,
                     LineEndingTranslation = LineEndingStyle.DoNotModify,
                     UseConPty = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8), // Windows 10 1903+
+                    EnvironmentVariables = new Dictionary<string, string>
+                    {
+                        ["TERM"] = "xterm-256color"
+                    },
                     KeyBindings = new []
                     {
                         new KeyBinding
@@ -427,12 +481,17 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     Id = Guid.Parse("ab942a61-7673-4755-9bd8-765aff91d9a3"),
                     Name = "CMD",
+                    MigrationVersion = ShellProfile.CurrentMigrationVersion,
                     Arguments = string.Empty,
                     Location = @"C:\Windows\System32\cmd.exe",
                     PreInstalled = true,
                     WorkingDirectory = string.Empty,
                     LineEndingTranslation = LineEndingStyle.DoNotModify,
                     UseConPty = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 7), // Windows 10 1809+
+                    EnvironmentVariables = new Dictionary<string, string>
+                    {
+                        ["TERM"] = "xterm-256color"
+                    },
                     KeyBindings = new []
                     {
                         new KeyBinding
@@ -450,12 +509,17 @@ namespace FluentTerminal.App.Services.Implementation
                 {
                     Id= Guid.Parse("e5785ad6-584f-40cb-bdcd-d5b3b3953e7f"),
                     Name = "WSL",
+                    MigrationVersion = ShellProfile.CurrentMigrationVersion,
                     Arguments = string.Empty,
                     Location = @"C:\windows\system32\wsl.exe",
                     PreInstalled = true,
                     WorkingDirectory = string.Empty,
                     LineEndingTranslation = LineEndingStyle.ToLF,
                     UseConPty = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 7), // Windows 10 1809+
+                    EnvironmentVariables = new Dictionary<string, string>
+                    {
+                        ["TERM"] = "xterm-256color"
+                    },
                     KeyBindings = new []
                     {
                         new KeyBinding

FluentTerminal.App.Services/Implementation/DialogService.cs

@@ -12,19 +12,25 @@ namespace FluentTerminal.App.Services.Implementation
         private readonly Func<ICreateKeyBindingDialog> _createKeyBindingDialogFactory;
         private readonly Func<IInputDialog> _inputDialogFactory;
         private readonly Func<ISshConnectionInfoDialog> _sshConnectionInfoDialogFactory;
+        private readonly Func<ICustomCommandDialog> _customCommandDialogFactory;
         private readonly Func<ISshProfileSelectionDialog> _sshProfileSelectionDialogFactory;
+        private readonly Func<IAboutDialog> _aboutDialogFactory;
 
         public DialogService(Func<IShellProfileSelectionDialog> shellProfileSelectionDialogFactory,
             Func<IMessageDialog> messageDialogFactory, Func<ICreateKeyBindingDialog> createKeyBindingDialogFactory,
             Func<IInputDialog> inputDialogFactory, Func<ISshConnectionInfoDialog> sshConnectionInfoDialogFactory,
-            Func<ISshProfileSelectionDialog> sshProfileSelectionDialogFactory)
+            Func<ICustomCommandDialog> customCommandDialogFactory,
+            Func<ISshProfileSelectionDialog> sshProfileSelectionDialogFactory,
+            Func<IAboutDialog> aboutDialogFactory)
         {
             _shellProfileSelectionDialogFactory = shellProfileSelectionDialogFactory;
             _messageDialogFactory = messageDialogFactory;
             _createKeyBindingDialogFactory = createKeyBindingDialogFactory;
             _inputDialogFactory = inputDialogFactory;
             _sshConnectionInfoDialogFactory = sshConnectionInfoDialogFactory;
+            _customCommandDialogFactory = customCommandDialogFactory;
             _sshProfileSelectionDialogFactory = sshProfileSelectionDialogFactory;
+            _aboutDialogFactory = aboutDialogFactory;
         }
 
         public Task<KeyBinding> ShowCreateKeyBindingDialog()
@@ -78,14 +84,24 @@ namespace FluentTerminal.App.Services.Implementation
             return dialog.SelectProfile();
         }
 
-        public Task<ISshConnectionInfo> ShowSshConnectionInfoDialogAsync(ISshConnectionInfo input) =>
+        public Task<SshProfile> ShowSshConnectionInfoDialogAsync(SshProfile input = null) =>
             _sshConnectionInfoDialogFactory().GetSshConnectionInfoAsync(input);
 
+        public Task<ShellProfile> ShowCustomCommandDialogAsync(ShellProfile input = null) =>
+            _customCommandDialogFactory().GetCustomCommandAsync(input);
+
         public Task<SshProfile> ShowSshProfileSelectionDialogAsync()
         {
             var dialog = _sshProfileSelectionDialogFactory();
 
             return dialog.SelectProfile();
         }
+
+        public Task ShowAboutDialogAsync()
+        {
+            var dialog = _aboutDialogFactory();
+
+            return dialog.ShowAsync();
+        }
     }
 }

FluentTerminal.App.Services/Implementation/ITermThemeParser.cs

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

FluentTerminal.App.Services/Implementation/KeyboardCommandService.cs

@@ -42,5 +42,10 @@ namespace FluentTerminal.App.Services.Implementation
 
             throw new KeyNotFoundException($"No handler registered for command: {command}");
         }
+
+        public void ClearCommandHandlers()
+        {
+            _commandHandlers.Clear();
+        }
     }
 }

FluentTerminal.App.Services/Implementation/SettingsService.cs

@@ -5,6 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using FluentTerminal.Models.Messages;
+using GalaSoft.MvvmLight.Messaging;
 
 namespace FluentTerminal.App.Services.Implementation
 {
@@ -146,33 +148,17 @@ namespace FluentTerminal.App.Services.Implementation
             SaveTerminalOptions(config.TerminalOptions);
         }
 
-        public event EventHandler<ApplicationSettings> ApplicationSettingsChanged;
-
-        public event EventHandler<TerminalTheme> ThemeAdded;
-        public event EventHandler<Guid> CurrentThemeChanged;
-        public event EventHandler<Guid> ThemeDeleted;
-
-        public event EventHandler KeyBindingsChanged;
-
-        public event EventHandler<ShellProfile> ShellProfileAdded;
-        public event EventHandler<Guid> ShellProfileDeleted;
-
-        public event EventHandler<SshProfile> SshProfileAdded;
-        public event EventHandler<Guid> SshProfileDeleted;
-
-        public event EventHandler<TerminalOptions> TerminalOptionsChanged;
-
         public void DeleteShellProfile(Guid id)
         {
             _shellProfiles.Delete(id.ToString());
-            ShellProfileDeleted?.Invoke(this, id);
+            Messenger.Default.Send(new ShellProfileDeletedMessage(id));
         }
 
         public void DeleteSshProfile(Guid id)
         {
             _sshProfiles.Delete(id.ToString());
-            SshProfileDeleted?.Invoke(this, id);
-            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
+            Messenger.Default.Send(new SshProfileDeletedMessage(id));
+            Messenger.Default.Send(new KeyBindingsChangedMessage());
         }
 
 
@@ -189,7 +175,7 @@ namespace FluentTerminal.App.Services.Implementation
                 }
             }
 
-            ThemeDeleted?.Invoke(this, id);
+            Messenger.Default.Send(new ThemeDeletedMessage(id));
         }
 
         public ApplicationSettings GetApplicationSettings()
@@ -280,13 +266,18 @@ 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();
+                   .Select(x => JsonConvert.DeserializeObject<SshProfile>((string)x)).ToList();
+            }
         }
 
         public IEnumerable<TabTheme> GetTabThemes()
@@ -316,20 +307,25 @@ namespace FluentTerminal.App.Services.Implementation
                 _keyBindings.WriteValueAsJson(command.ToString(), _defaultValueProvider.GetDefaultKeyBindings(command));
             }
 
-            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
+            Messenger.Default.Send(new KeyBindingsChangedMessage());
         }
 
         public void SaveApplicationSettings(ApplicationSettings applicationSettings)
         {
             _roamingSettings.WriteValueAsJson(nameof(ApplicationSettings), applicationSettings);
-            ApplicationSettingsChanged?.Invoke(this, applicationSettings);
+            Messenger.Default.Send(new ApplicationSettingsChangedMessage(applicationSettings));
+        }
+
+        public void NotifyApplicationSettingsChanged(ApplicationSettings applicationSettings)
+        {
+            Messenger.Default.Send(new ApplicationSettingsChangedMessage(applicationSettings));
         }
 
         public void SaveCurrentThemeId(Guid id)
         {
             _roamingSettings.SetValue(CurrentThemeKey, id);
 
-            CurrentThemeChanged?.Invoke(this, id);
+            Messenger.Default.Send(new CurrentThemeChangedMessage(id));
         }
 
         public void SaveDefaultShellProfileId(Guid id)
@@ -349,7 +345,7 @@ namespace FluentTerminal.App.Services.Implementation
             }
 
             _keyBindings.WriteValueAsJson(enumValue.ToString(), keyBindings);
-            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
+            Messenger.Default.Send(new KeyBindingsChangedMessage());
         }
 
         public void SaveShellProfile(ShellProfile shellProfile, bool newShell = false)
@@ -357,11 +353,11 @@ namespace FluentTerminal.App.Services.Implementation
             _shellProfiles.WriteValueAsJson(shellProfile.Id.ToString(), shellProfile);
 
             // When saving the shell profile, we also need to update keybindings for everywhere.
-            KeyBindingsChanged?.Invoke(this, System.EventArgs.Empty);
+            Messenger.Default.Send(new KeyBindingsChangedMessage());
 
             if (newShell)
             {
-                ShellProfileAdded?.Invoke(this, shellProfile);
+                Messenger.Default.Send(new ShellProfileAddedMessage(shellProfile));
             }
         }
         public void SaveSshProfile(SshProfile sshProfile, bool newShell = false)
@@ -369,18 +365,18 @@ namespace FluentTerminal.App.Services.Implementation
             _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);
+            Messenger.Default.Send(new KeyBindingsChangedMessage());
 
             if (newShell)
             {
-                SshProfileAdded?.Invoke(this, sshProfile);
+                Messenger.Default.Send(new SshProfileAddedMessage(sshProfile));
             }
         }
 
         public void SaveTerminalOptions(TerminalOptions terminalOptions)
         {
             _roamingSettings.WriteValueAsJson(nameof(TerminalOptions), terminalOptions);
-            TerminalOptionsChanged?.Invoke(this, terminalOptions);
+            Messenger.Default.Send(new TerminalOptionsChangedMessage(terminalOptions));
         }
 
         public void SaveTheme(TerminalTheme theme, bool newTheme = false)
@@ -389,12 +385,12 @@ namespace FluentTerminal.App.Services.Implementation
 
             if (theme.Id == GetCurrentThemeId())
             {
-                CurrentThemeChanged?.Invoke(this, theme.Id);
+                Messenger.Default.Send(new CurrentThemeChangedMessage(theme.Id));
             }
 
             if (newTheme)
             {
-                ThemeAdded?.Invoke(this, theme);
+                Messenger.Default.Send(new ThemeAddedMessage(theme));
             }
         }
     }

FluentTerminal.App.Services/Implementation/ShellProfileMigrationService.cs

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

FluentTerminal.App.Services/Implementation/ThemeParserFactory.cs

@@ -5,7 +5,7 @@ namespace FluentTerminal.App.Services.Implementation
 {
     public class ThemeParserFactory : IThemeParserFactory
     {
-        private IEnumerable<IThemeParser> _parsers;
+        private readonly IEnumerable<IThemeParser> _parsers;
 
         public IEnumerable<string> SupportedFileTypes { get; }
 

FluentTerminal.App.Services/Implementation/TrayProcessCommunicationService.cs

@@ -1,4 +1,5 @@
-using FluentTerminal.Models;
+using FluentTerminal.App.Services.Exceptions;
+using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using FluentTerminal.Models.Requests;
 using FluentTerminal.Models.Responses;
@@ -30,18 +31,6 @@ namespace FluentTerminal.App.Services.Implementation
             return _nextTerminalId++;
         }
 
-        public async Task<GetAvailablePortResponse> GetAvailablePort()
-        {
-            var request = new GetAvailablePortRequest();
-
-            var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(request));
-            var response = JsonConvert.DeserializeObject<GetAvailablePortResponse>((string)responseMessage[MessageKeys.Content]);
-
-            Logger.Instance.Debug("Received GetAvailablePortResponse: {@response}", response);
-
-            return response;
-        }
-
         private string _userName;
 
         public async Task<string> GetUserName()
@@ -52,13 +41,13 @@ namespace FluentTerminal.App.Services.Implementation
                 return _userName;
             }
 
-            GetUserNameResponse response;
+            StringValueResponse 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]);
+                response = JsonConvert.DeserializeObject<StringValueResponse>((string)responseMessage[MessageKeys.Content]);
             }
             catch (Exception e)
             {
@@ -69,7 +58,7 @@ namespace FluentTerminal.App.Services.Implementation
 
             Logger.Instance.Debug("Received GetUserNameResponse: {@response}", response);
 
-            _userName = response.UserName;
+            _userName = response.Value;
 
             return _userName;
         }
@@ -82,7 +71,7 @@ namespace FluentTerminal.App.Services.Implementation
 
             if (!response.Success)
             {
-                throw new Exception(string.IsNullOrEmpty(response.Error) ? "Failed to save the file." : response.Error);
+                throw new SaveTextFileException(string.IsNullOrEmpty(response.Error) ? "Failed to save the file." : response.Error);
             }
         }
 
@@ -138,6 +127,16 @@ namespace FluentTerminal.App.Services.Implementation
             return JsonConvert.DeserializeObject<CommonResponse>((string) responseMessage[MessageKeys.Content]).Success;
         }
 
+        public void MuteTerminal(bool mute)
+        {
+            _appServiceConnection.SendMessageAsync(CreateMessage(new MuteTerminalRequest { Mute = mute }));
+        }
+
+        public void UpdateSettings(ApplicationSettings settings)
+        {
+            _appServiceConnection.SendMessageAsync(CreateMessage(new UpdateSettingsRequest { Settings = settings }));
+        }
+
         public async Task<CreateTerminalResponse> CreateTerminal(byte id, TerminalSize size, ShellProfile shellProfile, SessionType sessionType)
         {
             var request = new CreateTerminalRequest
@@ -158,6 +157,18 @@ namespace FluentTerminal.App.Services.Implementation
             return response;
         }
 
+        public async Task<PauseTerminalOutputResponse> PauseTerminalOutput(byte id, bool pause)
+        {
+            var request = new PauseTerminalOutputRequest
+            {
+                Id = id,
+                Pause = pause
+            };
+
+            var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(request));
+            return JsonConvert.DeserializeObject<PauseTerminalOutputResponse>((string)responseMessage[MessageKeys.Content]);
+        }
+
         public void Initialize(IAppServiceConnection appServiceConnection)
         {
             _appServiceConnection = appServiceConnection;
@@ -183,7 +194,7 @@ namespace FluentTerminal.App.Services.Implementation
                         Logger.Instance.Error("Received output for unknown terminal Id {id}", terminalId);
                     }
                     break;
-                case TerminalExitedRequest.Identifier:
+                case (byte) MessageIdentifiers.TerminalExitedRequest:
                     var request = JsonConvert.DeserializeObject<TerminalExitedRequest>((string)messageContent);
                     Logger.Instance.Debug("Received TerminalExitedRequest: {@request}", request);
 
@@ -211,6 +222,14 @@ namespace FluentTerminal.App.Services.Implementation
             _terminalOutputHandlers[terminalId] = callback;
         }
 
+        public void UnsubscribeFromTerminalOutput(byte id)
+        {
+            if (_terminalOutputHandlers.ContainsKey(id))
+            {
+                _terminalOutputHandlers.Remove(id);
+            }
+        }
+
         public Task UpdateToggleWindowKeyBindings()
         {
             var keyBindings = _settingsService.GetCommandKeyBindings()[nameof(Command.ToggleWindow)];
@@ -244,6 +263,49 @@ namespace FluentTerminal.App.Services.Implementation
             return _appServiceConnection.SendMessageAsync(CreateMessage(request));
         }
 
+        private static readonly Dictionary<string, string> CommandPaths = new Dictionary<string, string>();
+
+        private static readonly Dictionary<string, string> CommandErrors = new Dictionary<string, string>();
+
+        public async Task<string> GetCommandPathAsync(string command)
+        {
+            if (string.IsNullOrWhiteSpace(command))
+            {
+                throw new ArgumentException("Input value is null or empty.", nameof(command));
+            }
+
+            command = command.Trim();
+
+            var commandLower = command.ToLowerInvariant();
+
+            if (CommandPaths.TryGetValue(commandLower, out var path))
+            {
+                return path;
+            }
+
+            if (CommandErrors.TryGetValue(commandLower, out var error))
+            {
+                throw new Exception(error);
+            }
+
+            var request = new GetCommandPathRequest {Command = command};
+
+            var responseMessage = await _appServiceConnection.SendMessageAsync(CreateMessage(request));
+            var response =
+                JsonConvert.DeserializeObject<StringValueResponse>((string) responseMessage[MessageKeys.Content]);
+
+            if (response.Success)
+            {
+                CommandPaths[commandLower] = response.Value;
+
+                return response.Value;
+            }
+
+            CommandErrors[commandLower] = response.Error;
+
+            throw new Exception(response.Error);
+        }
+
         private ValueSet CreateMessage(IMessage content)
         {
             return new ValueSet

FluentTerminal.App.Services/Terminal.cs

@@ -2,6 +2,7 @@
 using FluentTerminal.Models.Enums;
 using FluentTerminal.Models.Responses;
 using System;
+using System.Text;
 using System.Threading.Tasks;
 
 namespace FluentTerminal.App.Services
@@ -10,14 +11,16 @@ namespace FluentTerminal.App.Services
     {
         private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
         private Func<Task<string>> _selectedTextCallback;
-        private bool _closingFromUI = false;
-        private bool _exited = false;
+        private bool _closingFromUI;
+        private bool _exited;
+        private readonly bool _requireShellProcessStart;
 
-        public Terminal(ITrayProcessCommunicationService trayProcessCommunicationService)
+        public Terminal(ITrayProcessCommunicationService trayProcessCommunicationService, byte? terminalId = null)
         {
             _trayProcessCommunicationService = trayProcessCommunicationService;
             _trayProcessCommunicationService.TerminalExited += OnTerminalExited;
-            Id = _trayProcessCommunicationService.GetNextTerminalId();
+            Id = terminalId ?? trayProcessCommunicationService.GetNextTerminalId();
+            _requireShellProcessStart = !terminalId.HasValue;
         }
 
         private void OnTerminalExited(object sender, TerminalExitStatus status)
@@ -30,10 +33,12 @@ namespace FluentTerminal.App.Services
             _exited = true;
             Exited?.Invoke(this, status.ExitCode);
 
-            if (_closingFromUI == true || status.ExitCode <= 0)
+            if (_closingFromUI || status.ExitCode <= 0)
             {
                 Closed?.Invoke(this, System.EventArgs.Empty);
             }
+
+            _trayProcessCommunicationService.TerminalExited -= OnTerminalExited;
         }
 
         public event EventHandler<int> Exited;
@@ -78,6 +83,7 @@ namespace FluentTerminal.App.Services
                 return;
             }
             _closingFromUI = true;
+            _trayProcessCommunicationService.UnsubscribeFromTerminalOutput(Id);
             await _trayProcessCommunicationService.CloseTerminal(Id).ConfigureAwait(true);
         }
 
@@ -87,7 +93,7 @@ namespace FluentTerminal.App.Services
         /// <returns></returns>
         public Task<string> GetSelectedText()
         {
-            return _selectedTextCallback();
+            return _selectedTextCallback?.Invoke();
         }
 
         /// <summary>
@@ -133,17 +139,30 @@ namespace FluentTerminal.App.Services
         /// <param name="shellProfile"></param>
         /// <param name="size"></param>
         /// <param name="sessionType"></param>
-        public async Task<CreateTerminalResponse> StartShellProcess(ShellProfile shellProfile, TerminalSize size, SessionType sessionType)
+        public async Task<TerminalResponse> StartShellProcess(ShellProfile shellProfile, TerminalSize size, SessionType sessionType, string termState)
         {
-            _trayProcessCommunicationService.SubscribeForTerminalOutput(Id, t => OutputReceived?.Invoke(this, t));
-            var response = await _trayProcessCommunicationService.CreateTerminal(Id, size, shellProfile, sessionType).ConfigureAwait(true);
-
-            if (response.Success)
+            if (!_requireShellProcessStart && !string.IsNullOrEmpty(termState))
             {
-                FallbackTitle = response.ShellExecutableName;
-                SetTitle(FallbackTitle);
+                OutputReceived?.Invoke(this, Encoding.UTF8.GetBytes(termState));
+            }
+
+            _trayProcessCommunicationService.SubscribeForTerminalOutput(Id, t => OutputReceived?.Invoke(this, t));
+
+            if (_requireShellProcessStart)
+            {
+                var response = await _trayProcessCommunicationService.CreateTerminal(Id, size, shellProfile, sessionType).ConfigureAwait(true);
+
+                if (response.Success)
+                {
+                    FallbackTitle = response.ShellExecutableName;
+                    SetTitle(FallbackTitle);
+                }
+                return response;
+            }
+            else
+            {
+                return await _trayProcessCommunicationService.PauseTerminalOutput(Id, false);
             }
-            return response;
         }
 
         public Task Write(byte[] data)

FluentTerminal.App.Services/Utilities/I18N.cs

@@ -13,5 +13,12 @@ namespace FluentTerminal.App.Services.Utilities
             var resourceLoader = ResourceLoader.GetForCurrentView();
             return resourceLoader.GetString(resource.Replace('.', '/'));
         }
+
+        public static string TranslateWithFallback(string resource, string fallback)
+        {
+            var result = Translate(resource);
+
+            return string.IsNullOrEmpty(result) ? fallback : result;
+        }
     }
 }

FluentTerminal.App.ViewModels/EnvironmentVariableViewModel.cs

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

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

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

FluentTerminal.App.ViewModels/ISessionSuccessTracker.cs

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

FluentTerminal.App.ViewModels/ITerminalView.cs

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

FluentTerminal.App.ViewModels/Infrastructure/IAsyncCommand.cs

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

FluentTerminal.App.ViewModels/MainViewModel.cs

@@ -1,6 +1,7 @@
 using FluentTerminal.App.Services;
 using FluentTerminal.App.Services.EventArgs;
 using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.App.ViewModels.Infrastructure;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
@@ -10,6 +11,7 @@ using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
 using System.Threading.Tasks;
+using FluentTerminal.Models.Messages;
 
 namespace FluentTerminal.App.ViewModels
 {
@@ -21,7 +23,6 @@ namespace FluentTerminal.App.ViewModels
         private readonly IKeyboardCommandService _keyboardCommandService;
         private readonly ISettingsService _settingsService;
         private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
-        private readonly ISshHelperService _sshHelperService;
         private ApplicationSettings _applicationSettings;
         private string _background;
         private double _backgroundOpacity;
@@ -30,33 +31,36 @@ namespace FluentTerminal.App.ViewModels
         private string _windowTitle;
 
         public MainViewModel(ISettingsService settingsService, ITrayProcessCommunicationService trayProcessCommunicationService, IDialogService dialogService, IKeyboardCommandService keyboardCommandService,
-            IApplicationView applicationView, IDispatcherTimer dispatcherTimer, IClipboardService clipboardService, ISshHelperService sshHelperService)
+            IApplicationView applicationView, IDispatcherTimer dispatcherTimer, IClipboardService clipboardService)
         {
+            MessengerInstance.Register<ApplicationSettingsChangedMessage>(this, OnApplicationSettingsChanged);
+            MessengerInstance.Register<CurrentThemeChangedMessage>(this, OnCurrentThemeChanged);
+            MessengerInstance.Register<ShellProfileAddedMessage>(this, OnShellProfileAdded);
+            MessengerInstance.Register<ShellProfileDeletedMessage>(this, OnShellProfileDeleted);
+            MessengerInstance.Register<SshProfileAddedMessage>(this, OnSshProfileAdded);
+            MessengerInstance.Register<SshProfileDeletedMessage>(this, OnSshProfileDeleted);
+            MessengerInstance.Register<TerminalOptionsChangedMessage>(this, OnTerminalOptionsChanged);
+
             _settingsService = settingsService;
-            _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;
-            _sshHelperService = sshHelperService;
             _keyboardCommandService = keyboardCommandService;
             _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewTab), async () => await AddLocalTabAsync());
             _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewSshTab), async () => await AddSshTabAsync());
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewCustomCommandTab), async () => await AddCustomCommandTabAsync());
             _keyboardCommandService.RegisterCommandHandler(nameof(Command.ConfigurableNewTab), async () => await AddConfigurableTerminal());
             _keyboardCommandService.RegisterCommandHandler(nameof(Command.ChangeTabTitle), async () => await SelectedTerminal.EditTitle());
             _keyboardCommandService.RegisterCommandHandler(nameof(Command.CloseTab), CloseCurrentTab);
             _keyboardCommandService.RegisterCommandHandler(nameof(Command.SavedSshNewTab), async () => await AddSavedSshTerminalAsync());
             _keyboardCommandService.RegisterCommandHandler(nameof(Command.SavedSshNewWindow), () => NewWindow(NewWindowAction.ShowSshProfileSelection));
             _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewSshWindow), () => NewWindow(NewWindowAction.ShowSshInfoDialog));
-            
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.NewCustomCommandWindow), () => NewWindow(NewWindowAction.ShowCustomCommandDialog));
+            _keyboardCommandService.RegisterCommandHandler(nameof(Command.DuplicateTab), async () => await AddTerminalAsync(SelectedTerminal.ShellProfile.Clone()));
+
             // Add all of the commands for switching to a tab of a given ID, if there's one open there
             for (int i = 0; i < 9; i++)
             {
@@ -94,8 +98,9 @@ namespace FluentTerminal.App.ViewModels
             TabsPosition = _applicationSettings.TabsPosition;
 
             AddLocalShellCommand = new RelayCommand(async () => await AddLocalTabAsync());
-            AddRemoteShellCommand = new RelayCommand(async () => await AddSshTabAsync());
-            ShowAboutCommand = new RelayCommand(ShowAbout);
+            AddSshShellCommand = new RelayCommand(async () => await AddSshTabAsync());
+            AddQuickShellCommand = new RelayCommand(async () => await AddCustomCommandTabAsync());
+            ShowAboutCommand = new AsyncCommand(ShowAbout);
             ShowSettingsCommand = new RelayCommand(ShowSettings);
 
             ApplicationView.CloseRequested += OnCloseRequest;
@@ -105,26 +110,44 @@ namespace FluentTerminal.App.ViewModels
 
         private void OnClosed(object sender, EventArgs e)
         {
+            MessengerInstance.Unregister(this);
+
+            ApplicationView.CloseRequested -= OnCloseRequest;
+            ApplicationView.Closed -= OnClosed;
+            Terminals.CollectionChanged -= OnTerminalsCollectionChanged;
+
+            _keyboardCommandService.ClearCommandHandlers();
+
+            _applicationSettings = null;
+
+            AddLocalShellCommand = null;
+            AddSshShellCommand = null;
+            AddQuickShellCommand = null;
+            ShowAboutCommand = null;
+            ShowSettingsCommand = null;
+
             Closed?.Invoke(this, e);
         }
 
-        private void OnShellProfileDeleted(object sender, Guid e)
+        private void OnShellProfileDeleted(ShellProfileDeletedMessage message)
         {
-            _keyboardCommandService.DeregisterCommandHandler(e.ToString());
+            _keyboardCommandService.DeregisterCommandHandler(message.ProfileId.ToString());
         }
 
-        private void OnShellProfileAdded(object sender, ShellProfile e)
+        private void OnShellProfileAdded(ShellProfileAddedMessage message)
         {
-            _keyboardCommandService.RegisterCommandHandler(e.Id.ToString(), () => AddLocalTabOrWindowAsync(e.Id));
+            _keyboardCommandService.RegisterCommandHandler(message.ShellProfile.Id.ToString(),
+                () => AddLocalTabOrWindowAsync(message.ShellProfile.Id));
         }
 
-        private void OnSshProfileAdded(object sender, ShellProfile e)
+        private void OnSshProfileAdded(SshProfileAddedMessage message)
         {
-            _keyboardCommandService.RegisterCommandHandler(e.Id.ToString(), () => AddSshTabOrWindowAsync(e.Id));
+            _keyboardCommandService.RegisterCommandHandler(message.SshProfile.Id.ToString(),
+                () => AddSshTabOrWindowAsync(message.SshProfile.Id));
         }
-        private void OnSshProfileDeleted(object sender, Guid e)
+        private void OnSshProfileDeleted(SshProfileDeletedMessage message)
         {
-            _keyboardCommandService.DeregisterCommandHandler(e.ToString());
+            _keyboardCommandService.DeregisterCommandHandler(message.ProfileId.ToString());
         }
         
         private void OnTerminalsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
@@ -139,17 +162,23 @@ namespace FluentTerminal.App.ViewModels
 
         public event EventHandler ShowSettingsRequested;
 
-        public event EventHandler ShowAboutRequested;
-
         public event EventHandler ActivatedMv;
 
+        public event EventHandler<TerminalViewModel> TabTearedOff;
+
+        public void TearOffTab(TerminalViewModel model)
+        {
+            TabTearedOff?.Invoke(this, model);
+        }
+
         public void FocusWindow()
         {
             ActivatedMv?.Invoke(this, EventArgs.Empty);
         }
 
-        public RelayCommand AddLocalShellCommand { get; }
-        public RelayCommand AddRemoteShellCommand { get; }
+        public RelayCommand AddLocalShellCommand { get; private set; }
+        public RelayCommand AddSshShellCommand { get; private set; }
+        public RelayCommand AddQuickShellCommand { get; private set; }
 
         public string WindowTitle
         {
@@ -165,12 +194,12 @@ namespace FluentTerminal.App.ViewModels
 
         public bool ShowTabsOnTop
         {
-            get => TabsPosition == TabsPosition.Top && (Terminals.Count > 1 || _applicationSettings.AlwaysShowTabs);
+            get => TabsPosition == TabsPosition.Top;
         }
 
         public bool ShowTabsOnBottom
         {
-            get => TabsPosition == TabsPosition.Bottom && (Terminals.Count > 1 || _applicationSettings.AlwaysShowTabs);
+            get => TabsPosition == TabsPosition.Bottom;
         }
 
         public string Background
@@ -213,9 +242,9 @@ namespace FluentTerminal.App.ViewModels
             }
         }
 
-        public RelayCommand ShowAboutCommand { get; }
+        public IAsyncCommand ShowAboutCommand { get; private set; }
 
-        public RelayCommand ShowSettingsCommand { get; }
+        public RelayCommand ShowSettingsCommand { get; private set; }
 
         public TabsPosition TabsPosition
         {
@@ -246,7 +275,7 @@ namespace FluentTerminal.App.ViewModels
 
         public async Task AddSshTabAsync()
         {
-            SshProfile profile = await _sshHelperService.GetSshProfileAsync(new SshProfile());
+            SshProfile profile = await _dialogService.ShowSshConnectionInfoDialogAsync();
             if (profile == null)
             {
                 // User selected "Cancel"
@@ -260,6 +289,24 @@ namespace FluentTerminal.App.ViewModels
                 await AddTerminalAsync(profile);
             }
         }
+
+        public async Task AddCustomCommandTabAsync()
+        {
+            var profile = await _dialogService.ShowCustomCommandDialogAsync();
+            if (profile == null)
+            {
+                // User selected "Cancel"
+                if (Terminals.Count == 0)
+                {
+                    await ApplicationView.TryClose();
+                }
+            }
+            else
+            {
+                await AddTerminalAsync(profile);
+            }
+        }
+
         public Task AddSshTabOrWindowAsync(Guid shellProfileId)
         {
             switch (_applicationSettings.NewTerminalLocation)
@@ -277,7 +324,7 @@ namespace FluentTerminal.App.ViewModels
 
         public async Task AddSavedSshTerminalAsync()
         {
-            ShellProfile profile = await _sshHelperService.GetSavedSshProfileAsync();
+            ShellProfile profile = await _dialogService.ShowSshProfileSelectionDialogAsync();
 
             if (profile == null)
             {
@@ -314,22 +361,85 @@ namespace FluentTerminal.App.ViewModels
             }
         }
 
-        public Task AddTerminalAsync(ShellProfile profile)
+        public Task AddTerminalAsync(ShellProfile profile, string terminalState, int position)
         {
             return ApplicationView.RunOnDispatcherThread(() =>
             {
                 var terminal = new TerminalViewModel(_settingsService, _trayProcessCommunicationService, _dialogService, _keyboardCommandService,
-                    _applicationSettings, profile, ApplicationView, _dispatcherTimer, _clipboardService);
+                    _applicationSettings, profile, ApplicationView, _dispatcherTimer, _clipboardService, terminalState);
 
                 terminal.Closed += OnTerminalClosed;
                 terminal.ShellTitleChanged += Terminal_ShellTitleChanged;
                 terminal.CustomTitleChanged += Terminal_CustomTitleChanged;
-                Terminals.Add(terminal);
+                terminal.CloseLeftTabsRequested += Terminal_CloseLeftTabsRequested;
+                terminal.CloseRightTabsRequested += Terminal_CloseRightTabsRequested;
+                terminal.CloseOtherTabsRequested += Terminal_CloseOtherTabsRequested;
+                terminal.DuplicateTabRequested += Terminal_DuplicateTabRequested;
+                Terminals.Insert(Math.Min(position, Terminals.Count), terminal);
 
                 SelectedTerminal = terminal;
             });
         }
 
+        private async void Terminal_DuplicateTabRequested(object sender, EventArgs e)
+        {
+            if (sender is TerminalViewModel terminal)
+            {
+                await AddTerminalAsync(terminal.ShellProfile.Clone());
+            }
+        }
+
+        private void Terminal_CloseOtherTabsRequested(object sender, EventArgs e)
+        {
+            if (sender is TerminalViewModel terminal)
+            {
+                Array.ForEach<TerminalViewModel>(Terminals.ToArray(),
+                    async t => {
+                        if (terminal != t)
+                        {
+                            Logger.Instance.Debug("Terminal with Id: {@id} closed.", t.Terminal.Id);
+                            await t.CloseCommand.ExecuteAsync();
+                        }
+                    });
+            }
+        }
+
+        private async void Terminal_CloseRightTabsRequested(object sender, EventArgs e)
+        {
+            if (sender is TerminalViewModel terminal)
+            {
+                for (int i = Terminals.Count - 1; i > Terminals.IndexOf(terminal); --i)
+                {
+                    var terminalToRemove = Terminals[i];
+                    Logger.Instance.Debug("Terminal with Id: {@id} closed.", terminalToRemove.Terminal.Id);
+                    await terminalToRemove.CloseCommand.ExecuteAsync();
+                }
+            }
+        }
+
+        private async void Terminal_CloseLeftTabsRequested(object sender, EventArgs e)
+        {
+            if (sender is TerminalViewModel terminal)
+            {
+                for(int i = Terminals.IndexOf(terminal) - 1; i >= 0; --i)
+                {
+                    var terminalToRemove = Terminals[i];
+                    Logger.Instance.Debug("Terminal with Id: {@id} closed.", terminalToRemove.Terminal.Id);
+                    await terminalToRemove.CloseCommand.ExecuteAsync();
+                }
+            }
+        }
+
+        public Task AddTerminalAsync(ShellProfile profile)
+        {
+            return AddTerminalAsync(profile, "", Terminals.Count);
+        }
+
+        public Task AddTerminalAsync(string terminalState, int position)
+        {
+            return AddTerminalAsync(new ShellProfile(), terminalState, position);
+        }
+
         private void Terminal_CustomTitleChanged(object sender, string e)
         {
             if (sender is TerminalViewModel terminal)
@@ -363,13 +473,17 @@ namespace FluentTerminal.App.ViewModels
                 terminal.Closed -= OnTerminalClosed;
                 terminal.ShellTitleChanged -= Terminal_ShellTitleChanged;
                 terminal.CustomTitleChanged -= Terminal_CustomTitleChanged;
+                terminal.CloseLeftTabsRequested -= Terminal_CloseLeftTabsRequested;
+                terminal.CloseRightTabsRequested -= Terminal_CloseRightTabsRequested;
+                terminal.CloseOtherTabsRequested -= Terminal_CloseOtherTabsRequested;
+                terminal.DuplicateTabRequested -= Terminal_DuplicateTabRequested;
                 await terminal.Close();
             }
         }
 
         private void CloseCurrentTab()
         {
-            SelectedTerminal?.CloseCommand.Execute(null);
+            SelectedTerminal?.CloseCommand.ExecuteAsync();
         }
 
         private void NewWindow(NewWindowAction showSelection)
@@ -387,16 +501,16 @@ namespace FluentTerminal.App.ViewModels
             NewWindowRequested?.Invoke(this, args);
         }
 
-        private async void OnApplicationSettingsChanged(object sender, ApplicationSettings e)
+        private async void OnApplicationSettingsChanged(ApplicationSettingsChangedMessage message)
         {
             await ApplicationView.RunOnDispatcherThread(() =>
             {
-                _applicationSettings = e;
-                TabsPosition = e.TabsPosition;
+                _applicationSettings = message.ApplicationSettings;
+                TabsPosition = message.ApplicationSettings.TabsPosition;
                 RaisePropertyChanged(nameof(ShowTabsOnTop));
                 RaisePropertyChanged(nameof(ShowTabsOnBottom));
 
-                if (e.ShowCustomTitleInTitlebar)
+                if (message.ApplicationSettings.ShowCustomTitleInTitlebar)
                 {
                     WindowTitle = SelectedTerminal?.TabTitle;
                 }
@@ -428,13 +542,13 @@ namespace FluentTerminal.App.ViewModels
             }
         }
 
-        private async void OnCurrentThemeChanged(object sender, Guid e)
+        private async void OnCurrentThemeChanged(CurrentThemeChangedMessage message)
         {
             await ApplicationView.RunOnDispatcherThread(() =>
-             {
-                 var currentTheme = _settingsService.GetTheme(e);
-                 Background = currentTheme.Colors.Background;
-             });
+            {
+                var currentTheme = _settingsService.GetTheme(message.ThemeId);
+                Background = currentTheme.Colors.Background;
+            });
         }
 
         private async void OnTerminalClosed(object sender, EventArgs e)
@@ -446,6 +560,15 @@ namespace FluentTerminal.App.ViewModels
                     SelectedTerminal = Terminals.LastOrDefault(t => t != terminal);
                 }
                 Logger.Instance.Debug("Terminal with Id: {@id} closed.", terminal.Terminal.Id);
+
+                terminal.Closed -= OnTerminalClosed;
+                terminal.ShellTitleChanged -= Terminal_ShellTitleChanged;
+                terminal.CustomTitleChanged -= Terminal_CustomTitleChanged;
+                terminal.CloseLeftTabsRequested -= Terminal_CloseLeftTabsRequested;
+                terminal.CloseRightTabsRequested -= Terminal_CloseRightTabsRequested;
+                terminal.CloseOtherTabsRequested -= Terminal_CloseOtherTabsRequested;
+                terminal.DuplicateTabRequested -= Terminal_DuplicateTabRequested;
+
                 Terminals.Remove(terminal);
 
                 if (Terminals.Count == 0)
@@ -455,11 +578,11 @@ namespace FluentTerminal.App.ViewModels
             }
         }
 
-        private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
+        private async void OnTerminalOptionsChanged(TerminalOptionsChangedMessage message)
         {
             await ApplicationView.RunOnDispatcherThread(() =>
             {
-                BackgroundOpacity = e.BackgroundOpacity;
+                BackgroundOpacity = message.TerminalOptions.BackgroundOpacity;
             });
         }
 
@@ -485,9 +608,9 @@ namespace FluentTerminal.App.ViewModels
             SelectedTerminal = Terminals[previousIndex];
         }
 
-        private void ShowAbout()
+        private Task ShowAbout()
         {
-            ShowAboutRequested?.Invoke(this, EventArgs.Empty);
+            return _dialogService.ShowAboutDialogAsync();
         }
 
         private void ShowSettings()

FluentTerminal.App.ViewModels/OverlayViewModel.cs

@@ -14,7 +14,6 @@ namespace FluentTerminal.App.ViewModels
         {
             _overlayTimer = dispatcherTimer;
             _overlayTimer.Interval = new TimeSpan(0, 0, 2);
-            _overlayTimer.Tick += OnResizeOverlayTimerFinished;
         }
 
         public bool ShowOverlay
@@ -37,13 +36,16 @@ namespace FluentTerminal.App.ViewModels
             if (_overlayTimer.IsEnabled)
             {
                 _overlayTimer.Stop();
+                _overlayTimer.Tick -= OnResizeOverlayTimerFinished;
             }
             _overlayTimer.Start();
+            _overlayTimer.Tick += OnResizeOverlayTimerFinished;
         }
 
         private void OnResizeOverlayTimerFinished(object sender, object e)
         {
             _overlayTimer.Stop();
+            _overlayTimer.Tick -= OnResizeOverlayTimerFinished;
             ShowOverlay = false;
         }
 

FluentTerminal.App.ViewModels/Profiles/CommonProfileProviderViewModel.cs

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

FluentTerminal.App.ViewModels/Profiles/ExecutedCommand.cs

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

FluentTerminal.App.ViewModels/Profiles/ProfileProviderViewModelBase.cs

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

FluentTerminal.App.ViewModels/Profiles/SshConnectViewModel.cs

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

FluentTerminal.App.ViewModels/Profiles/SshConnectionInfoValidationResult.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace FluentTerminal.Models.Enums
+namespace FluentTerminal.App.ViewModels.Profiles
 {
     [Flags]
     public enum SshConnectionInfoValidationResult

FluentTerminal.App.ViewModels/Settings/AboutPageViewModel.cs

@@ -9,14 +9,12 @@ namespace FluentTerminal.App.ViewModels.Settings
     public class AboutPageViewModel : ViewModelBase
     {
         private const string BaseUrl = "https://github.com/felixse/FluentTerminal/releases/tag/";
-        private readonly ISettingsService _settingsService;
         private readonly IUpdateService _updateService;
         private string _latestVersion;
         private readonly IApplicationView _applicationView;
 
-        public AboutPageViewModel(ISettingsService settingsService, IUpdateService updateService, IApplicationView applicationView)
+        public AboutPageViewModel(IUpdateService updateService, IApplicationView applicationView)
         {
-            _settingsService = settingsService;
             _updateService = updateService;
             _applicationView = applicationView;
 

FluentTerminal.App.ViewModels/Settings/GeneralPageViewModel.cs

@@ -1,5 +1,6 @@
 using FluentTerminal.App.Services;
 using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.App.ViewModels.Infrastructure;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
@@ -22,19 +23,25 @@ namespace FluentTerminal.App.ViewModels.Settings
         private string _startupTaskErrorMessage;
         private bool _needsToRestart;
         private readonly IApplicationLanguageService _applicationLanguageService;
+        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
+        private readonly IFileSystemService _fileSystemService;
 
         public GeneralPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider,
-            IStartupTaskService startupTaskService, IApplicationLanguageService applicationLanguageService)
+            IStartupTaskService startupTaskService, IApplicationLanguageService applicationLanguageService,
+            ITrayProcessCommunicationService trayProcessCommunicationService, IFileSystemService fileSystemService)
         {
             _settingsService = settingsService;
             _dialogService = dialogService;
             _defaultValueProvider = defaultValueProvider;
             _startupTaskService = startupTaskService;
             _applicationLanguageService = applicationLanguageService;
+            _trayProcessCommunicationService = trayProcessCommunicationService;
+            _fileSystemService = fileSystemService;
 
             _applicationSettings = _settingsService.GetApplicationSettings();
 
-            RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
+            RestoreDefaultsCommand = new AsyncCommand(RestoreDefaults);
+            BrowseLogDirectoryCommand = new AsyncCommand(BrowseLogDirectory);
         }
 
         public IEnumerable<string> Languages => _applicationLanguageService.Languages;
@@ -61,20 +68,6 @@ namespace FluentTerminal.App.ViewModels.Settings
             SetStartupTaskPropertiesForStatus(startupTaskStatus);
         }
 
-        public bool AlwaysShowTabs
-        {
-            get => _applicationSettings.AlwaysShowTabs;
-            set
-            {
-                if (_applicationSettings.AlwaysShowTabs != value)
-                {
-                    _applicationSettings.AlwaysShowTabs = value;
-                    _settingsService.SaveApplicationSettings(_applicationSettings);
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
         public bool ShowCustomTitleInTitlebar
         {
             get => _applicationSettings.ShowCustomTitleInTitlebar;
@@ -168,6 +161,63 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
+        public bool MuteTerminalBeeps
+        {
+            get => _applicationSettings.MuteTerminalBeeps;
+            set
+            {
+                if (_applicationSettings.MuteTerminalBeeps != value)
+                {
+                    _applicationSettings.MuteTerminalBeeps = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+
+                    _trayProcessCommunicationService.MuteTerminal(value);
+                }
+            }
+        }
+        public bool EnableLogging
+        {
+            get => _applicationSettings.EnableLogging;
+            set
+            {
+                if (_applicationSettings.EnableLogging != value)
+                {
+                    _applicationSettings.EnableLogging = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public bool PrintableOutputOnly
+        {
+            get => _applicationSettings.PrintableOutputOnly;
+            set
+            {
+                if (_applicationSettings.PrintableOutputOnly != value)
+                {
+                    _applicationSettings.PrintableOutputOnly = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        public string LogDirectoryPath
+        {
+            get => _applicationSettings.LogDirectoryPath;
+            set
+            {
+                if (_applicationSettings.LogDirectoryPath != value)
+                {
+                    _applicationSettings.LogDirectoryPath = value;
+                    _settingsService.SaveApplicationSettings(_applicationSettings);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
         public bool BottomIsSelected
         {
             get => TabsPosition == TabsPosition.Bottom;
@@ -222,7 +272,9 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        public RelayCommand RestoreDefaultsCommand { get; }
+        public IAsyncCommand RestoreDefaultsCommand { get; }
+
+        public IAsyncCommand BrowseLogDirectoryCommand { get; }
 
         public bool StartupTaskEnabled
         {
@@ -328,13 +380,16 @@ namespace FluentTerminal.App.ViewModels.Settings
                 UnderlineSelectedTab = defaults.UnderlineSelectedTab;
                 InactiveTabColorMode = defaults.InactiveTabColorMode;
                 NewTerminalLocation = defaults.NewTerminalLocation;
-                AlwaysShowTabs = defaults.AlwaysShowTabs;
                 ShowNewOutputIndicator = defaults.ShowNewOutputIndicator;
                 EnableTrayIcon = defaults.EnableTrayIcon;
                 ShowCustomTitleInTitlebar = defaults.ShowCustomTitleInTitlebar;
                 UseMoshByDefault = defaults.UseMoshByDefault;
                 AutoFallbackToWindowsUsernameInLinks = defaults.AutoFallbackToWindowsUsernameInLinks;
                 RTrimCopiedLines = defaults.RTrimCopiedLines;
+                MuteTerminalBeeps = defaults.MuteTerminalBeeps;
+                EnableLogging = defaults.EnableLogging;
+                PrintableOutputOnly = defaults.PrintableOutputOnly;
+                LogDirectoryPath = defaults.LogDirectoryPath;
             }
         }
 
@@ -382,5 +437,15 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
             SetStartupTaskPropertiesForStatus(status);
         }
+
+        private async Task BrowseLogDirectory()
+        {
+            var folder = await _fileSystemService.BrowseForDirectory();
+
+            if (folder != null)
+            {
+                LogDirectoryPath = folder;
+            }
+        }
     }
 }

FluentTerminal.App.ViewModels/Settings/KeyBindingsPageViewModel.cs

@@ -14,17 +14,14 @@ namespace FluentTerminal.App.ViewModels.Settings
 {
     public class KeyBindingsPageViewModel : ViewModelBase
     {
-        private readonly IDefaultValueProvider _defaultValueProvider;
         private readonly IDialogService _dialogService;
         private readonly ISettingsService _settingsService;
         private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
-        private IDictionary<string, ICollection<KeyBinding>> _keyBindings;
 
-        public KeyBindingsPageViewModel(ISettingsService settingsService, IDialogService dialogService, IDefaultValueProvider defaultValueProvider, ITrayProcessCommunicationService trayProcessCommunicationService)
+        public KeyBindingsPageViewModel(ISettingsService settingsService, IDialogService dialogService, ITrayProcessCommunicationService trayProcessCommunicationService)
         {
             _settingsService = settingsService;
             _dialogService = dialogService;
-            _defaultValueProvider = defaultValueProvider;
             _trayProcessCommunicationService = trayProcessCommunicationService;
             RestoreDefaultsCommand = new RelayCommand(async () => await RestoreDefaults().ConfigureAwait(false));
             AddCommand = new RelayCommand<string>(async command => await Add(command).ConfigureAwait(false));
@@ -54,15 +51,13 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         private void Initialize(IDictionary<string, ICollection<KeyBinding>> keyBindings)
         {
-            _keyBindings = keyBindings;
-
             ClearKeyBindings();
 
             foreach (var value in Enum.GetValues(typeof(Command)))
             {
                 var command = (Command)value;
                 var viewModel = new KeyBindingsViewModel(command.ToString(), _dialogService, I18N.Translate($"{nameof(Command)}.{command}"), true);
-                foreach (var keyBinding in _keyBindings[command.ToString()])
+                foreach (var keyBinding in keyBindings[command.ToString()])
                 {
                     viewModel.Add(keyBinding);
                 }

FluentTerminal.App.ViewModels/Settings/ProfilesPageViewModel.cs

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

@@ -16,28 +16,28 @@ namespace FluentTerminal.App.ViewModels.Settings
         private readonly IFileSystemService _fileSystemService;
         private SshProfileViewModel _selectedShellProfile;
         private readonly IApplicationView _applicationView;
-        private readonly IDefaultValueProvider _defaultValueProvider;
         private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
+        private readonly IApplicationDataContainer _historyContainer;
 
         public SshProfilesPageViewModel(ISettingsService settingsService, IDialogService dialogService,
             IFileSystemService fileSystemService, IApplicationView applicationView,
-            IDefaultValueProvider defaultValueProvider,
-            ITrayProcessCommunicationService trayProcessCommunicationService)
+            ITrayProcessCommunicationService trayProcessCommunicationService,
+            IApplicationDataContainer historyContainer)
         {
             _settingsService = settingsService;
             _dialogService = dialogService;
             _fileSystemService = fileSystemService;
             _applicationView = applicationView;
-            _defaultValueProvider = defaultValueProvider;
             _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, defaultValueProvider, _trayProcessCommunicationService, false);
+                var viewModel = new SshProfileViewModel(sshProfile, settingsService, dialogService, fileSystemService,
+                    applicationView, _trayProcessCommunicationService, historyContainer, false);
                 viewModel.Deleted += OnSshProfileDeleted;
                 SshProfiles.Add(viewModel);
             }
@@ -83,11 +83,12 @@ namespace FluentTerminal.App.ViewModels.Settings
 
         private void Clone(SshProfileViewModel shellProfile)
         {
-            var cloned = (SshProfile) shellProfile.Model.Clone();
+            var cloned = (SshProfile) shellProfile.ProfileVm.Model.Clone();
 
             cloned.Id = Guid.NewGuid();
             cloned.PreInstalled = false;
             cloned.Name = $"Copy of {shellProfile.Name}";
+            cloned.KeyBindings = new List<KeyBinding>();
 
             foreach (KeyBinding keyBinding in cloned.KeyBindings)
             {
@@ -99,7 +100,7 @@ namespace FluentTerminal.App.ViewModels.Settings
         private void AddSshProfile(SshProfile sshProfile)
         {
             var viewModel = new SshProfileViewModel(sshProfile, _settingsService, _dialogService, _fileSystemService,
-                _applicationView, _defaultValueProvider, _trayProcessCommunicationService, true);
+                _applicationView, _trayProcessCommunicationService, _historyContainer, true);
 
             viewModel.EditCommand.Execute(null);
             viewModel.Deleted += OnSshProfileDeleted;

FluentTerminal.App.ViewModels/Settings/TerminalPageViewModel.cs

@@ -1,5 +1,6 @@
 using FluentTerminal.App.Services;
 using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.App.ViewModels.Utilities;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
@@ -114,7 +115,6 @@ namespace FluentTerminal.App.ViewModels.Settings
             get => _terminalOptions.ScrollBackLimit.ToString();
             set
             {
-                var oldValue = _terminalOptions.ScrollBackLimit;
                 if (uint.TryParse(value, out uint intValue))
                 {
                     if (intValue == uint.MinValue)
@@ -135,6 +135,21 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
+        public string WordSeparator
+        {
+            get => WebViewSpecialCharEncoder.Decode(_terminalOptions.WordSeparator);
+            set
+            {
+                value = WebViewSpecialCharEncoder.Encode(value);
+                if (_terminalOptions.WordSeparator != value)
+                {
+                    _terminalOptions.WordSeparator = value;
+                    _settingsService.SaveTerminalOptions(_terminalOptions);
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
         public bool BoldText
         {
             get => _terminalOptions.BoldText;
@@ -227,6 +242,7 @@ namespace FluentTerminal.App.ViewModels.Settings
                 BackgroundOpacity = defaults.BackgroundOpacity;
                 ScrollBackLimit = defaults.ScrollBackLimit.ToString();
                 ShowTextCopied = defaults.ShowTextCopied;
+                WordSeparator = defaults.WordSeparator;
             }
         }
 

FluentTerminal.App.ViewModels/Settings/ThemesPageViewModel.cs

@@ -1,11 +1,14 @@
 using FluentTerminal.App.Services;
 using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.App.ViewModels.Infrastructure;
 using FluentTerminal.Models;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Threading.Tasks;
+using FluentTerminal.Models.Messages;
 
 namespace FluentTerminal.App.ViewModels.Settings
 {
@@ -31,10 +34,10 @@ namespace FluentTerminal.App.ViewModels.Settings
             _fileSystemService = fileSystemService;
 
             CreateThemeCommand = new RelayCommand(CreateTheme);
-            ImportThemeCommand = new RelayCommand(ImportTheme);
+            ImportThemeCommand = new AsyncCommand(ImportTheme);
             CloneCommand = new RelayCommand<ThemeViewModel>(CloneTheme);
 
-            _settingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
+            MessengerInstance.Register<TerminalOptionsChangedMessage>(this, OnTerminalOptionsChanged);
 
             BackgroundOpacity = _settingsService.GetTerminalOptions().BackgroundOpacity;
 
@@ -56,7 +59,7 @@ namespace FluentTerminal.App.ViewModels.Settings
         }
 
         public RelayCommand CreateThemeCommand { get; }
-        public RelayCommand ImportThemeCommand { get; }
+        public IAsyncCommand ImportThemeCommand { get; }
         public RelayCommand<ThemeViewModel> CloneCommand { get; set; }
 
         public double BackgroundOpacity
@@ -110,7 +113,7 @@ namespace FluentTerminal.App.ViewModels.Settings
             AddTheme(theme);
         }
 
-        private async void ImportTheme()
+        private async Task ImportTheme()
         {
             var file = await _fileSystemService.OpenFile(_themeParserFactory.SupportedFileTypes).ConfigureAwait(true);
             if (file != null)
@@ -180,9 +183,9 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        private void OnTerminalOptionsChanged(object sender, TerminalOptions e)
+        private void OnTerminalOptionsChanged(TerminalOptionsChangedMessage message)
         {
-            BackgroundOpacity = e.BackgroundOpacity;
+            BackgroundOpacity = message.TerminalOptions.BackgroundOpacity;
         }
 
         private void OnSelectedThemeBackgroundChanged(object sender, string e)

FluentTerminal.App.ViewModels/SettingsViewModel.cs

@@ -9,20 +9,20 @@ 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)
+            IFileSystemService fileSystemService, IStartupTaskService startupTaskService, IApplicationView applicationView,
+            IApplicationLanguageService applicationLanguageService, ApplicationDataContainers containers)
         {
-            About = new AboutPageViewModel(settingsService, updateService, applicationView);
-            KeyBindings = new KeyBindingsPageViewModel(settingsService, dialogService, defaultValueProvider, trayProcessCommunicationService);
-            General = new GeneralPageViewModel(settingsService, dialogService, defaultValueProvider, startupTaskService, applicationLanguageService);
+            KeyBindings = new KeyBindingsPageViewModel(settingsService, dialogService, trayProcessCommunicationService);
+            General = new GeneralPageViewModel(settingsService, dialogService, defaultValueProvider, startupTaskService, applicationLanguageService, trayProcessCommunicationService, fileSystemService);
             Profiles = new ProfilesPageViewModel(settingsService, dialogService, defaultValueProvider, fileSystemService, applicationView);
             Terminal = new TerminalPageViewModel(settingsService, dialogService, defaultValueProvider, systemFontService);
             Themes = new ThemesPageViewModel(settingsService, dialogService, defaultValueProvider, themeParserFactory, fileSystemService);
             Mouse = new MousePageViewModel(settingsService, dialogService, defaultValueProvider);
-            SshProfiles = new SshProfilesPageViewModel(settingsService, dialogService, fileSystemService, applicationView, defaultValueProvider, trayProcessCommunicationService);
+            SshProfiles = new SshProfilesPageViewModel(settingsService, dialogService, fileSystemService,
+                applicationView, trayProcessCommunicationService, containers.HistoryContainer);
         }
 
         public event EventHandler Closed;
-        public event EventHandler AboutPageRequested;
 
         public GeneralPageViewModel General { get; }
         public KeyBindingsPageViewModel KeyBindings { get; }
@@ -30,14 +30,8 @@ namespace FluentTerminal.App.ViewModels
         public TerminalPageViewModel Terminal { get; }
         public ThemesPageViewModel Themes { get; }
         public MousePageViewModel Mouse { get; }
-        public AboutPageViewModel About { get; }
         public SshProfilesPageViewModel SshProfiles { get; }
 
-        public void NavigateToAboutPage()
-        {
-            AboutPageRequested?.Invoke(this, EventArgs.Empty);
-        }
-
         public void Close()
         {
             Closed?.Invoke(this, EventArgs.Empty);

FluentTerminal.App.ViewModels/ShellProfileViewModel.cs

@@ -1,73 +1,28 @@
 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
 {
-    public class ShellProfileViewModel : ViewModelBase
+    /// <summary>
+    /// Extends <see cref="ProfileViewModelBase{T}"/>, and implements only "Set as default" logic.
+    /// </summary>
+    public class ShellProfileViewModel : ProfileViewModelBase<CommonProfileProviderViewModel>
     {
-        #region Static
-
-        private static readonly LineEndingStyle[] LineEndingStylesArray =
-            Enum.GetValues(typeof(LineEndingStyle)).Cast<LineEndingStyle>().ToArray();
-
-        #endregion Static
-
         #region Fields
 
-        private ShellProfile _fallbackProfile;
-
-        protected readonly IDialogService DialogService;
-        protected readonly IFileSystemService FileSystemService;
-        protected readonly ISettingsService SettingsService;
-        protected readonly IApplicationView ApplicationView;
-        protected readonly IDefaultValueProvider DefaultValueProvider;
+        private readonly IDefaultValueProvider _defaultValueProvider;
 
         #endregion Fields
 
         #region Properties
 
-        protected bool IsNew { get; set; }
-
-        public Guid Id { get; private set; }
-
-        public ShellProfile Model { get; private set; }
-
-        public bool PreInstalled { get; private set; }
-
-        private bool _useConPty;
-
-        public bool UseConPty
-        {
-            get => _useConPty;
-            set => Set(ref _useConPty, value);
-        }
-
-        private string _arguments;
-
-        public string Arguments
-        {
-            get => _arguments;
-            set => Set(ref _arguments, value);
-        }
-
-        private bool _inEditMode;
-
-        public bool InEditMode
-        {
-            get => _inEditMode;
-            set => Set(ref _inEditMode, value);
-        }
-
         private bool _isDefault;
 
         public bool IsDefault
@@ -76,180 +31,35 @@ namespace FluentTerminal.App.ViewModels
             set => Set(ref _isDefault, value);
         }
 
-        private string _location;
-
-        public string Location
-        {
-            get => _location;
-            set => Set(ref _location, value);
-        }
-
-        private string _name;
-
-        public string Name
-        {
-            get => _name;
-            set => Set(ref _name, value);
-        }
-
-        private TabTheme _selectedTabTheme;
-
-        public TabTheme SelectedTabTheme
-        {
-            get => _selectedTabTheme ?? (_selectedTabTheme = TabThemes.FirstOrDefault(t => t.Id.Equals(_tabThemeId)));
-            set
-            {
-                if (value != null && Set(ref _selectedTabTheme, value))
-                {
-                    _tabThemeId = value.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
-            {
-                if (value != null && Set(ref _selectedTerminalTheme, value))
-                {
-                    _terminalThemeId = value.Id;
-                }
-            }
-        }
-
-        private Guid _terminalThemeId;
-
-        public Guid TerminalThemeId
-        {
-            get => _terminalThemeId;
-            set
-            {
-                if (Set(ref _terminalThemeId, value))
-                {
-                    SelectedTerminalTheme = TerminalThemes.FirstOrDefault(t => t.Id.Equals(value));
-                }
-            }
-        }
-
-        private string _workingDirectory;
-
-        public string WorkingDirectory
-        {
-            get => _workingDirectory;
-            set => Set(ref _workingDirectory, value);
-        }
-
-        private LineEndingStyle _lineEndingTranslation;
-
-        public LineEndingStyle LineEndingTranslation
-        {
-            get => _lineEndingTranslation;
-            set => Set(ref _lineEndingTranslation, value);
-        }
-
-        public ObservableCollection<TabTheme> TabThemes { get; }
-
-        public KeyBindingsViewModel KeyBindings { get; }
-
-        public ObservableCollection<TerminalTheme> TerminalThemes { get; }
-
-        public ObservableCollection<LineEndingStyle> LineEndingStyles { get; } =
-            new ObservableCollection<LineEndingStyle>(LineEndingStylesArray);
-
         #endregion Properties
 
         #region Events
 
-        public event EventHandler Deleted;
-
         public event EventHandler SetAsDefault;
 
         #endregion Events
 
         #region Commands
 
-        public IAsyncCommand BrowseForCustomShellCommand { get; }
-
-        public IAsyncCommand BrowseForWorkingDirectoryCommand { get; }
-
-        public IAsyncCommand CancelEditCommand { get; }
-
-        public IAsyncCommand DeleteCommand { get; }
-
-        public RelayCommand EditCommand { get; }
-
-        public IAsyncCommand SaveChangesCommand { get; }
-
         public RelayCommand SetDefaultCommand { get; }
 
         public IAsyncCommand RestoreDefaultsCommand { get; }
 
-        public IAsyncCommand AddKeyboardShortcutCommand { get; }
-
         #endregion Commands
 
         #region Constrcutor
 
         public ShellProfileViewModel(ShellProfile shellProfile, ISettingsService settingsService,
             IDialogService dialogService, IFileSystemService fileSystemService, IApplicationView applicationView,
-            IDefaultValueProvider defaultValueProvider, bool isNew)
+            IDefaultValueProvider defaultValueProvider, bool isNew) : base(shellProfile, settingsService, dialogService,
+            isNew)
         {
-            Model = shellProfile;
-            SettingsService = settingsService;
-            DialogService = dialogService;
-            FileSystemService = fileSystemService;
-            ApplicationView = applicationView;
-            DefaultValueProvider = defaultValueProvider;
-            IsNew = isNew;
+            _defaultValueProvider = defaultValueProvider;
 
-            SettingsService.ThemeAdded += OnThemeAdded;
-            SettingsService.ThemeDeleted += OnThemeDeleted;
-
-            TabThemes = new ObservableCollection<TabTheme>(settingsService.GetTabThemes());
-
-            TerminalThemes = new ObservableCollection<TerminalTheme>
-            {
-                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);
-
-            InitializeViewModelPropertiesPrivate(shellProfile);
+            ProfileVm = new CommonProfileProviderViewModel(settingsService, applicationView, fileSystemService,
+                shellProfile);
 
             SetDefaultCommand = new RelayCommand(SetDefault);
-            DeleteCommand = new AsyncCommand(Delete, CanDelete);
-            EditCommand = new RelayCommand(Edit);
-            CancelEditCommand = new AsyncCommand(CancelEdit);
-            SaveChangesCommand = new AsyncCommand(SaveChangesAsync);
-            AddKeyboardShortcutCommand = new AsyncCommand(AddKeyboardShortcut);
-            BrowseForCustomShellCommand = new AsyncCommand(BrowseForCustomShell);
-            BrowseForWorkingDirectoryCommand = new AsyncCommand(BrowseForWorkingDirectory);
             RestoreDefaultsCommand = new AsyncCommand(RestoreDefaults);
         }
 
@@ -257,97 +67,9 @@ namespace FluentTerminal.App.ViewModels
 
         #region Methods
 
-        // Loads view model properties from the input shellProfile
-        private void InitializeViewModelPropertiesPrivate(ShellProfile shellProfile)
-        {
-            Id = shellProfile.Id;
-            Name = shellProfile.Name;
-            Arguments = shellProfile.Arguments;
-            Location = shellProfile.Location;
-            WorkingDirectory = shellProfile.WorkingDirectory;
-            TerminalThemeId = shellProfile.TerminalThemeId;
-            TabThemeId = shellProfile.TabThemeId;
-            PreInstalled = shellProfile.PreInstalled;
-            LineEndingTranslation = shellProfile.LineEndingTranslation;
-            UseConPty = shellProfile.UseConPty;
-
-            KeyBindings.Clear();
-            foreach (var keyBinding in shellProfile.KeyBindings.Select(x => new KeyBinding(x)).ToList())
-            {
-                KeyBindings.Add(keyBinding);
-            }
-        }
-
-        // Loads view model properties from the input shellProfile
-        protected virtual void InitializeViewModelProperties(ShellProfile shellProfile) =>
-            InitializeViewModelPropertiesPrivate(shellProfile);
-
-        // Fills the input profile properties the view model properties. (Inverse of InitializeViewModelProperties()).
-        protected virtual Task FillProfileAsync(ShellProfile profile)
-        {
-            profile.Id = Id;
-            profile.Name = Name;
-            profile.Arguments = Arguments;
-            profile.Location = Location;
-            profile.WorkingDirectory = WorkingDirectory;
-            profile.TerminalThemeId = TerminalThemeId;
-            profile.TabThemeId = TabThemeId;
-            profile.PreInstalled = PreInstalled;
-            profile.LineEndingTranslation = LineEndingTranslation;
-            profile.UseConPty = UseConPty;
-            profile.KeyBindings = KeyBindings.KeyBindings.Select(x => x.Model).ToList();
-
-            return Task.CompletedTask;
-        }
-
-        // Used to "remember" the current state.
-        protected virtual async Task<ShellProfile> CreateProfileAsync()
-        {
-            var profile = new ShellProfile();
-
-            await FillProfileAsync(profile);
-
-            return profile;
-        }
-
-        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 virtual async Task SaveChangesAsync()
-        {
-            await FillProfileAsync(Model);
-
-            SettingsService.SaveShellProfile(Model);
-
-            KeyBindings.Editable = false;
-            InEditMode = false;
-            IsNew = false;
-        }
-
         private async Task RestoreDefaults()
         {
-            if (InEditMode || !PreInstalled)
+            if (InEditMode || !ProfileVm.PreInstalled)
             {
                 throw new InvalidOperationException();
             }
@@ -357,87 +79,24 @@ namespace FluentTerminal.App.ViewModels
 
             if (result == DialogButton.OK)
             {
-                Model = DefaultValueProvider.GetPreinstalledShellProfiles().FirstOrDefault(x => x.Id == Model.Id);
-                InitializeViewModelProperties(Model);
-                SettingsService.SaveShellProfile(Model);
-            }
-        }
+                var profile = _defaultValueProvider.GetPreinstalledShellProfiles().FirstOrDefault(x => x.Id.Equals(Id));
 
-        public Task AddKeyboardShortcut()
-        {
-            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 = await CreateProfileAsync();
-
-                if (!_fallbackProfile.EqualTo(changedProfile))
+                if (profile == null)
                 {
-                    var result = await DialogService.ShowMessageDialogAsnyc(I18N.Translate("PleaseConfirm"), I18N.Translate("ConfirmDiscardChanges"), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
-
-                    if (result == DialogButton.OK)
-                    {
-                        // Cancelled, so rollback
-                        InitializeViewModelProperties(_fallbackProfile);
-
-                        KeyBindings.Editable = false;
-                        InEditMode = false;
-                    }
-                }
-                else
-                {
-                    KeyBindings.Editable = false;
-                    InEditMode = false;
+                    // Should not happen ever, but...
+                    return;
                 }
+
+                ProfileVm.Model = profile;
+                Initialize(profile);
+
+                SettingsService.SaveShellProfile(profile);
             }
         }
 
-        private bool CanDelete()
+        protected override bool CanDelete()
         {
-            return !Model.PreInstalled;
-        }
-
-        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);
-            }
-        }
-
-        private void Edit()
-        {
-            _fallbackProfile = Model.Clone();
-
-            KeyBindings.Editable = true;
-            InEditMode = true;
+            return !ProfileVm.PreInstalled;
         }
 
         private void SetDefault()

FluentTerminal.App.ViewModels/ShellProfileViewModelBase.cs

@@ -0,0 +1,249 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.App.ViewModels.Infrastructure;
+using FluentTerminal.App.ViewModels.Profiles;
+using FluentTerminal.App.ViewModels.Settings;
+using FluentTerminal.Models;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+
+namespace FluentTerminal.App.ViewModels
+{
+    /// <summary>
+    /// Base class for all profile view models. Implements logic for saving, editing, resetting, etc.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public abstract class ProfileViewModelBase<T> : ViewModelBase where T : ProfileProviderViewModelBase
+    {
+        #region Fields
+
+        protected readonly IDialogService DialogService;
+        protected readonly ISettingsService SettingsService;
+
+        private List<KeyBinding> _bindingsBeforeEdit;
+        private Dictionary<string, string> _environmentVariablesBeforeEdit;
+        private string _nameBeforeEdit;
+
+        #endregion Fields
+
+        #region Properties
+
+        protected bool IsNew { get; private set; }
+
+        public Guid Id { get; private set; }
+
+        private bool _inEditMode;
+
+        public bool InEditMode
+        {
+            get => _inEditMode;
+            set => Set(ref _inEditMode, value);
+        }
+
+        private string _name;
+
+        public string Name
+        {
+            get => _name;
+            set => Set(ref _name, value);
+        }
+
+        public KeyBindingsViewModel KeyBindings { get; }
+
+        public ObservableCollection<EnvironmentVariableViewModel> EnvironmentVariables { get; } = new ObservableCollection<EnvironmentVariableViewModel>();
+
+        public T ProfileVm { get; protected set; }
+
+        #endregion Properties
+
+        #region Events
+
+        public event EventHandler Deleted;
+
+        #endregion Events
+
+        #region Commands
+
+        public IAsyncCommand CancelEditCommand { get; }
+
+        public IAsyncCommand DeleteCommand { get; }
+
+        public RelayCommand EditCommand { get; }
+
+        public IAsyncCommand SaveChangesCommand { get; }
+
+        public IAsyncCommand AddKeyboardShortcutCommand { get; }
+
+        #endregion Commands
+
+        #region Constructor
+
+        protected ProfileViewModelBase(ShellProfile shellProfile, ISettingsService settingsService, IDialogService dialogService, bool isNew)
+        {
+            SettingsService = settingsService;
+            DialogService = dialogService;
+            IsNew = isNew;
+
+            KeyBindings = new KeyBindingsViewModel(shellProfile.Id.ToString(), dialogService, string.Empty, false);
+
+            foreach (var environmentVariable in shellProfile.EnvironmentVariables)
+            {
+                EnvironmentVariables.Add(new EnvironmentVariableViewModel
+                {
+                    Name = environmentVariable.Key,
+                    Value = environmentVariable.Value
+                });
+            }
+
+            Initialize(shellProfile);
+
+            DeleteCommand = new AsyncCommand(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)
+                || !(_environmentVariablesBeforeEdit?.SequenceEqual(EnvironmentVariables.ToDictionary(x => x.Name, x => x.Value)) ?? 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();
+            _environmentVariablesBeforeEdit = EnvironmentVariables.ToDictionary(x => x.Name, x => x.Value);
+            _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;
+            }
+
+            if (EnvironmentVariables.Select(x => x.Name).Any(x => string.IsNullOrWhiteSpace(x)))
+            {
+                await DialogService.ShowMessageDialogAsnyc(I18N.Translate("InvalidInput"), I18N.Translate("EmptyEnvironmentVariableName"), DialogButton.OK);
+
+                return;
+            }
+
+            if (EnvironmentVariables.Select(x => x.Name).Distinct().Count() != EnvironmentVariables.Count)
+            {
+                await DialogService.ShowMessageDialogAsnyc(I18N.Translate("InvalidInput"), I18N.Translate("DuplicateEnvironmentVariable"), DialogButton.OK);
+
+                return;
+            }
+
+            var profile = ProfileVm.Model;
+
+            profile.Id = Id;
+            profile.Name = _name;
+            profile.KeyBindings = KeyBindings.KeyBindings.Select(x => x.Model).ToList();
+            profile.EnvironmentVariables = EnvironmentVariables.ToDictionary(x => x.Name, x => x.Value);
+
+            if (profile is SshProfile sshProfile)
+            {
+                SettingsService.SaveSshProfile(sshProfile, IsNew);
+            }
+            else
+            {
+                SettingsService.SaveShellProfile(profile, IsNew);
+            }
+
+            KeyBindings.Editable = false;
+            InEditMode = false;
+            IsNew = false;
+        }
+
+        public Task AddKeyboardShortcut()
+        {
+            return KeyBindings.ShowAddKeyBindingDialog();
+        }
+
+        #endregion Methods
+    }
+}

FluentTerminal.App.ViewModels/SshProfileViewModel.cs

@@ -1,275 +1,34 @@
 using FluentTerminal.App.Services;
-using FluentTerminal.App.Services.Utilities;
-using FluentTerminal.App.ViewModels.Infrastructure;
+using FluentTerminal.App.ViewModels.Profiles;
 using FluentTerminal.Models;
-using FluentTerminal.Models.Enums;
-using System;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FluentTerminal.App.ViewModels
 {
-    public class SshProfileViewModel : ShellProfileViewModel, ISshConnectionInfo
-    {
-        #region Fields
-
-        private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
-
-        // To prevent validating the existence of the same file multiple times because it's kinda expensive
-        private string _validatedIdentityFile;
-
-        #endregion Fields
-
-        #region Properties
-
-        private string _host;
-
-        public string Host
-        {
-            get => _host;
-            set => Set(ref _host, value);
-        }
-
-        private ushort _sshPort;
-        
-        public ushort SshPort
-        {
-            get => _sshPort;
-            set => Set(ref _sshPort, value);
-        }
-
-        private string _username;
-
-        public string Username
-        {
-            get => _username;
-            set => Set(ref _username, value);
-        }
-
-        private string _identityFile;
-
-        public string IdentityFile
-        {
-            get => _identityFile;
-            set => Set(ref _identityFile, value);
-        }
-
-        private bool _useMosh;
-
-        public bool UseMosh
-        {
-            get => _useMosh;
-            set => Set(ref _useMosh, value);
-        }
-
-        private ushort _moshPortFrom;
-
-        public ushort MoshPortFrom
-        {
-            get => _moshPortFrom;
-            set => Set(ref _moshPortFrom, value);
-        }
-
-        private ushort _moshPortTo;
-
-        public ushort MoshPortTo
-        {
-            get => _moshPortTo;
-            set => Set(ref _moshPortTo, value);
-        }
-
-        #endregion Properties
-
-        #region Commands
-
-        public IAsyncCommand BrowseForIdentityFileCommand { get; }
-
-        #endregion Commands
-
+    /// <summary>
+    /// Extends <see cref="ProfileViewModelBase{T}"/>, and doesn't implement any additional logic because in
+    /// case of SSH profiles no additional logic is needed.
+    /// </summary>
+    public class SshProfileViewModel : ProfileViewModelBase<SshConnectViewModel>
+    {
         #region Constructor
 
         public SshProfileViewModel(SshProfile sshProfile, ISettingsService settingsService,
             IDialogService dialogService, IFileSystemService fileSystemService, IApplicationView applicationView,
-            IDefaultValueProvider defaultValueProvider,
-            ITrayProcessCommunicationService trayProcessCommunicationService, bool isNew) : base(
-            sshProfile ?? new SshProfile(), settingsService, dialogService, fileSystemService, applicationView,
-            defaultValueProvider, isNew)
+            ITrayProcessCommunicationService trayProcessCommunicationService,
+            IApplicationDataContainer historyContainer, bool isNew) : base(sshProfile, settingsService, dialogService,
+            isNew)
         {
-            _trayProcessCommunicationService = trayProcessCommunicationService;
-
-            InitializeViewModelPropertiesPrivate(sshProfile ?? new SshProfile());
-
-            BrowseForIdentityFileCommand = new AsyncCommand(BrowseForIdentityFile);
+            ProfileVm = new SshConnectViewModel(settingsService, applicationView, trayProcessCommunicationService,
+                fileSystemService, sshProfile);
         }
 
         #endregion Constructor
 
         #region Methods
-
-        // Fills the remaining view model properties (those which aren't filled by the base method) from the input sshProfile
-        private void InitializeViewModelPropertiesPrivate(SshProfile sshProfile)
+
+        protected override bool CanDelete()
         {
-            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);
-                    }
-                }, TaskContinuationOptions.OnlyOnRanToCompletion);
-            }
-
-            IdentityFile = sshProfile.IdentityFile;
-            UseMosh = sshProfile.UseMosh;
-            MoshPortFrom = sshProfile.MoshPortFrom;
-            MoshPortTo = sshProfile.MoshPortTo;
-        }
-
-        protected override void InitializeViewModelProperties(ShellProfile sshProfile)
-        {
-            base.InitializeViewModelProperties(sshProfile);
-
-            InitializeViewModelPropertiesPrivate((SshProfile)sshProfile);
-        }
-
-        protected override async Task FillProfileAsync(ShellProfile profile)
-        {
-            await base.FillProfileAsync(profile);
-
-            profile.Location = _useMosh ? ShellLocation.Mosh : ShellLocation.SSH;
-            profile.Arguments = GetArgumentsString();
-            profile.WorkingDirectory = null;
-
-            var sshProfile = (SshProfile)profile;
-
-            sshProfile.Host = Host;
-            sshProfile.SshPort = SshPort;
-            sshProfile.Username = Username;
-            sshProfile.IdentityFile = IdentityFile;
-            sshProfile.UseMosh = UseMosh;
-            sshProfile.MoshPortFrom = MoshPortFrom;
-            sshProfile.MoshPortTo = MoshPortTo;
-        }
-
-        public virtual Task AcceptChangesAsync() => FillProfileAsync(Model);
-
-        protected override async Task<ShellProfile> CreateProfileAsync()
-        {
-            var profile = new SshProfile();
-
-            await FillProfileAsync(profile);
-
-            return profile;
-        }
-
-        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();
-        }
-
-        public override async Task SaveChangesAsync()
-        {
-            var result = await ValidateAsync();
-
-            if (result != SshConnectionInfoValidationResult.Valid)
-            {
-                await DialogService.ShowMessageDialogAsnyc(I18N.Translate("InvalidInput"),
-                    result.GetErrorString(Environment.NewLine), DialogButton.OK);
-
-                return;
-            }
-
-            await AcceptChangesAsync();
-
-            SettingsService.SaveSshProfile((SshProfile) Model, IsNew);
-
-            KeyBindings.Editable = false;
-            InEditMode = false;
-            IsNew = false;
-        }
-
-        private async Task BrowseForIdentityFile()
-        {
-            var file = await FileSystemService.OpenFile(new[] { "*" }).ConfigureAwait(true);
-            if (file != null)
-            {
-                IdentityFile = file.Path;
-            }
-        }
-
-        public async Task<SshConnectionInfoValidationResult> ValidateAsync()
-        {
-            var result = this.GetValidationResult();
-
-            var identityFile = _identityFile;
-
-            if (!string.IsNullOrEmpty(identityFile) && !string.Equals(identityFile, _validatedIdentityFile,
-                    StringComparison.OrdinalIgnoreCase))
-            {
-                // Here we need to take into account that files from ssh config dir can be provided by name, without full path.
-                string fullPath;
-
-                if (identityFile.Contains(Path.PathSeparator))
-                {
-                    fullPath = identityFile;
-                }
-                else
-                {
-                    var sshConfigDir = await _trayProcessCommunicationService.GetSshConfigDirAsync();
-
-                    if (string.IsNullOrEmpty(sshConfigDir))
-                    {
-                        result |= SshConnectionInfoValidationResult.IdentityFileDoesNotExist;
-
-                        return result;
-                    }
-
-                    fullPath = Path.Combine(sshConfigDir, identityFile);
-                }
-
-                if (await _trayProcessCommunicationService.CheckFileExistsAsync(fullPath))
-                {
-                    _validatedIdentityFile = identityFile;
-
-                    IdentityFile = fullPath;
-                }
-                else
-                {
-                    result |= SshConnectionInfoValidationResult.IdentityFileDoesNotExist;
-                }
-            }
-
-            return result;
-        }
-
-        public void SetValidatedIdentityFile(string identityFile)
-        {
-            _validatedIdentityFile = identityFile;
-            IdentityFile = identityFile;
+            return true;
         }
 
         #endregion Methods

FluentTerminal.App.ViewModels/TerminalViewModel.cs

@@ -5,12 +5,14 @@ using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
+using Newtonsoft.Json;
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using FluentTerminal.Models.Messages;
 
 namespace FluentTerminal.App.ViewModels
 {
@@ -22,8 +24,63 @@ namespace FluentTerminal.App.ViewModels
 
         #endregion Static
 
+        #region Serialize terminal state
+        private class TerminalState
+        {
+            public bool HasCustomTitle { get; set; }
+            public string ShellTitle { get; set; }
+            public string TabTitle { get; set; }
+            public TerminalTheme TerminalTheme { get; set; }
+            public TabTheme TabTheme { get; set; }
+            public bool ShowSearchPanel { get; set; }
+            public string SearchText { get; set; }
+            public string XtermBufferState { get; set; }
+            public byte TerminalId { get; set; }
+            public ShellProfile ShellProfile { get; set; }
+        }
+
+        public async Task<string> Serialize()
+        {
+            TerminalState state = new TerminalState
+            {
+                HasCustomTitle = _hasCustomTitle,
+                ShellTitle = ShellTitle,
+                TabTitle = TabTitle,
+                TerminalTheme = TerminalTheme,
+                TabTheme = TabTheme,
+                ShowSearchPanel = ShowSearchPanel,
+                SearchText = SearchText,
+                XtermBufferState = await SerializeXtermState(),
+                TerminalId = Terminal.Id,
+                ShellProfile = ShellProfile
+            };
+
+            return JsonConvert.SerializeObject(state);
+        }
+
+        public void Restore(string data)
+        {
+            TerminalState state = JsonConvert.DeserializeObject<TerminalState>(data);
+            if (state != null)
+            {
+                _hasCustomTitle = state.HasCustomTitle;
+                ShellTitle = state.ShellTitle;
+                TabTitle = state.TabTitle;
+                TerminalTheme = state.TerminalTheme;
+                TabTheme = state.TabTheme;
+                ShowSearchPanel = state.ShowSearchPanel;
+                SearchText = state.SearchText;
+                XtermBufferState = state.XtermBufferState;
+                _terminalId = state.TerminalId;
+                ShellProfile = state.ShellProfile;
+            }
+        }
+
+        #endregion Serialize terminal state
+
         private readonly IKeyboardCommandService _keyboardCommandService;
         private bool _isSelected;
+        private bool _isHovered;
         private bool _hasNewOutput;
         private bool _hasExitedWithError;
         private string _searchText;
@@ -34,16 +91,17 @@ namespace FluentTerminal.App.ViewModels
         private string _tabTitle;
         private string _shellTitle;
         private bool _hasCustomTitle;
+        private byte? _terminalId;
 
         public TerminalViewModel(ISettingsService settingsService, ITrayProcessCommunicationService trayProcessCommunicationService, IDialogService dialogService,
             IKeyboardCommandService keyboardCommandService, ApplicationSettings applicationSettings, ShellProfile shellProfile,
-            IApplicationView applicationView, IDispatcherTimer dispatcherTimer, IClipboardService clipboardService)
+            IApplicationView applicationView, IDispatcherTimer dispatcherTimer, IClipboardService clipboardService, string terminalState = null)
         {
+            MessengerInstance.Register<ApplicationSettingsChangedMessage>(this, OnApplicationSettingsChanged);
+            MessengerInstance.Register<CurrentThemeChangedMessage>(this, OnCurrentThemeChanged);
+            MessengerInstance.Register<TerminalOptionsChangedMessage>(this, OnTerminalOptionsChanged);
+
             SettingsService = settingsService;
-            SettingsService.CurrentThemeChanged += OnCurrentThemeChanged;
-            SettingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
-            SettingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
-            SettingsService.KeyBindingsChanged += OnKeyBindingsChanged;
 
             _terminalOptions = SettingsService.GetTerminalOptions();
 
@@ -61,14 +119,23 @@ namespace FluentTerminal.App.ViewModels
             TabThemes = new ObservableCollection<TabTheme>(SettingsService.GetTabThemes());
             TabTheme = TabThemes.FirstOrDefault(t => t.Id == ShellProfile.TabThemeId);
 
-            CloseCommand = new RelayCommand(async () => await TryClose().ConfigureAwait(false));
-            FindNextCommand = new RelayCommand(FindNext);
-            FindPreviousCommand = new RelayCommand(FindPrevious);
-            CloseSearchPanelCommand = new RelayCommand(CloseSearchPanel);
-            SelectTabThemeCommand = new RelayCommand<string>(SelectTabTheme);
-            EditTitleCommand = new AsyncCommand(EditTitle);
+            CloseCommand = new AsyncCommand(CloseTab, CanExecuteCommand);
+            CloseLeftTabsCommand = new RelayCommand(CloseLeftTabs, CanExecuteCommand);
+            CloseRightTabsCommand = new RelayCommand(CloseRightTabs, CanExecuteCommand);
+            CloseOtherTabsCommand = new RelayCommand(CloseOtherTabs, CanExecuteCommand);
+            FindNextCommand = new RelayCommand(FindNext, CanExecuteCommand);
+            FindPreviousCommand = new RelayCommand(FindPrevious, CanExecuteCommand);
+            CloseSearchPanelCommand = new RelayCommand(CloseSearchPanel, CanExecuteCommand);
+            SelectTabThemeCommand = new RelayCommand<string>(SelectTabTheme, CanExecuteCommand);
+            EditTitleCommand = new AsyncCommand(EditTitle, CanExecuteCommand);
+            DuplicateTabCommand = new RelayCommand(DuplicateTab, CanExecuteCommand);
 
-            Terminal = new Terminal(TrayProcessCommunicationService);
+            if (!String.IsNullOrEmpty(terminalState))
+            {
+                Restore(terminalState);
+            }
+
+            Terminal = new Terminal(TrayProcessCommunicationService, _terminalId);
             Terminal.KeyboardCommandReceived += Terminal_KeyboardCommandReceived;
             Terminal.OutputReceived += Terminal_OutputReceived;
             Terminal.SizeChanged += Terminal_SizeChanged;
@@ -80,16 +147,30 @@ namespace FluentTerminal.App.ViewModels
 
         }
 
+        private bool _disposalRequested;
+
+        public void DisposalPrepare()
+        {
+            _disposalRequested = true;
+            CloseCommand = null;
+            TerminalView.DisposalPrepare();
+            TerminalView = null;
+            Terminal = null;
+            Overlay = null;
+        }
+
         public event EventHandler Activated;
         public event EventHandler Closed;
         public event EventHandler<string> FindNextRequested;
         public event EventHandler<string> FindPreviousRequested;
-        public event EventHandler KeyBindingsChanged;
-        public event EventHandler<TerminalOptions> OptionsChanged;
         public event EventHandler SearchStarted;
         public event EventHandler<TerminalTheme> ThemeChanged;
         public event EventHandler<string> ShellTitleChanged;
         public event EventHandler<string> CustomTitleChanged;
+        public event EventHandler CloseLeftTabsRequested;
+        public event EventHandler CloseRightTabsRequested;
+        public event EventHandler CloseOtherTabsRequested;
+        public event EventHandler DuplicateTabRequested;
 
         public ApplicationSettings ApplicationSettings { get; private set; }
 
@@ -106,7 +187,15 @@ namespace FluentTerminal.App.ViewModels
 
         public IClipboardService ClipboardService { get; }
 
-        public RelayCommand CloseCommand { get; }
+        public string XtermBufferState { get; private set; }
+
+        public AsyncCommand CloseCommand { get; private set; }
+
+        public RelayCommand CloseRightTabsCommand { get; }
+
+        public RelayCommand CloseLeftTabsCommand { get; }
+
+        public RelayCommand CloseOtherTabsCommand { get; }
 
         public RelayCommand CloseSearchPanelCommand { get; }
 
@@ -118,6 +207,8 @@ namespace FluentTerminal.App.ViewModels
 
         public RelayCommand FindPreviousCommand { get; }
 
+        public RelayCommand DuplicateTabCommand { get; }
+
         public bool IsSelected
         {
             get => _isSelected;
@@ -131,10 +222,28 @@ namespace FluentTerminal.App.ViewModels
                     }
                     RaisePropertyChanged(nameof(IsUnderlined));
                     RaisePropertyChanged(nameof(BackgroundTabTheme));
+                    RaisePropertyChanged(nameof(ShowCloseButton));
                 }
             }
         }
 
+        public bool IsHovered
+        {
+            get => _isHovered;
+            set
+            {
+                if (Set(ref _isHovered, value))
+                {
+                    RaisePropertyChanged(nameof(ShowCloseButton));
+                }
+            }
+        }
+
+        public bool ShowCloseButton
+        {
+            get => IsHovered || IsSelected;
+        }
+
         public bool IsUnderlined => (IsSelected && ApplicationSettings.UnderlineSelectedTab) ||
             (!IsSelected && ApplicationSettings.InactiveTabColorMode == InactiveTabColorMode.Underlined && TabTheme.Color != null);
 
@@ -166,7 +275,7 @@ namespace FluentTerminal.App.ViewModels
 
         public ISettingsService SettingsService { get; }
 
-        public ShellProfile ShellProfile { get; }
+        public ShellProfile ShellProfile { get; private set; }
 
         public bool ShowSearchPanel
         {
@@ -197,6 +306,8 @@ namespace FluentTerminal.App.ViewModels
             set => Set(ref _terminalTheme, value);
         }
 
+        public bool Initialized { get; set; }
+
         public string TabTitle
         {
             get => _tabTitle;
@@ -246,16 +357,18 @@ namespace FluentTerminal.App.ViewModels
 
         public Task Close()
         {
-            SettingsService.CurrentThemeChanged -= OnCurrentThemeChanged;
-            SettingsService.TerminalOptionsChanged -= OnTerminalOptionsChanged;
-            SettingsService.ApplicationSettingsChanged -= OnApplicationSettingsChanged;
-            SettingsService.KeyBindingsChanged -= OnKeyBindingsChanged;
+            MessengerInstance.Unregister(this);
+
             return Terminal.Close();
         }
 
         public void CopyText(string text)
         {
             ClipboardService.SetText(text);
+            if (_terminalOptions.ShowTextCopied)
+            {
+                Overlay.Show(I18N.Translate("TextCopied"));
+            }
         }
 
         public async Task EditTitle()
@@ -288,49 +401,85 @@ namespace FluentTerminal.App.ViewModels
             FocusTerminal();
         }
 
+        private bool CanExecuteCommand<T>(T a)
+        {
+            return CanExecuteCommand();
+        }
+
+        private bool CanExecuteCommand()
+        {
+            return Initialized && !_disposalRequested;
+        }
+
+        private async Task CloseTab()
+        {
+             await TryClose().ConfigureAwait(false);
+        }
+
+        private void CloseLeftTabs()
+        {
+            CloseLeftTabsRequested?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void CloseRightTabs()
+        {
+            CloseRightTabsRequested?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void CloseOtherTabs()
+        {
+            CloseOtherTabsRequested?.Invoke(this, EventArgs.Empty);
+        }
+
         private void FindNext()
         {
             FindNextRequested?.Invoke(this, SearchText);
         }
 
+        public ITerminalView TerminalView { get; set; }
+
+        public async Task<string> SerializeXtermState()
+        {
+            return await TerminalView?.SerializeXtermState();
+        }
+
         private void FindPrevious()
         {
             FindPreviousRequested?.Invoke(this, SearchText);
         }
 
-        private async void OnApplicationSettingsChanged(object sender, ApplicationSettings e)
+        private void DuplicateTab()
+        {
+            DuplicateTabRequested?.Invoke(this, EventArgs.Empty);
+        }
+
+        private async void OnApplicationSettingsChanged(ApplicationSettingsChangedMessage message)
         {
             await ApplicationView.RunOnDispatcherThread(() =>
             {
-                ApplicationSettings = e;
+                ApplicationSettings = message.ApplicationSettings;
                 RaisePropertyChanged(nameof(IsUnderlined));
                 RaisePropertyChanged(nameof(BackgroundTabTheme));
             });
         }
 
-        private async void OnCurrentThemeChanged(object sender, Guid e)
+        private async void OnCurrentThemeChanged(CurrentThemeChangedMessage message)
         {
             await ApplicationView.RunOnDispatcherThread(() =>
             {
                 // only change theme if not overwritten by profile
                 if (ShellProfile.TerminalThemeId == Guid.Empty)
                 {
-                    var currentTheme = SettingsService.GetTheme(e);
+                    var currentTheme = SettingsService.GetTheme(message.ThemeId);
                     TerminalTheme = currentTheme;
                     ThemeChanged?.Invoke(this, currentTheme);
                 }
             });
         }
 
-        private async void OnKeyBindingsChanged(object sender, EventArgs e)
+        private void OnTerminalOptionsChanged(TerminalOptionsChangedMessage message)
         {
-            await ApplicationView.RunOnDispatcherThread(() => KeyBindingsChanged?.Invoke(this, EventArgs.Empty));
-        }
-
-        private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
-        {
-            _terminalOptions = e;
-            await ApplicationView.RunOnDispatcherThread(() => OptionsChanged?.Invoke(this, e));
+            _terminalOptions = message.TerminalOptions;
         }
 
         private void SelectTabTheme(string id)
@@ -340,12 +489,24 @@ namespace FluentTerminal.App.ViewModels
 
         private void Terminal_Exited(object sender, int exitCode)
         {
+            if (ShellProfile?.Tag is ISessionSuccessTracker tracker && exitCode != 0)
+            {
+                tracker.SetInvalid();
+            }
+
             ApplicationView.RunOnDispatcherThread(() => HasExitedWithError = exitCode > 0);
         }
 
         private void Terminal_Closed(object sender, EventArgs e)
         {
             ApplicationView.RunOnDispatcherThread(() => Closed?.Invoke(this, EventArgs.Empty));
+
+            Terminal.KeyboardCommandReceived -= Terminal_KeyboardCommandReceived;
+            Terminal.OutputReceived -= Terminal_OutputReceived;
+            Terminal.SizeChanged -= Terminal_SizeChanged;
+            Terminal.TitleChanged -= Terminal_TitleChanged;
+            Terminal.Exited -= Terminal_Exited;
+            Terminal.Closed -= Terminal_Closed;
         }
 
         private async void Terminal_KeyboardCommandReceived(object sender, string e)
@@ -355,11 +516,7 @@ namespace FluentTerminal.App.ViewModels
                 case nameof(Command.Copy):
                     {
                         var selection = await Terminal.GetSelectedText().ConfigureAwait(true);
-                        ClipboardService.SetText(selection);
-                        if(_terminalOptions.ShowTextCopied)
-                        {
-                            Overlay.Show(I18N.Translate("TextCopied"));
-                        }
+                        CopyText(selection);
                         break;
                     }
                 case nameof(Command.Paste):
@@ -401,6 +558,11 @@ namespace FluentTerminal.App.ViewModels
 
         private void Terminal_OutputReceived(object sender, byte[] e)
         {
+            if (ShellProfile?.Tag is ISessionSuccessTracker tracker)
+            {
+                tracker.SetOutputReceived();
+            }
+
             if (!IsSelected && ApplicationSettings.ShowNewOutputIndicator)
             {
                 ApplicationView.RunOnDispatcherThread(() => HasNewOutput = true);
@@ -420,9 +582,14 @@ namespace FluentTerminal.App.ViewModels
 
         private async Task TryClose()
         {
+            if (ShellProfile?.Tag is ISessionSuccessTracker tracker)
+            {
+                tracker.SetInvalid();
+            }
+
             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(I18N.Translate("PleaseConfirm"), String.Format(I18N.Translate("ConfirmCloseTab"), ShellTitle), DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
                 if (result == DialogButton.Cancel)
                 {

FluentTerminal.App.ViewModels/Utilities/WebViewSpecialCharEncoder.cs

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

FluentTerminal.App/Adapters/ApplicationViewAdapter.cs

@@ -31,6 +31,7 @@ namespace FluentTerminal.App.Adapters
 
         private void _applicationView_Consolidated(ApplicationView sender, ApplicationViewConsolidatedEventArgs args)
         {
+            _applicationView.Consolidated -= _applicationView_Consolidated;
             Closed?.Invoke(this, EventArgs.Empty);
         }
 
@@ -47,8 +48,15 @@ namespace FluentTerminal.App.Adapters
             return ApiInformation.IsApiContractPresent(api, version);
         }
 
-        public Task RunOnDispatcherThread(Action action)
+        public Task RunOnDispatcherThread(Action action, bool enforceNewSchedule = true)
         {
+            if (!enforceNewSchedule && _dispatcher.HasThreadAccess)
+            {
+                action();
+
+                return Task.CompletedTask;
+            }
+
             return _dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => action()).AsTask();
         }
 

FluentTerminal.App/Adapters/DispatcherTimerAdapter.cs

@@ -11,12 +11,11 @@ namespace FluentTerminal.App.Adapters
         public DispatcherTimerAdapter()
         {
             _dispatcherTimer = new DispatcherTimer();
-            _dispatcherTimer.Tick += OnDispatcherTimerTick;
         }
 
         private void OnDispatcherTimerTick(object sender, object e)
         {
-            Tick?.Invoke(this, null);
+            Tick?.Invoke(this, EventArgs.Empty);
         }
 
         public TimeSpan Interval
@@ -31,12 +30,14 @@ namespace FluentTerminal.App.Adapters
 
         public void Start()
         {
+            _dispatcherTimer.Tick += OnDispatcherTimerTick;
             _dispatcherTimer.Start();
         }
 
         public void Stop()
         {
             _dispatcherTimer.Stop();
+            _dispatcherTimer.Tick -= OnDispatcherTimerTick;
         }
     }
 }

FluentTerminal.App/App.xaml

@@ -6,6 +6,7 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
                 <ResourceDictionary Source="Styles\Custom.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <LinearGradientBrush x:Key="MissingColorSelectionBrush" StartPoint="0,0" EndPoint="1,1">
@@ -26,6 +27,7 @@
             <converters:FalseToVisibleConverter x:Key="FalseToVisibleConverter" />
             <converters:TrueToVisibleConverter x:Key="TrueToVisibleConverter" />
             <converters:TabColorFallbackConverter x:Key="TabColorFallbackConverter" />
+            <converters:TextMiddleEllipsisConverter x:Key="TextMiddleEllipsisConverter" />
             <converters:IntToVisibilityConverter
                 x:Key="ZeroToCollapsedConverter"
                 Else="Visible"

FluentTerminal.App/App.xaml.cs

@@ -35,6 +35,9 @@ using Windows.UI.Xaml.Controls;
 using FluentTerminal.App.Utilities;
 using IContainer = Autofac.IContainer;
 using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.App.ViewModels.Profiles;
+using FluentTerminal.Models.Messages;
+using GalaSoft.MvvmLight.Messaging;
 
 namespace FluentTerminal.App
 {
@@ -44,7 +47,6 @@ namespace FluentTerminal.App
         private readonly TaskCompletionSource<int> _trayReady = new TaskCompletionSource<int>();
         private readonly ISettingsService _settingsService;
         private readonly ITrayProcessCommunicationService _trayProcessCommunicationService;
-        private readonly Lazy<ISshHelperService> _sshHelperService;
         private readonly IDialogService _dialogService;
         private bool _alreadyLaunched;
         private bool _isLaunching;
@@ -73,7 +75,8 @@ namespace FluentTerminal.App
                 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))
+                SshProfiles = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings.CreateContainer(Constants.SshProfilesContainerName, ApplicationDataCreateDisposition.Always)), 
+                HistoryContainer = new ApplicationDataContainerAdapter(ApplicationData.Current.RoamingSettings.CreateContainer(Constants.ExecutedCommandsContainerName, ApplicationDataCreateDisposition.Always))
             };
             var builder = new ContainerBuilder();
             builder.RegisterType<SettingsService>().As<ISettingsService>().SingleInstance();
@@ -95,24 +98,38 @@ namespace FluentTerminal.App
             builder.RegisterType<SshProfileSelectionDialog>().As<ISshProfileSelectionDialog>().InstancePerDependency();
             builder.RegisterType<CreateKeyBindingDialog>().As<ICreateKeyBindingDialog>().InstancePerDependency();
             builder.RegisterType<InputDialog>().As<IInputDialog>().InstancePerDependency();
+            builder.RegisterType<AboutDialog>().As<IAboutDialog>().InstancePerDependency();
             builder.RegisterType<MessageDialogAdapter>().As<IMessageDialog>().InstancePerDependency();
             builder.RegisterType<SshInfoDialog>().As<ISshConnectionInfoDialog>().InstancePerDependency();
+            builder.RegisterType<CustomCommandDialog>().As<ICustomCommandDialog>().InstancePerDependency();
             builder.RegisterType<ApplicationViewAdapter>().As<IApplicationView>().InstancePerDependency();
             builder.RegisterType<DispatcherTimerAdapter>().As<IDispatcherTimer>().InstancePerDependency();
             builder.RegisterType<StartupTaskService>().As<IStartupTaskService>().SingleInstance();
-            builder.RegisterType<SshHelperService>().As<ISshHelperService>().SingleInstance();
             builder.RegisterType<ApplicationLanguageService>().As<IApplicationLanguageService>().SingleInstance();
+            builder.RegisterType<ShellProfileMigrationService>().As<IShellProfileMigrationService>().SingleInstance();
             builder.RegisterInstance(applicationDataContainers);
 
             _container = builder.Build();
 
+            Messenger.Default.Register<ApplicationSettingsChangedMessage>(this, OnApplicationSettingsChanged);
+
             _settingsService = _container.Resolve<ISettingsService>();
-            _settingsService.ApplicationSettingsChanged += OnApplicationSettingsChanged;
+
+            var shellProfileMigrationService = _container.Resolve<IShellProfileMigrationService>();
+            foreach (var profile in _settingsService.GetShellProfiles())
+            {
+                shellProfileMigrationService.Migrate(profile);
+                _settingsService.SaveShellProfile(profile);
+            }
+
+            foreach (var profile in _settingsService.GetSshProfiles())
+            {
+                shellProfileMigrationService.Migrate(profile);
+                _settingsService.SaveSshProfile(profile);
+            }
 
             _trayProcessCommunicationService = _container.Resolve<ITrayProcessCommunicationService>();
 
-            _sshHelperService = new Lazy<ISshHelperService>(() => _container.Resolve<ISshHelperService>());
-
             _dialogService = _container.Resolve<IDialogService>();
 
             _applicationSettings = _settingsService.GetApplicationSettings();
@@ -168,26 +185,45 @@ namespace FluentTerminal.App
         {
             if (args is ProtocolActivatedEventArgs protocolActivated)
             {
-                MainViewModel mainViewModel = null;
+                if (protocolActivated.Uri == new Uri("ftcmd://fluent.terminal?focus"))
+                {
+                    await ShowOrCreateWindow(protocolActivated.ViewSwitcher);
+                    return;
+                }
 
-                if (!_alreadyLaunched)
+                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 = _sshHelperService.Value.IsSsh(protocolActivated.Uri);
+                    isSsh = SshConnectViewModel.CheckScheme(protocolActivated.Uri);
                 }
                 catch (Exception ex)
                 {
-                    await new MessageDialog($"Invalid link: {ex.Message}", "Invalid Link").ShowAsync();
+                    await new MessageDialog(
+                            $"{I18N.TranslateWithFallback("InvalidLink", "Invalid link.")} {ex.Message}",
+                            "Invalid Link")
+                        .ShowAsync();
 
                     mainViewModel?.ApplicationView.TryClose();
 
@@ -196,40 +232,41 @@ namespace FluentTerminal.App
 
                 if (isSsh)
                 {
-                    SshProfileViewModel connectionInfo;
+                    SshConnectViewModel vm;
 
                     try
                     {
-                        connectionInfo = (SshProfileViewModel) _sshHelperService.Value.ParseSsh(protocolActivated.Uri);
+                        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();
+                        await new MessageDialog(
+                                $"{I18N.TranslateWithFallback("InvalidLink", "Invalid link.")} {ex.Message}",
+                                "Invalid Link")
+                            .ShowAsync();
 
                         mainViewModel?.ApplicationView.TryClose();
 
                         return;
                     }
 
-                    if (_applicationSettings.AutoFallbackToWindowsUsernameInLinks &&
-                        string.IsNullOrEmpty(connectionInfo.Username))
+                    if (_applicationSettings.AutoFallbackToWindowsUsernameInLinks && string.IsNullOrEmpty(vm.Username))
                     {
-                        connectionInfo.Username = await _trayProcessCommunicationService.GetUserName();
+                        vm.Username = await _trayProcessCommunicationService.GetUserName();
                     }
 
-                    SshConnectionInfoValidationResult result = await connectionInfo.ValidateAsync();
+                    var error = await vm.AcceptChangesAsync(true);
 
-                    if (result == SshConnectionInfoValidationResult.Valid)
-                    {
-                        await connectionInfo.AcceptChangesAsync();
-                    }
-                    else
+                    SshProfile profile = (SshProfile) vm.Model;
+
+                    if (!string.IsNullOrEmpty(error))
                     {
                         // Link is valid, but incomplete (i.e. username missing), so we need to show dialog.
-                        connectionInfo =
-                            (SshProfileViewModel) await _dialogService.ShowSshConnectionInfoDialogAsync(connectionInfo);
+                        profile = await _dialogService.ShowSshConnectionInfoDialogAsync(profile);
 
-                        if (connectionInfo == null)
+                        if (profile == null)
                         {
                             // User clicked "Cancel" in the dialog.
                             mainViewModel?.ApplicationView.TryClose();
@@ -239,14 +276,68 @@ namespace FluentTerminal.App
                     }
 
                     if (mainViewModel == null)
-                        await CreateTerminal(connectionInfo.Model, _applicationSettings.NewTerminalLocation);
+                        await CreateTerminal(profile, _applicationSettings.NewTerminalLocation, protocolActivated.ViewSwitcher);
                     else
-                        await mainViewModel.AddTerminalAsync(connectionInfo.Model);
+                        await mainViewModel.AddTerminalAsync(profile);
 
                     return;
                 }
 
-                await new MessageDialog($"Invalid link: {protocolActivated.Uri}", "Invalid Link").ShowAsync();
+                if (CommandProfileProviderViewModel.CheckScheme(protocolActivated.Uri))
+                {
+                    CommandProfileProviderViewModel vm;
+
+                    try
+                    {
+                        vm = CommandProfileProviderViewModel.ParseUri(protocolActivated.Uri, _settingsService,
+                            applicationView, _trayProcessCommunicationService,
+                            _container.Resolve<ApplicationDataContainers>().HistoryContainer);
+                    }
+                    catch (Exception ex)
+                    {
+                        await new MessageDialog(
+                                $"{I18N.TranslateWithFallback("InvalidLink", "Invalid link.")} {ex.Message}",
+                                "Invalid Link")
+                            .ShowAsync();
+
+                        mainViewModel?.ApplicationView.TryClose();
+
+                        return;
+                    }
+
+                    var error = await vm.AcceptChangesAsync(true);
+
+                    var profile = vm.Model;
+
+                    if (!string.IsNullOrEmpty(error))
+                    {
+                        // Link is valid, but incomplete, so we need to show dialog.
+                        profile = await _dialogService.ShowCustomCommandDialogAsync(profile);
+
+                        if (profile == null)
+                        {
+                            // User clicked "Cancel" in the dialog.
+                            mainViewModel?.ApplicationView.TryClose();
+
+                            return;
+                        }
+                    }
+
+                    if (mainViewModel == null)
+                    {
+                        await CreateTerminal(profile, _applicationSettings.NewTerminalLocation, protocolActivated.ViewSwitcher);
+                    }
+                    else
+                    {
+                        await mainViewModel.AddTerminalAsync(profile);
+                    }
+                    return;
+                }
+
+                await new MessageDialog(
+                        $"{I18N.TranslateWithFallback("InvalidLink", "Invalid link.")} {protocolActivated.Uri}",
+                        "Invalid Link")
+                    .ShowAsync();
 
                 mainViewModel?.ApplicationView.TryClose();
 
@@ -255,12 +346,13 @@ namespace FluentTerminal.App
 
             if (args is CommandLineActivatedEventArgs commandLineActivated)
             {
-                if (string.IsNullOrWhiteSpace(commandLineActivated.Operation.Arguments))
+                var arguments = commandLineActivated.Operation.Arguments;
+                if (string.IsNullOrWhiteSpace(arguments))
                 {
-                    return;
+                    arguments = "new";
                 }
 
-                _commandLineParser.ParseArguments(SplitArguments(commandLineActivated.Operation.Arguments), typeof(NewVerb), typeof(RunVerb), typeof(SettingsVerb)).WithParsed(async verb =>
+                _commandLineParser.ParseArguments(SplitArguments(arguments), typeof(NewVerb), typeof(RunVerb), typeof(SettingsVerb)).WithParsed(async verb =>
                 {
                     if (verb is SettingsVerb settingsVerb)
                     {
@@ -297,10 +389,14 @@ namespace FluentTerminal.App
                             profile = _settingsService.GetDefaultShellProfile();
                         }
 
-                        if (!string.IsNullOrWhiteSpace(newVerb.Directory))
+                        if (!string.IsNullOrWhiteSpace(newVerb.Directory) && newVerb.Directory != ".")
                         {
                             profile.WorkingDirectory = newVerb.Directory;
                         }
+                        else
+                        {
+                            profile.WorkingDirectory = commandLineActivated.Operation.CurrentDirectoryPath;
+                        }
 
                         var location = newVerb.Target == Target.Default ? _applicationSettings.NewTerminalLocation
                             : newVerb.Target == Target.Tab ? NewTerminalLocation.Tab
@@ -342,6 +438,19 @@ namespace FluentTerminal.App
             }
         }
 
+        private async Task ShowOrCreateWindow(ActivationViewSwitcher viewSwitcher)
+        {
+            if (_mainViewModels.Count == 0)
+            {
+                await CreateTerminal(_settingsService.GetDefaultShellProfile(), NewTerminalLocation.Tab, viewSwitcher);
+            }
+            else
+            {
+                var viewModel = _mainViewModels.Find(o => o.ApplicationView.Id == _activeWindowId) ?? _mainViewModels.Last();
+                await ShowAsStandaloneAsync(viewModel, viewSwitcher);
+            }
+        }
+
         protected override async void OnLaunched(LaunchActivatedEventArgs args)
         {
             if (_isLaunching)
@@ -369,16 +478,18 @@ namespace FluentTerminal.App
                 await CreateMainView(typeof(MainPage), viewModel, true).ConfigureAwait(true);
                 Window.Current.Activate();
             }
-            else if (_mainViewModels.Count == 0)
-            {
-                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);
+                await CreateTerminal(profile, location, args.ViewSwitcher).ConfigureAwait(true);
             }
+            else
+            {
+                var viewModel = await CreateNewTerminalWindow().ConfigureAwait(true);
+                await viewModel.AddLocalTabAsync();
+            }
+
             _isLaunching = false;
         }
 
@@ -431,6 +542,8 @@ namespace FluentTerminal.App
 
         private async Task CreateMainView(Type pageType, INotifyPropertyChanged viewModel, bool extendViewIntoTitleBar)
         {
+            ApplicationViewSwitcher.DisableSystemViewActivationPolicy();
+
             await StartSystemTray().ConfigureAwait(true);
 
             if (!(Window.Current.Content is Frame rootFrame))
@@ -448,8 +561,8 @@ namespace FluentTerminal.App
                     mainViewModel.Closed += OnMainViewModelClosed;
                     mainViewModel.NewWindowRequested += OnNewWindowRequested;
                     mainViewModel.ShowSettingsRequested += OnShowSettingsRequested;
-                    mainViewModel.ShowAboutRequested += OnShowAboutRequested;
                     mainViewModel.ActivatedMv += OnMainViewActivated;
+                    mainViewModel.TabTearedOff += OnTabTearOff;
                     _mainViewModels.Add(mainViewModel);
                 }
 
@@ -465,8 +578,8 @@ namespace FluentTerminal.App
             viewModel.Closed += OnMainViewModelClosed;
             viewModel.NewWindowRequested += OnNewWindowRequested;
             viewModel.ShowSettingsRequested += OnShowSettingsRequested;
-            viewModel.ShowAboutRequested += OnShowAboutRequested;
             viewModel.ActivatedMv += OnMainViewActivated;
+            viewModel.TabTearedOff += OnTabTearOff;
             _mainViewModels.Add(viewModel);
 
             return viewModel;
@@ -501,9 +614,10 @@ namespace FluentTerminal.App
             return viewModel;
         }
 
-        private void OnApplicationSettingsChanged(object sender, ApplicationSettings e)
+        private void OnApplicationSettingsChanged(ApplicationSettingsChangedMessage message)
         {
-            _applicationSettings = e;
+            _applicationSettings = message.ApplicationSettings;
+            _trayProcessCommunicationService.UpdateSettings(message.ApplicationSettings);
         }
 
         private void OnMainViewModelClosed(object sender, EventArgs e)
@@ -515,14 +629,16 @@ namespace FluentTerminal.App
                 viewModel.Closed -= OnMainViewModelClosed;
                 viewModel.NewWindowRequested -= OnNewWindowRequested;
                 viewModel.ShowSettingsRequested -= OnShowSettingsRequested;
-                viewModel.ShowAboutRequested -= OnShowAboutRequested;
                 viewModel.ActivatedMv -= OnMainViewActivated;
+                viewModel.TabTearedOff -= OnTabTearOff;
                 if (_activeWindowId == viewModel.ApplicationView.Id)
                 {
                     _activeWindowId = 0;
                 }
 
                 _mainViewModels.Remove(viewModel);
+
+                Window.Current.Content = null;
             }
         }
 
@@ -535,6 +651,14 @@ namespace FluentTerminal.App
             }
         }
 
+        private async void OnTabTearOff(object sender, TerminalViewModel model)
+        {
+            Logger.Instance.Debug("App.xaml.cs on tab tear off");
+
+            var newViewModel = await CreateNewTerminalWindow().ConfigureAwait(true);
+            await newViewModel.AddTerminalAsync(await model.Serialize(), 0);
+        }
+
         private async void OnNewWindowRequested(object sender, NewWindowRequestedEventArgs e)
         {
             ShellProfile profile = null;
@@ -551,7 +675,15 @@ namespace FluentTerminal.App
                     }
                     break;
                 case NewWindowAction.ShowSshProfileSelection:
-                    profile = await _sshHelperService.Value.GetSavedSshProfileAsync();
+                    profile = await _dialogService.ShowSshProfileSelectionDialogAsync();
+                    if (profile == null)
+                    {
+                        // Nothing to do if user cancels.
+                        return;
+                    }
+                    break;
+                case NewWindowAction.ShowCustomCommandDialog:
+                    profile = await _dialogService.ShowCustomCommandDialogAsync();
                     if (profile == null)
                     {
                         // Nothing to do if user cancels.
@@ -559,7 +691,7 @@ namespace FluentTerminal.App
                     }
                     break;
                 case NewWindowAction.ShowSshInfoDialog:
-                    profile = await _sshHelperService.Value.GetSshProfileAsync(new SshProfile());
+                    profile = await _dialogService.ShowSshConnectionInfoDialogAsync();
                     if (profile == null)
                     {
                         // Nothing to do if user cancels.
@@ -596,24 +728,28 @@ namespace FluentTerminal.App
             _settingsWindowId = null;
         }
 
-        private void OnShowAboutRequested(object sender, EventArgs e)
-        {
-            ShowAbout().ConfigureAwait(true);
-        }
-
         private async void OnShowSettingsRequested(object sender, EventArgs e)
         {
             await ShowSettings().ConfigureAwait(true);
         }
 
-        private async Task ShowAbout()
+        private async Task ShowAsStandaloneAsync(MainViewModel viewModel, ActivationViewSwitcher viewSwitcher = null)
         {
-            await ShowSettings().ConfigureAwait(true);
-            _settingsViewModel.NavigateToAboutPage();
+            int viewId = viewModel.ApplicationView.Id;
+            if (viewSwitcher != null)
+            {
+                await viewModel.ApplicationView.RunOnDispatcherThread(async () => await viewSwitcher.ShowAsStandaloneAsync(viewId));
+            }
+            else
+            {
+                await ApplicationViewSwitcher.TryShowAsStandaloneAsync(viewId);
+            }
         }
 
-        private async Task CreateTerminal(ShellProfile profile, NewTerminalLocation location)
+        private async Task CreateTerminal(ShellProfile profile, NewTerminalLocation location, ActivationViewSwitcher viewSwitcher = null)
         {
+            
+
             if (!_alreadyLaunched)
             {
                 var viewModel = _container.Resolve<MainViewModel>();
@@ -624,19 +760,19 @@ namespace FluentTerminal.App
             {
 
                 MainViewModel item = _mainViewModels.FirstOrDefault(o => o.ApplicationView.Id == _activeWindowId);
-                if (item != null)
+                if (item == null)
                 {
-                    await item.AddTerminalAsync(profile);
-                }
-                else
-                {
-                    await _mainViewModels.Last().AddTerminalAsync(profile);
+                    item = _mainViewModels.Last();
                 }
+
+                await item.AddTerminalAsync(profile);
+                await ShowAsStandaloneAsync(item, viewSwitcher);
             }
             else
             {
                 var viewModel = await CreateNewTerminalWindow().ConfigureAwait(true);
                 await viewModel.AddTerminalAsync(profile);
+                await ShowAsStandaloneAsync(viewModel, viewSwitcher);
             }
         }