diff --git a/docs/index.html b/docs/index.html
index e0e6fd1cb..0b809bbb4 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -307,7 +307,7 @@
       generation of DASM-compatible disassembly files</li>
     <li>Emulation of CRT TV systems using <a href="http://slack.net/~ant/libs/ntsc.html">
       Blargg filtering</a>, including presets for several common TV outputs
-      (composite, S-video, RGB, etc.), and ability to fully customize
+      (Composite, S-Video, RGB, etc.), and ability to fully customize
       many attributes (contrast, brightness, saturation, gamma, etc.).</li>
     <li>Built-in ROM database with information partially compiled by
       <a href="http://www.atarimania.com/rom_collection_archive_atari_2600_roms.html">
@@ -1270,17 +1270,17 @@
       <td>Cmd + 1</td>
     </tr>
     <tr>
-      <td>Select 'Composite' preset</td>
+      <td>Select 'RGB' preset</td>
       <td>Alt + 2</td>
       <td>Cmd + 2</td>
     </tr>
     <tr>
-      <td>Select 'S-video' preset</td>
+      <td>Select 'S-Video' preset</td>
       <td>Alt + 3</td>
       <td>Cmd + 3</td>
     </tr>
     <tr>
-      <td>Select 'RGB' preset</td>
+      <td>Select 'Composite' preset</td>
       <td>Alt + 4</td>
       <td>Cmd + 4</td>
     </tr>
diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx
index d0a2dd141..ccb2528b0 100644
--- a/src/common/PKeyboardHandler.cxx
+++ b/src/common/PKeyboardHandler.cxx
@@ -327,16 +327,16 @@ void PhysicalKeyboardHandler::handleEvent(StellaKey key, StellaMod mod, bool sta
           myOSystem.frameBuffer().tiaSurface().setNTSC(NTSCFilter::PRESET_OFF);
           break;
 
-        case KBDK_2:  // Alt-2 turns on 'composite' NTSC filtering
-          myOSystem.frameBuffer().tiaSurface().setNTSC(NTSCFilter::PRESET_COMPOSITE);
+        case KBDK_2:  // Alt-2 turns on 'rgb' NTSC filtering
+          myOSystem.frameBuffer().tiaSurface().setNTSC(NTSCFilter::PRESET_RGB);
           break;
 
         case KBDK_3:  // Alt-3 turns on 'svideo' NTSC filtering
           myOSystem.frameBuffer().tiaSurface().setNTSC(NTSCFilter::PRESET_SVIDEO);
           break;
 
-        case KBDK_4:  // Alt-4 turns on 'rgb' NTSC filtering
-          myOSystem.frameBuffer().tiaSurface().setNTSC(NTSCFilter::PRESET_RGB);
+        case KBDK_4:  // Alt-4 turns on 'composite' NTSC filtering
+          myOSystem.frameBuffer().tiaSurface().setNTSC(NTSCFilter::PRESET_COMPOSITE);
           break;
 
         case KBDK_5:  // Alt-5 turns on 'bad' NTSC filtering
diff --git a/src/gui/StellaSettingsDialog.cxx b/src/gui/StellaSettingsDialog.cxx
index 31320d433..e75714fb9 100644
--- a/src/gui/StellaSettingsDialog.cxx
+++ b/src/gui/StellaSettingsDialog.cxx
@@ -37,7 +37,7 @@ StellaSettingsDialog::StellaSettingsDialog(OSystem& osystem, DialogContainer& pa
   const int lineHeight = font.getLineHeight(),
     fontWidth = font.getMaxCharWidth();
   int xpos, ypos;
-    
+
   WidgetArray wid;
   VariantList items;
 
@@ -197,7 +197,7 @@ void StellaSettingsDialog::loadConfig()
 
   // TV Mode
   myTVMode->setSelected(
-    settings.getString("tv.filter"), "0");  
+    settings.getString("tv.filter"), "0");
 
   // TV scanline intensity and interpolation
   myTVScanIntense->setValue(settings.getInt("tv.scanlines"));
@@ -260,7 +260,7 @@ void StellaSettingsDialog::saveConfig()
   {
     instance().console().setProperties(myGameProperties);
   }
-  
+
   // Finally, issue a complete framebuffer re-initialization
   instance().createFrameBuffer();
 }
diff --git a/src/gui/StellaSettingsDialog.hxx b/src/gui/StellaSettingsDialog.hxx
index 026241ad3..a8d87e52f 100644
--- a/src/gui/StellaSettingsDialog.hxx
+++ b/src/gui/StellaSettingsDialog.hxx
@@ -41,7 +41,7 @@ class StellaSettingsDialog : public Dialog
     void addVideoOptions(WidgetArray& wid, int& xpos, int& ypos, const GUI::Font& font);
     void addUIOptions(WidgetArray& wid, int& xpos, int& ypos, const GUI::Font& font);
     void addGameOptions(WidgetArray& wid, int& xpos, int& ypos, const GUI::Font& font);
-    
+
     void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
     void handleTVModeChange();
     void handlePhosphorChange();