diff --git a/docs/graphics/eventmapping_devsports.png b/docs/graphics/eventmapping_devsports.png
index c4581b86f..e03739e59 100644
Binary files a/docs/graphics/eventmapping_devsports.png and b/docs/graphics/eventmapping_devsports.png differ
diff --git a/docs/graphics/options_debugger.png b/docs/graphics/options_debugger.png
deleted file mode 100644
index dee99f994..000000000
Binary files a/docs/graphics/options_debugger.png and /dev/null differ
diff --git a/docs/graphics/options_video.png b/docs/graphics/options_video.png
index eb9992f7e..37e46856c 100644
Binary files a/docs/graphics/options_video.png and b/docs/graphics/options_video.png differ
diff --git a/docs/graphics/options_video_tv.png b/docs/graphics/options_video_tv.png
index 2693a0faf..52ffd1b75 100644
Binary files a/docs/graphics/options_video_tv.png and b/docs/graphics/options_video_tv.png differ
diff --git a/docs/index.html b/docs/index.html
index 7842540ae..21b8a2979 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2496,21 +2496,21 @@
       <td valign="top">
         <table border="1" cellpadding="4">
           <tr><th>Item</th><th>Brief description</th><th>For more information,<br>see <a href="#CommandLine">CommandLine</a></th></tr>
-          <tr><td>Renderer</td><td>use specified rendering mode</td><td>-video</td></tr>
-          <tr><td>TIA Zoom</td><td>(integral) zoom level for emulation mode </td><td>-tia.zoom</td></tr>
-          <tr><td>TIA Palette</td><td>palette for emulation mode</td><td>-palette</td></tr>
-          <tr><td>TIA Inter</td><td>interpolation for TIA image</td><td>-tia.inter</td></tr>
-          <tr><td>Timing (*)</td><td>how to wait between frames (requires restart)</td><td>-timing</td></tr>
+          <tr><td>Renderer</td><td>Use specified rendering mode</td><td>-video</td></tr>
+          <tr><td>TIA Zoom</td><td>(Integral) zoom level for emulation mode </td><td>-tia.zoom</td></tr>
+          <tr><td>TIA Palette</td><td>Palette for emulation mode</td><td>-palette</td></tr>
+          <tr><td>TIA Inter</td><td>Interpolation for TIA image</td><td>-tia.inter</td></tr>
+          <tr><td>Timing (*)</td><td>How to wait between frames (requires restart)</td><td>-timing</td></tr>
           <tr><td>NTSC Aspect</td><td>Width of TIA image in NTSC mode</td><td>-tia.aspectn</td></tr>
           <tr><td>PAL Aspect</td><td>Width of TIA image in PAL mode</td><td>-tia.aspectp</td></tr>
-          <tr><td>Framerate</td><td>frames per second in emulation mode</td><td>-framerate</td></tr>
-          <tr><td>Fullscreen</td><td>self-explanatory</td><td>-fullscreen</td></tr>
-          <tr><td>Fullscreen Fill</td><td>completely fill TIA image in fullscreen</td><td>-tia.fsfill</td></tr>
-          <tr><td>VSync</td><td>enable vertical sync'ed updates</td><td>-vsync</td></tr>
-          <tr><td>Fast SC/AR BIOS</td><td>skip progress loading bars for SuperCharger ROMs</td><td>-fastscbios</td></tr>
-          <tr><td>Show UI messages</td><td>overlay UI messages onscreen</td><td>-uimessages</td></tr>
-          <tr><td>Center window</td><td>attempt to center application window</td><td>-center</td></tr>
-          <tr><td>Use multi-threading</td><td>enable multi-threaded rendering</td><td>-threads</td></tr>
+          <tr><td>Framerate</td><td>Frames per second in emulation mode</td><td>-framerate</td></tr>
+          <tr><td>Fullscreen</td><td>Self-explanatory</td><td>-fullscreen</td></tr>
+          <tr><td>Fullscreen Fill</td><td>Completely fill TIA image in fullscreen</td><td>-tia.fsfill</td></tr>
+          <tr><td>VSync</td><td>Enable vertical sync'ed updates</td><td>-vsync</td></tr>
+          <tr><td>Fast SC/AR BIOS</td><td>Skip progress loading bars for SuperCharger ROMs</td><td>-fastscbios</td></tr>
+          <tr><td>Show UI messages</td><td>Overlay UI messages onscreen</td><td>-uimessages</td></tr>
+          <tr><td>Center window</td><td>Attempt to center application window</td><td>-center</td></tr>
+          <tr><td>Use multi-threading</td><td>Enable multi-threaded rendering</td><td>-threads</td></tr>
         </table>
       </td>
     </tr>
