diff --git a/Changes.txt b/Changes.txt
index c679d2896..6d1c70f03 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -12,12 +12,14 @@
                               Release History
 ===========================================================================
 
-7.0 to 7.1 (xxx x, 202x)
+7.x to 8.0 (xxx x, 202x)
 
   * Ported Stella to SDL3 
 
   * Added option for switching Stella's theme in sync with OS (TODO: Doc)
 
+7.0 to 7.1 (xxx x, 202x)
+
   * Enhanced PAL-60 detection, searches for signature (e.g. PAL60) in ROM
 
   * Enhanced VSYNC emulation, considers VBLANK now too
diff --git a/docs/graphics/options_misc.png b/docs/graphics/options_misc.png
index f8d676b2b..817f14635 100644
Binary files a/docs/graphics/options_misc.png and b/docs/graphics/options_misc.png differ
diff --git a/docs/index.html b/docs/index.html
index be498a92c..f49efd53f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -21,7 +21,7 @@
     <img src="graphics/stella_icon.png">
     <h2><b>A multi-platform Atari 2600 VCS emulator</b></h2>
 
-    <h4><b>Release 7.0</b></h4>
+    <h4><b>Release 8.0</b></h4>
     <br>
 
     <h2><b>User's Guide</b></h2>
@@ -342,7 +342,7 @@
   <p>
   <h3><b><u>General</u> (required for all versions of Stella)</b></h3>
   <ul>
-    <li>SDL version 2.0.14 or greater, latest version highly recommended</li>
+    <li>SDL version 3.2.14 or greater, latest version highly recommended</li>
     <li>32 bit color graphics card</li>
     <li>Enough RAM for the OS + 256MB RAM for the emulation; 512MB+ highly recommended</li>
     <li>Joysticks or gamepads are highly recommended</li>
@@ -387,7 +387,7 @@
   <h3><b><u>Other</u></b></h3>
 
   <p>Stella is extremely portable, and in its lifetime has been ported to almost every
-  platform where the SDL library exists. It is 32/64-bit and endian clean in Linux/Unix, macOS
+  platform where the SDL library exists. It is 64-bit and endian clean in Linux/Unix, macOS
   and Windows. The Stella Team is interested in hearing about any problems you may
   encounter with diverse operating systems and CPU types.</p>
   </blockquote></br>
@@ -3249,12 +3249,17 @@
 
     <tr>
       <td><pre>-uipalette2 &lt;standard|classic|light|dark&gt;</pre></td>
-      <td>Define alternative palette/theme for UI elements.</td>
+      <td>Define alternative/light palette/theme for UI elements.</td>
     </tr>
 
     <tr>
       <td><pre>-altpalette &lt;1|0&gt;</pre></td>
-      <td>Use alternative palette/theme for UI elements.</td>
+      <td>Use alternative/dark palette/theme for UI elements.</td>
+    </tr>
+
+    <tr>
+      <td><pre>-autouipalette &lt;1|0&gt;</pre></td>
+      <td>Automatic switching between light and dark theme in sync with OS.</td>
     </tr>
 
     <tr>
@@ -4007,8 +4012,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">Command Line</a></th></tr>
-          <tr><td>Theme #1</td><td>Default theme to use for UI elements (see examples)</td><td>-uipalette</td></tr>
-          <tr><td>Theme #2</td><td>Alternative theme to use for UI elements (see examples)</td><td>-uipalette2</td></tr>
+          <tr><td>Light theme</td><td>Default theme to use for UI elements (see examples)</td><td>-uipalette</td></tr>
+          <tr><td>Dark theme</td><td>Alternative theme to use for UI elements (see examples)</td><td>-uipalette2</td></tr>
+		  <tr><td>Auto theme</td><td>Enable for automatic switching between light and dark themes in sync with OS.</td><td>-autouipalette</td></tr>
           <tr><td>Dialogs font</td><td>The font used in the dialogs</td><td>-dialogfont</td></tr>
           <tr><td>HiDPI mode</td><td>Scale the UI by a factor of two when enabled</td><td>-hidpi</td></tr>
           <tr><td>Dialogs position</td><td>Position of dialogs with Stella window</td><td>-dialogpos</td></tr>
diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index 85e93eb75..a1afe8714 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -331,6 +331,14 @@ void EventHandler::handleMouseMotionEvent(int x, int y, int xrel, int yrel)
     {
       myEvent.set(Event::MouseAxisXValue, x); // required for Lightgun controller
       myEvent.set(Event::MouseAxisYValue, y); // required for Lightgun controller
+      cerr << "dx " << (x - lastX - xrel) << ": " << x << ", " << xrel <<
+        "   y:" << y << ", " << yrel << "\n";
+      if(x - lastX - xrel != 0)
+        int i = 0;
+
+
+
+      lastX = x;
       myEvent.set(Event::MouseAxisXMove, xrel);
       myEvent.set(Event::MouseAxisYMove, yrel);
     }
diff --git a/src/emucore/EventHandler.hxx b/src/emucore/EventHandler.hxx
index 1bbad6ac1..e22494ba1 100644
--- a/src/emucore/EventHandler.hxx
+++ b/src/emucore/EventHandler.hxx
@@ -497,6 +497,8 @@ class EventHandler
     // Global Event object
     Event myEvent;
 
+    int lastX;
+
     // Indicates current overlay object
     DialogContainer* myOverlay{nullptr};
 
diff --git a/src/gui/UIDialog.cxx b/src/gui/UIDialog.cxx
index c32a47ec3..6ea32cf67 100644
--- a/src/gui/UIDialog.cxx
+++ b/src/gui/UIDialog.cxx
@@ -84,14 +84,14 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
   VarList::push_back(items, "Light", "light");
   VarList::push_back(items, "Dark", "dark");
   myPalette1Popup = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight,
-                                    items, "Theme #1   ", lwidth);
-  myPalette1Popup->setToolTip("Primary theme.", Event::ToggleUIPalette, EventMode::kMenuMode);
+                                    items, "Light theme", lwidth);
+  myPalette1Popup->setToolTip("Primary/light theme.", Event::ToggleUIPalette, EventMode::kMenuMode);
   wid.push_back(myPalette1Popup);
   ypos += lineHeight + VGAP;
 
   myPalette2Popup = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight,
-                                    items, "Theme #2   ", lwidth);
-  myPalette2Popup->setToolTip("Alternative theme.", Event::ToggleUIPalette, EventMode::kMenuMode);
+                                    items, "Dark theme ", lwidth);
+  myPalette2Popup->setToolTip("Alternative/dark theme.", Event::ToggleUIPalette, EventMode::kMenuMode);
   wid.push_back(myPalette2Popup);
   ypos += lineHeight + VGAP;
 
@@ -99,6 +99,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
   myAutoPalette = new CheckboxWidget(myTab, font, xpos2,
                                      myPalette1Popup->getBottom() - CheckboxWidget::boxSize(font) / 2 - 1,
                                      "Auto theme");
+  myAutoPalette->setToolTip("Enable for automatic switching between light and dark themes in sync with OS.");
   wid.push_back(myAutoPalette);
 
   // Dialog font