diff --git a/FluentTerminal.App.ViewModels/Settings/ProfilesPageViewModel.cs b/FluentTerminal.App.ViewModels/Settings/ProfilesPageViewModel.cs
index 0f85381..26ab885 100644
--- a/FluentTerminal.App.ViewModels/Settings/ProfilesPageViewModel.cs
+++ b/FluentTerminal.App.ViewModels/Settings/ProfilesPageViewModel.cs
@@ -32,7 +32,7 @@ namespace FluentTerminal.App.ViewModels.Settings
             var defaultShellProfileId = _settingsService.GetDefaultShellProfileId();
             foreach (var shellProfile in _settingsService.GetShellProfiles())
             {
-                var viewModel = new ShellProfileViewModel(shellProfile, settingsService, dialogService, fileSystemService, applicationView, defaultValueProvider);
+                var viewModel = new ShellProfileViewModel(shellProfile, settingsService, dialogService, fileSystemService, applicationView, defaultValueProvider, false);
                 viewModel.Deleted += OnShellProfileDeleted;
                 viewModel.SetAsDefault += OnShellProfileSetAsDefault;
 
@@ -112,7 +112,7 @@ namespace FluentTerminal.App.ViewModels.Settings
         {
             _settingsService.SaveShellProfile(shellProfile, true);
 
-            var viewModel = new ShellProfileViewModel(shellProfile, _settingsService, _dialogService, _fileSystemService, _applicationView, _defaultValueProvider);
+            var viewModel = new ShellProfileViewModel(shellProfile, _settingsService, _dialogService, _fileSystemService, _applicationView, _defaultValueProvider, true);
             viewModel.EditCommand.Execute(null);
             viewModel.SetAsDefault += OnShellProfileSetAsDefault;
             viewModel.Deleted += OnShellProfileDeleted;
diff --git a/FluentTerminal.App.ViewModels/Settings/ThemesPageViewModel.cs b/FluentTerminal.App.ViewModels/Settings/ThemesPageViewModel.cs
index 441f26a..d0efee4 100644
--- a/FluentTerminal.App.ViewModels/Settings/ThemesPageViewModel.cs
+++ b/FluentTerminal.App.ViewModels/Settings/ThemesPageViewModel.cs
@@ -40,7 +40,7 @@ namespace FluentTerminal.App.ViewModels.Settings
             var activeThemeId = _settingsService.GetCurrentThemeId();
             foreach (var theme in _settingsService.GetThemes())
             {
-                var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, fileSystemService);
+                var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, fileSystemService, false);
                 viewModel.Activated += OnThemeActivated;
                 viewModel.Deleted += OnThemeDeleted;
 
@@ -139,7 +139,8 @@ namespace FluentTerminal.App.ViewModels.Settings
         {
             _settingsService.SaveTheme(theme, true);
 
-            var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, _fileSystemService);
+            var viewModel = new ThemeViewModel(theme, _settingsService, _dialogService, _fileSystemService, true);
+            viewModel.EditCommand.Execute(null);
             viewModel.Activated += OnThemeActivated;
             viewModel.Deleted += OnThemeDeleted;
             Themes.Add(viewModel);
diff --git a/FluentTerminal.App.ViewModels/ShellProfileViewModel.cs b/FluentTerminal.App.ViewModels/ShellProfileViewModel.cs
index d9c0c0a..a2c9cbc 100644
--- a/FluentTerminal.App.ViewModels/ShellProfileViewModel.cs
+++ b/FluentTerminal.App.ViewModels/ShellProfileViewModel.cs
@@ -24,6 +24,7 @@ namespace FluentTerminal.App.ViewModels
         private string _location;
         private LineEndingStyle _lineEndingStyle;
         private string _name;
+        private bool _isNew;
         private TabTheme _selectedTabTheme;
         private TerminalTheme _selectedTerminalTheme;
         private string _workingDirectory;
@@ -31,7 +32,7 @@ namespace FluentTerminal.App.ViewModels
         private readonly IDefaultValueProvider _defaultValueProvider;
         private bool _editingLineEndingStyle;
 
-        public ShellProfileViewModel(ShellProfile shellProfile, ISettingsService settingsService, IDialogService dialogService, IFileSystemService fileSystemService, IApplicationView applicationView, IDefaultValueProvider defaultValueProvider)
+        public ShellProfileViewModel(ShellProfile shellProfile, ISettingsService settingsService, IDialogService dialogService, IFileSystemService fileSystemService, IApplicationView applicationView, IDefaultValueProvider defaultValueProvider, Boolean isNew)
         {
             Model = shellProfile;
             _settingsService = settingsService;
@@ -39,6 +40,7 @@ namespace FluentTerminal.App.ViewModels
             _fileSystemService = fileSystemService;
             _applicationView = applicationView;
             _defaultValueProvider = defaultValueProvider;
+            _isNew = isNew;
 
             _settingsService.ThemeAdded += OnThemeAdded;
             _settingsService.ThemeDeleted += OnThemeDeleted;
@@ -245,6 +247,7 @@ namespace FluentTerminal.App.ViewModels
 
             KeyBindings.Editable = false;
             InEditMode = false;
+            _isNew = false;
         }
 
         private async Task RestoreDefaults()
@@ -289,27 +292,53 @@ namespace FluentTerminal.App.ViewModels
 
         private async Task CancelEdit()
         {
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to discard all changes?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
-
-            if (result == DialogButton.OK)
+            if (_isNew)
             {
-                Arguments = _fallbackProfile.Arguments;
-                Location = _fallbackProfile.Location;
-                Name = _fallbackProfile.Name;
-                WorkingDirectory = _fallbackProfile.WorkingDirectory;
-                LineEndingStyle = _fallbackProfile.LineEndingTranslation;
-                SelectedTerminalTheme = TerminalThemes.FirstOrDefault(t => t.Id == _fallbackProfile.TerminalThemeId);
-                SelectedTabTheme = TabThemes.FirstOrDefault(t => t.Id == _fallbackProfile.TabThemeId);
-                
-
-                KeyBindings.KeyBindings.Clear();
-                foreach (var keyBinding in Model.KeyBindings.Select(x => new KeyBinding(x)).ToList())
+                await Delete();
+            }
+            else
+            {
+                ShellProfile changedProfile = new ShellProfile
                 {
-                    KeyBindings.Add(keyBinding);
-                }
+                    Arguments = Arguments,
+                    Location = Location,
+                    Name = Name,
+                    WorkingDirectory = WorkingDirectory,
+                    TabThemeId = SelectedTabTheme.Id,
+                    TerminalThemeId = SelectedTerminalTheme.Id,
+                    LineEndingTranslation = _lineEndingStyle,
+                    KeyBindings = KeyBindings.KeyBindings.Select(x => x.Model).ToList()
+                };
 
-                KeyBindings.Editable = false;
-                InEditMode = false;
+                if (!_fallbackProfile.Equals(changedProfile))
+                {
+                    var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to discard all changes?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
+
+                    if (result == DialogButton.OK)
+                    {
+                        Arguments = _fallbackProfile.Arguments;
+                        Location = _fallbackProfile.Location;
+                        Name = _fallbackProfile.Name;
+                        WorkingDirectory = _fallbackProfile.WorkingDirectory;
+                        LineEndingStyle = _fallbackProfile.LineEndingTranslation;
+                        SelectedTerminalTheme = TerminalThemes.FirstOrDefault(t => t.Id == _fallbackProfile.TerminalThemeId);
+                        SelectedTabTheme = TabThemes.FirstOrDefault(t => t.Id == _fallbackProfile.TabThemeId);
+
+                        KeyBindings.KeyBindings.Clear();
+                        foreach (var keyBinding in Model.KeyBindings.Select(x => new KeyBinding(x)).ToList())
+                        {
+                            KeyBindings.Add(keyBinding);
+                        }
+
+                        KeyBindings.Editable = false;
+                        InEditMode = false;
+                    }
+                }
+                else
+                {
+                    KeyBindings.Editable = false;
+                    InEditMode = false;
+                }
             }
         }
 
diff --git a/FluentTerminal.App.ViewModels/ThemeViewModel.cs b/FluentTerminal.App.ViewModels/ThemeViewModel.cs
index ffe618f..91fbf99 100644
--- a/FluentTerminal.App.ViewModels/ThemeViewModel.cs
+++ b/FluentTerminal.App.ViewModels/ThemeViewModel.cs
@@ -29,15 +29,14 @@ namespace FluentTerminal.App.ViewModels
         private string _cursor;
         private string _cursorAccent;
         private string _cyan;
-        private string _fallBackAuthor;
-        private TerminalColors _fallBackColors;
-        private string _fallBackName;
+        private TerminalTheme _fallbackTheme;
         private string _foreground;
         private string _green;
         private bool _inEditMode;
         private bool _isActive;
         private string _magenta;
         private string _name;
+        private bool _isNew;
         private string _red;
         private string _selection;
         private string _white;
@@ -46,12 +45,13 @@ namespace FluentTerminal.App.ViewModels
 
         public event EventHandler<string> BackgroundChanged;
 