@@ -2525,35 +2525,18 @@
       <td valign="top">
         <table border="1" cellpadding="4">
           <tr><th>Item</th><th>Brief description</th><th>For more information,<br>see <a href="#CommandLine">CommandLine</a></th></tr>
-          <tr><td>TV Mode</td><td>disable TV effects, or select TV preset</td><td>-tv.filter</td></tr>
-          <tr><td>TV Phosphor</td><td>enable phosphor mode under what conditions</td><td>-tv.phosphor</td></tr>
-          <tr><td>Phosphor (Default)</td><td>default blend level to use in phosphor mode<br/>
+          <tr><td>TV Mode</td><td>Disable TV effects, or select TV preset</td><td>-tv.filter</td></tr>
+          <tr><td>TV Phosphor</td><td>Enable phosphor mode under what conditions</td><td>-tv.phosphor</td></tr>
+          <tr><td>Phosphor (Default)</td><td>Default blend level to use in phosphor mode<br/>
                 (needs to be manually set for your particular hardware)</td><td>-tv.phosblend</td></tr>
-          <tr><td>Scanline Intensity</td><td>sets scanline black-level intensity</td><td>-tv.scanlines</td></tr>
-          <tr><td>Scanline Interpolation</td><td>smooth/blend scanlines into image</td><td>-tv.scaninter</td></tr>
-          <tr><td>Adjustable sliders</td><td>set specific attribute in 'Custom' mode</td><td>-tv.contrast, tv.hue, etc.</td></tr>
-          <tr><td>Clone Composite</td><td>copy 'Composite' attributes to 'Custom' sliders</td><td>&nbsp;</td></tr>
-          <tr><td>Clone S-Video</td><td>copy 'S-Video' attributes to 'Custom' sliders</td><td>&nbsp;</td></tr>
-          <tr><td>Clone RGB</td><td>copy 'RGB' attributes to 'Custom' sliders</td><td>&nbsp;</td></tr>
-          <tr><td>Clone Bad Adjust</td><td>copy 'Bad Adjust' attributes to 'Custom' sliders</td><td>&nbsp;</td></tr>
-          <tr><td>Revert</td><td>revert attribute sliders to saved 'Custom' settings</td><td>&nbsp;</td></tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-  <br>
-
-  <p><b>Video Settings</b> dialog (Debug Colors):</p>
-  <table border="5" cellpadding="2" frame="box" rules="none">
-    <tr>
-      <td><img src="graphics/options_video_dbgcolors.png"></td>
-      <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-      <td valign="top">
-        <table border="1" cellpadding="4">
-          <tr><th>Item</th><th>Brief description</th><th>For more information,<br>see <a href="#CommandLine">CommandLine</a></th></tr>
-          <tr><td>Player 0 <br/>Missile 0 <br/>Player 1 <br/>
-            Missile 1 <br/>Playfield <br/>Ball </td>
-          <td>Set color for specific object in debug colors mode</td><td>-tia.dbgcolors</td></tr>
+          <tr><td>Scanline Intensity</td><td>Sets scanline black-level intensity</td><td>-tv.scanlines</td></tr>
+          <tr><td>Scanline Interpolation</td><td>Smooth/blend scanlines into image</td><td>-tv.scaninter</td></tr>
+          <tr><td>Adjustable sliders</td><td>Set specific attribute in 'Custom' mode</td><td>-tv.contrast, tv.hue, etc.</td></tr>
+          <tr><td>Clone Composite</td><td>Copy 'Composite' attributes to 'Custom' sliders</td><td>&nbsp;</td></tr>
+          <tr><td>Clone S-Video</td><td>Copy 'S-Video' attributes to 'Custom' sliders</td><td>&nbsp;</td></tr>
+          <tr><td>Clone RGB</td><td>Copy 'RGB' attributes to 'Custom' sliders</td><td>&nbsp;</td></tr>
+          <tr><td>Clone Bad Adjust</td><td>Copy 'Bad Adjust' attributes to 'Custom' sliders</td><td>&nbsp;</td></tr>
+          <tr><td>Revert</td><td>Revert attribute sliders to saved 'Custom' settings</td><td>&nbsp;</td></tr>
         </table>
       </td>
     </tr>
