From 8cbbd7a9ee99b51b46a43ab37e12a677f83dc93d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=E2=96=88=E2=96=88=E2=96=88=E2=96=88=E2=96=88?=
 <dev.nullinside@gmail.com>
Date: Tue, 30 Sep 2025 14:32:29 -0400
Subject: [PATCH 1/3] chore: formatting of text

Right-aligning some text to remain consistent
---
 .../Views/Pages/SettingsView/TtsPhoneticWordsControl.axaml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Nullinside.TwitchStreamingTools/Views/Pages/SettingsView/TtsPhoneticWordsControl.axaml b/src/Nullinside.TwitchStreamingTools/Views/Pages/SettingsView/TtsPhoneticWordsControl.axaml
index d65e948..b0bde8a 100644
--- a/src/Nullinside.TwitchStreamingTools/Views/Pages/SettingsView/TtsPhoneticWordsControl.axaml
+++ b/src/Nullinside.TwitchStreamingTools/Views/Pages/SettingsView/TtsPhoneticWordsControl.axaml
@@ -30,9 +30,9 @@
             </Grid.ColumnDefinitions>
 
 
-            <Label Grid.Row="0" Grid.Column="0" VerticalAlignment="Center">Word:</Label>
+            <Label Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right">Word:</Label>
             <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding UserEnteredWord}" />
-            <Label Grid.Row="1" Grid.Column="0" VerticalAlignment="Center">Phonetic:</Label>
+            <Label Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right">Phonetic:</Label>
             <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding UserEnteredPhonetic}" />
             <StackPanel Grid.Row="2" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Right"
                         Grid.ColumnSpan="2">

From fe4435be6aa188df45334b5ace763b4ee21fa0bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=E2=96=88=E2=96=88=E2=96=88=E2=96=88=E2=96=88?=
 <dev.nullinside@gmail.com>
Date: Tue, 30 Sep 2025 15:43:21 -0400
Subject: [PATCH 2/3] chore: [ObservableProperty]

---
 .../Controls/Keybind.axaml                    |   6 +-
 .../Controls/ViewModels/KeybindViewModel.cs   |  25 +---
 .../Controls/ViewModels/TwoListViewModel.cs   | 102 +++------------
 .../Models/PhoneticWord.cs                    |  32 ++---
 .../Nullinside.TwitchStreamingTools.csproj    |   3 +-
 .../ViewModels/MainWindowViewModel.cs         |  44 +------
 .../ViewModels/NewVersionWindowViewModel.cs   |  24 +---
 .../ViewModels/Pages/AccountViewModel.cs      |  54 ++------
 .../ViewModels/Pages/ChatViewModel.cs         |  60 ++-------
 .../Pages/SettingsView/SettingsViewModel.cs   | 121 +++++-------------
 .../SettingsView/TtsPhoneticWordsViewModel.cs |  47 ++-----
 .../SettingsView/TtsSkipUsernamesViewModel.cs |  26 +---
 .../ViewModels/ViewModelBase.cs               |   4 +-
 .../Views/Pages/ChatView.axaml                |   2 +-
 14 files changed, 123 insertions(+), 427 deletions(-)

diff --git a/src/Nullinside.TwitchStreamingTools/Controls/Keybind.axaml b/src/Nullinside.TwitchStreamingTools/Controls/Keybind.axaml
index b5359e0..97d2c73 100644
--- a/src/Nullinside.TwitchStreamingTools/Controls/Keybind.axaml
+++ b/src/Nullinside.TwitchStreamingTools/Controls/Keybind.axaml
@@ -8,13 +8,13 @@
              x:Class="Nullinside.TwitchStreamingTools.Controls.Keybind"
              x:DataType="viewModels:KeybindViewModel">
     <StackPanel>
-        <Button IsVisible="{Binding !Listening}" 
+        <Button IsVisible="{Binding !Listening}"
                 Content="{Binding Keybind, TargetNullValue='[None]'}"
-                Command="{Binding ListenForKeystroke}" 
+                Command="{Binding ListenForKeystroke}"
                 ToolTip.Tip="ESC to unset" />
         <StackPanel IsVisible="{Binding Listening}"
                     Orientation="Horizontal">
-            <controls:Loading Width="25" 
+            <controls:Loading Width="25"
                               Height="25" />
             <Label>Press a key...</Label>
         </StackPanel>
diff --git a/src/Nullinside.TwitchStreamingTools/Controls/ViewModels/KeybindViewModel.cs b/src/Nullinside.TwitchStreamingTools/Controls/ViewModels/KeybindViewModel.cs
index 2796cec..d4281fe 100644
--- a/src/Nullinside.TwitchStreamingTools/Controls/ViewModels/KeybindViewModel.cs
+++ b/src/Nullinside.TwitchStreamingTools/Controls/ViewModels/KeybindViewModel.cs
@@ -1,8 +1,9 @@
 using System.Reactive;
 
+using CommunityToolkit.Mvvm.ComponentModel;
+
 using Nullinside.TwitchStreamingTools.Models;
 using Nullinside.TwitchStreamingTools.Services;
-using Nullinside.TwitchStreamingTools.ViewModels;
 
 using ReactiveUI;
 
@@ -11,7 +12,7 @@ namespace Nullinside.TwitchStreamingTools.Controls.ViewModels;
 /// <summary>
 ///   Handles storing information required to visualize a keybind.
 /// </summary>
