diff --git a/src/Pages/GameGridPage.xaml.cs b/src/Pages/GameGridPage.xaml.cs
index cadce7d..51eb3d6 100644
--- a/src/Pages/GameGridPage.xaml.cs
+++ b/src/Pages/GameGridPage.xaml.cs
@@ -1,33 +1,14 @@
-using DLSS_Swapper.Data;
-using DLSS_Swapper.Data.EpicGamesStore;
-using DLSS_Swapper.Data.GOG;
-using DLSS_Swapper.Data.Steam;
-using DLSS_Swapper.Data.UbisoftConnect;
-using DLSS_Swapper.Data.Xbox;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using DLSS_Swapper.Data;
 using DLSS_Swapper.Interfaces;
 using DLSS_Swapper.UserControls;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Documents;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Runtime.InteropServices.WindowsRuntime;
-using System.Security.Principal;
-using System.Text.Json;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -39,9 +20,9 @@ namespace DLSS_Swapper.Pages
     /// </summary>
     public sealed partial class GameGridPage : Page
     {
-        public List<IGameLibrary> GameLibraries { get; } = new List<IGameLibrary>();
+        public List<IGameLibrary> GameLibraries { get; } = [];
 
-        bool _loadingGamesAndDlls = false;
+        private bool _loadingGamesAndDlls = false;
 
         public bool RunsAsAdmin { get; } = Environment.IsPrivilegedProcess;
 
@@ -49,11 +30,9 @@ public GameGridPage()
         {
             this.InitializeComponent();
             DataContext = this;
-
         }
 
-
-        async Task LoadGamesAsync()
+        private async Task LoadGamesAsync()
         {
             // Added this check so if we get to here and this is true we probably crashed loading games last time and we should prompt for that.
             if (Settings.Instance.WasLoadingGames)
@@ -65,7 +44,7 @@ async Task LoadGamesAsync()
                 };
                 paragraph.Inlines.Add(new Run()
                 {
-                    Text = "DLSS Swapper had an issue loading game libraries.  Please try disabling a game library below. You can re-enable these options later in the settings.",
+                    Text = "DLSS Swapper had an issue loading game libraries. Please try disabling a game library below. You can re-enable these options later in the settings.",
                 });
                 richTextBlock.Blocks.Add(paragraph);
                 paragraph = new Paragraph()
@@ -94,24 +73,20 @@ async Task LoadGamesAsync()
 
 
 
-
                 var grid = new Grid()
                 {
                     RowSpacing = 10,
                 };
+
                 grid.RowDefinitions.Add(new RowDefinition());
                 grid.RowDefinitions.Add(new RowDefinition());
-
                 Grid.SetRow(richTextBlock, 0);
                 grid.Children.Add(richTextBlock);
 
-
                 var gameLibrarySelectorControl = new GameLibrarySelectorControl();
-
                 Grid.SetRow(gameLibrarySelectorControl, 1);
                 grid.Children.Add(gameLibrarySelectorControl);
 
-
                 var dialog = new EasyContentDialog(XamlRoot)
                 {
                     Title = "Failed to load game libraries",
@@ -120,8 +95,10 @@ async Task LoadGamesAsync()
                     DefaultButton = ContentDialogButton.Primary,
                     Content = grid,
                 };
+
                 var result = await dialog.ShowAsync();
-                if (result == ContentDialogResult.Primary)
+
+                if (result is ContentDialogResult.Primary)
                 {
                     gameLibrarySelectorControl.Save();
                 }
@@ -156,7 +133,7 @@ async Task LoadGamesAsync()
             });
         }
 
