diff --git a/Source/Project64/Plugins/PluginList.cpp b/Source/Project64/Plugins/PluginList.cpp
index 2da95ac37..8d3ae6dba 100644
--- a/Source/Project64/Plugins/PluginList.cpp
+++ b/Source/Project64/Plugins/PluginList.cpp
@@ -106,4 +106,4 @@ void CPluginList::AddPluginFromDir(CPath Dir)
             hLib = NULL;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Source/Project64/Settings/NotificationSettings.cpp b/Source/Project64/Settings/NotificationSettings.cpp
index 799317329..a3a949033 100644
--- a/Source/Project64/Settings/NotificationSettings.cpp
+++ b/Source/Project64/Settings/NotificationSettings.cpp
@@ -23,4 +23,4 @@ void CNotificationSettings::RegisterNotifications()
 void CNotificationSettings::RefreshSettings()
 {
     m_bInFullScreen = UISettingsLoadBool(UserInterface_InFullScreen);
-}
\ No newline at end of file
+}
diff --git a/Source/Project64/Settings/UISettings.cpp b/Source/Project64/Settings/UISettings.cpp
index bfc085399..40ea4590e 100644
--- a/Source/Project64/Settings/UISettings.cpp
+++ b/Source/Project64/Settings/UISettings.cpp
@@ -10,26 +10,26 @@
 
 void RegisterUISettings (void)
 {
-    //information - temp keys
+    // Information - temporary keys
     g_Settings->AddHandler((SettingID)(FirstUISettings + Info_ShortCutsChanged), new CSettingTypeTempBool(false));
 
-    //Support Files
+    // Support files
     g_Settings->AddHandler((SettingID)(FirstUISettings + SupportFile_ShortCuts), new CSettingTypeApplicationPath("", "ShortCuts", (SettingID)(FirstUISettings + SupportFile_ShortCutsDefault)));
     g_Settings->AddHandler((SettingID)(FirstUISettings + SupportFile_ShortCutsDefault), new CSettingTypeRelativePath("Config", "Project64.sc3"));
 
-    //Settings location
+    // Settings location
     g_Settings->AddHandler((SettingID)(FirstUISettings + Setting_PluginPageFirst), new CSettingTypeApplication("Settings", "Plugin Page First", false));
     g_Settings->AddHandler((SettingID)(FirstUISettings + Setting_DisableScrSaver), new CSettingTypeApplication("Settings", "Disable Screen Saver", (uint32_t)true));
 	g_Settings->AddHandler((SettingID)(FirstUISettings + Setting_EnableDiscordRPC), new CSettingTypeApplication("Settings", "Enable Discord RPC", true));
     g_Settings->AddHandler((SettingID)(FirstUISettings + Setting_AutoSleep), new CSettingTypeApplication("Settings", "Auto Sleep", (uint32_t)true));
     g_Settings->AddHandler((SettingID)(FirstUISettings + Setting_AutoFullscreen), new CSettingTypeApplication("Settings", "Auto Full Screen", (uint32_t)false));
 
-    //RDB Settings
+    // RDB settings
     g_Settings->AddHandler((SettingID)(FirstUISettings + Rdb_Status), new CSettingTypeRomDatabase("Status", "Unknown"));
     g_Settings->AddHandler((SettingID)(FirstUISettings + Rdb_NotesCore), new CSettingTypeRomDatabase("Core Note", ""));
     g_Settings->AddHandler((SettingID)(FirstUISettings + Rdb_NotesPlugin), new CSettingTypeRomDatabase("Plugin Note", ""));
 
-    //User Interface
+    // User interface
     g_Settings->AddHandler((SettingID)(FirstUISettings + UserInterface_InFullScreen), new CSettingTypeTempBool(false));
     g_Settings->AddHandler((SettingID)(FirstUISettings + UserInterface_MainWindowTop), new CSettingTypeApplication("Main Window", "Top", Default_None));
     g_Settings->AddHandler((SettingID)(FirstUISettings + UserInterface_MainWindowLeft), new CSettingTypeApplication("Main Window", "Left", Default_None));
@@ -56,7 +56,7 @@ void RegisterUISettings (void)
 
     g_Settings->AddHandler((SettingID)(FirstUISettings + SupportWindows_RunCount), new CSettingTypeApplication("Support Project64", "Run Count", (uint32_t)0));
 
-    //Debugger UI
+    // Debugger UI
     g_Settings->AddHandler((SettingID)(FirstUISettings + DebuggerUI_CommandsPos), new CSettingTypeApplication("Debugger UI", "Commands Pos", Default_None));
     g_Settings->AddHandler((SettingID)(FirstUISettings + DebuggerUI_MemoryPos), new CSettingTypeApplication("Debugger UI", "Memory Pos", Default_None));
     g_Settings->AddHandler((SettingID)(FirstUISettings + DebuggerUI_MemoryDumpPos), new CSettingTypeApplication("Debugger UI", "Memory Dump Pos", Default_None));
diff --git a/Source/Project64/Settings/UISettings.h b/Source/Project64/Settings/UISettings.h
index 38ef43585..bf89fb91d 100644
--- a/Source/Project64/Settings/UISettings.h
+++ b/Source/Project64/Settings/UISettings.h
@@ -4,26 +4,26 @@
 
 enum UISettingID
 {
-    //information - temp keys
+    // Information - temporary keys
     Info_ShortCutsChanged,
 
-    //Support Files
+    // Support files
     SupportFile_ShortCuts,
     SupportFile_ShortCutsDefault,
 
-    //Settings location
+    // Settings location
     Setting_PluginPageFirst,
     Setting_DisableScrSaver,
 	Setting_EnableDiscordRPC,
     Setting_AutoSleep,
     Setting_AutoFullscreen,
 
-    //RDB TLB Settings
+    // RDB TLB settings
     Rdb_Status,
     Rdb_NotesCore,
     Rdb_NotesPlugin,
 
-    //User Interface
+    // User interface
     UserInterface_InFullScreen,
     UserInterface_MainWindowTop,
     UserInterface_MainWindowLeft,
@@ -41,19 +41,19 @@ enum UISettingID
     RomBrowser_SortAscendingIndex,
     RomBrowser_Maximized,
 
-    //Directory Info
+    // Directory info
     Directory_LastSave,
     Directory_RecentGameDirCount,
     Directory_RecentGameDirIndex,
 
-    //Recent Game
+    // Recent game
     File_RecentGameFileCount,
     File_RecentGameFileIndex,
 
-    //Support Window
+    // Support window
     SupportWindows_RunCount,
 
-    //Debugger UI window positions and sizes
+    // Debugger UI window positions and sizes
     DebuggerUI_CommandsPos,
     DebuggerUI_MemoryPos,
     DebuggerUI_MemoryDumpPos,