diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx
index 152d7dd9d..d117e9324 100644
--- a/src/emucore/Console.cxx
+++ b/src/emucore/Console.cxx
@@ -55,8 +55,8 @@
 #include "CommandMenu.hxx"
 #include "Serializable.hxx"
 #include "Version.hxx"
-#include "TvMode.hxx"
 #include "FrameManager.hxx"
+#include "FrameLayout.hxx"
 
 #ifdef DEBUGGER_SUPPORT
   #include "Debugger.hxx"
@@ -125,9 +125,10 @@ Console::Console(OSystem& osystem, unique_ptr<Cartridge>& cart,
     uInt8 linesNTSC = 0;
 
     mySystem->reset(true);  // autodetect in reset enabled
-    myTIA->autodetectTvMode(true);
+    myTIA->autodetectLayout(true);
     for(int i = 0; i < 60; ++i) {
-      if (i > initialGarbageFrames) myTIA->tvMode() == TvMode::pal ? linesPAL++ : linesNTSC++;
+      if (i > initialGarbageFrames)
+        myTIA->frameLayout() == FrameLayout::pal ? linesPAL++ : linesNTSC++;
 
       myTIA->update();
     }
@@ -245,7 +246,7 @@ void Console::toggleFormat(int direction)
   {
     case 0:  // auto-detect
       myTIA->update();
-      myDisplayFormat = myTIA->tvMode() == TvMode::pal ? "PAL" : "NTSC";
+      myDisplayFormat = myTIA->frameLayout() == FrameLayout::pal ? "PAL" : "NTSC";
       message = "Auto-detect mode: " + myDisplayFormat;
       saveformat = "AUTO";
       break;
@@ -571,7 +572,7 @@ void Console::setTIAProperties()
   if(height != 0)
     height = BSPF::clamp(height, FrameManager::minViewableHeight, FrameManager::maxViewableHeight);
 
-  myTIA->autodetectTvMode(false);
+  myTIA->autodetectLayout(false);
 
   if(myDisplayFormat == "NTSC" || myDisplayFormat == "PAL60" ||
      myDisplayFormat == "SECAM60")
@@ -579,7 +580,7 @@ void Console::setTIAProperties()
     // Assume we've got ~262 scanlines (NTSC-like format)
     myFramerate = 60.0;
     myConsoleInfo.InitialFrameRate = "60";
-    myTIA->setTvMode(TvMode::ntsc);
+    myTIA->setLayout(FrameLayout::ntsc);
   }
   else
   {
@@ -590,7 +591,7 @@ void Console::setTIAProperties()
     // PAL ROMs normally need at least 250 lines
     if (height != 0) height = std::max(height, 250u);
 
-    myTIA->setTvMode(TvMode::pal);
+    myTIA->setLayout(FrameLayout::pal);
   }
 
   myTIA->setYStart(ystart);
diff --git a/src/emucore/tia/TvMode.hxx b/src/emucore/tia/FrameLayout.hxx
similarity index 76%
rename from src/emucore/tia/TvMode.hxx
rename to src/emucore/tia/FrameLayout.hxx
index 913777e2e..c8df7a4d7 100644
--- a/src/emucore/tia/TvMode.hxx
+++ b/src/emucore/tia/FrameLayout.hxx
@@ -15,11 +15,12 @@
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //============================================================================
 
-#ifndef TIA_TYPES
-#define TIA_TYPES
+#ifndef FRAME_LAYOUT
+#define FRAME_LAYOUT
 
-enum TvMode {
-  pal, ntsc
+enum FrameLayout {
+  ntsc, // ROM display has NTSC timings (~60Hz, ~262 scanlines, etc)
+  pal   // ROM display has PAL timings (~50Hz, ~312 scanlines, etc)
 };
 
-#endif // TIA_TYPES
+#endif // FRAME_LAYOUT
diff --git a/src/emucore/tia/FrameManager.cxx b/src/emucore/tia/FrameManager.cxx
index 012ffb58d..3b8f01615 100644
--- a/src/emucore/tia/FrameManager.cxx
+++ b/src/emucore/tia/FrameManager.cxx
@@ -54,12 +54,12 @@ uInt8 FrameManager::initialGarbageFrames()
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 FrameManager::FrameManager()
-  : myMode(TvMode::pal),
-    myAutodetectTvMode(true),
+  : myLayout(FrameLayout::pal),
+    myAutodetectLayout(true),
     myHeight(0),
     myFixedHeight(0)
 {
-  updateTvMode(TvMode::ntsc);
+  updateLayout(FrameLayout::ntsc);
   reset();
 }
 
@@ -105,12 +105,12 @@ void FrameManager::nextLine()
       if ((myCurrentFrameTotalLines > myFrameLines - 3) || myTotalFrames == 0)
         myVsyncLines++;
 
-      if (myVsyncLines > vsyncLimit(myAutodetectTvMode)) setState(State::waitForFrameStart);
+      if (myVsyncLines > vsyncLimit(myAutodetectLayout)) setState(State::waitForFrameStart);
 
       break;
 
     case State::waitForVsyncEnd:
-      if (++myVsyncLines > vsyncLimit(myAutodetectTvMode))
+      if (++myVsyncLines > vsyncLimit(myAutodetectLayout))
         setState(State::waitForFrameStart);
 
       break;
@@ -220,39 +220,39 @@ void FrameManager::finalizeFrame()
   (cout << "frame complete @ " << myLineInState << " (" << myCurrentFrameFinalLines << " total)" << "\n").flush();
 #endif // TIA_FRAMEMANAGER_DEBUG_LOG
 
-  if (myAutodetectTvMode) updateAutodetectedTvMode();
+  if (myAutodetectLayout) updateAutodetectedLayout();
 
-  myFrameRate = (myMode == TvMode::pal ? 15600.0 : 15720.0) /
-                myCurrentFrameFinalLines;
+  myFrameRate = (myLayout == FrameLayout::pal ? 15600.0 : 15720.0) /
+                 myCurrentFrameFinalLines;
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void FrameManager::updateAutodetectedTvMode()
+void FrameManager::updateAutodetectedLayout()
 {
   if (myTotalFrames <= Metrics::initialGarbageFrames) {
     return;
   }
 
-  const TvMode oldMode = myMode;
+  const FrameLayout oldLayout = myLayout;
 
   const uInt32
     deltaNTSC = abs(Int32(myCurrentFrameFinalLines) - Int32(frameLinesNTSC)),
     deltaPAL =  abs(Int32(myCurrentFrameFinalLines) - Int32(frameLinesPAL));
 
   if (std::min(deltaNTSC, deltaPAL) <= Metrics::tvModeDetectionTolerance)
-    updateTvMode(deltaNTSC <= deltaPAL ? TvMode::ntsc : TvMode::pal);
+    updateLayout(deltaNTSC <= deltaPAL ? FrameLayout::ntsc : FrameLayout::pal);
   else if (!myModeConfirmed) {
     if (
       (myCurrentFrameFinalLines < frameLinesPAL) &&
       (myCurrentFrameFinalLines > frameLinesNTSC) &&
       (myCurrentFrameFinalLines % 2)
     )
-      updateTvMode(TvMode::ntsc);
+      updateLayout(FrameLayout::ntsc);
     else
-      updateTvMode(deltaNTSC <= deltaPAL ? TvMode::ntsc : TvMode::pal);
+      updateLayout(deltaNTSC <= deltaPAL ? FrameLayout::ntsc : FrameLayout::pal);
   }
 
-  if (oldMode == myMode)
+  if (oldLayout == myLayout)
     myFramesInMode++;
   else
     myFramesInMode = 0;
@@ -262,28 +262,28 @@ void FrameManager::updateAutodetectedTvMode()
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void FrameManager::updateTvMode(TvMode mode)
+void FrameManager::updateLayout(FrameLayout layout)
 {
-  if (mode == myMode) return;
+  if (layout == myLayout) return;
 
 #ifdef TIA_FRAMEMANAGER_DEBUG_LOG
   (cout << "TV mode switched to " << int(mode) << "\n").flush();
 #endif // TIA_FRAMEMANAGER_DEBUG_LOG
 
-  myMode = mode;
+  myLayout = layout;
 
-  switch (myMode)
+  switch (myLayout)
   {
-    case TvMode::ntsc:
-      myVblankLines     = Metrics::vblankNTSC;
-      myKernelLines     = Metrics::kernelNTSC;
-      myOverscanLines   = Metrics::overscanNTSC;
+    case FrameLayout::ntsc:
+      myVblankLines   = Metrics::vblankNTSC;
+      myKernelLines   = Metrics::kernelNTSC;
+      myOverscanLines = Metrics::overscanNTSC;
       break;
 
-    case TvMode::pal:
-      myVblankLines     = Metrics::vblankPAL;
-      myKernelLines     = Metrics::kernelPAL;
-      myOverscanLines   = Metrics::overscanPAL;
+    case FrameLayout::pal:
+      myVblankLines   = Metrics::vblankPAL;
+      myKernelLines   = Metrics::kernelPAL;
+      myOverscanLines = Metrics::overscanPAL;
       break;
 
     default:
@@ -291,7 +291,8 @@ void FrameManager::updateTvMode(TvMode mode)
   }
 
   myFrameLines = Metrics::vsync + myVblankLines + myKernelLines + myOverscanLines;
-  setFixedHeight(myFixedHeight);  // update since myKernelLines may have changed
+  if (myFixedHeight == 0)
+    myHeight = myKernelLines + Metrics::visibleOverscan;
 
   myVblankManager.setVblankLines(myVblankLines);
 }
diff --git a/src/emucore/tia/FrameManager.hxx b/src/emucore/tia/FrameManager.hxx
index 6079c7ab3..ee6022457 100644
--- a/src/emucore/tia/FrameManager.hxx
+++ b/src/emucore/tia/FrameManager.hxx
@@ -22,7 +22,7 @@
 
 #include "VblankManager.hxx"
 #include "Serializable.hxx"
-#include "TvMode.hxx"
+#include "FrameLayout.hxx"
 #include "bspf.hxx"
 
 class FrameManager : public Serializable
@@ -51,7 +51,7 @@ class FrameManager : public Serializable
 
     bool isRendering() const { return myState == State::frame; }
 
-    TvMode tvMode() const { return myMode; }
+    FrameLayout layout() const { return myLayout; }
 
     bool vblank() const { return myVblankManager.vblank(); }
 
@@ -78,9 +78,9 @@ class FrameManager : public Serializable
     uInt32 ystart() const { return myVblankManager.ystart(); }
     bool ystartIsAuto(uInt32 line) const { return myVblankManager.ystartIsAuto(line); }
 
-    void autodetectTvMode(bool toggle) { myAutodetectTvMode = toggle; }
+    void autodetectLayout(bool toggle) { myAutodetectLayout = toggle; }
 
-    void setTvMode(TvMode mode) { if (!myAutodetectTvMode) updateTvMode(mode); }
+    void setLayout(FrameLayout mode) { if (!myAutodetectLayout) updateLayout(mode); }
 
     /**
       Serializable methods (see that class for more information).
@@ -112,9 +112,9 @@ class FrameManager : public Serializable
 
   private:
 
-    void updateTvMode(TvMode mode);
+    void updateLayout(FrameLayout mode);
 
-    void updateAutodetectedTvMode();
+    void updateAutodetectedLayout();
 
     void setState(State state);
 
@@ -129,8 +129,8 @@ class FrameManager : public Serializable
 
     VblankManager myVblankManager;
 
-    TvMode myMode;
-    bool myAutodetectTvMode;
+    FrameLayout myLayout;
+    bool myAutodetectLayout;
     State myState;
     uInt32 myLineInState;
     uInt32 myCurrentFrameTotalLines;
diff --git a/src/emucore/tia/PaddleReader.cxx b/src/emucore/tia/PaddleReader.cxx
index bac870375..d8ec20738 100644
--- a/src/emucore/tia/PaddleReader.cxx
+++ b/src/emucore/tia/PaddleReader.cxx
@@ -42,7 +42,7 @@ void PaddleReader::reset(double timestamp)
   myValue = 0;
   myTimestamp = timestamp;
 
-  setTvMode(TvMode::ntsc);
+  setLayout(FrameLayout::ntsc);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -71,10 +71,10 @@ uInt8 PaddleReader::inpt(double timestamp)
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void PaddleReader::update(double value, double timestamp, TvMode tvMode)
+void PaddleReader::update(double value, double timestamp, FrameLayout layout)
 {
-  if (tvMode != myTvMode) {
-    setTvMode(tvMode);
+  if (layout != myLayout) {
+    setLayout(layout);
   }
 
   if (value != myValue) {
@@ -84,11 +84,11 @@ void PaddleReader::update(double value, double timestamp, TvMode tvMode)
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void PaddleReader::setTvMode(TvMode mode)
+void PaddleReader::setLayout(FrameLayout layout)
 {
-  myTvMode = mode;
+  myLayout = layout;
 
-  myClockFreq = myTvMode == TvMode::ntsc ? 60 * 228 * 262 : 50 * 228 * 312;
+  myClockFreq = myLayout == FrameLayout::ntsc ? 60 * 228 * 262 : 50 * 228 * 312;
   myUThresh = USUPP * (1. - exp(-TRIPPOINT_LINES * 228 / myClockFreq  / (RPOT + R0) / C));
 }
 
diff --git a/src/emucore/tia/PaddleReader.hxx b/src/emucore/tia/PaddleReader.hxx
index 2185093f8..464a112c7 100644
--- a/src/emucore/tia/PaddleReader.hxx
+++ b/src/emucore/tia/PaddleReader.hxx
@@ -19,7 +19,7 @@
 #define TIA_PADDLE_READER
 
 #include "bspf.hxx"
-#include "TvMode.hxx"
+#include "FrameLayout.hxx"
 #include "Serializable.hxx"
 
 class PaddleReader : public Serializable
@@ -37,7 +37,7 @@ class PaddleReader : public Serializable
 
     uInt8 inpt(double timestamp);
 
-    void update(double value, double timestamp, TvMode tvMode);
+    void update(double value, double timestamp, FrameLayout layout);
 
     /**
       Serializable methods (see that class for more information).
@@ -48,7 +48,7 @@ class PaddleReader : public Serializable
 
   private:
 
-    void setTvMode(TvMode mode);
+    void setLayout(FrameLayout layout);
 
     void updateCharge(double timestamp);
 
@@ -60,7 +60,7 @@ class PaddleReader : public Serializable
     double myValue;
     double myTimestamp;
 
-    TvMode myTvMode;
+    FrameLayout myLayout;
     double myClockFreq;
 
     bool myIsDumped;
diff --git a/src/emucore/tia/TIA.cxx b/src/emucore/tia/TIA.cxx
index 898ca5a8c..079d9e0bc 100644
--- a/src/emucore/tia/TIA.cxx
+++ b/src/emucore/tia/TIA.cxx
@@ -735,7 +735,7 @@ bool TIA::toggleFixedColors(uInt8 mode)
   // Otherwise, flip the state
   bool on = (mode == 0 || mode == 1) ? bool(mode) : myColorHBlank == 0;
 
-  bool pal = myFrameManager.tvMode() == TvMode::pal;
+  bool pal = myFrameManager.layout() == FrameLayout::pal;
   myMissile0.setDebugColor(pal ? M0ColorPAL : M0ColorNTSC);
   myMissile1.setDebugColor(pal ? M1ColorPAL : M1ColorNTSC);
   myPlayer0.setDebugColor(pal ? P0ColorPAL : P0ColorNTSC);
@@ -1226,7 +1226,7 @@ void TIA::updatePaddle(uInt8 idx)
   myPaddleReaders[idx].update(
     (resistance == Controller::maximumResistance ? -1 : double(resistance)) / MAX_RESISTANCE,
     myTimestamp,
-    myFrameManager.tvMode()
+    myFrameManager.layout()
   );
 }
 
diff --git a/src/emucore/tia/TIA.hxx b/src/emucore/tia/TIA.hxx
index 3d94ffc7d..fb378823c 100644
--- a/src/emucore/tia/TIA.hxx
+++ b/src/emucore/tia/TIA.hxx
@@ -26,6 +26,7 @@
 #include "TIATypes.hxx"
 #include "DelayQueue.hxx"
 #include "FrameManager.hxx"
+#include "FrameLayout.hxx"
 #include "Background.hxx"
 #include "Playfield.hxx"
 #include "Missile.hxx"
@@ -33,7 +34,6 @@
 #include "Ball.hxx"
 #include "LatchedInput.hxx"
 #include "PaddleReader.hxx"
-#include "TvMode.hxx"
 
 class Console;
 
@@ -170,9 +170,9 @@ class TIA : public Device
     void setHeight(uInt32 height) { myFrameManager.setFixedHeight(height); }
     void setYStart(uInt32 ystart) { myFrameManager.setYstart(ystart); }
 
-    void autodetectTvMode(bool toggle) { myFrameManager.autodetectTvMode(toggle); }
-    void setTvMode(TvMode mode) { myFrameManager.setTvMode(mode); }
-    TvMode tvMode() const { return myFrameManager.tvMode(); }
+    void autodetectLayout(bool toggle) { myFrameManager.autodetectLayout(toggle); }
+    void setLayout(FrameLayout layout) { myFrameManager.setLayout(layout); }
+    FrameLayout frameLayout() const { return myFrameManager.layout(); }
 
     /**
       Enables/disables auto-frame calculation.  If enabled, the TIA