diff --git a/docs/graphics/eventmapping.png b/docs/graphics/eventmapping.png
index 3907eaff8..86deacd4a 100644
Binary files a/docs/graphics/eventmapping.png and b/docs/graphics/eventmapping.png differ
diff --git a/docs/graphics/eventmapping_remap.png b/docs/graphics/eventmapping_remap.png
index e99aed5dd..a2e3ce949 100644
Binary files a/docs/graphics/eventmapping_remap.png and b/docs/graphics/eventmapping_remap.png differ
diff --git a/docs/index.html b/docs/index.html
index 227dc6e2b..7e5ec7011 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2897,7 +2897,8 @@
   <p>To remap an event:
   <ol>
     <li>Enter <b>Options Menu</b> and click the <b>Input Settings</b> button.</li>
-    <li>If you wish to remap emulation events, click the 'Emulation Events' tab.
+    <li>If you wish to remap emulation events, click the 'Emulation Events' tab. Here
+	  you can also filter for the type of events.
       Otherwise, click the 'UI Events' tab for user interface events.</li>
     <li>Select event you want to remap and double-click or click the 'Map' button.</li>
     <li>Now define the input:
@@ -3700,6 +3701,7 @@ Ms Pac-Man (Stella extended codes):
         <tr><td>UA </td><td>8K UA Ltd. </td><td>.UA </td></tr>
         <tr><td>UASW </td><td>8K UA Ltd. (swapped banks)</td><td>.UASW </td></tr>
         <tr><td>WD </td><td>Wickstead Design (Pink Panther) </td><td>.WD </td></tr>
+		<tr><td>WDSW </td><td>Wickstead Design (Pink Panther) (bad)</td><td>.WDSW </td></tr>
         <tr><td>X07 &#185;</td><td>64K AtariAge </td><td>.X07 </td></tr>
       </table></td>
     </tr>
diff --git a/src/emucore/tia/TIA.hxx b/src/emucore/tia/TIA.hxx
index dcf467ebe..4bc92482b 100644
--- a/src/emucore/tia/TIA.hxx
+++ b/src/emucore/tia/TIA.hxx
@@ -79,7 +79,7 @@ class TIA : public Device
       NTSC_RED      = 0x30,
       NTSC_ORANGE   = 0x38,
       NTSC_YELLOW   = 0x1c,
-      NTSC_GREEN    = 0xc4,
+      NTSC_GREEN    = 0xc6,
       NTSC_BLUE     = 0x9c,
       NTSC_PURPLE   = 0x66,
       NTSC_GREY     = 0x04,
@@ -87,7 +87,7 @@ class TIA : public Device
       PAL_RED       = 0x62,
       PAL_ORANGE    = 0x4a,
       PAL_YELLOW    = 0x2e,
-      PAL_GREEN     = 0x34,
+      PAL_GREEN     = 0x36,
       PAL_BLUE      = 0xbc,
       PAL_PURPLE    = 0xa6,
       PAL_GREY      = 0x06,
@@ -869,6 +869,8 @@ class TIA : public Device
     bool myColorLossEnabled;
     bool myColorLossActive;
 
+    std::array<uInt32, 16> myColorCounts;
+
     /**
      * System cycles at the end of the previous frame / beginning of next frame.
      */