-        public ThemeViewModel(TerminalTheme theme, ISettingsService settingsService, IDialogService dialogService, IFileSystemService fileSystemService)
+        public ThemeViewModel(TerminalTheme theme, ISettingsService settingsService, IDialogService dialogService, IFileSystemService fileSystemService, bool isNew)
         {
             Model = theme;
             _settingsService = settingsService;
             _dialogService = dialogService;
             _fileSystemService = fileSystemService;
+            _isNew = isNew;
 
             Name = Model.Name;
             Author = Model.Author;
@@ -299,42 +299,89 @@ namespace FluentTerminal.App.ViewModels
             _settingsService.SaveTheme(Model);
 
             InEditMode = false;
+            _isNew = false;
         }
 
         private async Task CancelEdit()
         {
-            var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to discard all changes?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
-
-            if (result == DialogButton.OK)
+            if (_isNew)
             {
-                Black = _fallBackColors.Black;
-                Red = _fallBackColors.Red;
-                Green = _fallBackColors.Green;
-                Yellow = _fallBackColors.Yellow;
-                Blue = _fallBackColors.Blue;
-                Magenta = _fallBackColors.Magenta;
-                Cyan = _fallBackColors.Cyan;
-                White = _fallBackColors.White;
+                await Delete();
+            }
+            else
+            {
+                TerminalTheme changedTheme = new TerminalTheme()
+                {
+                    Name = Name,
+                    Author = Author,
+                    Colors = new TerminalColors()
+                    {
+                        Black = Black,
+                        Red = Red,
+                        Green = Green,
+                        Yellow = Yellow,
+                        Blue = Blue,
+                        Magenta = Magenta,
+                        Cyan = Cyan,
+                        White = White,
 
-                BrightBlack = _fallBackColors.BrightBlack;
-                BrightRed = _fallBackColors.BrightRed;
-                BrightGreen = _fallBackColors.BrightGreen;
-                BrightYellow = _fallBackColors.BrightYellow;
-                BrightBlue = _fallBackColors.BrightBlue;
-                BrightMagenta = _fallBackColors.BrightMagenta;
-                BrightCyan = _fallBackColors.BrightCyan;
-                BrightWhite = _fallBackColors.BrightWhite;
+                        BrightBlack = BrightBlack,
+                        BrightRed = BrightRed,
+                        BrightGreen = BrightGreen,
+                        BrightYellow = BrightYellow,
+                        BrightBlue = BrightBlue,
+                        BrightMagenta = BrightMagenta,
+                        BrightCyan = BrightCyan,
+                        BrightWhite = BrightWhite,
 
-                Background = _fallBackColors.Background;
-                Foreground = _fallBackColors.Foreground;
-                Cursor = _fallBackColors.Cursor;
-                CursorAccent = _fallBackColors.CursorAccent;
-                Selection = _fallBackColors.Selection;
+                        Background = Background,
+                        Foreground = Foreground,
+                        Cursor = Cursor,
+                        CursorAccent = CursorAccent,
+                        Selection = Selection
+                    }
+                };
 
-                Name = _fallBackName;
-                Author = _fallBackAuthor;
+                if (!_fallbackTheme.Equals(changedTheme))
+                {
+                    var result = await _dialogService.ShowMessageDialogAsnyc("Please confirm", "Are you sure you want to discard all changes?", DialogButton.OK, DialogButton.Cancel).ConfigureAwait(true);
 
-                InEditMode = false;
+                    if (result == DialogButton.OK)
+                    {
+                        Black = _fallbackTheme.Colors.Black;
+                        Red = _fallbackTheme.Colors.Red;
+                        Green = _fallbackTheme.Colors.Green;
+                        Yellow = _fallbackTheme.Colors.Yellow;
+                        Blue = _fallbackTheme.Colors.Blue;
+                        Magenta = _fallbackTheme.Colors.Magenta;
+                        Cyan = _fallbackTheme.Colors.Cyan;
+                        White = _fallbackTheme.Colors.White;
+
+                        BrightBlack = _fallbackTheme.Colors.BrightBlack;
+                        BrightRed = _fallbackTheme.Colors.BrightRed;
+                        BrightGreen = _fallbackTheme.Colors.BrightGreen;
+                        BrightYellow = _fallbackTheme.Colors.BrightYellow;
+                        BrightBlue = _fallbackTheme.Colors.BrightBlue;
+                        BrightMagenta = _fallbackTheme.Colors.BrightMagenta;
+                        BrightCyan = _fallbackTheme.Colors.BrightCyan;
+                        BrightWhite = _fallbackTheme.Colors.BrightWhite;
+
+                        Background = _fallbackTheme.Colors.Background;
+                        Foreground = _fallbackTheme.Colors.Foreground;
+                        Cursor = _fallbackTheme.Colors.Cursor;
+                        CursorAccent = _fallbackTheme.Colors.CursorAccent;
+                        Selection = _fallbackTheme.Colors.Selection;
+
+                        Name = _fallbackTheme.Name;
+                        Author = _fallbackTheme.Author;
+
+                        InEditMode = false;
+                    }
+                }
+                else
+                {
+                    InEditMode = false;
+                }
             }
         }
 
@@ -355,9 +402,7 @@ namespace FluentTerminal.App.ViewModels
 
         private void Edit()
         {
-            _fallBackColors = new TerminalColors(Model.Colors);
-            _fallBackName = Name;
-            _fallBackAuthor = Author;
+            _fallbackTheme = new TerminalTheme(Model);
             InEditMode = true;
         }
 
diff --git a/FluentTerminal.App/FluentTerminal.App.csproj b/FluentTerminal.App/FluentTerminal.App.csproj
index a3ba77f..908294b 100644
--- a/FluentTerminal.App/FluentTerminal.App.csproj
+++ b/FluentTerminal.App/FluentTerminal.App.csproj
@@ -176,10 +176,12 @@
       <DependentUpon>TabBar.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\TabBarBackgroundBindingHelper.cs" />
+    <Compile Include="Views\TerminalKeybindTemplateSelector.cs" />
     <Compile Include="Views\TabThemeTemplateSelector.cs" />
     <Compile Include="Views\TerminalColorPicker.xaml.cs">
       <DependentUpon>TerminalColorPicker.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\NoValueTemplateSelector.cs" />
     <Compile Include="Views\TerminalThemeTemplateSelector.cs" />
     <Compile Include="Views\TerminalView.xaml.cs">
       <DependentUpon>TerminalView.xaml</DependentUpon>
diff --git a/FluentTerminal.App/Styles/Custom.xaml b/FluentTerminal.App/Styles/Custom.xaml
index a11be8a..b6590dd 100644
--- a/FluentTerminal.App/Styles/Custom.xaml
+++ b/FluentTerminal.App/Styles/Custom.xaml
@@ -1,5 +1,9 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
+    <Thickness x:Key="HeaderMargin">24,0,0,0</Thickness>
+    <Thickness x:Key="ContainerMargin">24,0,24,24</Thickness>
+    <Thickness x:Key="ItemMargin">0,24,0,0</Thickness>
+
     <Style
         x:Key="WindowTitleTextBlockStyle"
         BasedOn="{StaticResource CaptionTextBlockStyle}"
diff --git a/FluentTerminal.App/Views/NoValueTemplateSelector.cs b/FluentTerminal.App/Views/NoValueTemplateSelector.cs
new file mode 100644
index 0000000..a80d51c
--- /dev/null
+++ b/FluentTerminal.App/Views/NoValueTemplateSelector.cs
@@ -0,0 +1,26 @@
+using System;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace FluentTerminal.App.Views
+{
+    public class NoValueTemplateSelector : DataTemplateSelector
+    {
+        public DataTemplate DefaultTemplate { get; set; }
+        public DataTemplate CustomTemplate { get; set; }
+
+        protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
+        {
+            return SelectTemplateCore(item);
+        }
+
+        protected override DataTemplate SelectTemplateCore(object item)
+        {
+            if (item is String arguments)
+            {
+                return String.Empty.Equals(arguments) ? DefaultTemplate : CustomTemplate;
+            }
+            return null;
+        }
+    }
+}
diff --git a/FluentTerminal.App/Views/SettingsPages/About.xaml b/FluentTerminal.App/Views/SettingsPages/About.xaml
index 30861e1..ebea433 100644
--- a/FluentTerminal.App/Views/SettingsPages/About.xaml
+++ b/FluentTerminal.App/Views/SettingsPages/About.xaml
@@ -6,14 +6,13 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
     mc:Ignorable="d">
-
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="32" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Grid Grid.Row="1" Margin="24,0,0,24">
+        <Grid Grid.Row="1" Margin="{StaticResource HeaderMargin}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition />
@@ -36,52 +35,56 @@
                     Label="Check for updates" />
             </CommandBar>
         </Grid>
-        <ScrollViewer Grid.Row="2" Margin="24,0,0,0">
-            <Grid>
+        <ScrollViewer Grid.Row="2">
+            <Grid Margin="{StaticResource ContainerMargin}">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="*" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
                 <StackPanel Grid.Row="0">