@@ -2568,10 +2551,10 @@
       <td valign="top">
         <table border="1" cellpadding="4">
           <tr><th>Item</th><th>Brief description</th><th>For more information,<br>see <a href="#CommandLine">CommandLine</a></th></tr>
-          <tr><td>Volume</td><td>self-explanatory</td><td>-volume</td></tr>
-          <tr><td>Sample size (*)</td><td>set size of audio buffers</td><td>-fragsize</td></tr>
-          <tr><td>Frequency (*)</td><td>change sound output frequency</td><td>-freq</td></tr>
-          <tr><td>Enable sound</td><td>self-explanatory</td><td>-sound</td></tr>
+          <tr><td>Volume</td><td>Self-explanatory</td><td>-volume</td></tr>
+          <tr><td>Sample size (*)</td><td>Set size of audio buffers</td><td>-fragsize</td></tr>
+          <tr><td>Frequency (*)</td><td>Change sound output frequency</td><td>-freq</td></tr>
+          <tr><td>Enable sound</td><td>Self-explanatory</td><td>-sound</td></tr>
         </table>
       </td>
     </tr>
@@ -2604,9 +2587,9 @@
       <td valign="top">
         <table border="1" cellpadding="4">
           <tr><th>Item</th><th>Brief description</th><th>For more information,<br>see <a href="#CommandLine">CommandLine</a></th></tr>
-          <tr><td>Interface Palette</td><td>palette to use for UI elements</td><td>-uipalette</td></tr>
-          <tr><td>List quick delay</td><td>time to wait between keypresses in listwidget</td><td>-listdelay</td></tr>
-          <tr><td>Mouse wheel scroll</td><td>number of lines mouse scroll will move in listwidget</td><td>-mscroll</td></tr>
+          <tr><td>Interface Palette</td><td>Palette to use for UI elements</td><td>-uipalette</td></tr>
+          <tr><td>List quick delay</td><td>Time to wait between keypresses in list-widgets</td><td>-listdelay</td></tr>
+          <tr><td>Mouse wheel scroll</td><td>Number of lines mouse scroll will move in list-widgets</td><td>-mscroll</td></tr>
         </table>
       </td>
     </tr>
@@ -2621,12 +2604,12 @@
       <td valign="top">
         <table border="1" cellpadding="4">
           <tr><th>Item</th><th>Brief description</th><th>For more information,<br>see <a href="#CommandLine">CommandLine</a></th></tr>