-        void FilterGames()
+        private void FilterGames()
         {
             // TODO: Remove weird hack which otherwise causes MainGridView_SelectionChanged to fire when changing MainGridView.ItemsSource.
             MainGridView.SelectionChanged -= MainGridView_SelectionChanged;
@@ -165,7 +142,6 @@ void FilterGames()
 
             if (Settings.Instance.GroupGameLibrariesTogether)
             {
-
                 var collectionViewSource = new CollectionViewSource()
                 {
                     IsSourceGrouped = true,
@@ -191,7 +167,7 @@ void FilterGames()
                 {
                     foreach (var gameLibrary in GameLibraries)
                     {
-                        games.AddRange(gameLibrary.LoadedGames.Where(g => g.HasDLSS == true));
+                        games.AddRange(gameLibrary.LoadedGames.Where(g => g.HasDLSS is true));
                     }
                 }
                 else
@@ -212,15 +188,14 @@ void FilterGames()
             MainGridView.SelectionChanged += MainGridView_SelectionChanged;
         }
 
-
-        async void Page_Loaded(object sender, RoutedEventArgs e)
+        private async void Page_Loaded(object sender, RoutedEventArgs e)
         {
             await LoadGamesAndDlls();
         }
 
-        async void MainGridView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private async void MainGridView_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (e.AddedItems.Count == 0)
+            if (e.AddedItems.Count is 0)
             {
                 return;
             }
@@ -230,21 +205,36 @@ async void MainGridView_SelectionChanged(object sender, SelectionChangedEventArg
             {
                 EasyContentDialog dialog;
 
-                if (game.HasDLSS == false)
+                if (game.HasDLSS is false)
                 {
                     dialog = new EasyContentDialog(XamlRoot)
                     {
-                        //dialog.Title = "Error";
+                        Title = "Error",
                         PrimaryButtonText = "Okay",
                         DefaultButton = ContentDialogButton.Primary,
                         Content = $"DLSS was not detected in {game.Title}.",
                     };
+
+                    await dialog.ShowAsync();
+                    return;
+                }
+
+                if (Settings.Instance.HideNotDownloadedVersions && App.CurrentApp.MainWindow.CurrentDLSSRecords.Where(static r => r.LocalRecord.IsDownloaded).Count() is 0)
+                {
+                    dialog = new(XamlRoot)
+                    {
+                        Title = "Error",
+                        PrimaryButtonText = "Okay",
+                        DefaultButton = ContentDialogButton.Primary,
+                        Content = "You have not downloaded any DLSS version. Please download one from the library page.",
+                    };
+
                     await dialog.ShowAsync();
                     return;
                 }
 
                 var dlssPickerControl = new DLSSPickerControl(game);
-                dialog = new EasyContentDialog(XamlRoot)
+                dialog = new(XamlRoot)
                 { 
                     Title = "Select DLSS Version",
                     PrimaryButtonText = "Swap",
@@ -253,37 +243,37 @@ async void MainGridView_SelectionChanged(object sender, SelectionChangedEventArg
                     Content = dlssPickerControl,
                 };
 
-                if (String.IsNullOrEmpty(game.BaseDLSSVersion) == false)
+                if (string.IsNullOrEmpty(game.BaseDLSSVersion) is false)
                 {
                     dialog.SecondaryButtonText = "Reset";
                 }
 
                 var result = await dialog.ShowAsync();
 
-
-                if (result == ContentDialogResult.Primary)
+                if (result is ContentDialogResult.Primary)
                 {
                     var selectedDLSSRecord = dlssPickerControl.GetSelectedDLSSRecord();
 
-                    if (selectedDLSSRecord.LocalRecord.IsDownloading == true || selectedDLSSRecord.LocalRecord.IsDownloaded == false)
+                    if (selectedDLSSRecord.LocalRecord.IsDownloading is true || selectedDLSSRecord.LocalRecord.IsDownloaded is false)
                     {
                         // TODO: Initiate download here.
-                        dialog = new EasyContentDialog(XamlRoot)
+                        dialog = new(XamlRoot)
                         {
                             Title = "Error",
                             CloseButtonText = "Okay",
                             DefaultButton = ContentDialogButton.Close,
                             Content = "Please download the DLSS record from the downloads page first.",
                         };
+
                         await dialog.ShowAsync();
                         return;
                     }
 
                     var didUpdate = game.UpdateDll(selectedDLSSRecord);
 
-                    if (didUpdate.Success == false)
+                    if (didUpdate.Success is false)
                     {
-                        dialog = new EasyContentDialog(XamlRoot)
+                        dialog = new(XamlRoot)
                         {
                             Title = "Error",
                             PrimaryButtonText = "Okay",
@@ -291,6 +281,7 @@ async void MainGridView_SelectionChanged(object sender, SelectionChangedEventArg
                             Content = didUpdate.Message,
                         };
 
+
                         if (didUpdate.PromptToRelaunchAsAdmin is true)
                         {
                             dialog.SecondaryButtonText = "Relaunch as Administrator";
@@ -303,11 +294,11 @@ async void MainGridView_SelectionChanged(object sender, SelectionChangedEventArg
                         }
                     }
                 }
-                else if (result == ContentDialogResult.Secondary)
+                else if (result is ContentDialogResult.Secondary)
                 {
                     var didReset = game.ResetDll();
 
-                    if (didReset.Success == false)
+                    if (didReset.Success is false)
                     {
                         dialog = new EasyContentDialog(XamlRoot)
                         {
@@ -332,9 +323,7 @@ async void MainGridView_SelectionChanged(object sender, SelectionChangedEventArg
             }
         }
 
-
-
-        async Task LoadGamesAndDlls()
+        private async Task LoadGamesAndDlls()
         {
             if (_loadingGamesAndDlls)
                 return;
@@ -347,7 +336,6 @@ async Task LoadGamesAndDlls()
             var tasks = new List<Task>();
             tasks.Add(LoadGamesAsync());
 
-
             await Task.WhenAll(tasks);
 
             DispatcherQueue.TryEnqueue(() =>
@@ -357,12 +345,12 @@ async Task LoadGamesAndDlls()
             });
         }
 
-        async void RefreshButton_Click(object sender, RoutedEventArgs e)
+        private async void RefreshButton_Click(object sender, RoutedEventArgs e)
         {
             await LoadGamesAndDlls();
         }
 
-        async void FilterButton_Click(object sender, RoutedEventArgs e)
+        private async void FilterButton_Click(object sender, RoutedEventArgs e)
         {
             var gameFilterControl = new GameFilterControl();
 
@@ -376,7 +364,7 @@ async void FilterButton_Click(object sender, RoutedEventArgs e)
             };
             var result = await dialog.ShowAsync();
 
-            if (result == ContentDialogResult.Primary)
+            if (result is ContentDialogResult.Primary)
             {
                 Settings.Instance.HideNonDLSSGames = gameFilterControl.IsHideNonDLSSGamesChecked();
                 Settings.Instance.GroupGameLibrariesTogether = gameFilterControl.IsGroupGameLibrariesTogetherChecked();
diff --git a/src/Pages/SettingsPage.xaml b/src/Pages/SettingsPage.xaml
index 08818c2..72dd74d 100644
--- a/src/Pages/SettingsPage.xaml
+++ b/src/Pages/SettingsPage.xaml
@@ -54,7 +54,6 @@
                     <RadioButton x:Name="DefaultThemeRadioButton" GroupName="ThemeGroup" Tag="Default" Checked="ThemeRadioButton_Checked" Content="Use system setting" />
                 </StackPanel>
 
-
                 <TextBlock
                     Style="{StaticResource SubtitleTextBlockStyle}"
                     Margin="0,40,0,0"
@@ -74,7 +73,6 @@
                     </TextBlock>
                 </StackPanel>
 
-
                 <TextBlock
                     Style="{StaticResource SubtitleTextBlockStyle}"
                     Margin="0,40,0,0"
@@ -86,6 +84,16 @@
                     </TextBlock>
                 </StackPanel>
 
+                <TextBlock
+                    Style="{StaticResource SubtitleTextBlockStyle}"
+                    Margin="0,40,0,0"
+                    Text="Hide Not Downloaded DLSS Versions" />
+                <StackPanel Margin="0,10,0,0">
+                    <ToggleSwitch x:Name="HideNotDownloadedToggleSwitch" Toggled="HideNotDownloaded_Toggled" OffContent="No" OnContent="Yes" Margin="0,0,0,4"/>
+                    <TextBlock Style="{ThemeResource CaptionTextBlockStyle}" FontStyle="Italic" Margin="0,8,0,0">
+                        This setting will hide not downloaded DLSS versions in the selector.
+                    </TextBlock>
+                </StackPanel>
 
                 <TextBlock
                     Style="{StaticResource SubtitleTextBlockStyle}"
@@ -98,7 +106,6 @@
                     </TextBlock>
                 </StackPanel>
 
-
                 <TextBlock
                     Style="{StaticResource SubtitleTextBlockStyle}"
                     Margin="0,40,0,0"
@@ -126,7 +133,6 @@
                 </TextBlock>
                 <Button Content="Check for updates" Margin="0,12,0,0" Command="{Binding CheckForUpdatesCommand}" />
 
-                
                 <TextBlock
                     Style="{StaticResource SubtitleTextBlockStyle}"
                     Margin="0,40,0,0"
@@ -134,11 +140,10 @@
                 <RichTextBlock Margin="0,12,0,0">
                     <Paragraph>
                         You can suggest a feature or report a problem or on the DLSS Swapper
-                        <Hyperlink NavigateUri="https://github.com/beeradmoore/dlss-swapper/issues">GitHub repository</Hyperlink>.
+                        <Hyperlink NavigateUri="https://github.com/beeradmoore/dlss-swapper/issues">GitHub repository</Hyperlink> .
                     </Paragraph>
                 </RichTextBlock>
 
-                
                 <TextBlock
                     Style="{StaticResource SubtitleTextBlockStyle}"
                     Margin="0,40,0,0"
@@ -149,10 +154,10 @@
                         <Hyperlink NavigateUri="https://github.com/beeradmoore/dlss-swapper/graphs/contributors">contributors</Hyperlink>
                         and the people who have filed
                         <Hyperlink NavigateUri="https://github.com/beeradmoore/dlss-swapper/issues">feedback</Hyperlink> to help improve the product.
-                        <LineBreak />(also NVIDIA for DLSS 😊)
+                        <LineBreak /> (also NVIDIA for DLSS 😊)
                     </Paragraph>
                 </RichTextBlock>
-
+                
             </StackPanel>
         </ScrollViewer>
     </Grid>
diff --git a/src/Pages/SettingsPage.xaml.cs b/src/Pages/SettingsPage.xaml.cs
index ccb8bfe..9d01926 100644
--- a/src/Pages/SettingsPage.xaml.cs
+++ b/src/Pages/SettingsPage.xaml.cs
@@ -1,27 +1,14 @@
-using CommunityToolkit.WinUI.UI.Controls;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Documents;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using MvvmHelpers.Commands;
-using MvvmHelpers.Interfaces;
-using System;
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.Foundation.Diagnostics;
-using Windows.System;
-using Windows.UI.ViewManagement;
-using System.Diagnostics;
 using DLSS_Swapper.UserControls;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Documents;
+using MvvmHelpers.Commands;
 
 namespace DLSS_Swapper.Pages
 {
@@ -32,7 +19,6 @@ public sealed partial class SettingsPage : Page
     {
         //https://github.com/microsoft/Xaml-Controls-Gallery/blob/6450265cc94da5b2fac5e1e22d1be35dc66c402e/XamlControlsGallery/Navigation/NavigationRootPage.xaml.cs#L32
 
-
         public string Version => App.CurrentApp.GetVersionString();
 
         private AsyncCommand _checkForUpdateCommand;
@@ -61,22 +47,22 @@ public SettingsPage()
         {
             this.InitializeComponent();
 
-
             // Initilize defaults.
-            LightThemeRadioButton.IsChecked = Settings.Instance.AppTheme == ElementTheme.Light;
-            DarkThemeRadioButton.IsChecked = Settings.Instance.AppTheme == ElementTheme.Dark;
-            DefaultThemeRadioButton.IsChecked = Settings.Instance.AppTheme == ElementTheme.Default;
+            LightThemeRadioButton.IsChecked = Settings.Instance.AppTheme is ElementTheme.Light;
+            DarkThemeRadioButton.IsChecked = Settings.Instance.AppTheme is ElementTheme.Dark;
+            DefaultThemeRadioButton.IsChecked = Settings.Instance.AppTheme is ElementTheme.Default;
 
             AllowUntrustedToggleSwitch.IsOn = Settings.Instance.AllowUntrusted;
             AllowExperimentalToggleSwitch.IsOn = Settings.Instance.AllowExperimental;
+            HideNotDownloadedToggleSwitch.IsOn = Settings.Instance.HideNotDownloadedVersions;
             LoggingComboBox.SelectedItem = Settings.Instance.LoggingLevel;
 
             DataContext = this;
         }
 
-        void ThemeRadioButton_Checked(object sender, RoutedEventArgs e)
+        private void ThemeRadioButton_Checked(object sender, RoutedEventArgs e)
         {
-            if (DataContext == null)
+            if (DataContext is null)
             {
                 return;
             }
@@ -98,9 +84,9 @@ void ThemeRadioButton_Checked(object sender, RoutedEventArgs e)
             }
         }
 
-        void AllowExperimental_Toggled(object sender, RoutedEventArgs e)
+        private void AllowExperimental_Toggled(object sender, RoutedEventArgs e)
         {
-            if (DataContext == null)
+            if (DataContext is null)
             {
                 return;
             }
@@ -112,9 +98,9 @@ void AllowExperimental_Toggled(object sender, RoutedEventArgs e)
             }
         }
 
-        void AllowUntrusted_Toggled(object sender, RoutedEventArgs e)
+        private void AllowUntrusted_Toggled(object sender, RoutedEventArgs e)
         {
-            if (DataContext == null)
+            if (DataContext is null)
             {
                 return;
             }
@@ -126,20 +112,33 @@ void AllowUntrusted_Toggled(object sender, RoutedEventArgs e)
             }
         }
 
-        async Task CheckForUpdatesAsync()
+        private void HideNotDownloaded_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (DataContext is null)
+            {
+                return;
+            }
+
+            if (e.OriginalSource is ToggleSwitch toggleSwitch)
+            {
+                Settings.Instance.HideNotDownloadedVersions = toggleSwitch.IsOn;
+            }
+        }
+
+        private async Task CheckForUpdatesAsync()
         {
             IsCheckingForUpdates = true;
             var githubUpdater = new Data.GitHub.GitHubUpdater();
             var newUpdate = await githubUpdater.CheckForNewGitHubRelease();      
-            if (newUpdate == null)
+            if (newUpdate is null)
             {
-
                 var dialog = new EasyContentDialog(XamlRoot)
                 {
                     CloseButtonText = "Okay",
                     DefaultButton = ContentDialogButton.Close,
                     Content = "No new updates are available.",
                 };
+
                 await dialog.ShowAsync();
 
                 IsCheckingForUpdates = false;
@@ -153,7 +152,7 @@ async Task CheckForUpdatesAsync()
 
         private void LoggingComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (DataContext == null)
+            if (DataContext is null)
             {
                 return;
             }
diff --git a/src/Settings.cs b/src/Settings.cs
index fc0cc71..aa47aa0 100644
--- a/src/Settings.cs
+++ b/src/Settings.cs
@@ -1,5 +1,5 @@
-using Microsoft.UI.Xaml;
-using System;
+using System;
+using Microsoft.UI.Xaml;
 
 namespace DLSS_Swapper
 {
@@ -10,9 +10,9 @@ public class Settings
         public static Settings Instance => _instance ??= Settings.FromJson();
         
         // We default this to false to prevent saves firing when loading from json.
-        bool _autoSave = false;
+        private bool _autoSave = false;
 
-        bool _hasShownWarning = false;
+        private bool _hasShownWarning = false;
         public bool HasShownWarning
         {
             get { return _hasShownWarning; }
@@ -29,7 +29,7 @@ public bool HasShownWarning
             }
         }
 
-        bool _hasShownMultiplayerWarning = false;
+        private bool _hasShownMultiplayerWarning = false;
         public bool HasShownMultiplayerWarning
         {
             get { return _hasShownMultiplayerWarning; }
@@ -46,7 +46,7 @@ public bool HasShownMultiplayerWarning
             }
         }
 
-        bool _hideNonDLSSGames = true;
+        private bool _hideNonDLSSGames = true;
         public bool HideNonDLSSGames
         {
             get { return _hideNonDLSSGames; }
@@ -63,8 +63,7 @@ public bool HideNonDLSSGames
             }
         }
 
-
-        bool _groupGameLibrariesTogether = false;
+        private bool _groupGameLibrariesTogether = false;
         public bool GroupGameLibrariesTogether
         {
             get { return _groupGameLibrariesTogether; }
@@ -81,7 +80,7 @@ public bool GroupGameLibrariesTogether
             }
         }
 
-        ElementTheme _appTheme = ElementTheme.Default;
+        private ElementTheme _appTheme = ElementTheme.Default;
         public ElementTheme AppTheme
         {
             get { return _appTheme; }
@@ -98,7 +97,7 @@ public ElementTheme AppTheme
             }
         }
 
-        bool _allowExperimental = false;
+        private bool _allowExperimental = false;
         public bool AllowExperimental
         {
             get { return _allowExperimental; }
@@ -115,8 +114,7 @@ public bool AllowExperimental
             }
         }
 
-
-        bool _allowUntrusted = false;
+        private bool _allowUntrusted = false;
         public bool AllowUntrusted
         {
             get { return _allowUntrusted; }
@@ -133,7 +131,24 @@ public bool AllowUntrusted
             }
         }
 
-        DateTimeOffset _lastRecordsRefresh = DateTimeOffset.MinValue;
+        private bool _hideNotDownloadedVersions = false;
+        public bool HideNotDownloadedVersions
+        {
+            get { return _hideNotDownloadedVersions; }
+            set
+            {
+                if (_hideNotDownloadedVersions != value)
+                {
+                    _hideNotDownloadedVersions = value;
+                    if (_autoSave)
+                    {
+                        SaveJson();
+                    }
+                }
+            }
+        }
+
+        private DateTimeOffset _lastRecordsRefresh = DateTimeOffset.MinValue;
         public DateTimeOffset LastRecordsRefresh
         {
             get { return _lastRecordsRefresh; }
@@ -150,8 +165,7 @@ public DateTimeOffset LastRecordsRefresh
             }
         }
 
-
-        ulong _lastPromptWasForVersion = 0L;
+        private ulong _lastPromptWasForVersion = 0L;
         public ulong LastPromptWasForVersion
         {
             get { return _lastPromptWasForVersion; }
@@ -168,9 +182,8 @@ public ulong LastPromptWasForVersion
             }
         }
 
-
         // Don't forget to change this back to off.
-        LoggingLevel _loggingLevel = LoggingLevel.Error;
+        private LoggingLevel _loggingLevel = LoggingLevel.Error;
         public LoggingLevel LoggingLevel
         {
             get { return _loggingLevel; }
@@ -187,7 +200,7 @@ public LoggingLevel LoggingLevel
             }
         }
 