-                    <!--  App Logo  -->
                     <Image
                         MaxWidth="106"
                         MaxHeight="106"
-                        Margin="24,0,24,0"
+                        Margin="{StaticResource ItemMargin}"
                         HorizontalAlignment="Left"
                         Source="/Assets/AppIcons/Square106x106Logo.black.png"
                         Stretch="None" />
 
-                    <!--  Current version  -->
-                    <TextBlock Margin="0,24,0,8" Text="Current version" />
-                    <TextBlock><Run Text="{x:Bind ViewModel.CurrentVersion}" />
-                         - <Hyperlink NavigateUri="{x:Bind ViewModel.CurrentVersionReleaseNotesURL}">Release notes</Hyperlink></TextBlock>
+                    <StackPanel Margin="{StaticResource ItemMargin}">
+                        <TextBlock Margin="0,0,0,8" Text="Current version" />
+                        <TextBlock>
+                            <Run Text="{x:Bind ViewModel.CurrentVersion}" />
+                            -<Hyperlink NavigateUri="{x:Bind ViewModel.CurrentVersionReleaseNotesURL}">Release notes</Hyperlink>
+                        </TextBlock>
+                    </StackPanel>
 
-                    <!--  Latest version  -->
-                    <TextBlock Margin="0,24,0,8" Text="Latest version" />
-                    <TextBlock Visibility="{x:Bind ViewModel.LatestVersionLoading, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}"><Italic>loading...</Italic></TextBlock>
-                    <TextBlock Visibility="{x:Bind ViewModel.LatestVersionNotFound, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}"><Italic>Not found</Italic></TextBlock>
-                    <TextBlock Visibility="{x:Bind ViewModel.LatestVersionFound, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}">
-                        <Run Text="{x:Bind ViewModel.LatestVersion, Mode=OneWay}" />
-                         - <Hyperlink NavigateUri="{x:Bind ViewModel.LatestVersionReleaseNotesURL, Mode=OneWay}">
-                            Release notes
-                        </Hyperlink>
-                    </TextBlock>
+                    <StackPanel Margin="{StaticResource ItemMargin}">
+                        <TextBlock Margin="0,0,0,8" Text="Latest version" />
+                        <StackPanel Orientation="Horizontal" Visibility="{x:Bind ViewModel.LatestVersionLoading, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}">
+                            <ProgressRing Margin="0,0,8,0" IsActive="True" />
+                            <TextBlock><Italic>Checking for updates...</Italic></TextBlock>
+                        </StackPanel>
+                        <TextBlock Visibility="{x:Bind ViewModel.LatestVersionNotFound, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}">
+                            <Italic>Not found</Italic>
+                        </TextBlock>
+                        <TextBlock Visibility="{x:Bind ViewModel.LatestVersionFound, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}">
+                            <Run Text="{x:Bind ViewModel.LatestVersion, Mode=OneWay}" />
+                            -<Hyperlink NavigateUri="{x:Bind ViewModel.LatestVersionReleaseNotesURL, Mode=OneWay}">Release notes</Hyperlink>
+                        </TextBlock>
+                    </StackPanel>
 
-                    <!--  License  -->
-                    <TextBlock Margin="0,24,0,8" Text="License" />
-                    <TextBlock><Hyperlink NavigateUri="https://github.com/felixse/FluentTerminal/blob/master/LICENSE">GNU General Public License v3.0</Hyperlink></TextBlock>
+                    <StackPanel Margin="{StaticResource ItemMargin}">
+                        <TextBlock Margin="0,0,0,8" Text="License" />
+                        <TextBlock><Hyperlink NavigateUri="https://github.com/felixse/FluentTerminal/blob/master/LICENSE">GNU General Public License v3.0</Hyperlink></TextBlock>
+                    </StackPanel>
                 </StackPanel>
                 <StackPanel
                     Grid.Row="1"
-                    Margin="0,72,0,24"
+                    Margin="0,72,0,0"
                     VerticalAlignment="Bottom">
-                    <!--  Created by...  -->
-                    <TextBlock>
-                        Created by <Italic>felixse</Italic>
-                        and <Hyperlink NavigateUri="https://github.com/felixse/FluentTerminal/graphs/contributors">contributors</Hyperlink></TextBlock>
+                    <TextBlock x:Name="CreatedBy" />
                 </StackPanel>
             </Grid>
         </ScrollViewer>
     </Grid>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/FluentTerminal.App/Views/SettingsPages/About.xaml.cs b/FluentTerminal.App/Views/SettingsPages/About.xaml.cs
index 95e79a8..21f5c06 100644
--- a/FluentTerminal.App/Views/SettingsPages/About.xaml.cs
+++ b/FluentTerminal.App/Views/SettingsPages/About.xaml.cs
@@ -1,5 +1,7 @@
 using FluentTerminal.App.ViewModels.Settings;
+using System;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Documents;
 using Windows.UI.Xaml.Navigation;
 
 namespace FluentTerminal.App.Views.SettingsPages
@@ -11,6 +13,10 @@ namespace FluentTerminal.App.Views.SettingsPages
         public About()
         {
             InitializeComponent();
+            CreatedBy.Inlines.Add(new Run { Text = "Created by " });
+            CreatedBy.Inlines.Add(new Italic { Inlines = { new Run { Text = "felixse " } } });
+            CreatedBy.Inlines.Add(new Run { Text = "and " });
+            CreatedBy.Inlines.Add(new Hyperlink { Inlines = { new Run { Text = "contributors" } }, NavigateUri = new Uri("https://github.com/felixse/FluentTerminal/graphs/contributors") });
         }
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
diff --git a/FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml b/FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml
index b4c447d..d4f8ee9 100644
--- a/FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml
+++ b/FluentTerminal.App/Views/SettingsPages/GeneralSettings.xaml
@@ -11,7 +11,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Grid Grid.Row="1" Margin="24,00,0,24">
+        <Grid Grid.Row="1" Margin="{StaticResource HeaderMargin}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition />
@@ -34,79 +34,93 @@
                     Label="Restore Defaults" />
             </CommandBar>
         </Grid>
-        <ScrollViewer Grid.Row="2" Margin="24,0,0,0">
-            <StackPanel>
+        <ScrollViewer Grid.Row="2">
+            <StackPanel Margin="{StaticResource ContainerMargin}">
+                <StackPanel Margin="{StaticResource ItemMargin}">
+                    <ToggleSwitch
+                        Header="Run on startup"
+                        IsEnabled="{x:Bind ViewModel.CanEnableStartupTask, Mode=OneWay}"
+                        IsOn="{x:Bind ViewModel.StartupTaskEnabled, Mode=TwoWay}" />
+                    <TextBlock
+                        Foreground="Red"
+                        Text="{x:Bind ViewModel.StartupTaskErrorMessage, Mode=OneWay}"
+                        Visibility="{x:Bind ViewModel.CanEnableStartupTask, Mode=OneWay, Converter={StaticResource FalseToVisibleConverter}}" />
+                </StackPanel>
+
+                <StackPanel Margin="{StaticResource ItemMargin}">
+                    <ToggleSwitch Header="Show in system tray" IsOn="{x:Bind ViewModel.EnableTrayIcon, Mode=TwoWay}" />
+                    <TextBlock
+                        Foreground="Red"
+                        Text="Relaunch required to apply setting"
+                        Visibility="{x:Bind ViewModel.ShouldRestartForTrayMessage, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}" />
+                </StackPanel>
+
+                <StackPanel Margin="{StaticResource ItemMargin}">
+                    <TextBlock Margin="0,0,0,8" Text="Open new terminals as" />
+                    <RadioButton
+                        Content="Tabs"
+                        GroupName="NewTerminalLocation"
+                        IsChecked="{x:Bind ViewModel.TabIsSelected, Mode=TwoWay}" />
+                    <RadioButton
+                        Content="Windows"
+                        GroupName="NewTerminalLocation"
+                        IsChecked="{x:Bind ViewModel.WindowIsSelected, Mode=TwoWay}" />
+                </StackPanel>
+
+                <StackPanel Margin="{StaticResource ItemMargin}">
+                    <TextBlock Margin="0,0,0,8" Text="Show tabs on" />
+                    <RadioButton
+                        Content="Top"
+                        GroupName="TabsPosition"
+                        IsChecked="{x:Bind ViewModel.TopIsSelected, Mode=TwoWay}" />
+                    <RadioButton
+                        Content="Bottom"
+                        GroupName="TabsPosition"
+                        IsChecked="{x:Bind ViewModel.BottomIsSelected, Mode=TwoWay}" />
+                </StackPanel>
+
                 <ToggleSwitch