-          <tr><td>Save path</td><td>specifies where to save snapshots</td><td>-snapsavedir</td></tr>
-          <tr><td>Load path</td><td>specifies where to load snapshots</td><td>-snaploaddir</td></tr>
-          <tr><td>Save snapshots according to</td><td>specifies how to name saved snapshots</td><td>-snapname</td></tr>
-          <tr><td>Continuous snapshot interval</td><td>interval (in seconds) between snapshot</td><td>-ssinterval</td></tr>
-          <tr><td>Overwrite existing files</td><td>whether to overwrite old snapshots</td><td>-sssingle</td></tr>
-          <tr><td>Ignore scaling (1x mode)</td><td>save snapshot in 1x mode, without scaling</td><td>-ss1x</td></tr>
+          <tr><td>Save path</td><td>Specifies where to save snapshots</td><td>-snapsavedir</td></tr>
+          <tr><td>Load path</td><td>Specifies where to load snapshots</td><td>-snaploaddir</td></tr>
+          <tr><td>Save snapshots according to</td><td>Specifies how to name saved snapshots</td><td>-snapname</td></tr>
+          <tr><td>Continuous snapshot interval</td><td>Interval (in seconds) between snapshots</td><td>-ssinterval</td></tr>
+          <tr><td>Overwrite existing files</td><td>Whether to overwrite old snapshots</td><td>-sssingle</td></tr>
+          <tr><td>Ignore scaling (1x mode)</td><td>Save snapshot in 1x mode, without scaling</td><td>-ss1x</td></tr>
         </table>
       </td>
     </tr>
@@ -2641,12 +2624,12 @@
       <td valign="top">
         <table border="1" cellpadding="4">
           <tr><th>Item</th><th>Brief description</th><th>For more information,<br>see <a href="#CommandLine">CommandLine</a></th></tr>
-          <tr><td>Rom path</td><td>specifies location of ROM files</td><td>-romdir</td></tr>
-          <tr><td>Cheat file</td><td>specifies location of cheatfile database</td><td>-cheatfile</td></tr>
-          <tr><td>Palette file</td><td>specifies location of user palette</td><td>-palettefile</td></tr>
-          <tr><td>Properties file </td><td>specifies location of external stella.pro database</td><td>-propsfile</td></tr>
-          <tr><td>State path</td><td>specifies location of state files</td><td>-statedir</td></tr>
-          <tr><td>NVRAM path</td><td>specifies location of NVRAM (flash/EEPROM) files</td><td>-nvramdir</td></tr>
+          <tr><td>Rom path</td><td>Specifies location of ROM files</td><td>-romdir</td></tr>
+          <tr><td>Cheat file</td><td>Specifies location of cheatfile database</td><td>-cheatfile</td></tr>
+          <tr><td>Palette file</td><td>Specifies location of user palette</td><td>-palettefile</td></tr>
+          <tr><td>Properties file </td><td>Specifies location of external stella.pro database</td><td>-propsfile</td></tr>
+          <tr><td>State path</td><td>Specifies location of state files</td><td>-statedir</td></tr>
+          <tr><td>NVRAM path</td><td>Specifies location of NVRAM (flash/EEPROM) files</td><td>-nvramdir</td></tr>
         </table>
       </td>
     </tr>
@@ -2742,15 +2725,16 @@
           <tr><td>Stelladaptor port order</td><td>Specifies which virtual port each Stelladaptor/2600-daptor uses (See <b>Advanced Configuration - <a href="#Adaptor">Stelladaptor/2600-daptor Support</a></b>)</td><td>-saport</td></tr>
           <tr><td>Use mouse as ...</td><td>Allow the mouse to emulate various controllers</td><td>-usemouse</td></tr>
           <tr><td>Mouse cursor visibility</td><td>Show/hide cursor depending on current state</td><td>-cursor</td></tr>