-        uint _enabledGameLibraries = uint.MaxValue;
+        private uint _enabledGameLibraries = uint.MaxValue;
         public uint EnabledGameLibraries
         {
             get { return _enabledGameLibraries; }
@@ -204,8 +217,7 @@ public uint EnabledGameLibraries
             }
         }
 
-
-        bool _wasLoadingGames = false;
+        private bool _wasLoadingGames = false;
         public bool WasLoadingGames
         {
             get { return _wasLoadingGames; }
@@ -222,18 +234,18 @@ public bool WasLoadingGames
             }
         }
 
-        void SaveJson()
+        private void SaveJson()
         {
             AsyncHelper.RunSync(() => Storage.SaveSettingsJsonAsync(this));
         }
 
-        static Settings FromJson()
+        private static Settings FromJson()
         {
             Settings settings = null;
 
             var settingsFromJson = AsyncHelper.RunSync(() => Storage.LoadSettingsJsonAsync());
             // If we couldn't load settings then save the defaults.
-            if (settingsFromJson == null)
+            if (settingsFromJson is null)
             {
                 settings = new Settings();
                 settings.SaveJson();
diff --git a/src/UserControls/DLSSPickerControl.xaml.cs b/src/UserControls/DLSSPickerControl.xaml.cs
index be9d6a2..ca17899 100644
--- a/src/UserControls/DLSSPickerControl.xaml.cs
+++ b/src/UserControls/DLSSPickerControl.xaml.cs
@@ -1,19 +1,7 @@
-using DLSS_Swapper.Data;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using MvvmHelpers;
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
+using DLSS_Swapper.Data;
+using Microsoft.UI.Xaml.Controls;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -22,27 +10,32 @@ namespace DLSS_Swapper.UserControls
 {
     public sealed partial class DLSSPickerControl : UserControl
     {
-        Game _game;
-        public List<DLSSRecord> DLSSRecords { get; } = new List<DLSSRecord>();
+        private readonly Game _game;
+        public List<DLSSRecord> DLSSRecords { get; } = [];
 
         public DLSSPickerControl(Game game)
         {
             _game = game;
-            DLSSRecords.AddRange(App.CurrentApp.MainWindow.CurrentDLSSRecords);
+            bool hideNotDownloaded = Settings.Instance.HideNotDownloadedVersions;
+            if (hideNotDownloaded)
+            {
+                DLSSRecords.AddRange(App.CurrentApp.MainWindow.CurrentDLSSRecords.Where(r => r.LocalRecord.IsDownloaded is true));
+            }
+            else
+            {
+                DLSSRecords.AddRange(App.CurrentApp.MainWindow.CurrentDLSSRecords);
+            }
 
             this.InitializeComponent();
             DataContext = this;
 
-            // TODO: If you select an imported DLSS 
             var detectedVersion = DLSSRecords.FirstOrDefault(v => v.MD5Hash == game.CurrentDLSSHash);
-            if (detectedVersion == null)
-            {
-
-            }
-            else
+            if (detectedVersion is not null)
             {
                 DLSSRecordsListView.SelectedItem = detectedVersion;
             }
+            // TODO: If you select an imported DLSS
+            // else { }
         }
 
         internal DLSSRecord GetSelectedDLSSRecord()