-                    Header="Run on startup"
-                    IsEnabled="{x:Bind ViewModel.CanEnableStartupTask, Mode=OneWay}"
-                    IsOn="{x:Bind ViewModel.StartupTaskEnabled, Mode=TwoWay}" />
-                <TextBlock
-                    Foreground="Red"
-                    Text="{x:Bind ViewModel.StartupTaskErrorMessage, Mode=OneWay}"
-                    Visibility="{x:Bind ViewModel.CanEnableStartupTask, Mode=OneWay, Converter={StaticResource FalseToVisibleConverter}}" />
-                <ToggleSwitch
-                    Margin="0,24,0,0"
-                    Header="Show in system tray"
-                    IsOn="{x:Bind ViewModel.EnableTrayIcon, Mode=TwoWay}" />
-                <TextBlock
-                    Foreground="Red"
-                    Text="Relaunch required to apply setting"
-                    Visibility="{x:Bind ViewModel.ShouldRestartForTrayMessage, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}" />
-                <TextBlock Margin="0,24,0,8" Text="Open new terminals as" />
-                <RadioButton
-                    Content="Tabs"
-                    GroupName="NewTerminalLocation"
-                    IsChecked="{x:Bind ViewModel.TabIsSelected, Mode=TwoWay}" />
-                <RadioButton
-                    Margin="0,0,0,24"
-                    Content="Windows"
-                    GroupName="NewTerminalLocation"
-                    IsChecked="{x:Bind ViewModel.WindowIsSelected, Mode=TwoWay}" />
-                <TextBlock Margin="0,0,0,8" Text="Show tabs on" />
-                <RadioButton
-                    Content="Top"
-                    GroupName="TabsPosition"
-                    IsChecked="{x:Bind ViewModel.TopIsSelected, Mode=TwoWay}" />
-                <RadioButton
-                    Margin="0,0,0,24"
-                    Content="Bottom"
-                    GroupName="TabsPosition"
-                    IsChecked="{x:Bind ViewModel.BottomIsSelected, Mode=TwoWay}" />
-                <ToggleSwitch
-                    Margin="0,0,0,24"
+                    Margin="{StaticResource ItemMargin}"
                     Header="Always show tabs"
                     IsOn="{x:Bind ViewModel.AlwaysShowTabs, Mode=TwoWay}" />
+
                 <ToggleSwitch
-                    Margin="0,0,0,24"
+                    Margin="{StaticResource ItemMargin}"
                     Header="Underline selected tab"
                     IsOn="{x:Bind ViewModel.UnderlineSelectedTab, Mode=TwoWay}" />
-                <TextBlock Margin="0,0,0,8" Text="Color on inactive tabs" />
-                <RadioButton
-                    Content="Background"
-                    GroupName="InactiveTabColorMode"
-                    IsChecked="{x:Bind ViewModel.BackgroundIsSelected, Mode=TwoWay}" />
-                <RadioButton
-                    Margin="0,0,0,24"
-                    Content="Underline"
-                    GroupName="InactiveTabColorMode"
-                    IsChecked="{x:Bind ViewModel.UnderlinedIsSelected, Mode=TwoWay}" />
+
+                <StackPanel Margin="{StaticResource ItemMargin}">
+                    <TextBlock Margin="0,0,0,8" Text="Color on inactive tabs" />
+                    <RadioButton
+                        Content="Background"
+                        GroupName="InactiveTabColorMode"
+                        IsChecked="{x:Bind ViewModel.BackgroundIsSelected, Mode=TwoWay}" />
+                    <RadioButton
+                        Content="Underline"
+                        GroupName="InactiveTabColorMode"
+                        IsChecked="{x:Bind ViewModel.UnderlinedIsSelected, Mode=TwoWay}" />
+                </StackPanel>
+
                 <ToggleSwitch
-                    Margin="0,0,0,24"
+                    Margin="{StaticResource ItemMargin}"
                     Header="Ask before closing windows"
                     IsOn="{x:Bind ViewModel.ConfirmClosingWindows, Mode=TwoWay}" />
+
                 <ToggleSwitch
-                    Margin="0,0,0,24"
+                    Margin="{StaticResource ItemMargin}"
                     Header="Ask before closing tabs"
                     IsOn="{x:Bind ViewModel.ConfirmClosingTabs, Mode=TwoWay}" />
+
                 <ToggleSwitch
-                    Margin="0,0,0,24"
+                    Margin="{StaticResource ItemMargin}"
                     Header="Show new output indicator on background tabs"
                     IsOn="{x:Bind ViewModel.ShowNewOutputIndicator, Mode=TwoWay}" />
+
                 <ToggleSwitch
-                    Margin="0,0,0,24"
+                    Margin="{StaticResource ItemMargin}"
                     Header="Windows 10 1809+: Always use WinPty"
                     IsOn="{x:Bind ViewModel.AlwaysUseWinPty, Mode=TwoWay}" />
             </StackPanel>
         </ScrollViewer>
     </Grid>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/FluentTerminal.App/Views/SettingsPages/KeyBindingSettings.xaml b/FluentTerminal.App/Views/SettingsPages/KeyBindingSettings.xaml
index 6a4f806..52e248b 100644
--- a/FluentTerminal.App/Views/SettingsPages/KeyBindingSettings.xaml
+++ b/FluentTerminal.App/Views/SettingsPages/KeyBindingSettings.xaml
@@ -13,7 +13,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Grid Grid.Row="1" Margin="24,0,0,0">
+        <Grid Grid.Row="1" Margin="{StaticResource HeaderMargin}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition />
@@ -42,11 +42,11 @@
                     Label="Restore Defaults" />
             </CommandBar>
         </Grid>
-        <ScrollViewer Grid.Row="2" Margin="24,24,0,0">
-            <ItemsControl ItemsSource="{x:Bind ViewModel.KeyBindings, Mode=OneWay}">
+        <ScrollViewer Grid.Row="2">
+            <ItemsControl Margin="{StaticResource ContainerMargin}" ItemsSource="{x:Bind ViewModel.KeyBindings, Mode=OneWay}">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate x:DataType="settings:KeyBindingsViewModel">
-                        <views:KeyBindingsView Margin="0,0,0,24" ViewModel="{x:Bind}" />
+                        <views:KeyBindingsView Margin="{StaticResource ItemMargin}" ViewModel="{x:Bind}" />
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
diff --git a/FluentTerminal.App/Views/SettingsPages/MouseSettings.xaml b/FluentTerminal.App/Views/SettingsPages/MouseSettings.xaml
index b94cffe..14765a2 100644
--- a/FluentTerminal.App/Views/SettingsPages/MouseSettings.xaml
+++ b/FluentTerminal.App/Views/SettingsPages/MouseSettings.xaml
@@ -6,14 +6,13 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
     mc:Ignorable="d">
-
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="32" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Grid Grid.Row="1" Margin="24,00,0,24">
+        <Grid Grid.Row="1" Margin="{StaticResource HeaderMargin}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition />
@@ -36,40 +35,44 @@
                     Label="Restore Defaults" />
             </CommandBar>
         </Grid>
-        <ScrollViewer Grid.Row="2" Margin="24,0,0,0">
-            <StackPanel>
+        <ScrollViewer Grid.Row="2">
+            <StackPanel Margin="{StaticResource ContainerMargin}">
                 <ToggleSwitch
-                Margin="0,0,0,24"
-                Header="Copy on select"
-                IsOn="{x:Bind ViewModel.CopyOnSelect, Mode=TwoWay}" />
-                <TextBlock Margin="0,0,0,8" Text="Middle button action" />
-                <RadioButton
-                Content="Nothing"
-                GroupName="MiddleButton"
-                IsChecked="{x:Bind ViewModel.MouseMiddleClickNoneIsSelected, Mode=TwoWay}" />
-                <RadioButton
-                Content="Context menu"
-                GroupName="MiddleButton"
-                IsChecked="{x:Bind ViewModel.MouseMiddleClickContextMenuIsSelected, Mode=TwoWay}" />
-                <RadioButton
-                Margin="0,0,0,24"
-                Content="Paste"
-                GroupName="MiddleButton"
-                IsChecked="{x:Bind ViewModel.MouseMiddleClickPasteIsSelected, Mode=TwoWay}" />
-                <TextBlock Margin="0,0,0,8" Text="Right button action" />
-                <RadioButton
-                Content="Nothing"
-                GroupName="RightButton"
-                IsChecked="{x:Bind ViewModel.MouseRightClickNoneIsSelected, Mode=TwoWay}" />
-                <RadioButton
-                Content="Context menu"
-                GroupName="RightButton"
-                IsChecked="{x:Bind ViewModel.MouseRightClickContextMenuIsSelected, Mode=TwoWay}" />
-                <RadioButton
-                Margin="0,0,0,24"
-                Content="Paste"
-                GroupName="RightButton"
-                IsChecked="{x:Bind ViewModel.MouseRightClickPasteIsSelected, Mode=TwoWay}" />
+                    Margin="{StaticResource ItemMargin}"
+                    Header="Copy on select"
+                    IsOn="{x:Bind ViewModel.CopyOnSelect, Mode=TwoWay}" />
+
+                <StackPanel Margin="{StaticResource ItemMargin}">
+                    <TextBlock Margin="0,0,0,8" Text="Middle button action" />
+                    <RadioButton
+                        Content="Nothing"
+                        GroupName="MiddleButton"
+                        IsChecked="{x:Bind ViewModel.MouseMiddleClickNoneIsSelected, Mode=TwoWay}" />
+                    <RadioButton
+                        Content="Context menu"
+                        GroupName="MiddleButton"
+                        IsChecked="{x:Bind ViewModel.MouseMiddleClickContextMenuIsSelected, Mode=TwoWay}" />
+                    <RadioButton
+                        Content="Paste"
+                        GroupName="MiddleButton"
+                        IsChecked="{x:Bind ViewModel.MouseMiddleClickPasteIsSelected, Mode=TwoWay}" />
+                </StackPanel>
+
+                <StackPanel Margin="{StaticResource ItemMargin}">
+                    <TextBlock Margin="0,0,0,8" Text="Right button action" />
+                    <RadioButton
+                        Content="Nothing"
+                        GroupName="RightButton"
+                        IsChecked="{x:Bind ViewModel.MouseRightClickNoneIsSelected, Mode=TwoWay}" />
+                    <RadioButton
+                        Content="Context menu"
+                        GroupName="RightButton"
+                        IsChecked="{x:Bind ViewModel.MouseRightClickContextMenuIsSelected, Mode=TwoWay}" />
+                    <RadioButton
+                        Content="Paste"
+                        GroupName="RightButton"
+                        IsChecked="{x:Bind ViewModel.MouseRightClickPasteIsSelected, Mode=TwoWay}" />
+                </StackPanel>
             </StackPanel>
         </ScrollViewer>
     </Grid>