-public class KeybindViewModel : ViewModelBase {
+public partial class KeybindViewModel : ObservableObject {
   /// <summary>
   ///   The listener for keystrokes on the keyboard.
   /// </summary>
@@ -20,12 +21,12 @@ public class KeybindViewModel : ViewModelBase {
   /// <summary>
   ///   The keybind, if set.
   /// </summary>
-  private Keybind? _keybind;
+  [ObservableProperty] private Keybind? _keybind;
 
   /// <summary>
   ///   True if listening for keystrokes, false otherwise.
   /// </summary>
-  private bool _listening;
+  [ObservableProperty] private bool _listening;
 
   /// <summary>
   ///   Initializes a new instance of the <see cref="KeybindViewModel" /> class.
@@ -36,22 +37,6 @@ public KeybindViewModel(IGlobalKeyPressService service) {
     ListenForKeystroke = ReactiveCommand.Create(StartListenKeystroke);
   }
 
-  /// <summary>
-  ///   The keybind.
-  /// </summary>
-  public Keybind? Keybind {
-    get => _keybind;
-    set => this.RaiseAndSetIfChanged(ref _keybind, value);
-  }
-
-  /// <summary>
-  ///   True if listening for keystrokes, false otherwise.
-  /// </summary>
-  public bool Listening {
-    get => _listening;
-    set => this.RaiseAndSetIfChanged(ref _listening, value);
-  }
-
   /// <summary>
   ///   Listens for keystrokes.
   /// </summary>
diff --git a/src/Nullinside.TwitchStreamingTools/Controls/ViewModels/TwoListViewModel.cs b/src/Nullinside.TwitchStreamingTools/Controls/ViewModels/TwoListViewModel.cs
index 1ba310f..caee3c0 100644
--- a/src/Nullinside.TwitchStreamingTools/Controls/ViewModels/TwoListViewModel.cs
+++ b/src/Nullinside.TwitchStreamingTools/Controls/ViewModels/TwoListViewModel.cs
@@ -1,16 +1,16 @@
 using System;
 using System.Collections.ObjectModel;
 
-using Nullinside.TwitchStreamingTools.ViewModels;
+using CommunityToolkit.Mvvm.ComponentModel;
 
-using ReactiveUI;
+using Nullinside.TwitchStreamingTools.ViewModels;
 
 namespace Nullinside.TwitchStreamingTools.Controls.ViewModels;
 
 /// <summary>
 ///   Handles maintaining two lists and moving items between them.
 /// </summary>
-public class TwoListViewModel : ViewModelBase {
+public partial class TwoListViewModel : ViewModelBase {
   /// <summary>
   ///   The behavior to maintain when double clicking
   /// </summary>
@@ -26,44 +26,50 @@ public enum DoubleClickBehavior {
     DELETE_FROM_LIST
   }
 
-  private string? _leftHeader;
+  /// <summary>
+  ///   The header on the left list.
+  /// </summary>
+  [ObservableProperty] private string? _leftHeader;
 
   /// <summary>
   ///   The collection of items in the left list.
   /// </summary>
-  private ObservableCollection<string> _leftList;
+  [ObservableProperty] private ObservableCollection<string> _leftList;
 
   /// <summary>
   ///   The method to call when an item in the left list is double clicked.
   /// </summary>
-  private Action<string?>? _onLeftDoubleClick;
+  [ObservableProperty] private Action<string?>? _onLeftDoubleClick;
 
   /// <summary>
   ///   The method to call when an item in the right list is double clicked.
   /// </summary>
-  private Action<string?>? _onRightDoubleClick;
+  [ObservableProperty] private Action<string?>? _onRightDoubleClick;
 
-  private string? _rightHeader;
+  /// <summary>
+  ///   The header on the right list.
+  /// </summary>
+  [ObservableProperty] private string? _rightHeader;
 
   /// <summary>
   ///   The collection of items in the right list.
   /// </summary>
-  private ObservableCollection<string> _rightList;
+  [ObservableProperty] private ObservableCollection<string> _rightList;
 
   /// <summary>
   ///   The behavior of how to handle double clicking on items in the right list.
   /// </summary>
-  private DoubleClickBehavior _rightListBehavior;
+  [ObservableProperty] private DoubleClickBehavior _rightListBehavior;
 
   /// <summary>
   ///   A value indicating whether the left list should be sorted.
   /// </summary>
-  private bool _sortLeftList;
+  [ObservableProperty] private bool _sortLeftList;
 
   /// <summary>
   ///   A value indicating whether the right list should be sorted.
   /// </summary>
-  private bool _sortRightList;
+  [ObservableProperty] private bool _sortRightList;
 
   /// <summary>
   ///   Initializes a new instance of the <see cref="TwoListViewModel" /> class.
@@ -75,78 +81,6 @@ public TwoListViewModel() {
     OnRightDoubleClick += OnRightDoubleClicked;
   }
 
-  /// <summary>
-  ///   Gets or sets the collection of items in the left list.
-  /// </summary>
-  public ObservableCollection<string> LeftList {
-    get => _leftList;
-    set => this.RaiseAndSetIfChanged(ref _leftList, value);
-  }
-
-  /// <summary>
-  ///   Gets or sets the collection of items in the right list.
-  /// </summary>
-  public Action<string?>? OnLeftDoubleClick {
-    get => _onLeftDoubleClick;
-    set => this.RaiseAndSetIfChanged(ref _onLeftDoubleClick, value);
-  }
-
-  /// <summary>
-  ///   Gets or sets the method to call when an item in the left list is double clicked.
-  /// </summary>
-  public Action<string?>? OnRightDoubleClick {
-    get => _onRightDoubleClick;
-    set => this.RaiseAndSetIfChanged(ref _onRightDoubleClick, value);
-  }
-
-  /// <summary>
-  ///   Gets or sets the method to call when an item in the right list is double clicked.
-  /// </summary>
-  public ObservableCollection<string> RightList {
-    get => _rightList;
-    set => this.RaiseAndSetIfChanged(ref _rightList, value);
-  }
-
-  /// <summary>
-  ///   Gets or sets the behavior of how to handle double clicking on items in the right list.
-  /// </summary>
-  public DoubleClickBehavior RightListBehavior {
-    get => _rightListBehavior;
-    set => this.RaiseAndSetIfChanged(ref _rightListBehavior, value);
-  }
-
-  /// <summary>
-  ///   Gets or sets a value indicating whether the left list should be sorted.
-  /// </summary>
-  public bool SortLeftList {
-    get => _sortLeftList;
-    set => this.RaiseAndSetIfChanged(ref _sortLeftList, value);
-  }
-
-  /// <summary>
-  ///   Gets or sets a value indicating whether the right list should be sorted.
-  /// </summary>
-  public bool SortRightList {
-    get => _sortRightList;
-    set => this.RaiseAndSetIfChanged(ref _sortRightList, value);
-  }
-
-  /// <summary>
-  ///   The left header.
-  /// </summary>
-  public string? LeftHeader {
-    get => _leftHeader;
-    set => this.RaiseAndSetIfChanged(ref _leftHeader, value);
-  }
-
-  /// <summary>
-  ///   The right header.
-  /// </summary>
-  public string? RightHeader {
-    get => _rightHeader;
-    set => this.RaiseAndSetIfChanged(ref _rightHeader, value);
-  }
-
   /// <summary>
   ///   Adds an item to the left list.
   /// </summary>
diff --git a/src/Nullinside.TwitchStreamingTools/Models/PhoneticWord.cs b/src/Nullinside.TwitchStreamingTools/Models/PhoneticWord.cs
index bdaec62..0587460 100644
--- a/src/Nullinside.TwitchStreamingTools/Models/PhoneticWord.cs
+++ b/src/Nullinside.TwitchStreamingTools/Models/PhoneticWord.cs
@@ -1,14 +1,14 @@
-using Nullinside.TwitchStreamingTools.ViewModels;
-using Nullinside.TwitchStreamingTools.ViewModels.Pages.SettingsView;
+using CommunityToolkit.Mvvm.ComponentModel;
 
-using ReactiveUI;
+using Nullinside.TwitchStreamingTools.ViewModels;
+using Nullinside.TwitchStreamingTools.ViewModels.Pages.SettingsView;
 
 namespace Nullinside.TwitchStreamingTools.Models;
 
 /// <summary>
 ///   A representation of a word that needs to be pronounced phonetically.
 /// </summary>
-public class PhoneticWord : ViewModelBase {
+public partial class PhoneticWord : ViewModelBase {
   /// <summary>
   ///   The view model that owns this object.
   /// </summary>
@@ -17,12 +17,12 @@ public class PhoneticWord : ViewModelBase {
   /// <summary>
   ///   The phonetic pronunciation of the word.
   /// </summary>
-  private string _phonetic;
+  [ObservableProperty] private string _phonetic;
 
   /// <summary>
   ///   The word to pronounce phonetically.
   /// </summary>
-  private string _word;
+  [ObservableProperty] private string _word;
 
   /// <summary>
   ///   Initializes a new instance of the <see cref="PhoneticWord" /> class.
@@ -36,33 +36,17 @@ public PhoneticWord(TtsPhoneticWordsViewModel viewModel, string word, string pho
     _phonetic = phonetic;
   }
 
-  /// <summary>
-  ///   Gets or sets the phonetic pronunciation of the word.
-  /// </summary>
-  public string Phonetic {
-    get => _phonetic;
-    set => this.RaiseAndSetIfChanged(ref _phonetic, value);
-  }
-
-  /// <summary>
-  ///   Gets or sets the word to pronounce phonetically.
-  /// </summary>
-  public string Word {
-    get => _word;
-    set => this.RaiseAndSetIfChanged(ref _word, value);
-  }
-
   /// <summary>
   ///   Deletes this word from the list.
   /// </summary>
   public void DeletePhonetic() {
-    _viewModel.DeletePhonetic(_word);
+    _viewModel.DeletePhonetic(Word);
   }
 
   /// <summary>
   ///   Edits this word in the list.
   /// </summary>
   public void EditPhonetic() {
-    _viewModel.EditPhonetic(_word);
+    _viewModel.EditPhonetic(Word);
   }
 }
\ No newline at end of file
diff --git a/src/Nullinside.TwitchStreamingTools/Nullinside.TwitchStreamingTools.csproj b/src/Nullinside.TwitchStreamingTools/Nullinside.TwitchStreamingTools.csproj
index ed2bb2a..df6b169 100644
--- a/src/Nullinside.TwitchStreamingTools/Nullinside.TwitchStreamingTools.csproj
+++ b/src/Nullinside.TwitchStreamingTools/Nullinside.TwitchStreamingTools.csproj
@@ -60,6 +60,7 @@
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.6"/>
         <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.6"/>
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
         <PackageReference Include="DynamicData" Version="9.4.1"/>
         <PackageReference Include="log4net" Version="3.2.0"/>
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9"/>
@@ -67,8 +68,6 @@
         <PackageReference Include="NAudio.WinMM" Version="2.2.1"/>
         <PackageReference Include="PInvoke.User32" Version="0.7.124"/>
         <PackageReference Include="System.Speech" Version="9.0.9"/>
-        <PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.6.4"/>
-        <PackageReference Include="Xaml.Behaviors.Interactivity" Version="11.3.6.4"/>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Nullinside.TwitchStreamingTools/ViewModels/MainWindowViewModel.cs b/src/Nullinside.TwitchStreamingTools/ViewModels/MainWindowViewModel.cs
index 9843b62..0a4a475 100644
--- a/src/Nullinside.TwitchStreamingTools/ViewModels/MainWindowViewModel.cs
+++ b/src/Nullinside.TwitchStreamingTools/ViewModels/MainWindowViewModel.cs
@@ -4,6 +4,8 @@
 using System.Linq;
 using System.Reactive;
 
+using CommunityToolkit.Mvvm.ComponentModel;
+
 using DynamicData;
 
 using Microsoft.Extensions.DependencyInjection;
@@ -19,7 +21,7 @@ namespace Nullinside.TwitchStreamingTools.ViewModels;
 /// <summary>
 ///   The view model for the main UI.
 /// </summary>
-public class MainWindowViewModel : ViewModelBase {
+public partial class MainWindowViewModel : ViewModelBase {
   /// <summary>
   ///   The dependency injection service provider.
   /// </summary>
@@ -28,22 +30,22 @@ public class MainWindowViewModel : ViewModelBase {
   /// <summary>
   ///   A flag indicating whether the menu is open.
   /// </summary>
-  private bool _isMenuOpen = true;
+  [ObservableProperty] private bool _isMenuOpen = true;
 
   /// <summary>
   ///   True if the application is updating, false otherwise.
   /// </summary>
-  private bool _isUpdating;
+  [ObservableProperty] private bool _isUpdating;
 
   /// <summary>
   ///   The open page.
   /// </summary>
-  private ViewModelBase _page;
+  [ObservableProperty] private ViewModelBase _page;
 
   /// <summary>
   ///   The currently selected page.
   /// </summary>
-  private MenuItem _selectedMenuItem;
+  [ObservableProperty] private MenuItem _selectedMenuItem;
 
   /// <summary>
   ///   Initializes a new instance of the <see cref="MainWindowViewModel" /> class.
@@ -77,43 +79,11 @@ public MainWindowViewModel(IServiceProvider provider) {
   /// </summary>
   public ObservableCollection<MenuItem> MenuItems { get; set; }
 
-  /// <summary>
-  ///   A flag indicating whether the menu is open.
-  /// </summary>
-  public bool IsMenuOpen {
-    get => _isMenuOpen;
-    set => this.RaiseAndSetIfChanged(ref _isMenuOpen, value);
-  }
-
   /// <summary>
   ///   Called when toggling the menu open and close.
   /// </summary>
   public ReactiveCommand<Unit, bool> OnToggleMenu { get; }
 
-  /// <summary>
-  ///   The open page.
-  /// </summary>
-  public ViewModelBase Page {
-    get => _page;
-    set => this.RaiseAndSetIfChanged(ref _page, value);
-  }
-
-  /// <summary>
-  ///   The currently selected page.
-  /// </summary>
-  public MenuItem SelectedMenuItem {
-    get => _selectedMenuItem;
-    set => this.RaiseAndSetIfChanged(ref _selectedMenuItem, value);
-  }
-
-  /// <summary>
-  ///   True if the application is updating, false otherwise.
-  /// </summary>
-  public bool IsUpdating {
-    get => _isUpdating;
-    set => this.RaiseAndSetIfChanged(ref _isUpdating, value);
-  }
-
   /// <summary>
   ///   Initializes the menu items.
   /// </summary>
diff --git a/src/Nullinside.TwitchStreamingTools/ViewModels/NewVersionWindowViewModel.cs b/src/Nullinside.TwitchStreamingTools/ViewModels/NewVersionWindowViewModel.cs
index 0e6d839..bb9e5b6 100644
--- a/src/Nullinside.TwitchStreamingTools/ViewModels/NewVersionWindowViewModel.cs
+++ b/src/Nullinside.TwitchStreamingTools/ViewModels/NewVersionWindowViewModel.cs
@@ -5,6 +5,8 @@
 using Avalonia.Controls;
 using Avalonia.Threading;
 
+using CommunityToolkit.Mvvm.ComponentModel;
+
 using Nullinside.Api.Common.Desktop;
 using Nullinside.TwitchStreamingTools.Views;
 
@@ -15,11 +17,11 @@ namespace Nullinside.TwitchStreamingTools.ViewModels;
 /// <summary>
 ///   The view model for the <seealso cref="NewVersionWindow" /> class.
 /// </summary>
-public class NewVersionWindowViewModel : ViewModelBase {
+public partial class NewVersionWindowViewModel : ViewModelBase {
   /// <summary>
   ///   True if updating the application currently, false otherwise.
   /// </summary>
-  private bool _isUpdating;
+  [ObservableProperty] private bool _isUpdating;
 
   /// <summary>
   ///   The local version of the software.
@@ -34,7 +36,7 @@ public class NewVersionWindowViewModel : ViewModelBase {
   /// <summary>
   ///   The version of the application on the GitHub server.
   /// </summary>
-  private string? _serverVersion;
+  [ObservableProperty] private string? _serverVersion;
 
   /// <summary>
   ///   Initializes a new instance of the <see cref="NewVersionWindowViewModel" /> class.
@@ -65,22 +67,6 @@ public string? LocalVersion {
     set => _localVersion = value;
   }
 
-  /// <summary>
-  ///   The version of the software on the GitHub server.
-  /// </summary>
-  public string? ServerVersion {
-    get => _serverVersion;
-    set => this.RaiseAndSetIfChanged(ref _serverVersion, value);
-  }
-
-  /// <summary>
-  ///   True if updating the application currently, false otherwise.
-  /// </summary>
-  public bool IsUpdating {
-    get => _isUpdating;
-    set => this.RaiseAndSetIfChanged(ref _isUpdating, value);
-  }
-
   /// <summary>
   ///   A command to update the software.
   /// </summary>
diff --git a/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/AccountViewModel.cs b/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/AccountViewModel.cs
index 5e559d9..e9ec468 100644
--- a/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/AccountViewModel.cs
+++ b/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/AccountViewModel.cs
@@ -9,6 +9,8 @@
 
 using Avalonia.Media.Imaging;
 
+using CommunityToolkit.Mvvm.ComponentModel;
+
 using log4net;
 
 using Newtonsoft.Json;
@@ -28,7 +30,7 @@ namespace Nullinside.TwitchStreamingTools.ViewModels.Pages;
 /// <summary>
 ///   Handles binding your account to the application.
 /// </summary>
-public class AccountViewModel : PageViewModelBase, IDisposable {
+public partial class AccountViewModel : PageViewModelBase, IDisposable {
   /// <summary>
   ///   The path to the folder containing cached profile images.
   /// </summary>
@@ -58,27 +60,27 @@ public class AccountViewModel : PageViewModelBase, IDisposable {
   /// <summary>
   ///   True if currently downloading the logged in user's profile photo, false otherwise.
   /// </summary>
-  private bool _downloadingProfileImage;
+  [ObservableProperty] private bool _downloadingProfileImage;
 
   /// <summary>
   ///   True if we have a valid OAuth token, false otherwise.
   /// </summary>
-  private bool _hasValidOAuthToken;
+  [ObservableProperty] private bool _hasValidOAuthToken;
 
   /// <summary>
   ///   True if currently in the logging in process, false otherwise.
   /// </summary>
-  private bool _loggingIn;
+  [ObservableProperty] private bool _loggingIn;
 
   /// <summary>
   ///   The profile image of the logged in user.
   /// </summary>
-  private Bitmap? _profileImage;
+  [ObservableProperty] private Bitmap? _profileImage;
 
   /// <summary>
   ///   The authenticated user's twitch username.
   /// </summary>
-  private string? _twitchUsername;
+  [ObservableProperty] private string? _twitchUsername;
 
   /// <summary>
   ///   Initializes a new instance of the <see cref="AccountViewModel" /> class.
@@ -98,14 +100,6 @@ public AccountViewModel(ITwitchAccountService twitchAccountService, IConfigurati
     TwitchUsername = _twitchAccountService.TwitchUsername;
   }
 
-  /// <summary>
-  ///   The profile image of the logged in user.
-  /// </summary>
-  public Bitmap? ProfileImage {
-    get => _profileImage;
-    set => this.RaiseAndSetIfChanged(ref _profileImage, value);
-  }
-
   /// <inheritdoc />
   public override string IconResourceKey { get; } = "InprivateAccountRegular";
 
@@ -119,38 +113,6 @@ public Bitmap? ProfileImage {
   /// </summary>
   public ReactiveCommand<Unit, Unit> OnLogout { get; }
 
-  /// <summary>
-  ///   True if currently in the logging in process, false otherwise.
-  /// </summary>
-  public bool LoggingIn {
-    get => _loggingIn;
-    set => this.RaiseAndSetIfChanged(ref _loggingIn, value);
-  }
-
-  /// <summary>
-  ///   True if currently downloading the logged in user's profile photo, false otherwise.
-  /// </summary>
-  public bool DownloadingProfileImage {
-    get => _downloadingProfileImage;
-    set => this.RaiseAndSetIfChanged(ref _downloadingProfileImage, value);
-  }
-
-  /// <summary>
-  ///   True if we have a valid OAuth token, false otherwise.
-  /// </summary>
-  public bool HasValidOAuthToken {
-    get => _hasValidOAuthToken;
-    set => this.RaiseAndSetIfChanged(ref _hasValidOAuthToken, value);
-  }
-
-  /// <summary>
-  ///   The authenticated user's twitch username.
-  /// </summary>
-  public string? TwitchUsername {
-    get => _twitchUsername;
-    set => this.RaiseAndSetIfChanged(ref _twitchUsername, value);
-  }
-
   /// <summary>
   ///   The application version number.
   /// </summary>
diff --git a/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/ChatViewModel.cs b/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/ChatViewModel.cs
index df2b8a2..c080a3b 100644
--- a/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/ChatViewModel.cs
+++ b/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/ChatViewModel.cs
@@ -10,6 +10,8 @@
 using Avalonia.Controls;
 using Avalonia.Media;
 
+using CommunityToolkit.Mvvm.ComponentModel;
+
 using Nullinside.Api.Common.Twitch;
 using Nullinside.TwitchStreamingTools.Models;
 using Nullinside.TwitchStreamingTools.Utilities;
@@ -23,7 +25,7 @@ namespace Nullinside.TwitchStreamingTools.ViewModels.Pages;
 /// <summary>
 ///   Handles settings up and viewing chat.
 /// </summary>
-public class ChatViewModel : PageViewModelBase, IDisposable {
+public partial class ChatViewModel : PageViewModelBase, IDisposable {
   /// <summary>
   ///   The application configuration;
   /// </summary>
@@ -42,22 +44,22 @@ public class ChatViewModel : PageViewModelBase, IDisposable {
   /// <summary>
   ///   The list of chat names selected in the list.
   /// </summary>
-  private ObservableCollection<string> _selectedTwitchChatNames = [];
+  [ObservableProperty] private ObservableCollection<string> _selectedTwitchChatNames = [];
 
   /// <summary>
   ///   The current position of the cursor for the text box showing our chat logs, increment to move down.
   /// </summary>
-  private int _textBoxCursorPosition;
+  [ObservableProperty] private int _textBoxCursorPosition;
 
   /// <summary>
   ///   The current twitch chat.
   /// </summary>
-  private string? _twitchChat = string.Empty;
+  [ObservableProperty] private string? _twitchChat = string.Empty;
 
   /// <summary>
   ///   The current twitch chat name entered by the user.
   /// </summary>
-  private string? _twitchChatName;
+  [ObservableProperty] private string? _twitchChatName;
 
   /// <summary>
   ///   Initializes a new instance of the <see cref="ChatViewModel" /> class.
@@ -95,38 +97,6 @@ public ChatViewModel(ITwitchClientProxy twitchClient, IConfiguration configurati
   /// </summary>
   public ReactiveCommand<string, Unit> OnRemoveChat { get; }
 
-  /// <summary>
-  ///   The current twitch chat name entered by the user.
-  /// </summary>
-  public string? TwitchChatName {
-    get => _twitchChatName;
-    set => this.RaiseAndSetIfChanged(ref _twitchChatName, value);
-  }
-
-  /// <summary>
-  ///   The current twitch chat.
-  /// </summary>
-  public string? TwitchChat {
-    get => _twitchChat;
-    set => this.RaiseAndSetIfChanged(ref _twitchChat, value);
-  }
-
-  /// <summary>
-  ///   The list of chat names selected in the list.
-  /// </summary>
-  public ObservableCollection<string> ChatItems {
-    get => _selectedTwitchChatNames;
-    set => this.RaiseAndSetIfChanged(ref _selectedTwitchChatNames, value);
-  }
-
-  /// <summary>
-  ///   The current position of the cursor for the text box showing our chat logs, increment to move down.
-  /// </summary>
-  public int TextBoxCursorPosition {
-    get => _textBoxCursorPosition;
-    set => this.RaiseAndSetIfChanged(ref _textBoxCursorPosition, value);
-  }
-
   /// <inheritdoc />
   public void Dispose() {
     foreach (TwitchChatConfiguration channel in _configuration.TwitchChats ?? []) {
@@ -147,12 +117,11 @@ public void Dispose() {
   private void OnAddChatCommand() {
     // Ensure we have a username
     string? username = TwitchChatName?.Trim();
-    if (string.IsNullOrWhiteSpace(username) || _selectedTwitchChatNames.Contains(username)) {
+    if (string.IsNullOrWhiteSpace(username) || SelectedTwitchChatNames.Contains(username)) {
       return;
     }
 
-    // Add it to the list.
-    _selectedTwitchChatNames.Add(username);
+    SelectedTwitchChatNames.Add(username);
 
     // Add the callback, we don't need to wait for it to return it can run in the background.
     _ = _twitchClient.AddMessageCallback(username, OnChatMessage);
@@ -162,7 +131,7 @@ private void OnAddChatCommand() {
 
     // Update and write the configuration
     _configuration.TwitchChats = (
-      from user in _selectedTwitchChatNames
+      from user in SelectedTwitchChatNames
       select new TwitchChatConfiguration {
         TwitchChannel = user,
         OutputDevice = Configuration.GetDefaultAudioDevice(),
@@ -179,15 +148,14 @@ from user in _selectedTwitchChatNames
   /// </summary>
   /// <param name="channel">The chat to remove.</param>
   private void OnRemoveChatCommand(string channel) {
-    // Remove it from the list
-    _selectedTwitchChatNames.Remove(channel);
+    SelectedTwitchChatNames.Remove(channel);
 
     // Remove the callback
     _twitchClient.RemoveMessageCallback(channel, OnChatMessage);
 
     // Update and write the configuration
     _configuration.TwitchChats = (
-      from user in _selectedTwitchChatNames
+      from user in SelectedTwitchChatNames
       select new TwitchChatConfiguration {
         TwitchChannel = user,
         OutputDevice = Configuration.GetDefaultAudioDevice(),
@@ -204,7 +172,7 @@ from user in _selectedTwitchChatNames
   /// </summary>
   /// <param name="msg">The message received.</param>
   private void OnChatMessage(OnMessageReceivedArgs msg) {
-    if (_selectedTwitchChatNames.Count > 1) {
+    if (SelectedTwitchChatNames.Count > 1) {
       TwitchChat = (TwitchChat + FormatChatMessage(msg.ChatMessage.Username, msg.ChatMessage.Message, msg.GetTimestamp() ?? DateTime.UtcNow, msg.ChatMessage.Channel)).Trim();
     }
     else {
@@ -275,7 +243,7 @@ private void InitializeTwitchChatConnections() {
         continue;
       }
 
-      _selectedTwitchChatNames.Add(channel.TwitchChannel);
+      SelectedTwitchChatNames.Add(channel.TwitchChannel);
       Task.Run(() => _twitchClient.AddMessageCallback(channel.TwitchChannel, OnChatMessage));
     }
   }
diff --git a/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/SettingsView/SettingsViewModel.cs b/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/SettingsView/SettingsViewModel.cs
index 68a9e83..7bf2ff7 100644
--- a/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/SettingsView/SettingsViewModel.cs
+++ b/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/SettingsView/SettingsViewModel.cs
@@ -1,10 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
 using System.Reactive;
 using System.Speech.Synthesis;
 
+using CommunityToolkit.Mvvm.ComponentModel;
+
 using Nullinside.TwitchStreamingTools.Controls.ViewModels;
 using Nullinside.TwitchStreamingTools.Models;
 using Nullinside.TwitchStreamingTools.Utilities;
@@ -16,7 +19,7 @@ namespace Nullinside.TwitchStreamingTools.ViewModels.Pages.SettingsView;
 /// <summary>
 ///   Handles binding your application settings.
 /// </summary>
-public class SettingsViewModel : PageViewModelBase {
+public partial class SettingsViewModel : PageViewModelBase {
   /// <summary>
   ///   The application configuration.
   /// </summary>
@@ -35,7 +38,7 @@ public class SettingsViewModel : PageViewModelBase {
   /// <summary>
   ///   The list of possible output devices that exist on the machine.
   /// </summary>
-  private ObservableCollection<string> _outputDevices;
+  [ObservableProperty] private ObservableCollection<string> _outputDevices;
 
   /// <summary>
   ///   Change sound pitch by n semitones (-60 to +60 semitones)
@@ -70,17 +73,17 @@ public class SettingsViewModel : PageViewModelBase {
   /// <summary>
   ///   True if the advanced Text-to-Speech (TTS) settings are displayed.
   /// </summary>
-  private bool _showAdvancedTts;
+  [ObservableProperty] private bool _showAdvancedTts;
 
   /// <summary>
   ///   The keybind for skipping all TTS messages.
   /// </summary>
-  private KeybindViewModel _skipAllTtsKeyBinding;
+  [ObservableProperty] private KeybindViewModel _skipAllTtsKeyBinding;
 
   /// <summary>
   ///   The keybind for skipping TTS messages.
   /// </summary>
-  private KeybindViewModel _skipTtsKeyBinding;
+  [ObservableProperty] private KeybindViewModel _skipTtsKeyBinding;
 
   /// <summary>
   ///   The speed (as a multiplicative).
@@ -95,17 +98,17 @@ public class SettingsViewModel : PageViewModelBase {
   /// <summary>
   ///   The view model for the phonetic words list.
   /// </summary>
-  private TtsPhoneticWordsViewModel _ttsPhoneticWordsViewModel;
+  [ObservableProperty] private TtsPhoneticWordsViewModel _ttsPhoneticWordsViewModel;
 
   /// <summary>
   ///   The control responsible for managing the list of usernames to skip.
   /// </summary>
-  private TtsSkipUsernamesViewModel _ttsSkipUsernamesViewModel;
+  [ObservableProperty] private TtsSkipUsernamesViewModel _ttsSkipUsernamesViewModel;
 
   /// <summary>
   ///   The list of installed TTS voices on the machine.
   /// </summary>
-  private ObservableCollection<string> _ttsVoices;
+  [ObservableProperty] private ObservableCollection<string> _ttsVoices;
 
   /// <summary>
   ///   The volume to play the TTS messages at.
@@ -142,10 +145,10 @@ public SettingsViewModel(IConfiguration configuration, TtsPhoneticWordsViewModel
     _sayUsernameWithMessage = _configuration.SayUsernameWithMessage;
     _skipTtsKeyBinding = keybindViewModel;
     _skipTtsKeyBinding.Keybind = _configuration.SkipTtsKey;
-    _skipTtsKeyBinding.Changed.Subscribe(OnSkipTtsKeybindChanged);
+    _skipTtsKeyBinding.PropertyChanged += OnSkipTtsKeybindChanged;
     _skipAllTtsKeyBinding = keybindAllViewModel;
     _skipAllTtsKeyBinding.Keybind = _configuration.SkipAllTtsKey;
-    _skipAllTtsKeyBinding.Changed.Subscribe(OnSkipAllTtsKeybindChanged);
+    _skipAllTtsKeyBinding.PropertyChanged += OnSkipAllTtsKeybindChanged;
 
     ToggleAdvancedTtsCommand = ReactiveCommand.Create(() => ShowAdvancedTts = !ShowAdvancedTts);
 
@@ -174,21 +177,13 @@ public SettingsViewModel(IConfiguration configuration, TtsPhoneticWordsViewModel
   /// <inheritdoc />
   public override string IconResourceKey { get; } = "SettingsRegular";
 
-  /// <summary>
-  ///   The list of output devices available on the machine.
-  /// </summary>
-  public ObservableCollection<string> OutputDevices {
-    get => _outputDevices;
-    set => this.RaiseAndSetIfChanged(ref _outputDevices, value);
-  }
-
   /// <summary>
   ///   The selected output device that audio will be sent to.
   /// </summary>
   public string? SelectedOutputDevice {
     get => _selectedOutputDevice;
     set {
-      this.RaiseAndSetIfChanged(ref _selectedOutputDevice, value);
+      SetProperty(ref _selectedOutputDevice, value);
 
       // Go through each twitch chat and update their property
       foreach (TwitchChatConfiguration chat in _configuration.TwitchChats ?? []) {
@@ -199,21 +194,13 @@ public string? SelectedOutputDevice {
     }
   }
 
-  /// <summary>
-  ///   The list of TTS voices available on the machine.
-  /// </summary>
-  public ObservableCollection<string> TtsVoices {
-    get => _ttsVoices;
-    set => this.RaiseAndSetIfChanged(ref _ttsVoices, value);
-  }
-
   /// <summary>
   ///   The selected TTS voice will be used.
   /// </summary>
   public string? SelectedTtsVoice {
     get => _selectedTtsVoice;
     set {
-      this.RaiseAndSetIfChanged(ref _selectedTtsVoice, value);
+      SetProperty(ref _selectedTtsVoice, value);
 
       // Go through each twitch chat and update their property
       foreach (TwitchChatConfiguration chat in _configuration.TwitchChats ?? []) {
@@ -231,7 +218,7 @@ public string? SelectedTtsVoice {
   public uint TtsVolume {
     get => _ttsVolume;
     set {
-      this.RaiseAndSetIfChanged(ref _ttsVolume, value);
+      SetProperty(ref _ttsVolume, value);
 
       // Go through each twitch chat and update their property
       foreach (TwitchChatConfiguration chat in _configuration.TwitchChats ?? []) {
@@ -242,29 +229,13 @@ public uint TtsVolume {
     }
   }
 
-  /// <summary>
-  ///   Gets or sets the  view model for the phonetic words list.
-  /// </summary>
-  public TtsPhoneticWordsViewModel TtsPhoneticWordsViewModel {
-    get => _ttsPhoneticWordsViewModel;
-    set => this.RaiseAndSetIfChanged(ref _ttsPhoneticWordsViewModel, value);
-  }
-
-  /// <summary>
-  ///   Gets or sets the  view responsible for managing the list of usernames to skip.
-  /// </summary>
-  public TtsSkipUsernamesViewModel TtsSkipUsernamesViewModel {
-    get => _ttsSkipUsernamesViewModel;
-    set => this.RaiseAndSetIfChanged(ref _ttsSkipUsernamesViewModel, value);
-  }
-
   /// <summary>
   ///   Change sound tempo by n percents (-95 to +5000 %)
   /// </summary>
   public int Tempo {
     get => _tempo;
     set {
-      this.RaiseAndSetIfChanged(ref _tempo, value);
+      SetProperty(ref _tempo, value);
       if (_configuration.SoundStretchArgs != null) {
         _configuration.SoundStretchArgs.Tempo = value;
         _configuration.WriteConfiguration();
@@ -278,7 +249,7 @@ public int Tempo {
   public int Pitch {
     get => _pitch;
     set {
-      this.RaiseAndSetIfChanged(ref _pitch, value);
+      SetProperty(ref _pitch, value);
       if (_configuration.SoundStretchArgs != null) {
         _configuration.SoundStretchArgs.Pitch = value;
         _configuration.WriteConfiguration();
@@ -292,7 +263,7 @@ public int Pitch {
   public int Rate {
     get => _rate;
     set {
-      this.RaiseAndSetIfChanged(ref _rate, value);
+      SetProperty(ref _rate, value);
       if (_configuration.SoundStretchArgs != null) {
         _configuration.SoundStretchArgs.Rate = value;
         _configuration.WriteConfiguration();
@@ -306,7 +277,7 @@ public int Rate {
   public int Bpm {
     get => _bpm;
     set {
-      this.RaiseAndSetIfChanged(ref _bpm, value);
+      SetProperty(ref _bpm, value);
       if (_configuration.SoundStretchArgs != null) {
         _configuration.SoundStretchArgs.Bpm = value;
         _configuration.WriteConfiguration();
@@ -320,7 +291,7 @@ public int Bpm {
   public bool Quick {
     get => _quick;
     set {
-      this.RaiseAndSetIfChanged(ref _quick, value);
+      SetProperty(ref _quick, value);
       if (_configuration.SoundStretchArgs != null) {
         _configuration.SoundStretchArgs.Quick = value;
         _configuration.WriteConfiguration();
@@ -334,7 +305,7 @@ public bool Quick {
   public bool AntiAliasingOff {
     get => _antiAliasingOff;
     set {
-      this.RaiseAndSetIfChanged(ref _antiAliasingOff, value);
+      SetProperty(ref _antiAliasingOff, value);
       if (_configuration.SoundStretchArgs != null) {
         _configuration.SoundStretchArgs.AntiAliasingOff = value;
         _configuration.WriteConfiguration();
@@ -348,7 +319,7 @@ public bool AntiAliasingOff {
   public bool TurnOnSpeech {
     get => _turnOnSpeech;
     set {
-      this.RaiseAndSetIfChanged(ref _turnOnSpeech, value);
+      SetProperty(ref _turnOnSpeech, value);
       if (_configuration.SoundStretchArgs != null) {
         _configuration.SoundStretchArgs.TurnOnSpeech = value;
         _configuration.WriteConfiguration();
@@ -356,14 +327,6 @@ public bool TurnOnSpeech {
     }
   }
 
-  /// <summary>
-  ///   True if we are displaying the advanced TTS settings, false otherwise.
-  /// </summary>
-  public bool ShowAdvancedTts {
-    get => _showAdvancedTts;
-    set => this.RaiseAndSetIfChanged(ref _showAdvancedTts, value);
-  }
-
   /// <summary>
   ///   Called when the show advanced settings is clicked.
   /// </summary>
@@ -375,7 +338,7 @@ public bool ShowAdvancedTts {
   public double Speed {
     get => _speed;
     set {
-      this.RaiseAndSetIfChanged(ref _speed, value);
+      SetProperty(ref _speed, value);
 
       // In terms of tempo, 50 is 100% faster (2x speed). Scaling that equation linearly, we get:
       double tempo = (value - 1.0) * 50;
@@ -394,52 +357,38 @@ public double Speed {
   public bool SayUsernameWithMessage {
     get => _sayUsernameWithMessage;
     set {
-      this.RaiseAndSetIfChanged(ref _sayUsernameWithMessage, value);
+      SetProperty(ref _sayUsernameWithMessage, value);
 
       _configuration.SayUsernameWithMessage = value;
       _configuration.WriteConfiguration();
     }
   }
 
-  /// <summary>
-  ///   The keybind to use to skip TTS messages.
-  /// </summary>
-  public KeybindViewModel SkipTtsKeyBinding {
-    get => _skipTtsKeyBinding;
-    set => this.RaiseAndSetIfChanged(ref _skipTtsKeyBinding, value);
-  }
-
-  /// <summary>
-  ///   The keybind to use to skip all TTS messages.
-  /// </summary>
-  public KeybindViewModel SkipAllTtsKeyBinding {
-    get => _skipAllTtsKeyBinding;
-    set => this.RaiseAndSetIfChanged(ref _skipAllTtsKeyBinding, value);
-  }
-
   /// <summary>
   ///   Handles updating the configuration when the skip TTS keybind changes.
   /// </summary>
-  /// <param name="args">The arguments about the properties that changed.</param>
-  private void OnSkipTtsKeybindChanged(IReactivePropertyChangedEventArgs<IReactiveObject> args) {
-    if (!nameof(_skipTtsKeyBinding.Keybind).Equals(args.PropertyName)) {
+  /// <param name="_">Unused sender argument.</param>
+  /// <param name="e">The arguments about the properties that changed.</param>
+  private void OnSkipTtsKeybindChanged(object? _, PropertyChangedEventArgs e) {
+    if (!nameof(SkipTtsKeyBinding.Keybind).Equals(e.PropertyName)) {
       return;
     }
 
-    _configuration.SkipTtsKey = _skipTtsKeyBinding.Keybind;
+    _configuration.SkipTtsKey = SkipTtsKeyBinding.Keybind;
     _configuration.WriteConfiguration();
   }
 
   /// <summary>
   ///   Handles updating the configuration when the skip all TTS keybind changes.
   /// </summary>
-  /// <param name="args">The arguments about the properties that changed.</param>
-  private void OnSkipAllTtsKeybindChanged(IReactivePropertyChangedEventArgs<IReactiveObject> args) {
-    if (!nameof(_skipAllTtsKeyBinding.Keybind).Equals(args.PropertyName)) {
+  /// <param name="_">Unused sender argument.</param>
+  /// <param name="e">The arguments about the properties that changed.</param>
+  private void OnSkipAllTtsKeybindChanged(object? _, PropertyChangedEventArgs e) {
+    if (!nameof(SkipAllTtsKeyBinding.Keybind).Equals(e.PropertyName)) {
       return;
     }
 
-    _configuration.SkipAllTtsKey = _skipAllTtsKeyBinding.Keybind;
+    _configuration.SkipAllTtsKey = SkipAllTtsKeyBinding.Keybind;
     _configuration.WriteConfiguration();
   }
 }
\ No newline at end of file
diff --git a/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/SettingsView/TtsPhoneticWordsViewModel.cs b/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/SettingsView/TtsPhoneticWordsViewModel.cs
index 38a3a4b..89b5a4c 100644
--- a/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/SettingsView/TtsPhoneticWordsViewModel.cs
+++ b/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/SettingsView/TtsPhoneticWordsViewModel.cs
@@ -3,16 +3,16 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 
-using Nullinside.TwitchStreamingTools.Models;
+using CommunityToolkit.Mvvm.ComponentModel;
 
-using ReactiveUI;
+using Nullinside.TwitchStreamingTools.Models;
 
 namespace Nullinside.TwitchStreamingTools.ViewModels.Pages.SettingsView;
 
 /// <summary>
 ///   The view responsible for maintaining the list of phonetic words.
 /// </summary>
-public class TtsPhoneticWordsViewModel : ViewModelBase {
+public partial class TtsPhoneticWordsViewModel : ViewModelBase {
   /// <summary>
   ///   The application configuration.
   /// </summary>
@@ -26,17 +26,17 @@ public class TtsPhoneticWordsViewModel : ViewModelBase {
   /// <summary>
   ///   The user entered phonetic pronunciation of the word.
   /// </summary>
-  private string? _userEnteredPhonetic;
+  [ObservableProperty] private string? _userEnteredPhonetic;
 
   /// <summary>
   ///   The user entered word to pronounce phonetically.
   /// </summary>
-  private string? _userEnteredWord;
+  [ObservableProperty] private string? _userEnteredWord;
 
   /// <summary>
   ///   The collection of all phonetic words.
   /// </summary>
-  private ObservableCollection<PhoneticWord> _wordsToPhonetics = new();
+  [ObservableProperty] private ObservableCollection<PhoneticWord> _wordsToPhonetics = new();
 
   /// <summary>
   ///   Initializes a new instance of the <see cref="TtsPhoneticWordsViewModel" /> class.
@@ -53,30 +53,6 @@ public TtsPhoneticWordsViewModel(IConfiguration configuration) {
     }
   }
 
-  /// <summary>
-  ///   Gets or sets the user entered phonetic pronunciation of the word.
-  /// </summary>
-  public string? UserEnteredPhonetic {
-    get => _userEnteredPhonetic;
-    set => this.RaiseAndSetIfChanged(ref _userEnteredPhonetic, value);
-  }
-
-  /// <summary>
-  ///   Gets or sets the user entered word to pronounce phonetically.
-  /// </summary>
-  public string? UserEnteredWord {
-    get => _userEnteredWord;
-    set => this.RaiseAndSetIfChanged(ref _userEnteredWord, value);
-  }
-
-  /// <summary>
-  ///   Gets or sets the list of words/usernames and their phonetic pronunciations.
-  /// </summary>
-  public ObservableCollection<PhoneticWord> WordsToPhonetics {
-    get => _wordsToPhonetics;
-    set => this.RaiseAndSetIfChanged(ref _wordsToPhonetics, value);
-  }
-
   /// <summary>
   ///   Cancels the editing of the current word.
   /// </summary>
@@ -95,12 +71,12 @@ public void DeletePhonetic(string word) {
       return;
     }
 
-    PhoneticWord? entry = _wordsToPhonetics.FirstOrDefault(w => word.Equals(w.Word));
+    PhoneticWord? entry = WordsToPhonetics.FirstOrDefault(w => word.Equals(w.Word));
     if (null == entry) {
       return;
     }
 
-    _wordsToPhonetics.Remove(entry);
+    WordsToPhonetics.Remove(entry);
     RemoveFromConfig(word);
   }
 
@@ -113,7 +89,7 @@ public void EditPhonetic(string word) {
       return;
     }
 
-    PhoneticWord? entry = _wordsToPhonetics.FirstOrDefault(w => word.Equals(w.Word));
+    PhoneticWord? entry = WordsToPhonetics.FirstOrDefault(w => word.Equals(w.Word));
     if (null == entry) {
       return;
     }
@@ -134,14 +110,13 @@ public void SaveEntry() {
     // If we are not currently editing.
     if (null == _editingPhonetic) {
       // If the word already exists in the list and this would be a duplicate then change the existing word.
-      PhoneticWord? existing = _wordsToPhonetics.FirstOrDefault(w => UserEnteredWord.Equals(w.Word, StringComparison.InvariantCultureIgnoreCase));
+      PhoneticWord? existing = WordsToPhonetics.FirstOrDefault(w => UserEnteredWord.Equals(w.Word, StringComparison.InvariantCultureIgnoreCase));
       if (null != existing) {
         existing.Word = UserEnteredWord;
         existing.Phonetic = UserEnteredPhonetic;
       }
       else {
-        // Otherwise, make a new word.
-        _wordsToPhonetics.Add(new PhoneticWord(this, UserEnteredWord, UserEnteredPhonetic));
+        WordsToPhonetics.Add(new PhoneticWord(this, UserEnteredWord, UserEnteredPhonetic));
       }
     }
     else {
diff --git a/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/SettingsView/TtsSkipUsernamesViewModel.cs b/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/SettingsView/TtsSkipUsernamesViewModel.cs
index 93a3e32..62b2f89 100644
--- a/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/SettingsView/TtsSkipUsernamesViewModel.cs
+++ b/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/SettingsView/TtsSkipUsernamesViewModel.cs
@@ -4,14 +4,14 @@
 using System.Linq;
 using System.Timers;
 
+using CommunityToolkit.Mvvm.ComponentModel;
+
 using log4net;
 
 using Nullinside.TwitchStreamingTools.Controls.ViewModels;
 using Nullinside.TwitchStreamingTools.Models;
 using Nullinside.TwitchStreamingTools.Utilities;
 
-using ReactiveUI;
-
 using TwitchLib.Api.Core.Exceptions;
 using TwitchLib.Api.Helix.Models.Chat.GetChatters;
 using TwitchLib.Api.Helix.Models.Users.GetUsers;
@@ -23,7 +23,7 @@ namespace Nullinside.TwitchStreamingTools.ViewModels.Pages.SettingsView;
 /// <summary>
 ///   Handles managing the list of users to skip in TTS.
 /// </summary>
-public class TtsSkipUsernamesViewModel : ViewModelBase {
+public partial class TtsSkipUsernamesViewModel : ViewModelBase {
   /// <summary>
   ///   The logger.
   /// </summary>
@@ -47,12 +47,12 @@ public class TtsSkipUsernamesViewModel : ViewModelBase {
   /// <summary>
   ///   The view model that handles the two column control.
   /// </summary>
-  private TwoListViewModel _twoListViewModel;
+  [ObservableProperty] private TwoListViewModel _twoListViewModel;
 
   /// <summary>
   ///   The user entered username to add to the skip list.
   /// </summary>
-  private string? _userToAdd;
+  [ObservableProperty] private string? _userToAdd;
 
   /// <summary>
   ///   Initializes a new instance of the <see cref="TtsSkipUsernamesViewModel" /> class.
@@ -80,22 +80,6 @@ public TtsSkipUsernamesViewModel(IConfiguration configuration) {
     _userListRefreshTimer.Start();
   }
 
-  /// <summary>
-  ///   Gets or sets the view model that handles the two column control.
-  /// </summary>
-  public TwoListViewModel TwoListViewModel {
-    get => _twoListViewModel;
-    set => this.RaiseAndSetIfChanged(ref _twoListViewModel, value);
-  }
-
-  /// <summary>
-  ///   Gets or sets the user entered username to add to the skip list.
-  /// </summary>
-  public string? UserToAdd {
-    get => _userToAdd;
-    set => this.RaiseAndSetIfChanged(ref _userToAdd, value);
-  }
-
   /// <summary>
   ///   Handles adding the <see cref="UserToAdd" /> to the skip list.
   /// </summary>
diff --git a/src/Nullinside.TwitchStreamingTools/ViewModels/ViewModelBase.cs b/src/Nullinside.TwitchStreamingTools/ViewModels/ViewModelBase.cs
index cff65b3..7dbd399 100644
--- a/src/Nullinside.TwitchStreamingTools/ViewModels/ViewModelBase.cs
+++ b/src/Nullinside.TwitchStreamingTools/ViewModels/ViewModelBase.cs
@@ -1,9 +1,9 @@
-using ReactiveUI;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Nullinside.TwitchStreamingTools.ViewModels;
 
 /// <summary>
 ///   A base class for all view models.
 /// </summary>
-public class ViewModelBase : ReactiveObject {
+public class ViewModelBase : ObservableObject {
 }
\ No newline at end of file
diff --git a/src/Nullinside.TwitchStreamingTools/Views/Pages/ChatView.axaml b/src/Nullinside.TwitchStreamingTools/Views/Pages/ChatView.axaml
index 47d5e1a..09869ea 100644
--- a/src/Nullinside.TwitchStreamingTools/Views/Pages/ChatView.axaml
+++ b/src/Nullinside.TwitchStreamingTools/Views/Pages/ChatView.axaml
@@ -34,7 +34,7 @@
 
         <Label Grid.Row="1" Grid.Column="0" HorizontalAlignment="Center">Twitch Channels</Label>
         <Label Grid.Row="1" Grid.Column="1" HorizontalAlignment="Center">Chat Log</Label>
-        <ListBox Grid.Row="2" Grid.Column="0" ItemsSource="{Binding ChatItems}" Margin="0 0 10 0">
+        <ListBox Grid.Row="2" Grid.Column="0" ItemsSource="{Binding SelectedTwitchChatNames}" Margin="0 0 10 0">
             <ListBox.ItemTemplate>
                 <DataTemplate DataType="{x:Type system:String}">
                     <Grid Margin="0">

From 04bf92cba0ca0effae7f7834f71d1ee24723c9ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=E2=96=88=E2=96=88=E2=96=88=E2=96=88=E2=96=88?=
 <dev.nullinside@gmail.com>
Date: Tue, 30 Sep 2025 15:56:45 -0400
Subject: [PATCH 3/3] chore: adding [RelayCommand]

Converting all the boilerplate code over to use the attribute tags
---
 .../Controls/Keybind.axaml                    |  2 +-
 .../Controls/ViewModels/KeybindViewModel.cs   |  8 ++----
 .../ViewModels/NewVersionWindowViewModel.cs   | 21 +++-----------
 .../ViewModels/Pages/AccountViewModel.cs      | 28 ++++---------------
 .../ViewModels/Pages/ChatViewModel.cs         | 26 ++++-------------
 .../ViewModels/Pages/PageViewModelBase.cs     | 18 ++++--------
 .../Views/NewVersionWindow.axaml              |  4 +--
 .../Views/Pages/AccountView.axaml             |  4 +--
 .../Views/Pages/ChatView.axaml                |  4 +--
 9 files changed, 28 insertions(+), 87 deletions(-)

diff --git a/src/Nullinside.TwitchStreamingTools/Controls/Keybind.axaml b/src/Nullinside.TwitchStreamingTools/Controls/Keybind.axaml
index 97d2c73..0c6c042 100644
--- a/src/Nullinside.TwitchStreamingTools/Controls/Keybind.axaml
+++ b/src/Nullinside.TwitchStreamingTools/Controls/Keybind.axaml
@@ -10,7 +10,7 @@
     <StackPanel>
         <Button IsVisible="{Binding !Listening}"
                 Content="{Binding Keybind, TargetNullValue='[None]'}"
-                Command="{Binding ListenForKeystroke}"
+                Command="{Binding StartListenKeystrokeCommand}"
                 ToolTip.Tip="ESC to unset" />
         <StackPanel IsVisible="{Binding Listening}"
                     Orientation="Horizontal">
diff --git a/src/Nullinside.TwitchStreamingTools/Controls/ViewModels/KeybindViewModel.cs b/src/Nullinside.TwitchStreamingTools/Controls/ViewModels/KeybindViewModel.cs
index d4281fe..507304e 100644
--- a/src/Nullinside.TwitchStreamingTools/Controls/ViewModels/KeybindViewModel.cs
+++ b/src/Nullinside.TwitchStreamingTools/Controls/ViewModels/KeybindViewModel.cs
@@ -1,6 +1,7 @@
 using System.Reactive;
 
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 
 using Nullinside.TwitchStreamingTools.Models;
 using Nullinside.TwitchStreamingTools.Services;
@@ -34,17 +35,12 @@ public partial class KeybindViewModel : ObservableObject {
   /// <param name="service">The listener for keystrokes on the keyboard.</param>
   public KeybindViewModel(IGlobalKeyPressService service) {
     _service = service;
-    ListenForKeystroke = ReactiveCommand.Create(StartListenKeystroke);
   }
 
-  /// <summary>
-  ///   Listens for keystrokes.
-  /// </summary>
-  public ReactiveCommand<Unit, Unit> ListenForKeystroke { get; }
-
   /// <summary>
   ///   Starts listening for keystrokes.
   /// </summary>
+  [RelayCommand]
   private void StartListenKeystroke() {
     Listening = true;
     _service.OnKeystroke -= OnKeystroke;
diff --git a/src/Nullinside.TwitchStreamingTools/ViewModels/NewVersionWindowViewModel.cs b/src/Nullinside.TwitchStreamingTools/ViewModels/NewVersionWindowViewModel.cs
index bb9e5b6..eb1ee91 100644
--- a/src/Nullinside.TwitchStreamingTools/ViewModels/NewVersionWindowViewModel.cs
+++ b/src/Nullinside.TwitchStreamingTools/ViewModels/NewVersionWindowViewModel.cs
@@ -1,17 +1,15 @@
 using System.Diagnostics;
 using System.Threading.Tasks;
-using System.Windows.Input;
 
 using Avalonia.Controls;
 using Avalonia.Threading;
 
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 
 using Nullinside.Api.Common.Desktop;
 using Nullinside.TwitchStreamingTools.Views;
 
-using ReactiveUI;
-
 namespace Nullinside.TwitchStreamingTools.ViewModels;
 
 /// <summary>
@@ -42,9 +40,6 @@ public partial class NewVersionWindowViewModel : ViewModelBase {
   ///   Initializes a new instance of the <see cref="NewVersionWindowViewModel" /> class.
   /// </summary>
   public NewVersionWindowViewModel() {
-    UpdateSoftware = ReactiveCommand.Create(StartUpdateSoftware);
-    CloseWindow = ReactiveCommand.Create<Window>(CloseWindowCommand);
-
     // asynchronously determine the current version number.
     Task.Factory.StartNew(async () => {
       GithubLatestReleaseJson? version =
@@ -67,27 +62,19 @@ public string? LocalVersion {
     set => _localVersion = value;
   }
 
-  /// <summary>
-  ///   A command to update the software.
-  /// </summary>
-  public ICommand UpdateSoftware { get; }
-
-  /// <summary>
-  ///   A command to close the current window.
-  /// </summary>
-  public ICommand CloseWindow { get; }
-
   /// <summary>
   ///   A command to close the current window.
   /// </summary>
   /// <param name="self">The reference to our own window.</param>
-  private void CloseWindowCommand(Window self) {
+  [RelayCommand]
+  private void CloseWindow(Window self) {
     self.Close();
   }
 
   /// <summary>
   ///   Launches the web browser at the new release page.
   /// </summary>
+  [RelayCommand]
   private void StartUpdateSoftware() {
     IsUpdating = true;
     GitHubUpdateManager.PrepareUpdate()
diff --git a/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/AccountViewModel.cs b/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/AccountViewModel.cs
index e9ec468..1f56455 100644
--- a/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/AccountViewModel.cs
+++ b/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/AccountViewModel.cs
@@ -3,13 +3,13 @@
 using System.IO;
 using System.Net.Http;
 using System.Net.WebSockets;
-using System.Reactive;
 using System.Threading;
 using System.Threading.Tasks;
 
 using Avalonia.Media.Imaging;
 
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 
 using log4net;
 
@@ -21,8 +21,6 @@
 using Nullinside.TwitchStreamingTools.Services;
 using Nullinside.TwitchStreamingTools.Utilities;
 
-using ReactiveUI;
-
 using TwitchLib.Api.Helix.Models.Users.GetUsers;
 
 namespace Nullinside.TwitchStreamingTools.ViewModels.Pages;
@@ -30,7 +28,7 @@ namespace Nullinside.TwitchStreamingTools.ViewModels.Pages;
 /// <summary>
 ///   Handles binding your account to the application.
 /// </summary>
-public partial class AccountViewModel : PageViewModelBase, IDisposable {
+public partial class AccountViewModel : PageViewModelBase {
   /// <summary>
   ///   The path to the folder containing cached profile images.
   /// </summary>
@@ -92,8 +90,6 @@ public AccountViewModel(ITwitchAccountService twitchAccountService, IConfigurati
     _twitchAccountService.OnCredentialsStatusChanged += OnCredentialsStatusChanged;
     _twitchAccountService.OnCredentialsChanged += OnCredentialsChanged;
     _configuration = configuration;
-    OnPerformLogin = ReactiveCommand.Create(PerformLogin);
-    OnLogout = ReactiveCommand.Create(ClearCredentials);
 
     // Set the initial state of the ui
     HasValidOAuthToken = _twitchAccountService.CredentialsAreValid;
@@ -103,27 +99,11 @@ public AccountViewModel(ITwitchAccountService twitchAccountService, IConfigurati
   /// <inheritdoc />
   public override string IconResourceKey { get; } = "InprivateAccountRegular";
 
-  /// <summary>
-  ///   Called when the user clicks the login button.
-  /// </summary>
-  public ReactiveCommand<Unit, Unit> OnPerformLogin { get; }
-
-  /// <summary>
-  ///   Called when logging out the current user.
-  /// </summary>
-  public ReactiveCommand<Unit, Unit> OnLogout { get; }
-
   /// <summary>
   ///   The application version number.
   /// </summary>
   public string? Version => Constants.APP_VERSION;
 
-  /// <inheritdoc />
-  public void Dispose() {
-    OnPerformLogin.Dispose();
-    OnLogout.Dispose();
-  }
-
   /// <summary>
   ///   Loads the profile image when the UI loads.
   /// </summary>
@@ -202,7 +182,8 @@ private void OnCredentialsStatusChanged(bool valid) {
   /// <summary>
   ///   Launches the computer's default browser to generate an OAuth token.
   /// </summary>
-  private async void PerformLogin() {
+  [RelayCommand]
+  private async Task PerformLogin() {
     LoggingIn = true;
     try {
       CancellationToken token = CancellationToken.None;
@@ -251,6 +232,7 @@ private async void PerformLogin() {
   /// <summary>
   ///   Clears the credentials out (logging out).
   /// </summary>
+  [RelayCommand]
   private void ClearCredentials() {
     _twitchAccountService.DeleteCredentials();
   }
diff --git a/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/ChatViewModel.cs b/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/ChatViewModel.cs
index c080a3b..fb9c627 100644
--- a/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/ChatViewModel.cs
+++ b/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/ChatViewModel.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Reactive;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -11,13 +10,12 @@
 using Avalonia.Media;
 
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 
 using Nullinside.Api.Common.Twitch;
 using Nullinside.TwitchStreamingTools.Models;
 using Nullinside.TwitchStreamingTools.Utilities;
 
-using ReactiveUI;
-
 using TwitchLib.Client.Events;
 
 namespace Nullinside.TwitchStreamingTools.ViewModels.Pages;
@@ -72,9 +70,6 @@ public ChatViewModel(ITwitchClientProxy twitchClient, IConfiguration configurati
     _twitchClient = twitchClient;
     _configuration = configuration;
 
-    OnAddChat = ReactiveCommand.Create(OnAddChatCommand);
-    OnRemoveChat = ReactiveCommand.Create<string>(OnRemoveChatCommand);
-
     Application.Current!.TryFindResource("DeleteRegular", out object? icon);
     DeleteIcon = (StreamGeometry)icon!;
   }
@@ -87,16 +82,6 @@ public ChatViewModel(ITwitchClientProxy twitchClient, IConfiguration configurati
   /// </summary>
   public StreamGeometry DeleteIcon { get; set; }
 
-  /// <summary>
-  ///   Called when adding a chat.
-  /// </summary>
-  public ReactiveCommand<Unit, Unit> OnAddChat { get; }
-
-  /// <summary>
-  ///   Called when removing a chat.
-  /// </summary>
-  public ReactiveCommand<string, Unit> OnRemoveChat { get; }
-
   /// <inheritdoc />
   public void Dispose() {
     foreach (TwitchChatConfiguration channel in _configuration.TwitchChats ?? []) {
@@ -106,15 +91,13 @@ public void Dispose() {
 
       _twitchClient.RemoveMessageCallback(channel.TwitchChannel, OnChatMessage);
     }
-
-    OnAddChat.Dispose();
-    OnRemoveChat.Dispose();
   }
 
   /// <summary>
   ///   Handles adding a new chat to monitor.
   /// </summary>
-  private void OnAddChatCommand() {
+  [RelayCommand]
+  private void AddChat() {
     // Ensure we have a username
     string? username = TwitchChatName?.Trim();
     if (string.IsNullOrWhiteSpace(username) || SelectedTwitchChatNames.Contains(username)) {
@@ -147,7 +130,8 @@ from user in SelectedTwitchChatNames
   ///   Handles removing a chat we were monitoring.
   /// </summary>
   /// <param name="channel">The chat to remove.</param>
-  private void OnRemoveChatCommand(string channel) {
+  [RelayCommand]
+  private void RemoveChat(string channel) {
     SelectedTwitchChatNames.Remove(channel);
 
     // Remove the callback
diff --git a/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/PageViewModelBase.cs b/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/PageViewModelBase.cs
index bfb4b78..26d53e7 100644
--- a/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/PageViewModelBase.cs
+++ b/src/Nullinside.TwitchStreamingTools/ViewModels/Pages/PageViewModelBase.cs
@@ -1,5 +1,7 @@
 using System.Reactive;
 
+using CommunityToolkit.Mvvm.Input;
+
 using ReactiveUI;
 
 namespace Nullinside.TwitchStreamingTools.ViewModels.Pages;
@@ -7,13 +9,11 @@ namespace Nullinside.TwitchStreamingTools.ViewModels.Pages;
 /// <summary>
 ///   A base class for all pages of the application that are navigable through the left nav of the application.
 /// </summary>
-public abstract class PageViewModelBase : ViewModelBase {
+public abstract partial class PageViewModelBase : ViewModelBase {
   /// <summary>
   ///   Initializes a new instance of the <see cref="PageViewModelBase" /> class.
   /// </summary>
   protected PageViewModelBase() {
-    OnLoadedCommand = ReactiveCommand.Create(OnLoaded);
-    OnUnloadedCommand = ReactiveCommand.Create(OnUnloaded);
   }
 
   /// <summary>
@@ -21,19 +21,10 @@ protected PageViewModelBase() {
   /// </summary>
   public abstract string IconResourceKey { get; }
 
-  /// <summary>
-  ///   Called when the UI is loaded.
-  /// </summary>
-  public ReactiveCommand<Unit, Unit> OnLoadedCommand { protected set; get; }
-
-  /// <summary>
-  ///   Called when the UI is unloaded.
-  /// </summary>
-  public ReactiveCommand<Unit, Unit> OnUnloadedCommand { protected set; get; }
-
   /// <summary>
   ///   Called then Ui is loaded.
   /// </summary>
+  [RelayCommand]
   public virtual void OnLoaded() {
     // Just exist to be overridden.
   }
@@ -41,6 +32,7 @@ public virtual void OnLoaded() {
   /// <summary>
   ///   Called when the Ui is unloaded.
   /// </summary>
+  [RelayCommand]
   public virtual void OnUnloaded() {
   }
 }
\ No newline at end of file
diff --git a/src/Nullinside.TwitchStreamingTools/Views/NewVersionWindow.axaml b/src/Nullinside.TwitchStreamingTools/Views/NewVersionWindow.axaml
index 06f5b81..0cdbc08 100644
--- a/src/Nullinside.TwitchStreamingTools/Views/NewVersionWindow.axaml
+++ b/src/Nullinside.TwitchStreamingTools/Views/NewVersionWindow.axaml
@@ -33,8 +33,8 @@
                     <TextBlock Text="{Binding ServerVersion}" HorizontalAlignment="Center" VerticalAlignment="Center" />
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
-                    <Button Command="{Binding UpdateSoftware}" Margin="0 10 0 0">Install New Version</Button>
-                    <Button Command="{Binding CloseWindow}" CommandParameter="{Binding ElementName=Window}"
+                    <Button Command="{Binding StartUpdateSoftwareCommand}" Margin="0 10 0 0">Install New Version</Button>
+                    <Button Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=Window}"
                             Margin="10 10 0 0">
                         Close
                     </Button>
diff --git a/src/Nullinside.TwitchStreamingTools/Views/Pages/AccountView.axaml b/src/Nullinside.TwitchStreamingTools/Views/Pages/AccountView.axaml
index 49c718f..8542f42 100644
--- a/src/Nullinside.TwitchStreamingTools/Views/Pages/AccountView.axaml
+++ b/src/Nullinside.TwitchStreamingTools/Views/Pages/AccountView.axaml
@@ -28,7 +28,7 @@
             <controls1:Loading IsVisible="{Binding LoggingIn}" Width="75" Height="75" />
             <Button IsVisible="{Binding !HasValidOAuthToken}"
                     IsEnabled="{Binding !LoggingIn}"
-                    Command="{Binding OnPerformLogin}"
+                    Command="{Binding PerformLoginCommand}"
                     HorizontalAlignment="Center"
                     VerticalContentAlignment="Top">
                 Login
@@ -47,7 +47,7 @@
                     <TextBlock Grid.Column="0" VerticalAlignment="Center" Margin="0 0 10 0">User:</TextBlock>
                     <TextBox Grid.Column="1" Text="{Binding TwitchUsername}" IsReadOnly="True" />
                 </Grid>
-                <Button Command="{Binding OnLogout}"
+                <Button Command="{Binding ClearCredentialsCommand}"
                         HorizontalAlignment="Center"
                         VerticalContentAlignment="Top">
                     Logout
diff --git a/src/Nullinside.TwitchStreamingTools/Views/Pages/ChatView.axaml b/src/Nullinside.TwitchStreamingTools/Views/Pages/ChatView.axaml
index 09869ea..78fd766 100644
--- a/src/Nullinside.TwitchStreamingTools/Views/Pages/ChatView.axaml
+++ b/src/Nullinside.TwitchStreamingTools/Views/Pages/ChatView.axaml
@@ -29,7 +29,7 @@
             </Grid.ColumnDefinitions>
             <TextBlock Grid.Column="0" VerticalAlignment="Center" Margin="0 0 5 0">Twitch Channel:</TextBlock>
             <TextBox Grid.Column="1" Text="{Binding TwitchChatName}" Margin="0 0 5 0" />
-            <Button Grid.Column="2" IsDefault="True" Command="{Binding OnAddChat}" Content="Add" />
+            <Button Grid.Column="2" IsDefault="True" Command="{Binding AddChatCommand}" Content="Add" />
         </Grid>
 
         <Label Grid.Row="1" Grid.Column="0" HorizontalAlignment="Center">Twitch Channels</Label>
@@ -45,7 +45,7 @@
                         <TextBlock HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding }" Padding="0" />
                         <Button Grid.Column="1"
                                 FontWeight="Bold"
-                                Command="{Binding $parent[UserControl].((chatView:ChatViewModel)DataContext).OnRemoveChat, FallbackValue=null}"
+                                Command="{Binding $parent[UserControl].((chatView:ChatViewModel)DataContext).RemoveChatCommand, FallbackValue=null}"
                                 CommandParameter="{Binding }">
                             <Button.Styles>
                                 <Style Selector="Button">