diff --git a/src/windows/DeveloperDialog.cxx b/src/windows/DeveloperDialog.cxx
new file mode 100644
index 000000000..9932e70f7
--- /dev/null
+++ b/src/windows/DeveloperDialog.cxx
@@ -0,0 +1,427 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll
+//  SS  SS   tt           ll   ll
+//  SS     tttttt  eeee   ll   ll   aaaa
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2017 by Bradford W. Mott, Stephen Anthony
+// and the Stella Team
+//
+// See the file "License.txt" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//============================================================================
+
+#include "bspf.hxx"
+
+#include "OSystem.hxx"
+#include "Joystick.hxx"
+#include "Paddles.hxx"
+#include "PointingDevice.hxx"
+#include "SaveKey.hxx"
+#include "AtariVox.hxx"
+#include "Settings.hxx"
+#include "EventMappingWidget.hxx"
+#include "EditTextWidget.hxx"
+#include "PopUpWidget.hxx"
+#include "TabWidget.hxx"
+#include "Widget.hxx"
+#include "Console.hxx"
+#include "TIA.hxx"
+#include "OSystem.hxx"
+
+#include "DeveloperDialog.hxx"
+
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+DeveloperDialog::DeveloperDialog(OSystem& osystem, DialogContainer& parent,
+                         const GUI::Font& font, int max_w, int max_h)
+  : Dialog(osystem, parent),
+  myMaxWidth(max_w),
+  myMaxHeight(max_h)
+{
+  const int lineHeight = font.getLineHeight(),
+    fontWidth = font.getMaxCharWidth(),
+    buttonHeight = font.getLineHeight() + 4;
+  const int VBORDER = 4+2;
+  const int HBORDER = 8;
+  int xpos, ypos, tabID;
+  StringList actions;
+
+  // Set real dimensions
+  _w = std::min(54 * fontWidth + 10, max_w);
+  _h = std::min(16 * (lineHeight + 4) + 14, max_h);
+
+  WidgetArray wid;
+
+  ypos = VBORDER;
+  myDevSettings = new CheckboxWidget(this, font, HBORDER, ypos, "Enable developer settings", kDevOptions);
+  wid.push_back(myDevSettings);
+  addToFocusList(wid);
+
+  // The tab widget
+  ypos += lineHeight + 2;
+  xpos = 2;
+  myTab = new TabWidget(this, font, xpos, ypos, _w - 2 * xpos, _h - buttonHeight - 16 - ypos);
+  addTabWidget(myTab);
+
+  addEmulationTab(font);
+  //addVideoTab(font);
+  //addDebuggerTab(font);
+  //addUITab(font);
+  addStatesTab(font);
+  addDefaultOKCancelButtons(font);
+
+  // Activate the first tab
+  myTab->setActiveTab(0);
+}
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+void DeveloperDialog::addEmulationTab(const GUI::Font& font)
+{
+  const int VGAP = 4;
+  const int INDENT = 13+3;
+  const int HBORDER = 10;
+  const int VBORDER = 8;
+
+  int ypos, tabID;
+  int lineHeight = font.getLineHeight();
+  StringList actions;
+  WidgetArray wid;
+  int fontWidth = font.getMaxCharWidth(), fontHeight = font.getFontHeight();
+
+  tabID = myTab->addTab(" Emulation ");
+
+  ypos = VBORDER;
+  /*myDevSettings = new CheckboxWidget(myTab, font, HBORDER, ypos, "Enable developer settings", kDevOptions);
+  wid.push_back(myDevSettings);
+
+  ypos += lineHeight + VGAP;*/
+
+  // Randomize items
+  myLoadingROMLabel = new StaticTextWidget(myTab, font, HBORDER + INDENT*0, ypos, "When loading a ROM:", kTextAlignLeft);
+  wid.push_back(myLoadingROMLabel);
+
+  ypos += lineHeight + VGAP;
+  myRandomBank = new CheckboxWidget(myTab, font, HBORDER + INDENT * 1, ypos + 1, "Random startup bank (TODO)");
+  wid.push_back(myRandomBank);
+
+  // Randomize RAM
+  ypos += lineHeight + VGAP;
+  myRandomizeRAM = new CheckboxWidget(myTab, font, HBORDER + INDENT * 1, ypos + 1,
+                                      "Randomize zero-page and extended RAM", kRandRAMID);
+  wid.push_back(myRandomizeRAM);
+
+  // Randomize CPU
+  ypos += lineHeight + VGAP;
+  int lwidth = font.getStringWidth("Randomize CPU ");
+  myRandomizeCPULabel = new StaticTextWidget(myTab, font, HBORDER + INDENT * 1, ypos + 1, "Randomize CPU ");
+  wid.push_back(myRandomizeCPULabel);
+
+  int xpos = myRandomizeCPULabel->getRight() + 10;
+  const char* const cpuregs[] = { "SP", "A", "X", "Y", "PS" };
+  for(int i = 0; i < 5; ++i)
+  {
+    myRandomizeCPU[i] = new CheckboxWidget(myTab, font, xpos, ypos + 1,
+                                           cpuregs[i], kRandCPUID);
+    //myRandomizeCPU[i]->setID(kRandCPUID);
+    //myRandomizeCPU[i]->setTarget(this);
+    //addFocusWidget(myRandomizeCPU[i]);
+    wid.push_back(myRandomizeCPU[i]);
+    xpos += CheckboxWidget::boxSize() + font.getStringWidth("XX") + 20;
+  }
+
+  ypos += lineHeight + VGAP;
+  /*myThumbException = new CheckboxWidget(myTab, font, HBORDER + INDENT, ypos + 1, "Thumb ARM emulation can throw an exception");
+  wid.push_back(myThumbException);*/
+
+  //ypos += (lineHeight + VGAP) * 2;
+  myColorLoss = new CheckboxWidget(myTab, font, HBORDER + INDENT*0, ypos + 1, "PAL color-loss");
+  wid.push_back(myColorLoss);
+
+  // TV jitter effect
+  ypos += lineHeight + VGAP;
+  myTVJitter = new CheckboxWidget(myTab, font, HBORDER + INDENT*0, ypos + 1, "Jitter/Roll Effect", kTVJitter);
+  wid.push_back(myTVJitter);
+  myTVJitterRec = new SliderWidget(myTab, font,
+                                   myTVJitter->getRight()+ 16, ypos - 1,
+                                   8 * fontWidth, lineHeight, "Recovery ",
+                                   font.getStringWidth("Recovery "), kTVJitterChanged);
+  myTVJitterRec->setMinValue(1); myTVJitterRec->setMaxValue(20);
+  wid.push_back(myTVJitterRec);
+
+  myTVJitterRecLabel = new StaticTextWidget(myTab, font,
+                                         myTVJitterRec->getRight() + 4, myTVJitterRec->getTop(),
+                                         5 * fontWidth, fontHeight, "", kTextAlignLeft);
+  myTVJitterRecLabel->setFlags(WIDGET_CLEARBG);
+  wid.push_back(myTVJitterRecLabel);
+
+  // debug colors
+  ypos += lineHeight + VGAP;
+  myDebugColors = new CheckboxWidget(myTab, font, HBORDER + INDENT*0, ypos + 1, "Debug Colors");
+  wid.push_back(myDebugColors);
+
+  // How to handle undriven TIA pins
+  ypos += lineHeight + VGAP;
+  myUndrivenPins = new CheckboxWidget(myTab, font, HBORDER + INDENT*0, ypos + 1,
+                                      "Drive unused TIA pins randomly on a read/peek");
+  wid.push_back(myUndrivenPins);
+
+  // Add items for tab 0
+  addToFocusList(wid, myTab, tabID);
+}
+
+/*// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+void DeveloperDialog::addVideoTab(const GUI::Font& font)
+{
+  int tabID = myTab->addTab("Video");
+  WidgetArray wid;
+  // PAL color-loss effect
+  myColorLoss = new CheckboxWidget(myTab, font, xpos, ypos, "PAL color-loss");
+  wid.push_back(myColorLoss);
+  ypos += lineHeight + 4;
+
+  addToFocusList(wid, myTab, tabID);
+}
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+void DeveloperDialog::addDebuggerTab(const GUI::Font& font)
+{
+  int tabID = myTab->addTab(" Debugger ");
+  WidgetArray wid;
+
+
+  addToFocusList(wid, myTab, tabID);
+}
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+void DeveloperDialog::addUITab(const GUI::Font& font)
+{
+  int tabID = myTab->addTab("UI");
+  WidgetArray wid;
+
+
+  addToFocusList(wid, myTab, tabID);
+}*/
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+void DeveloperDialog::addStatesTab(const GUI::Font& font)
+{
+  int tabID = myTab->addTab("States");
+  WidgetArray wid;
+
+  new StaticTextWidget(myTab, font, 10, 10, "TODO: Rewind-States");
+
+  addToFocusList(wid, myTab, tabID);
+}
+
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+void DeveloperDialog::addDefaultOKCancelButtons(const GUI::Font& font)
+{
+  const int buttonWidth = font.getStringWidth("Defaults") + 20,
+    buttonHeight = font.getLineHeight() + 4;
+  WidgetArray wid;
+
+  wid.clear();
+  ButtonWidget* btn = new ButtonWidget(this, font, 10, _h - buttonHeight - 10,
+                                       buttonWidth, buttonHeight, "Defaults", GuiObject::kDefaultsCmd);
+  wid.push_back(btn);
+  addOKCancelBGroup(wid, font);
+  addBGroupToFocusList(wid);
+}
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+void DeveloperDialog::loadConfig()
+{
+  myDevSettings->setState(instance().settings().getBool("dev.settings"));
+
+  myRandomBank->setState(instance().settings().getBool("dev.bankrandom"));
+  myRandomizeRAM->setState(instance().settings().getBool("dev.ramrandom"));
+
+  const string& cpurandom = instance().settings().getString("dev.cpurandom");
+  const char* const cpuregs[] = { "S", "A", "X", "Y", "P" };
+  for(int i = 0; i < 5; ++i)
+    myRandomizeCPU[i]->setState(BSPF::containsIgnoreCase(cpurandom, cpuregs[i]));
+  //myThumbException->setState(instance().settings().getBool("dev.thumb.trapfatal"));
+
+  // PAL color-loss effect
+  myColorLoss->setState(instance().settings().getBool("dev.colorloss"));
+
+  myTVJitter->setState(instance().settings().getBool("dev.tv.jitter"));
+  myTVJitterRec->setValue(instance().settings().getInt("dev.tv.jitter_recovery"));
+
+  myDebugColors->setState(instance().settings().getBool("dev.debugcolors"));
+  // Undriven TIA pins
+  myUndrivenPins->setState(instance().settings().getBool("dev.tiadriven"));
+
+  enableOptions();
+
+  myTab->loadConfig();
+}
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+void DeveloperDialog::saveConfig()
+{
+  //TODO
+  // - bankrandom (not implemented yet)
+  // - thumbexception (commandline only yet)
+  // - debugcolors (no effect yet)
+
+  bool devSettings = myDevSettings->getState();
+  instance().settings().setValue("dev.settings", devSettings);
+
+  instance().settings().setValue("dev.bankrandom", myRandomBank->getState());
+  instance().settings().setValue("dev.ramrandom", myRandomizeRAM->getState());
+
+  string cpurandom;
+  const char* const cpuregs[] = { "S", "A", "X", "Y", "P" };
+  for(int i = 0; i < 5; ++i)
+    if(myRandomizeCPU[i]->getState())
+      cpurandom += cpuregs[i];
+  instance().settings().setValue("dev.cpurandom", cpurandom);
+  //instance().settings().setValue("dev.thumb.trapfatal", myThumbException->getState());
+
+  // jitter
+  instance().settings().setValue("dev.tv.jitter", myTVJitter->getState());
+  instance().settings().setValue("dev.tv.jitter_recovery", myTVJitterRecLabel->getLabel());
+  if(instance().hasConsole())
+  {
+    if (devSettings)
+    {
+      instance().console().tia().toggleJitter(myTVJitter->getState() ? 1 : 0);
+      instance().console().tia().setJitterRecoveryFactor(myTVJitterRec->getValue());
+    }
+    else
+    {
+      instance().console().tia().toggleJitter(instance().settings().getBool("tv.jitter") ? 1 : 0);
+      instance().console().tia().setJitterRecoveryFactor(instance().settings().getInt("tv.jitter_recovery"));
+    }
+  }
+
+  instance().settings().setValue("dev.debugcolors", myDebugColors->getState());
+  handleDebugColors();
+
+  // PAL color loss
+  instance().settings().setValue("dev.colorloss", myColorLoss->getState());
+  if(instance().hasConsole())
+  {
+    if(devSettings)
+      instance().console().toggleColorLoss(myColorLoss->getState());
+    else
+      instance().console().toggleColorLoss(instance().settings().getBool("colorloss"));
+  }
+
+  instance().settings().setValue("dev.tiadriven", myUndrivenPins->getState());
+
+  // Finally, issue a complete framebuffer re-initialization
+  instance().createFrameBuffer();
+}
+
+void DeveloperDialog::setDefaults()
+{
+  myDevSettings->setState(false);
+
+  myRandomBank->setState(true);
+  myRandomizeRAM->setState(true);
+  for(int i = 0; i < 5; ++i)
+    myRandomizeCPU[i]->setState(true);
+  //myThumbException->setState(false);
+
+  // PAL color-loss effect
+  myColorLoss->setState(true);
+  // jitter
+  myTVJitter->setState(true);
+  myTVJitterRec->setValue(1);
+  // debug colors
+  myDebugColors->setState(false);
+  // Undriven TIA pins
+  myUndrivenPins->setState(true);
+
+  enableOptions();
+  handleTVJitterChange(false);
+  handleDebugColors();
+}
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+void DeveloperDialog::handleCommand(CommandSender* sender, int cmd, int data, int id)
+{
+  switch(cmd)
+  {
+    case kDevOptions:
+      enableOptions();
+      break;
+
+    case kTVJitter:
+      handleTVJitterChange(myTVJitter->getState());
+      break;
+
+    case kTVJitterChanged:
+      myTVJitterRecLabel->setValue(myTVJitterRec->getValue());
+      break;
+
+    case kPPinCmd:
+      instance().console().tia().driveUnusedPinsRandom(myUndrivenPins->getState());
+      break;
+
+    case GuiObject::kOKCmd:
+      saveConfig();
+      close();
+      break;
+
+    case GuiObject::kCloseCmd:
+      // Revert changes made to event mapping
+      close();
+      break;
+
+    case GuiObject::kDefaultsCmd:
+      setDefaults();
+      break;
+
+    default:
+      Dialog::handleCommand(sender, cmd, data, 0);
+  }
+}
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+void DeveloperDialog::enableOptions()
+{
+  bool enable = myDevSettings->getState();
+
+  // CPU
+  myLoadingROMLabel->setEnabled(enable);
+  myRandomBank->setEnabled(false/*enable*/);
+  myRandomizeRAM->setEnabled(enable);
+  myRandomizeCPULabel->setEnabled(enable);
+  for(int i = 0; i < 5; ++i)
+    myRandomizeCPU[i]->setEnabled(enable);
+  //myThumbException->setEnabled(enable);
+
+  // TIA
+  myColorLoss->setEnabled(enable);
+  myTVJitter->setEnabled(enable);
+  handleTVJitterChange(enable && myTVJitter->getState());
+  myDebugColors->setEnabled(enable);
+  myUndrivenPins->setEnabled(enable);
+}
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+void DeveloperDialog::handleTVJitterChange(bool enable)
+{
+  myTVJitterRec->setEnabled(enable);
+  myTVJitterRecLabel->setEnabled(enable);
+}
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+void DeveloperDialog::handleDebugColors()
+{
+  if(instance().hasConsole() && myDevSettings->getState())
+  {
+    bool fixed = instance().console().tia().usingFixedColors();
+    if(fixed != myDebugColors->getState())
+      instance().console().tia().toggleFixedColors();
+  }
+}
diff --git a/src/windows/DeveloperDialog.hxx b/src/windows/DeveloperDialog.hxx
new file mode 100644
index 000000000..98d7177d3
--- /dev/null
+++ b/src/windows/DeveloperDialog.hxx
@@ -0,0 +1,105 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll
+//  SS  SS   tt           ll   ll
+//  SS     tttttt  eeee   ll   ll   aaaa
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2017 by Bradford W. Mott, Stephen Anthony
+// and the Stella Team
+//
+// See the file "License.txt" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//============================================================================
+
+#ifndef DEVELOPER_DIALOG_HXX
+#define DEVELOPER_DIALOG_HXX
+
+class OSystem;
+class GuiObject;
+class TabWidget;
+class EventMappingWidget;
+class CheckboxWidget;
+class EditTextWidget;
+class PopUpWidget;
+class SliderWidget;
+class StaticTextWidget;
+
+#include "Dialog.hxx"
+#include "bspf.hxx"
+#include "d:\Users\Thomas\Documents\Atari\stella\src\gui\Dialog.hxx"
+
+class DeveloperDialog : public Dialog
+{
+public:
+  DeveloperDialog(OSystem& osystem, DialogContainer& parent,
+              const GUI::Font& font, int max_w, int max_h);
+  virtual ~DeveloperDialog() = default;
+
+private:
+  /*void handleKeyDown(StellaKey key, StellaMod mod) override;
+  void handleJoyDown(int stick, int button) override;
+  void handleJoyAxis(int stick, int axis, int value) override;
+  bool handleJoyHat(int stick, int hat, int value) override;*/
+  void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
+
+  void loadConfig() override;
+  void saveConfig() override;
+  void setDefaults() override;
+
+private:
+  enum
+  {
+    kDevOptions       = 'DVop',
+    kRandRAMID        = 'DVrm',
+    kRandCPUID        = 'DVcp',
+    kTVJitter         = 'DVjt',
+    kTVJitterChanged  = 'DVjr',
+    kPPinCmd          = 'DVpn'
+  };
+
+  TabWidget* myTab;
+
+  CheckboxWidget*   myDevSettings;
+
+  StaticTextWidget* myLoadingROMLabel;
+  CheckboxWidget*   myRandomBank;
+  CheckboxWidget*   myRandomizeRAM;
+  StaticTextWidget* myRandomizeCPULabel;
+  CheckboxWidget*   myRandomizeCPU[5];
+  //CheckboxWidget*   myThumbException;
+
+  CheckboxWidget*   myColorLoss;
+  CheckboxWidget*   myTVJitter;
+  SliderWidget*     myTVJitterRec;
+  StaticTextWidget* myTVJitterRecLabel;
+  CheckboxWidget*   myDebugColors;
+  CheckboxWidget*   myUndrivenPins;
+
+  // Maximum width and height for this dialog
+  int myMaxWidth, myMaxHeight;
+
+private:
+  void addEmulationTab(const GUI::Font& font);
+  //void addVideoTab(const GUI::Font& font);
+  //void addDebuggerTab(const GUI::Font& font);
+  //void addUITab(const GUI::Font& font);
+  void addStatesTab(const GUI::Font& font);
+  // Add Defaults, OK and Cancel buttons
+  void addDefaultOKCancelButtons(const GUI::Font& font);
+
+  void enableOptions();
+  void handleTVJitterChange(bool enable);
+  void handleDebugColors();
+
+  // Following constructors and assignment operators not supported
+  DeveloperDialog() = delete;
+  DeveloperDialog(const DeveloperDialog&) = delete;
+  DeveloperDialog(DeveloperDialog&&) = delete;
+  DeveloperDialog& operator=(const DeveloperDialog&) = delete;
+  DeveloperDialog& operator=(DeveloperDialog&&) = delete;
+};
+#endif