diff --git a/FluentTerminal.App/Views/SettingsPages/ShellProfileSettings.xaml b/FluentTerminal.App/Views/SettingsPages/ShellProfileSettings.xaml
index e1cd0b3..6abd3b4 100644
--- a/FluentTerminal.App/Views/SettingsPages/ShellProfileSettings.xaml
+++ b/FluentTerminal.App/Views/SettingsPages/ShellProfileSettings.xaml
@@ -48,6 +48,33 @@
                 </DataTemplate>
             </views:TerminalThemeTemplateSelector.ThemeTemplate>
         </views:TerminalThemeTemplateSelector>
+        <views:TerminalKeybindTemplateSelector x:Key="TerminalKeybindTemplateSelector">
+            <views:TerminalKeybindTemplateSelector.DefaultTemplate>
+                <DataTemplate x:DataType="settings:KeyBindingsViewModel">
+                    <TextBlock FontStyle="Italic" Text="None" />
+                </DataTemplate>
+            </views:TerminalKeybindTemplateSelector.DefaultTemplate>
+            <views:TerminalKeybindTemplateSelector.KeyBindingsTemplate>
+                <DataTemplate x:DataType="settings:KeyBindingsViewModel">
+                    <views:KeyBindingsView
+                        Margin="0,6,0,0"
+                        ShowCommandName="False"
+                        ViewModel="{x:Bind}" />
+                </DataTemplate>
+            </views:TerminalKeybindTemplateSelector.KeyBindingsTemplate>
+        </views:TerminalKeybindTemplateSelector>
+        <views:NoValueTemplateSelector x:Key="NoValueTemplateSelector">
+            <views:NoValueTemplateSelector.DefaultTemplate>
+                <DataTemplate x:DataType="x:String">
+                    <TextBlock FontStyle="Italic" Text="None" />
+                </DataTemplate>
+            </views:NoValueTemplateSelector.DefaultTemplate>
+            <views:NoValueTemplateSelector.CustomTemplate>
+                <DataTemplate x:DataType="x:String">
+                    <TextBlock Text="{x:Bind}" />
+                </DataTemplate>
+            </views:NoValueTemplateSelector.CustomTemplate>
+        </views:NoValueTemplateSelector>
     </Page.Resources>
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <Grid.ColumnDefinitions>
@@ -63,16 +90,13 @@
             Grid.RowSpan="3"
             Grid.Column="0"
             Background="{ThemeResource SystemControlAcrylicWindowBrush}" />
-        <Grid
-            Grid.Row="1"
-            Grid.ColumnSpan="2"
-            Margin="0,0,0,24">
+        <Grid Grid.Row="1" Grid.ColumnSpan="2" Margin="{StaticResource HeaderMargin}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
             <TextBlock
-                Margin="24,10,0,0"
+                Margin="0,10,0,0"
                 VerticalAlignment="Center"
                 FontSize="28"
                 Style="{StaticResource TitleTextBlockStyle}"
@@ -130,7 +154,7 @@
             Grid.Row="2"
             Grid.Column="0"
             VerticalScrollBarVisibility="Auto">
-            <StackPanel>
+            <StackPanel Margin="{StaticResource ItemMargin}">
                 <ListView ItemsSource="{x:Bind ViewModel.ShellProfiles}" SelectedItem="{x:Bind ViewModel.SelectedShellProfile, Mode=TwoWay}">
                     <ListView.ItemTemplate>
                         <DataTemplate x:DataType="viewmodels:ShellProfileViewModel">
@@ -181,23 +205,26 @@
         <ScrollViewer
             Grid.Row="2"
             Grid.Column="1"
-            Margin="24,0,0,0"
             HorizontalAlignment="Stretch"
             VerticalScrollBarVisibility="Auto">
-            <ContentControl HorizontalContentAlignment="Stretch" Content="{x:Bind ViewModel.SelectedShellProfile, Mode=OneWay}">
+            <ContentControl
+                Margin="{StaticResource ContainerMargin}"
+                HorizontalContentAlignment="Stretch"
+                Content="{x:Bind ViewModel.SelectedShellProfile, Mode=OneWay}">
                 <ContentControl.ContentTemplate>
                     <DataTemplate x:DataType="viewmodels:ShellProfileViewModel">
                         <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                            <StackPanel Margin="0,0,24,0" Visibility="{x:Bind InEditMode, Converter={StaticResource TrueToVisibleConverter}, Mode=OneWay}">
+                            <StackPanel Visibility="{x:Bind InEditMode, Converter={StaticResource TrueToVisibleConverter}, Mode=OneWay}">
                                 <TextBox
                                     Width="300"
+                                    Margin="{StaticResource ItemMargin}"
                                     HorizontalAlignment="Left"
                                     Header="Name"
                                     IsEnabled="{x:Bind PreInstalled, Converter={StaticResource NegateConverter}, Mode=OneWay}"
                                     IsSpellCheckEnabled="False"
                                     Text="{x:Bind Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-                                <StackPanel Margin="0,24,0,0" Orientation="Horizontal">
+                                <StackPanel Margin="{StaticResource ItemMargin}" Orientation="Horizontal">
                                     <TextBox
                                         Width="300"
                                         Header="Shell executable location"
@@ -213,7 +240,7 @@
                                         Style="{StaticResource ButtonRevealStyle}" />
                                 </StackPanel>
 
-                                <StackPanel Margin="0,24,0,0" Orientation="Horizontal">
+                                <StackPanel Margin="{StaticResource ItemMargin}" Orientation="Horizontal">
                                     <TextBox
                                         Width="300"
                                         Header="Working directory"
@@ -230,105 +257,121 @@
 
                                 <TextBox
                                     Width="300"
-                                    Margin="0,24,0,0"
+                                    Margin="{StaticResource ItemMargin}"
                                     HorizontalAlignment="Left"
                                     Header="Arguments"
                                     IsEnabled="{x:Bind InEditMode, Mode=OneWay}"
                                     IsSpellCheckEnabled="False"
                                     Text="{x:Bind Arguments, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
                                 <ComboBox
                                     Width="150"
-                                    Margin="0,24,0,0"
+                                    Margin="{StaticResource ItemMargin}"
                                     Header="Tab color"
                                     IsEnabled="{x:Bind InEditMode, Mode=OneWay}"
                                     ItemTemplateSelector="{StaticResource TabThemeTemplateSelector}"
                                     ItemsSource="{x:Bind TabThemes, Mode=OneWay}"
                                     SelectedItem="{Binding SelectedTabTheme, Mode=TwoWay}" />
+
                                 <ComboBox
                                     Width="150"
-                                    Margin="0,24,0,0"
+                                    Margin="{StaticResource ItemMargin}"
                                     Header="Theme"
                                     IsEnabled="{x:Bind InEditMode, Mode=OneWay}"
                                     ItemTemplateSelector="{StaticResource TerminalThemeTemplateSelector}"
                                     ItemsSource="{x:Bind TerminalThemes, Mode=OneWay}"
                                     SelectedItem="{Binding SelectedTerminalTheme, Mode=TwoWay}" />
 
