diff --git a/docs/graphics/options.png b/docs/graphics/options.png
index 5497cb154..f242fab3d 100644
Binary files a/docs/graphics/options.png and b/docs/graphics/options.png differ
diff --git a/docs/index.html b/docs/index.html
index cf8b9aeb5..89ae662ed 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1791,11 +1791,6 @@
         emulator, or a user-defined palette.</td>
     </tr>
 
-    <tr>
-      <td><pre>-colorloss &lt;1|0&gt;</pre></td>
-      <td>Enable/disable the PAL color-loss effect.</td>
-    </tr>
-
     <tr>
       <td><pre>-framerate &lt;number&gt;</pre></td>
       <td>Display the given number of frames per second.  Normally, Stella
@@ -1909,18 +1904,6 @@
       </td>
     </tr>
 
-    <tr>
-      <td><pre>-tv.jitter &lt;1|0&gt;</pre></td>
-      <td>Enable TV jitter/roll effect, when there are too many or too few scanlines
-        per frame.</td>
-    </tr>
-
-    <tr>
-      <td><pre>-tv.jitter_recovery &lt;1 - 20&gt;</pre></td>
-      <td>When TV jitter/roll effect is enabled, determines how long to delay recovery
-        time (recovery spread over multiple frames).</td>
-    </tr>
-
     <tr>
       <td><pre>-tv.scanlines &lt;0 - 100&gt;</pre></td>
       <td>Blargg TV effects scanline intensity, where 0 means completely off.</td>
@@ -2085,11 +2068,6 @@
         saving a ROM state file.</td>
     </tr>
 
-    <tr>
-      <td><pre>-stats &lt;1|0&gt;</pre></td>
-      <td>Overlay console info on the TIA image during emulation.</td>
-    </tr>
-
     <tr>
       <td><pre>-fastscbios &lt;1|0&gt;</pre></td>
       <td>Disable Supercharger BIOS progress loading bars.</td>
@@ -2327,22 +2305,6 @@
         event.</td>
     </tr>
 
-    <tr>
-      <td><pre>-tiadriven &lt;1|0&gt;</pre></td>
-      <td>Set unused TIA pins to be randomly driven high or low on a read/peek.
-          If disabled, use the last databus value for those pins instead.</td>
-    </tr>
-
-    <tr>
-      <td><pre>-cpurandom &lt;S,A,X,Y,P&gt;</pre></td>
-      <td>On reset, randomize the content of the specified CPU registers.</td>
-    </tr>
-
-    <tr>
-      <td><pre>-ramrandom &lt;1|0&gt;</pre></td>
-      <td>On reset, either randomize all RAM content, or zero it out instead.</td>
-    </tr>
-
     <tr>
       <td><pre>-bs &lt;type&gt;</pre></td>
       <td>Set "Cartridge.Type" property.  See the <i>Game Properties</i> section
@@ -2444,6 +2406,75 @@
       to real hardware.</td>
     </tr>
   </table>
+
+  <p>The following are available in two sets, one for players (prefixed by "plr.") and one
+    for developers (prefixd by "dev."). Only use them if you know what you're doing!  Note
+    that in all cases, the values supplied to the arguments are <b>not</b> case sensitive.</p>
+
+  <table BORDER=2>
+    <tr>
+      <th>Argument</th>
+      <th>Description</th>
+    </tr>
+
+    <tr>
+      <td><pre>-dev.settings &lt;1|0&gt;</pre></td>
+      <td>Select developer (1) or player (0) set.</td>
+    </tr>
+
+    <tr>
+      <td><pre>-&lt;plr.|dev.&gt;stats &lt;1|0&gt;</pre></td>
+      <td>Overlay console info on the TIA image during emulation.</td>
+    </tr>
+
+    <tr>
+      <td><pre>-&lt;plr.|dev.&gt;console &lt;2600|7800&gt;</pre></td>
+      <td>Select console for B/W and Pause key handling and RAM initialization.</td>
+    </tr>
+
+    <tr>
+      <td><pre>-&lt;plr.|dev.&gt;bankrandom &lt;1|0&gt;</pre></td>
+      <td>On reset, randomize the startup bank.</td>
+    </tr>
+
+    <tr>
+      <td><pre>-&lt;plr.|dev.&gt;ramrandom &lt;1|0&gt;</pre></td>
+      <td>On reset, either randomize all RAM content, or initialize with zero (console = 2600)/startup values (console = 7800) instead.</td>
+    </tr>
+
+    <tr>
+      <td><pre>-&lt;plr.|dev.&gt;cpurandom &lt;S,A,X,Y,P&gt;</pre></td>
+      <td>On reset, randomize the content of the specified CPU registers.</td>
+    </tr>
+
+    <tr>
+      <td><pre>-&lt;plr.|dev.&gt;debugcolors &lt;1|0&gt;</pre></td>
+      <td>Enable/disable the fixed debug colors.</td>
+    </tr>
+
+    <tr>
+      <td><pre>-&lt;plr.|dev.&gt;colorloss &lt;1|0&gt;</pre></td>
+      <td>Enable/disable the PAL color-loss effect.</td>
+    </tr>
+
+    <tr>
+      <td><pre>-&lt;plr.|dev.&gt;tv.jitter &lt;1|0&gt;</pre></td>
+      <td>Enable TV jitter/roll effect, when there are too many or too few scanlines
+        per frame.</td>
+    </tr>
+
+    <tr>
+      <td><pre>-&lt;plr.|dev.&gt;tv.jitter_recovery &lt;1 - 20&gt;</pre></td>
+      <td>When TV jitter/roll effect is enabled, determines how long to delay recovery
+        time (recovery spread over multiple frames).</td>
+    </tr>
+
+    <tr>
+      <td><pre>-&lt;plr.|dev.&gt;tiadriven &lt;1|0&gt;</pre></td>
+      <td>Set unused TIA pins to be randomly driven high or low on a read/peek.
+          If disabled, use the last databus value for those pins instead.</td>
+    </tr>
+  </table>
   </blockquote>
 
   <h2><b><a name="Options">2. Changing Options</a></b></h2>

Argument	Description
-dev.settings <1\|0>	Select developer (1) or player (0) set.
-<plr.\|dev.>stats <1\|0>	Overlay console info on the TIA image during emulation.
-<plr.\|dev.>console <2600\|7800>	Select console for B/W and Pause key handling and RAM initialization.
-<plr.\|dev.>bankrandom <1\|0>	On reset, randomize the startup bank.
-<plr.\|dev.>ramrandom <1\|0>	On reset, either randomize all RAM content, or initialize with zero (console = 2600)/startup values (console = 7800) instead.
-<plr.\|dev.>cpurandom <S,A,X,Y,P>	On reset, randomize the content of the specified CPU registers.
-<plr.\|dev.>debugcolors <1\|0>	Enable/disable the fixed debug colors.
-<plr.\|dev.>colorloss <1\|0>	Enable/disable the PAL color-loss effect.
-<plr.\|dev.>tv.jitter <1\|0>	Enable TV jitter/roll effect, when there are too many or too few scanlines + per frame.
-<plr.\|dev.>tv.jitter_recovery <1 - 20>	When TV jitter/roll effect is enabled, determines how long to delay recovery + time (recovery spread over multiple frames).
-<plr.\|dev.>tiadriven <1\|0>	Set unused TIA pins to be randomly driven high or low on a read/peek. + If disabled, use the last databus value for those pins instead.