-          <tr><td>AVox serial port</td><td>Described in further detail in <b>Advanced Configuration - <a href="#AtariVox">AtariVox/SaveKey Support</a></b> </td><td>-avoxport</td></tr>
-          <tr><td>Joy deadzone size</td><td>Deadzone area for axes on joysticks/gamepads</td><td>-joydeadzone</td></tr>
+          <tr><td>Joystick deadzone size</td><td>Deadzone area for axes on joysticks/gamepads</td><td>-joydeadzone</td></tr>
           <tr><td>Digital paddle sensitivity</td><td>Sensitivity used when emulating a paddle using a digital device</td><td>-dsense</td></tr>
           <tr><td>Mouse paddle sensitivity</td><td>Sensitivity used when emulating a paddle using a mouse</td><td>-msense</td></tr>
           <tr><td>Trackball sensitivity</td><td>Sensitivity used when emulating a trackball device using a mouse</td><td>-tsense</td></tr>
-          <tr><td>Allow all 4 ...</td><td>Allow all 4 joystick directions to be pressed simultaneously</td><td>-joyallow4</td></tr>
-          <tr><td>Grab mouse ...</td><td>Keep mouse in window in emulation mode</td><td>-grabmouse</td></tr>
+          <tr><td>Allow all 4 directions ...</td><td>Allow all 4 joystick directions to be pressed simultaneously</td><td>-joyallow4</td></tr>
+          <tr><td>Grab mouse ...</td><td>Keep mouse in window in emulation mode<br/>(only when used as controller)</td><td>-grabmouse</td></tr>
           <tr><td>Use Control key combos</td><td>Enable using Control key in keyboard actions</td><td>-ctrlcombo</td></tr>
-          <tr><td>Show Joystick Database</td><td>Show all joysticks that Stella knows about, with the option to remove them</td><td>&nbsp;</td></tr>
+          <tr><td>Joystick Database</td><td>Show all joysticks that Stella knows about, with the option to remove them</td><td>&nbsp;</td></tr>
+          <tr><td>Erase EEPROM</td><td>Erase the whole AtariVox/SaveKey flash memory</td><td>&nbsp;</td></tr>
+          <tr><td>AVox serial port</td><td>Described in further detail in <b>Advanced Configuration - <a href="#AtariVox">AtariVox/SaveKey Support</a></b> </td><td>-avoxport</td></tr>
         </table>
       </td>
     </tr>
@@ -2832,8 +2816,8 @@
           <tr><td>Right Difficulty</td><td>-rd</td></tr>
           <tr><td>TV Type</td><td>-tv</td></tr>
           <tr><td>Startup Mode</td><td>-debug</td></tr>
-          <tr><td>Left joy items</td><td>-holdjoy0</td></tr>
-          <tr><td>Right joy items</td><td>-holdjoy1</td></tr>
+          <tr><td>Left Joy items</td><td>-holdjoy0</td></tr>
+          <tr><td>Right Joy items</td><td>-holdjoy1</td></tr>
           <tr><td>Console: Select</td><td>-holdselect</td></tr>
           <tr><td>Console: Reset</td><td>-holdreset</td></tr>
         </table>
@@ -3003,7 +2987,7 @@
   <p><b>Developer Settings</b> dialog (Emulator)</p>
   <table border="5" cellpadding="2" frame="box" rules="none">
     <tr>
-      <td><img src="graphics/options_developer.png"></td>
+      <td><img src="graphics/options_developer_emulation.png"></td>
       <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
       <td valign="top">
         <table border="1" cellpadding="4">
@@ -3012,13 +2996,13 @@
           <tr><td>Frame Statistics</td><td>Overlay console info on the TIA image during emulation.</td><td>-plr.stats<br/>-dev.stats</td></tr>
           <tr><td>Console</td><td>Select the console type, this affects Color/B&W/Pause key emulation and zero-page RAM initialzation</td><td>-plr.console <br/>-dev.console</td></tr>
           <tr><td>Random startup bank</td><td>Randomize the startup bank for several bankswitch types</td><td>-plr.bankrandom<br/>-dev.bankrandom</td></tr>