-                                <TextBlock Margin="0,24,0,8" Text="Line ending translation mode on paste" />
-                                <RadioButton
-                                    Content="Do not modify line endings"
-                                    GroupName="LineEndingStyle"
-                                    IsChecked="{x:Bind DoNotModifyIsSelected, Mode=TwoWay}" />
-                                <RadioButton
-                                    Content="Convert line endings to CR+LF"
-                                    GroupName="LineEndingStyle"
-                                    IsChecked="{x:Bind ToCRLFIsSelected, Mode=TwoWay}" />
-                                <RadioButton
-                                    Content="Convert line endings to LF"
-                                    GroupName="LineEndingStyle"
-                                    IsChecked="{x:Bind ToLFIsSelected, Mode=TwoWay}" />
+                                <StackPanel Margin="{StaticResource ItemMargin}">
+                                    <TextBlock Margin="0,0,0,8" Text="Line ending translation mode on paste" />
+                                    <RadioButton
+                                        Content="Do not modify line endings"
+                                        GroupName="LineEndingStyle"
+                                        IsChecked="{x:Bind DoNotModifyIsSelected, Mode=TwoWay}" />
+                                    <RadioButton
+                                        Content="Convert line endings to CR+LF"
+                                        GroupName="LineEndingStyle"
+                                        IsChecked="{x:Bind ToCRLFIsSelected, Mode=TwoWay}" />
+                                    <RadioButton
+                                        Content="Convert line endings to LF"
+                                        GroupName="LineEndingStyle"
+                                        IsChecked="{x:Bind ToLFIsSelected, Mode=TwoWay}" />
+                                </StackPanel>
 
-                                <StackPanel
-                                    Width="300"
-                                    Margin="0,24,0,0"
-                                    HorizontalAlignment="Left"
-                                    Orientation="Horizontal">
+                                <StackPanel Margin="{StaticResource ItemMargin}">
                                     <TextBlock
                                         Margin="0,0,6,0"
                                         VerticalAlignment="Center"
                                         Text="Keyboard shortcut" />
                                     <HyperlinkButton Command="{x:Bind AddKeyboardShortcutCommand}" Content="Add" />
+                                    <views:KeyBindingsView ShowCommandName="False" ViewModel="{x:Bind KeyBindings}" />
                                 </StackPanel>
-                                <views:KeyBindingsView ShowCommandName="False" ViewModel="{x:Bind KeyBindings}" />
                             </StackPanel>
-                            <StackPanel Margin="0,0,24,0" Visibility="{x:Bind InEditMode, Mode=OneWay, Converter={StaticResource FalseToVisibleConverter}}">
-                                <TextBlock Style="{StaticResource SubtitleTextBlockStyle}" Text="{x:Bind Name, Mode=OneWay}" />
+                            <StackPanel Visibility="{x:Bind InEditMode, Mode=OneWay, Converter={StaticResource FalseToVisibleConverter}}">
+                                <TextBlock
+                                    Margin="{StaticResource ItemMargin}"
+                                    Style="{StaticResource SubtitleTextBlockStyle}"
+                                    Text="{x:Bind Name, Mode=OneWay}" />
+
                                 <controls:HeaderedTextBlock
-                                    Margin="0,58,0,0"
+                                    Margin="{StaticResource ItemMargin}"
                                     Header="Shell executable location"
                                     Text="{x:Bind Location, Mode=OneWay}" />
-                                <controls:HeaderedTextBlock
-                                    Margin="0,36,0,0"
-                                    Header="Working directory"
-                                    Text="{x:Bind WorkingDirectory, Mode=OneWay}" />
-                                <controls:HeaderedTextBlock
-                                    Margin="0,36,0,0"
-                                    Header="Arguments"
-                                    Text="{x:Bind Arguments, Mode=OneWay}" />
+
                                 <controls:HeaderedContentControl
-                                    Margin="0,36,0,0"
+                                    Margin="{StaticResource ItemMargin}"
                                     HorizontalContentAlignment="Stretch"
-                                    Header="Theme">
+                                    Header="Working directory">
                                     <ContentControl
-                                        Margin="0,6,0,0"
-                                        Content="{x:Bind SelectedTerminalTheme, Mode=OneWay}"
-                                        ContentTemplateSelector="{StaticResource TerminalThemeTemplateSelector}" />
+                                        Content="{x:Bind WorkingDirectory, Mode=OneWay}"
+                                        ContentTemplateSelector="{StaticResource NoValueTemplateSelector}"
+                                        FontSize="18"
+                                        FontWeight="Light" />
                                 </controls:HeaderedContentControl>
+
                                 <controls:HeaderedContentControl
-                                    Margin="0,36,0,0"
+                                    Margin="{StaticResource ItemMargin}"
+                                    HorizontalContentAlignment="Stretch"
+                                    Header="Arguments">
+                                    <ContentControl
+                                        Content="{x:Bind Arguments, Mode=OneWay}"
+                                        ContentTemplateSelector="{StaticResource NoValueTemplateSelector}"
+                                        FontSize="18"
+                                        FontWeight="Light" />
+                                </controls:HeaderedContentControl>
+
+                                <controls:HeaderedContentControl
+                                    Margin="{StaticResource ItemMargin}"
                                     HorizontalContentAlignment="Stretch"
                                     Header="Tab color">
                                     <ContentControl
                                         Margin="0,6,0,0"
                                         Content="{x:Bind SelectedTabTheme, Mode=OneWay}"
-                                        ContentTemplateSelector="{StaticResource TabThemeTemplateSelector}" />
+                                        ContentTemplateSelector="{StaticResource TabThemeTemplateSelector}"
+                                        FontSize="18"
+                                        FontWeight="Light" />
                                 </controls:HeaderedContentControl>
+
                                 <controls:HeaderedContentControl
-                                    Margin="0,36,0,0"
+                                    Margin="{StaticResource ItemMargin}"
                                     HorizontalContentAlignment="Stretch"
                                     Header="Line ending translation mode">
                                     <ContentControl
-                                        Margin="0,6,0,0"
                                         Content="{x:Bind LineEndingStyle, Mode=OneWay, Converter={StaticResource EnumToDescriptionConverter}}"
-                                        ContentTemplateSelector="{StaticResource TerminalThemeTemplateSelector}" />
+                                        ContentTemplateSelector="{StaticResource TerminalThemeTemplateSelector}"
+                                        FontSize="18"
+                                        FontWeight="Light" />
                                 </controls:HeaderedContentControl>
+
                                 <controls:HeaderedContentControl
-                                    Margin="0,36,0,0"
+                                    Margin="{StaticResource ItemMargin}"
                                     HorizontalContentAlignment="Stretch"
                                     Header="Keyboard shortcut">
-                                    <views:KeyBindingsView
-                                        Margin="0,6,0,0"
-                                        ShowCommandName="False"
-                                        ViewModel="{x:Bind KeyBindings}" />
+                                    <ContentControl
+                                        Content="{x:Bind KeyBindings, Mode=OneWay}"
+                                        ContentTemplateSelector="{StaticResource TerminalKeybindTemplateSelector}"
+                                        FontSize="18"
+                                        FontWeight="Light" />
                                 </controls:HeaderedContentControl>
                             </StackPanel>
                         </Grid>
@@ -337,4 +380,4 @@
             </ContentControl>
         </ScrollViewer>
     </Grid>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/FluentTerminal.App/Views/SettingsPages/TerminalSettings.xaml b/FluentTerminal.App/Views/SettingsPages/TerminalSettings.xaml
index d6cccf7..88423c1 100644
--- a/FluentTerminal.App/Views/SettingsPages/TerminalSettings.xaml
+++ b/FluentTerminal.App/Views/SettingsPages/TerminalSettings.xaml
@@ -15,7 +15,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Grid Grid.Row="1" Margin="24,00,0,24">
+        <Grid Grid.Row="1" Margin="{StaticResource HeaderMargin}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition />
@@ -38,36 +38,40 @@
                     Label="Restore Defaults" />
             </CommandBar>
         </Grid>
-        <ScrollViewer Grid.Row="2" Margin="24,0,0,0">
-            <StackPanel>
+        <ScrollViewer Grid.Row="2">
+            <StackPanel Margin="{StaticResource ContainerMargin}">
                 <ComboBox
                     Width="200"
-                    Margin="0,0,0,24"
+                    Margin="{StaticResource ItemMargin}"
                     Header="Font family"
                     ItemsSource="{x:Bind ViewModel.Fonts}"
                     SelectedValue="{x:Bind ViewModel.FontFamily, Mode=TwoWay}" />
+
                 <ComboBox
                     Width="200"
-                    Margin="0,0,0,24"
+                    Margin="{StaticResource ItemMargin}"
                     Header="Font size"
                     ItemsSource="{x:Bind ViewModel.Sizes}"
                     SelectedValue="{x:Bind ViewModel.FontSize, Mode=TwoWay}" />
+
                 <ToggleSwitch
-                    Margin="0,0,0,24"
+                    Margin="{StaticResource ItemMargin}"
                     Header="Bold text"
                     IsOn="{x:Bind ViewModel.BoldText, Mode=TwoWay}" />
+
                 <Slider
                     Width="200"
-                    Margin="0,0,0,24"
+                    Margin="{StaticResource ItemMargin}"
                     HorizontalAlignment="Left"
                     Header="Background opacity"
                     Maximum="1"
                     Minimum="0"
                     StepFrequency="0.01"
                     Value="{x:Bind ViewModel.BackgroundOpacity, Mode=TwoWay}" />
+
                 <Slider
                     Width="200"
-                    Margin="0,0,0,24"
+                    Margin="{StaticResource ItemMargin}"
                     HorizontalAlignment="Left"
                     Header="Padding"
                     Maximum="64"
@@ -75,45 +79,52 @@
                     StepFrequency="1"
                     ThumbToolTipValueConverter="{StaticResource ToolTipValueToPixelConverter}"
                     Value="{x:Bind ViewModel.Padding, Mode=TwoWay}" />
+
                 <TextBox
                     Width="200"
-                    Margin="0,0,0,24"
+                    Margin="{StaticResource ItemMargin}"
                     HorizontalAlignment="Left"
                     Header="Scrollback limit"
                     KeyDown="ScrollBackTextBoxOnKeyDown"
                     Text="{x:Bind ViewModel.ScrollBackLimit, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
                 <ToggleSwitch
-                    Margin="0,0,0,24"
+                    Margin="{StaticResource ItemMargin}"
                     Header="Blinking cursor"
                     IsOn="{x:Bind ViewModel.CursorBlink, Mode=TwoWay}" />
-                <TextBlock Margin="0,0,0,8" Text="Cursor style" />
-                <RadioButton
-                    Content="Block"
-                    GroupName="Cursor"
-                    IsChecked="{x:Bind ViewModel.BlockIsSelected, Mode=TwoWay}" />
-                <RadioButton
-                    Content="Underline"
-                    GroupName="Cursor"
-                    IsChecked="{x:Bind ViewModel.UnderlineIsSelected, Mode=TwoWay}" />
-                <RadioButton
-                    Content="Bar"
-                    GroupName="Cursor"
-                    IsChecked="{x:Bind ViewModel.BarIsSelected, Mode=TwoWay}" />
 
-                <TextBlock Margin="0,24,0,8" Text="Scrollbar style" />
-                <RadioButton
-                    Content="Hidden"
-                    GroupName="ScrollBar"
-                    IsChecked="{x:Bind ViewModel.HiddenIsSelected, Mode=TwoWay}" />
-                <RadioButton
-                    Content="Auto hiding"
-                    GroupName="ScrollBar"
-                    IsChecked="{x:Bind ViewModel.AutoHidingIsSelected, Mode=TwoWay}" />
-                <RadioButton
-                    Content="Visible"
-                    GroupName="ScrollBar"
-                    IsChecked="{x:Bind ViewModel.VisibleIsSelected, Mode=TwoWay}" />
+                <StackPanel Margin="{StaticResource ItemMargin}">
+                    <TextBlock Margin="0,0,0,8" Text="Cursor style" />
+                    <RadioButton
+                        Content="Block"
+                        GroupName="Cursor"
+                        IsChecked="{x:Bind ViewModel.BlockIsSelected, Mode=TwoWay}" />
+                    <RadioButton
+                        Content="Underline"
+                        GroupName="Cursor"
+                        IsChecked="{x:Bind ViewModel.UnderlineIsSelected, Mode=TwoWay}" />
+                    <RadioButton
+                        Content="Bar"
+                        GroupName="Cursor"
+                        IsChecked="{x:Bind ViewModel.BarIsSelected, Mode=TwoWay}" />
+                </StackPanel>
+
+                <StackPanel Margin="{StaticResource ItemMargin}">
+                    <TextBlock Margin="0,0,0,8" Text="Scrollbar style" />
+                    <RadioButton
+                        Content="Hidden"
+                        GroupName="ScrollBar"
+                        IsChecked="{x:Bind ViewModel.HiddenIsSelected, Mode=TwoWay}" />
+                    <RadioButton
+                        Content="Auto hiding"
+                        GroupName="ScrollBar"
+                        IsChecked="{x:Bind ViewModel.AutoHidingIsSelected, Mode=TwoWay}" />
+                    <RadioButton
+                        Content="Visible"
+                        GroupName="ScrollBar"
+                        IsChecked="{x:Bind ViewModel.VisibleIsSelected, Mode=TwoWay}" />
+                </StackPanel>
             </StackPanel>
         </ScrollViewer>
     </Grid>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/FluentTerminal.App/Views/SettingsPages/ThemeSettings.xaml b/FluentTerminal.App/Views/SettingsPages/ThemeSettings.xaml
index aca6d71..6fdf5f1 100644
--- a/FluentTerminal.App/Views/SettingsPages/ThemeSettings.xaml
+++ b/FluentTerminal.App/Views/SettingsPages/ThemeSettings.xaml
@@ -28,16 +28,13 @@
             Grid.RowSpan="3"
             Grid.Column="0"
             Background="{ThemeResource SystemControlAcrylicWindowBrush}" />
-        <Grid
-            Grid.Row="1"
-            Grid.ColumnSpan="2"
-            Margin="0,0,0,24">
+        <Grid Grid.Row="1" Grid.ColumnSpan="2" Margin="{StaticResource HeaderMargin}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
             <TextBlock
-                Margin="24,10,0,0"
+                Margin="0,10,0,0"
                 VerticalAlignment="Center"
                 FontSize="28"
                 Style="{StaticResource TitleTextBlockStyle}"
@@ -103,7 +100,7 @@
             Grid.Row="2"
             Grid.Column="0"
             VerticalScrollBarVisibility="Auto">
-            <StackPanel>
+            <StackPanel Margin="{StaticResource ItemMargin}">
                 <ListView ItemsSource="{x:Bind ViewModel.Themes}" SelectedItem="{x:Bind ViewModel.SelectedTheme, Mode=TwoWay}">
                     <ListView.ItemTemplate>
                         <DataTemplate x:DataType="viewmodels:ThemeViewModel">
@@ -175,15 +172,16 @@
         <ContentControl
             Grid.Row="2"
             Grid.Column="1"
-            Margin="24,0,0,0"
             HorizontalContentAlignment="Stretch"
             Content="{x:Bind ViewModel.SelectedTheme, Mode=TwoWay}"
             RequestedTheme="{x:Bind ViewModel.SelectedTheme.Background, Mode=OneWay, Converter={StaticResource BackgroundToApplicationThemeConverter}}">
             <ContentControl.ContentTemplate>
                 <DataTemplate x:DataType="viewmodels:ThemeViewModel">
-                    <ScrollViewer Padding="0,0,24,0" VerticalScrollBarVisibility="Auto">
-                        <StackPanel>
+                    <ScrollViewer VerticalScrollBarVisibility="Auto">
+                        <StackPanel Margin="{StaticResource ContainerMargin}">
+                            <!--  VIEW THEME  -->
                             <TextBlock
+                                Margin="{StaticResource ItemMargin}"
                                 Style="{StaticResource SubtitleTextBlockStyle}"
                                 Text="{x:Bind Name, Mode=OneWay}"
                                 Visibility="{x:Bind InEditMode, Mode=OneWay, Converter={StaticResource FalseToVisibleConverter}}">
@@ -191,22 +189,42 @@
                                     <SolidColorBrush Color="{x:Bind Foreground, Mode=OneWay}" />
                                 </TextBlock.Foreground>
                             </TextBlock>
-                            <TextBlock Style="{StaticResource CaptionTextBlockStyle}" Text="{x:Bind Author, Mode=OneWay}" />
+
+                            <TextBlock
+                                Margin="{StaticResource ItemMargin}"
+                                FontSize="14"
+                                Style="{StaticResource SubtitleTextBlockStyle}"
+                                Text="{x:Bind Author, Mode=OneWay}"
+                                Visibility="{x:Bind InEditMode, Mode=OneWay, Converter={StaticResource FalseToVisibleConverter}}">
+                                <TextBlock.Foreground>
+                                    <SolidColorBrush Color="{x:Bind Foreground, Mode=OneWay}" />
+                                </TextBlock.Foreground>
+                            </TextBlock>
+
+                            <!--  EDIT THEME  -->
                             <TextBox
+                                Width="200"
+                                Margin="{StaticResource ItemMargin}"
+                                HorizontalAlignment="Left"
                                 Header="Name"
                                 Text="{x:Bind Name, Mode=TwoWay}"
                                 Visibility="{x:Bind InEditMode, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}" />
+
                             <TextBox
-                                Margin="0,24,0,0"
+                                Width="200"
+                                Margin="{StaticResource ItemMargin}"
+                                HorizontalAlignment="Left"
                                 Header="Author"
                                 Text="{x:Bind Author, Mode=TwoWay}"
                                 Visibility="{x:Bind InEditMode, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}" />
-                            <Grid Margin="0,48,0,0">
+
+                            <Grid Margin="{StaticResource ItemMargin}">
                                 <Grid.RowDefinitions>
                                     <RowDefinition />
                                     <RowDefinition />
                                     <RowDefinition />
                                     <RowDefinition />
+                                    <RowDefinition />
                                 </Grid.RowDefinitions>
                                 <Grid.Resources>
                                     <Style TargetType="Border">
@@ -215,7 +233,16 @@
                                         <Setter Property="Height" Value="24" />
                                     </Style>
                                 </Grid.Resources>