-          <tr><td>Randomize zero-page...</td><td>When loading a ROM, randomize all RAM content instead of initializing with all zeroes (console = 2600) or startup values (console = 7800)</td><td>-plr.ramrandom<br/>-dev.ramrandom</td></tr>
+          <tr><td>Randomize zero-page ...</td><td>When loading a ROM, randomize all RAM content instead of initializing with all zeroes (for 'Console' = 'Atari 2600' only)</td><td>-plr.ramrandom<br/>-dev.ramrandom</td></tr>
           <tr><td>Randomize CPU</td><td>When loading a ROM, randomize the content of the specified CPU registers</td><td>-plr.cpurandom<br/>-dev.cpurandom</td></tr>
           <tr><td>PAL color-loss</td><td>Use PAL color-loss effect</td><td>-plr.colorloss<br/>-dev.colorloss</td></tr>
           <tr><td>Debug colors</td><td>Use fixed debug colors</td><td>-plr.debugcolors<br/>-dev.debugcolors</td></tr>
           <tr><td>Jitter/roll effect</td><td>Emulate screen roll with inconsistent scanline count</td><td>-plr.tv.jitter<br/>-dev.tv.jitter</td></tr>
           <tr><td>Jitter/roll recovery</td><td>Determines recovery time for screen rolling</td><td>-plr.tv.jitter_recovery<br/>-dev.tv.jitter_recovery</td></tr>
-          <tr><td>Drive unused TIA pins...</td><td>Unused TIA pins are read random instead of the last databus value</td><td>-plr.tiadriven<br/>-dev.tiadriven</td></tr>
+          <tr><td>Drive unused TIA pins ...</td><td>Unused TIA pins are read random instead of the last databus values</td><td>-plr.tiadriven<br/>-dev.tiadriven</td></tr>
         </table>
       </td>
     </tr>
@@ -3042,17 +3026,35 @@
     </tr>
   </table>
 
-  <p><b>Developer Settings</b> dialog (Debugger)</p>
+  <p><b>Developer Settings</b> dialog (Debug Colors):</p>
   <table border="5" cellpadding="2" frame="box" rules="none">
     <tr>
-      <td><img src="graphics/options_debugger.png"></td>
+      <td><img src="graphics/options_developer_dbgcolors.png"></td>
       <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
       <td valign="top">
         <table border="1" cellpadding="4">
           <tr><th>Item</th><th>Brief description</th><th>For more information,<br>see <a href="#CommandLine">CommandLine</a></th></tr>
-          <tr><td>Font Style</td><td>self-explanatory (requires ROM reload)</td><td>-dbg.fontstyle</td></tr>
-          <tr><td>Font Size</td><td>self-explanatory (requires ROM reload)</td><td>N/A</td></tr>
-          <tr><td>Debugger Width/Height</td><td>self-explanatory (requires ROM reload)</td><td>-dbg.res</td></tr>
+          <tr><td>Player 0 <br/>Missile 0 <br/>Player 1 <br/>
+            Missile 1 <br/>Playfield <br/>Ball </td>
+          <td>Set color for specific object in debug colors mode<br/>(disabled in ROM Launcher mode)</td><td>-tia.dbgcolors</td></tr>
+        </table>
+      </td>
+    </tr>
+  </table>
+  <br>
+
+
+  <p><b>Developer Settings</b> dialog (Debugger)</p>
+  <table border="5" cellpadding="2" frame="box" rules="none">
+    <tr>
+      <td><img src="graphics/options_developer_debugger.png"></td>
+      <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+      <td valign="top">
+        <table border="1" cellpadding="4">
+          <tr><th>Item</th><th>Brief description</th><th>For more information,<br>see <a href="#CommandLine">CommandLine</a></th></tr>
+          <tr><td>Font style</td><td>Self-explanatory (requires ROM reload)</td><td>-dbg.fontstyle</td></tr>
+          <tr><td>Font size</td><td>Self-explanatory (requires ROM reload)</td><td>N/A</td></tr>
+          <tr><td>Debugger width/height</td><td>Self-explanatory (requires ROM reload)</td><td>-dbg.res</td></tr>
         </table>
       </td>
     </tr>