-                                <StackPanel Grid.Row="0" Orientation="Horizontal">
+                                <TextBlock Grid.Row="0" Text="Color palette" />
+                                <TextBlock
+                                    Grid.Row="1"
+                                    Margin="0,0,0,8"
+                                    FontSize="14"
+                                    FontStyle="Italic"
+                                    Foreground="LightGray"
+                                    Text="Click on a color to edit"
+                                    Visibility="{x:Bind InEditMode, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}" />
+                                <StackPanel Grid.Row="2" Orientation="Horizontal">
                                     <views:TerminalColorPicker
                                         ColorName="Black"
                                         EnableEditing="{x:Bind InEditMode, Mode=OneWay}"
@@ -249,7 +276,7 @@
                                         EnableEditing="{x:Bind InEditMode, Mode=OneWay}"
                                         SelectedColor="{x:Bind White, Mode=TwoWay, Converter={StaticResource StringToColorConverter}, ConverterParameter=false}" />
                                 </StackPanel>
-                                <StackPanel Grid.Row="1" Orientation="Horizontal">
+                                <StackPanel Grid.Row="3" Orientation="Horizontal">
                                     <views:TerminalColorPicker
                                         ColorName="Bright Black"
                                         EnableEditing="{x:Bind InEditMode, Mode=OneWay}"
@@ -283,7 +310,7 @@
                                         EnableEditing="{x:Bind InEditMode, Mode=OneWay}"
                                         SelectedColor="{x:Bind BrightWhite, Mode=TwoWay, Converter={StaticResource StringToColorConverter}, ConverterParameter=false}" />
                                 </StackPanel>
-                                <StackPanel Grid.Row="2" Orientation="Horizontal">
+                                <StackPanel Grid.Row="4" Orientation="Horizontal">
                                     <views:TerminalColorPicker
                                         ColorName="Foreground"
                                         EnableEditing="{x:Bind InEditMode, Mode=OneWay}"
@@ -306,11 +333,6 @@
                                         IsAlphaEnabled="True"
                                         SelectedColor="{x:Bind Selection, Mode=TwoWay, Converter={StaticResource StringToColorConverter}, ConverterParameter=true}" />
                                 </StackPanel>
-                                <TextBlock
-                                    Grid.Row="3"
-                                    Margin="0,6,0,0"
-                                    Text="Click on a color to edit"
-                                    Visibility="{x:Bind InEditMode, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}" />
                             </Grid>
                         </StackPanel>
                     </ScrollViewer>
@@ -318,4 +340,4 @@
             </ContentControl.ContentTemplate>
         </ContentControl>
     </Grid>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/FluentTerminal.App/Views/TerminalColorPicker.xaml b/FluentTerminal.App/Views/TerminalColorPicker.xaml
index 3f6a67d..e4925a7 100644
--- a/FluentTerminal.App/Views/TerminalColorPicker.xaml
+++ b/FluentTerminal.App/Views/TerminalColorPicker.xaml
@@ -9,10 +9,10 @@
     mc:Ignorable="d">
     <Button
         x:Name="Root"
+        Background="{x:Bind ButtonBackground, Mode=OneWay}"
         IsEnabled="{x:Bind EnableEditing, Mode=OneWay}"
         Style="{StaticResource ColorPreviewButtonStyle}"
-        ToolTipService.ToolTip="{x:Bind ColorName}"
-        Background="{x:Bind ButtonBackground, Mode=OneWay}">
+        ToolTipService.ToolTip="{x:Bind ColorName}">
         <!--<Button.Background>
             <SolidColorBrush Color="{x:Bind VisibleColor, Mode=OneWay}" />
         </Button.Background>-->
diff --git a/FluentTerminal.App/Views/TerminalKeybindTemplateSelector.cs b/FluentTerminal.App/Views/TerminalKeybindTemplateSelector.cs
new file mode 100644
index 0000000..228ded5
--- /dev/null
+++ b/FluentTerminal.App/Views/TerminalKeybindTemplateSelector.cs
@@ -0,0 +1,26 @@
+using FluentTerminal.App.ViewModels.Settings;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace FluentTerminal.App.Views
+{
+    public class TerminalKeybindTemplateSelector : DataTemplateSelector
+    {
+        public DataTemplate DefaultTemplate { get; set; }
+        public DataTemplate KeyBindingsTemplate { get; set; }
+
+        protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
+        {
+            return SelectTemplateCore(item);
+        }
+
+        protected override DataTemplate SelectTemplateCore(object item)
+        {
+            if (item is KeyBindingsViewModel keyBindings)
+            {
+                return keyBindings.KeyBindings.Count == 0 ? DefaultTemplate : KeyBindingsTemplate;
+            }
+            return null;
+        }
+    }
+}
diff --git a/FluentTerminal.Models/KeyBinding.cs b/FluentTerminal.Models/KeyBinding.cs
index a976fd2..1ebccf3 100644
--- a/FluentTerminal.Models/KeyBinding.cs
+++ b/FluentTerminal.Models/KeyBinding.cs
@@ -23,5 +23,19 @@
         public bool Alt { get; set; }
         public bool Shift { get; set; }
         public bool Meta { get; set; }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is KeyBinding other)
+            {
+                return other.Command.Equals(Command)
+                    && other.Key == Key
+                    && other.Ctrl == Ctrl
+                    && other.Alt == Alt
+                    && other.Shift == Shift
+                    && other.Meta == Meta;
+            }
+            return false;
+        }
     }
 }
\ No newline at end of file
diff --git a/FluentTerminal.Models/ShellProfile.cs b/FluentTerminal.Models/ShellProfile.cs
index bd65951..ea41f30 100644
--- a/FluentTerminal.Models/ShellProfile.cs
+++ b/FluentTerminal.Models/ShellProfile.cs
@@ -57,5 +57,23 @@ namespace FluentTerminal.Models
 
         public Guid TerminalThemeId { get; set; }
         public ICollection<KeyBinding> KeyBindings { get; set; } = new List<KeyBinding>();
+
+        public override bool Equals(object obj)
+        {
+            if (obj is ShellProfile other)
+            {
+                return other.Id.Equals(Id)
+                    && other.PreInstalled.Equals(PreInstalled)
+                    && other.Name.Equals(Name)
+                    && other.Arguments.Equals(Arguments)
+                    && other.Location.Equals(Location)
+                    && other.WorkingDirectory.Equals(WorkingDirectory)
+                    && other.TabThemeId.Equals(TabThemeId)
+                    && other.TerminalThemeId.Equals(TerminalThemeId)
+                    && other.LineEndingTranslation == LineEndingTranslation
+                    && other.KeyBindings.SequenceEqual(KeyBindings);
+            }
+            return false;
+        }
     }
 }
\ No newline at end of file
diff --git a/FluentTerminal.Models/TerminalColors.cs b/FluentTerminal.Models/TerminalColors.cs
index 03aaa05..7a5d869 100644
--- a/FluentTerminal.Models/TerminalColors.cs
+++ b/FluentTerminal.Models/TerminalColors.cs
@@ -56,5 +56,34 @@
             BrightCyan = other.BrightCyan;
             BrightWhite = other.BrightWhite;
         }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is TerminalColors other)
+            {
+                return other.Foreground.Equals(Foreground)
+                    && other.Background.Equals(Background)
+                    && other.Cursor.Equals(Cursor)
+                    && other.CursorAccent.Equals(CursorAccent)
+                    && other.Selection.Equals(Selection)
+                    && other.Black.Equals(Black)
+                    && other.Red.Equals(Red)
+                    && other.Green.Equals(Green)
+                    && other.Yellow.Equals(Yellow)
+                    && other.Blue.Equals(Blue)
+                    && other.Magenta.Equals(Magenta)
+                    && other.Cyan.Equals(Cyan)
+                    && other.White.Equals(White)
+                    && other.BrightBlack.Equals(BrightBlack)
+                    && other.BrightRed.Equals(BrightRed)
+                    && other.BrightGreen.Equals(BrightGreen)
+                    && other.BrightYellow.Equals(BrightYellow)
+                    && other.BrightBlue.Equals(BrightBlue)
+                    && other.BrightMagenta.Equals(BrightMagenta)
+                    && other.BrightCyan.Equals(BrightCyan)
+                    && other.BrightWhite.Equals(BrightWhite);
+            }
+            return false;
+        }
     }
 }
\ No newline at end of file
diff --git a/FluentTerminal.Models/TerminalTheme.cs b/FluentTerminal.Models/TerminalTheme.cs
index 1b8f612..079f5e9 100644
--- a/FluentTerminal.Models/TerminalTheme.cs
+++ b/FluentTerminal.Models/TerminalTheme.cs
@@ -22,5 +22,16 @@ namespace FluentTerminal.Models
         public string Author { get; set; }
         public bool PreInstalled { get; set; }
         public TerminalColors Colors { get; set; }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is TerminalTheme other)
+            {
+                return other.Name.Equals(Name)
+                    && other.Author == null ? Author == null : other.Author.Equals(Author)
+                    && other.Colors.Equals(Colors);
+            }
+            return false;
+        }
     }
 }
\ No newline at end of file