diff --git a/src/settings/SettingsManager.cpp b/src/settings/SettingsManager.cpp
index 91d1573..0e1a61f 100644
--- a/src/settings/SettingsManager.cpp
+++ b/src/settings/SettingsManager.cpp
@@ -112,6 +112,27 @@ SettingsManager::WindowTheme SettingsManager::WindowThemeFromInt(int value) {
   return WindowTheme::Dark;
 }
 
+SettingsManager::BackgroundColor SettingsManager::BackgroundColorFromInt(int value) {
+  using BackgroundColor = SettingsManager::BackgroundColor;
+
+  switch (value) {
+  case static_cast<int>(BackgroundColor::Black):
+    return BackgroundColor::Black;
+  case static_cast<int>(BackgroundColor::White):
+    return BackgroundColor::White;
+  case static_cast<int>(BackgroundColor::Custom):
+    return BackgroundColor::Custom;
+  default:
+    QMessageBox::critical(nullptr, "Invalid value provided for 'BackgroundColor'!",
+                          "An unrecognised value for 'BackgroundColor': " + QString::number(value) + " was provided");
+    QApplication::exit(1);
+    break;
+  }
+
+  // Should never happen, but just in case
+  return BackgroundColor::Black;
+}
+
 const SettingsManager::SettingValue &SettingsManager::getQtKey(SettingsManager::Key key) const {
   auto iterator = SettingsManager::qtKeyMap.find(key);
   if (iterator == SettingsManager::qtKeyMap.end()) {
@@ -171,4 +192,19 @@ void SettingsManager::setTheme(SettingsManager::WindowTheme theme) {
   }
 }
 
+QColor SettingsManager::getRenderBackgroundColor() const {
+  switch (get<BackgroundColor>(Key::RenderBackgroundColor).value()) {
+  case BackgroundColor::Black:
+    return QColorConstants::Black;
+  case BackgroundColor::White:
+    return QColorConstants::White;
+  case BackgroundColor::Custom:
+    return get<QColor>(Key::RenderBackgroundColorCustom).value();
+  }
+
+  // Just in case
+  std::cerr << "Error getting render background color\n";
+  return QColorConstants::Black;
+}
+
 } // namespace netsimulyzer
diff --git a/src/settings/SettingsManager.h b/src/settings/SettingsManager.h
index 2a1f6a0..55f7cc5 100644
--- a/src/settings/SettingsManager.h
+++ b/src/settings/SettingsManager.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "parser/model.h"
+#include <QColor>
 #include <QSettings>
 #include <QString>
 #include <Qt>
@@ -52,6 +53,8 @@ class SettingsManager {
     RenderMotionTrailLength,
     RenderLabels,
     RenderSkybox,
+    RenderBackgroundColor,
+    RenderBackgroundColorCustom,
     ChartDropdownSortOrder,
     WindowTheme
   };
@@ -62,6 +65,7 @@ class SettingsManager {
   enum class MotionTrailRenderMode : int { Always, EnabledOnly, Never };
   enum class TimeUnit : int { Milliseconds, Microseconds, Nanoseconds };
   enum class WindowTheme : int { Dark, Light, Native };
+  enum class BackgroundColor : int { Black, White, Custom };
 
   /**
    * Convert an int to a `BuildingRenderMode` enum value.
@@ -135,6 +139,18 @@ class SettingsManager {
    */
   static WindowTheme WindowThemeFromInt(int value);
 
+  /**
+   * Convert an int to a `BackgroundColor` enum value.
+   * Necessary since Qt will only allow sending registered types with signals/slots.
+   *
+   * @param value
+   * An integer that corresponds to an enum value
+   *
+   * @return
+   * The enum value corresponding to `value`
+   */
+  static BackgroundColor BackgroundColorFromInt(int value);
+
   /**
    * Defines when retrieving a value fails,
    * should it's default value be provided in the return
@@ -184,6 +200,8 @@ class SettingsManager {
       {Key::RenderGrid, {"renderer/showGrid", true}},
       {Key::RenderGridStep, {"renderer/gridStepSize", 1}},
       {Key::RenderSkybox, {"renderer/enableSkybox", true}},
+      {Key::RenderBackgroundColor, {"renderer/backgroundColor", "black"}},
+      {Key::RenderBackgroundColorCustom, {"renderer/backgroundColorCustom", QColorConstants::Black}},
       {Key::RenderLabels, {"renderer/showLabels", "enabledOnly"}},
       {Key::RenderMotionTrails, {"renderer/showMotionTrails", "enabledOnly"}},
       {Key::RenderMotionTrailLength, {"renderer/motionTrailLength", 100}},
@@ -349,6 +367,9 @@ class SettingsManager {
    * The theme to load into the application.
    */
   void setTheme(WindowTheme theme);
+
+  [[nodiscard]]
+  QColor getRenderBackgroundColor() const;
 };
 
 // Specialize so we don't have to convert to/from QString all the time
@@ -449,6 +470,18 @@ template <>
   return SettingsManager::WindowTheme::Dark;
 }
 
+template <>
+[[nodiscard]] inline SettingsManager::BackgroundColor SettingsManager::getDefault(SettingsManager::Key key) const {
+  const auto &settingKey = getQtKey(key);
+  if (!settingKey.defaultValue.isValid()) {
+    std::cerr << "Requested default for key: " << settingKey.key.toStdString() << " which has no default\n";
+    std::abort();
+  }
+
+  // TODO: Use the map value
+  return SettingsManager::BackgroundColor::Black;
+}
+
 template <>
 [[nodiscard]] inline std::optional<SettingsManager::BuildingRenderMode> SettingsManager::get(Key key,
                                                                                              RetrieveMode mode) const {
@@ -479,7 +512,8 @@ template <>
 }
 
 template <>
-[[nodiscard]] inline std::optional<SettingsManager::LabelRenderMode> SettingsManager::get(Key key, RetrieveMode mode) const {
+[[nodiscard]]
+inline std::optional<SettingsManager::LabelRenderMode> SettingsManager::get(Key key, RetrieveMode mode) const {
   const auto &settingKey = getQtKey(key);
   const auto qtSetting = qtSettings.value(settingKey.key);
 
@@ -602,8 +636,8 @@ SettingsManager::get(Key key, RetrieveMode mode) const {
 }
 
 template <>
-[[nodiscard]] inline std::optional<SettingsManager::WindowTheme>
-SettingsManager::get(Key key, RetrieveMode mode) const {
+[[nodiscard]]
+inline std::optional<SettingsManager::WindowTheme> SettingsManager::get(Key key, RetrieveMode mode) const {
   const auto &settingKey = getQtKey(key);
   const auto qtSetting = qtSettings.value(settingKey.key);
 
@@ -632,6 +666,37 @@ SettingsManager::get(Key key, RetrieveMode mode) const {
   return {};
 }
 
+template <>
+[[nodiscard]] inline std::optional<SettingsManager::BackgroundColor> SettingsManager::get(Key key,
+                                                                                          RetrieveMode mode) const {
+  const auto &settingKey = getQtKey(key);
+  const auto qtSetting = qtSettings.value(settingKey.key);
+
+  QString stringMode;
+
+  if (qtSetting.isValid() && !qtSetting.isNull() && qtSetting.template canConvert<QString>())
+    stringMode = qtSetting.toString();
+  else if (mode == RetrieveMode::AllowDefault)
+    stringMode = settingKey.defaultValue.toString();
+  else
+    return {};
+
+  if (stringMode == "black")
+    return {BackgroundColor::Black};
+  else if (stringMode == "white")
+    return {BackgroundColor::White};
+  else if (stringMode == "custom")
+    return {BackgroundColor::Custom};
+  else
+    std::cerr << "Unrecognised 'BackgroundColor' provided '" << stringMode.toStdString() << "' value ignored!\n";
+
+  // Final catch if the provided string value is invalid
+  if (mode == RetrieveMode::AllowDefault)
+    return getDefault<BackgroundColor>(Key::RenderBackgroundColor);
+
+  return {};
+}
+
 template <>
 inline void SettingsManager::set(SettingsManager::Key key, const SettingsManager::BuildingRenderMode &value) {
   const auto &settingKey = getQtKey(key);
@@ -746,4 +811,23 @@ inline void SettingsManager::set(SettingsManager::Key key, const SettingsManager
   }
 }
 
+template <>
+inline void SettingsManager::set(SettingsManager::Key key, const SettingsManager::BackgroundColor &value) {
+  const auto &settingKey = getQtKey(key);
+
+  switch (value) {
+  case BackgroundColor::Black:
+    qtSettings.setValue(settingKey.key, "black");
+    break;
+  case BackgroundColor::White:
+    qtSettings.setValue(settingKey.key, "white");
+    break;
+  case BackgroundColor::Custom:
+    qtSettings.setValue(settingKey.key, "custom");
+    break;
+  default:
+    std::cerr << "Unrecognised 'BackgroundColor': " << static_cast<int>(value) << " value not saved!\n";
+  }
+}
+
 } // namespace netsimulyzer
diff --git a/src/window/MainWindow.cpp b/src/window/MainWindow.cpp
index e1ab964..c307599 100644
--- a/src/window/MainWindow.cpp
+++ b/src/window/MainWindow.cpp
@@ -214,6 +214,8 @@ MainWindow::MainWindow() : QMainWindow() {
     scene.setSkyboxRenderState(enable);
   });
 
+  QObject::connect(&settingsDialog, &SettingsDialog::backgroundColorChanged, &scene, &SceneWidget::setClearColor);
+
   QObject::connect(&settingsDialog, &SettingsDialog::buildingRenderModeChanged, [this](int mode) {
     scene.setBuildingRenderMode(SettingsManager::BuildingRenderModeFromInt(mode));
   });
diff --git a/src/window/scene/SceneWidget.cpp b/src/window/scene/SceneWidget.cpp
index 67a9149..229ebb2 100644
--- a/src/window/scene/SceneWidget.cpp
+++ b/src/window/scene/SceneWidget.cpp
@@ -261,7 +261,7 @@ void SceneWidget::paintGL() {
   camera.move(static_cast<float>(frameTimer.elapsed()));
   renderer.use(camera);
 
-  glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+  glClearColor(clearColorGl[0], clearColorGl[1], clearColorGl[2], 1.0f);
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   if (renderSkybox)
     renderer.render(*skyBox);
@@ -723,6 +723,14 @@ void SceneWidget::setSkyboxRenderState(bool enable) {
   renderSkybox = enable;
 }
 
+void SceneWidget::setClearColor(const QColor &value) {
+  clearColor = value;
+
+  clearColorGl[0] = static_cast<float>(clearColor.redF());
+  clearColorGl[1] = static_cast<float>(clearColor.greenF());
+  clearColorGl[2] = static_cast<float>(clearColor.blueF());
+}
+
 void SceneWidget::setBuildingRenderMode(SettingsManager::BuildingRenderMode mode) {
   buildingRenderMode = mode;
 }
diff --git a/src/window/scene/SceneWidget.h b/src/window/scene/SceneWidget.h
index bdb226e..b5dff4d 100644
--- a/src/window/scene/SceneWidget.h
+++ b/src/window/scene/SceneWidget.h
@@ -64,6 +64,7 @@
 #include <QOpenGLFunctions_3_3_Core>
 #include <QOpenGLWidget>
 #include <QTimer>
+#include <array>
 #include <deque>
 #include <glm/glm.hpp>
 #include <iostream>
@@ -99,6 +100,11 @@ class SceneWidget : public QOpenGLWidget, protected QOpenGLFunctions_3_3_Core {
   bool renderBuildingOutlines = settings.get<bool>(SettingsManager::Key::RenderBuildingOutlines).value();
   SettingsManager::MotionTrailRenderMode renderMotionTrails =
       settings.get<SettingsManager::MotionTrailRenderMode>(SettingsManager::Key::RenderMotionTrails).value();
+  QColor clearColor = settings.getRenderBackgroundColor();
+  // Store the converted form of the clear color,
+  // that OpenGL can accept
+  std::array<float, 3> clearColorGl{static_cast<float>(clearColor.redF()), static_cast<float>(clearColor.greenF()),
+                                    static_cast<float>(clearColor.blueF())};
 
   std::unique_ptr<PickingFramebuffer> pickingFbo;
 
@@ -233,6 +239,14 @@ class SceneWidget : public QOpenGLWidget, protected QOpenGLFunctions_3_3_Core {
    */
   void setSkyboxRenderState(bool enable);
 
+  /**
+   *
+   * @param value
+   * The value to use when clearing the scene.
+   * Only visible when the skybox is off
+   */
+  void setClearColor(const QColor &value);
+
   /**
    * Sets the building render behavior
    * @param mode
diff --git a/src/window/settings/SettingsDialog.cpp b/src/window/settings/SettingsDialog.cpp
index b626b5b..a5a737a 100644
--- a/src/window/settings/SettingsDialog.cpp
+++ b/src/window/settings/SettingsDialog.cpp
@@ -4,6 +4,8 @@
 #include "src/window/util/file-operations.h"
 #include "ui_SettingsDialog.h"
 #include <QApplication>
+#include <QColorDialog>
+#include <QComboBox>
 #include <QFileDialog>
 #include <QFileInfo>
 #include <QMessageBox>
@@ -37,6 +39,12 @@ void SettingsDialog::loadSettings() {
 
   ui.checkBoxSkybox->setChecked(settings.get<bool>(Key::RenderSkybox).value());
 
+  const auto backgroundColor = *settings.get<SettingsManager::BackgroundColor>(Key::RenderBackgroundColor);
+  ui.comboBackgroundColor->setCurrentIndex(static_cast<int>(backgroundColor));
+
+  customBackgroundColor = settings.get<QColor>(SettingsManager::Key::RenderBackgroundColorCustom).value();
+  ui.comboBackgroundColor->setItemData(2, customBackgroundColor, Qt::DecorationRole);
+
   const auto buildingMode = settings.get<SettingsManager::BuildingRenderMode>(Key::RenderBuildingMode).value();
   ui.comboBuildingRender->setCurrentIndex(ui.comboBuildingRender->findData(static_cast<int>(buildingMode)));
 
@@ -92,9 +100,27 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) {
   ui.comboSamples->addItem("8", 8);
   ui.comboSamples->addItem("16", 16);
 
+  ui.comboBackgroundColor->addItem("Black", static_cast<int>(SettingsManager::BackgroundColor::Black));
+  ui.comboBackgroundColor->setItemData(0, QColorConstants::Black, Qt::DecorationRole);
+
+  ui.comboBackgroundColor->addItem("White", static_cast<int>(SettingsManager::BackgroundColor::White));
+  ui.comboBackgroundColor->setItemData(1, QColorConstants::White, Qt::DecorationRole);
+
+  ui.comboBackgroundColor->addItem("Custom", static_cast<int>(SettingsManager::BackgroundColor::Custom));
+  ui.comboBackgroundColor->setItemData(2, customBackgroundColor, Qt::DecorationRole);
+
   ui.comboBuildingRender->addItem("Transparent", static_cast<int>(SettingsManager::BuildingRenderMode::Transparent));
   ui.comboBuildingRender->addItem("Opaque", static_cast<int>(SettingsManager::BuildingRenderMode::Opaque));
 
+  QObject::connect(ui.buttonSetCustomBackgroundColor, &QPushButton::clicked, [this]() {
+    const auto userColor = QColorDialog::getColor(customBackgroundColor, this, "Select a Background Color");
+    if (!userColor.isValid())
+      return;
+
+    customBackgroundColor = userColor;
+    ui.comboBackgroundColor->setItemData(2, customBackgroundColor, Qt::DecorationRole);
+  });
+
   using SortOrder = SettingsManager::ChartDropdownSortOrder;
   ui.comboSortOrder->addItem("Alphabetical", static_cast<int>(SortOrder::Alphabetical));
   ui.comboSortOrder->addItem("Type", static_cast<int>(SortOrder::Type));
@@ -156,6 +182,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) {
   QObject::connect(ui.buttonResetSortOrder, &QPushButton::clicked, this, &SettingsDialog::defaultChartSortOrder);
 
   QObject::connect(ui.buttonResetSkybox, &QPushButton::clicked, this, &SettingsDialog::defaultEnableSkybox);
+  QObject::connect(ui.buttonResetBackgroundColor, &QPushButton::clicked, this, &SettingsDialog::defaultBackgroundColor);
   QObject::connect(ui.buttonResetSamples, &QPushButton::clicked, this, &SettingsDialog::defaultSamples);
   QObject::connect(ui.buttonResetBuildingRender, &QPushButton::clicked, this, &SettingsDialog::defaultBuildingEffect);
   QObject::connect(ui.buttonResetBuildingOutlines, &QPushButton::clicked, this,
@@ -217,6 +244,7 @@ void SettingsDialog::dialogueButtonClicked(QAbstractButton *button) {
     ui.buttonResetSortOrder->click();
 
     ui.buttonResetSkybox->click();
+    ui.buttonResetBackgroundColor->click();
     ui.buttonResetSamples->click();
     ui.buttonResetBuildingRender->click();
     ui.buttonResetBuildingOutlines->click();
@@ -325,6 +353,31 @@ void SettingsDialog::dialogueButtonClicked(QAbstractButton *button) {
       emit renderSkyboxChanged(enableSkybox);
     }
 
+    using BackgroundColor = SettingsManager::BackgroundColor;
+    const auto backgroundColorMode =
+        SettingsManager::BackgroundColorFromInt(ui.comboBackgroundColor->currentData().toInt());
+    // Handle basic modes
+    if (backgroundColorMode != settings.get<BackgroundColor>(Key::RenderBackgroundColor)) {
+      settings.set(Key::RenderBackgroundColor, backgroundColorMode);
+      switch (backgroundColorMode) {
+      case BackgroundColor::Black:
+        emit backgroundColorChanged(QColorConstants::Black);
+      case BackgroundColor::White:
+        emit backgroundColorChanged(QColorConstants::White);
+        break;
+      case BackgroundColor::Custom:
+        // Ignored here
+        break;
+      }
+    }
+
+    // Handle custom color
+    if (backgroundColorMode == BackgroundColor::Custom &&
+        customBackgroundColor != settings.get<QColor>(Key::RenderBackgroundColorCustom).value()) {
+      settings.set(Key::RenderBackgroundColorCustom, customBackgroundColor);
+      emit backgroundColorChanged(customBackgroundColor);
+    }
+
     auto buildingRenderMode = SettingsManager::BuildingRenderModeFromInt(ui.comboBuildingRender->currentData().toInt());
     if (buildingRenderMode != settings.get<SettingsManager::BuildingRenderMode>(Key::RenderBuildingMode).value()) {
       settings.set(Key::RenderBuildingMode, buildingRenderMode);
@@ -456,6 +509,12 @@ void SettingsDialog::defaultChartSortOrder() {
   ui.comboSortOrder->setCurrentIndex(ui.comboSortOrder->findData(defaultValue));
 }
 
+void SettingsDialog::defaultBackgroundColor() {
+  const auto defaultValue = static_cast<int>(
+      settings.getDefault<SettingsManager::BackgroundColor>(SettingsManager::Key::RenderBackgroundColor));
+  ui.comboBackgroundColor->setCurrentIndex(ui.comboBackgroundColor->findData(defaultValue));
+}
+
 void SettingsDialog::defaultSamples() {
   ui.comboSamples->setCurrentIndex(
       ui.comboSamples->findData(settings.getDefault<int>(SettingsManager::Key::NumberSamples)));
diff --git a/src/window/settings/SettingsDialog.h b/src/window/settings/SettingsDialog.h
index 808de7c..289b428 100644
--- a/src/window/settings/SettingsDialog.h
+++ b/src/window/settings/SettingsDialog.h
@@ -36,6 +36,7 @@
 #include "src/settings/SettingsManager.h"
 #include "src/window/scene/SceneWidget.h"
 #include "ui_SettingsDialog.h"
+#include <QColor>
 #include <QDialog>
 #include <QString>
 
@@ -76,6 +77,12 @@ class SettingsDialog : public QDialog {
    */
   double passedTimeStep = 10.0;
 
+  /**
+   * The user specified clear color.
+   * Used when the skybox is off
+   */
+  QColor customBackgroundColor = settings.get<QColor>(SettingsManager::Key::RenderBackgroundColorCustom).value();
+
   /**
    * Sets the suffix in the time step preference SpinBox
    *
@@ -127,6 +134,11 @@ class SettingsDialog : public QDialog {
    */
   void defaultSamples();
 
+  /**
+   * Set the background color combo box to it's default value
+   */
+  void defaultBackgroundColor();
+
   /**
    * Set the Skybox checkbox to the default value
    */
@@ -209,6 +221,13 @@ class SettingsDialog : public QDialog {
   void setTimeStep(double value);
 
 signals:
+
+  // Ignore unimplemented function warning
+  // for Qt Signals, since those are generated
+  // For us elsewhere
+#pragma clang diagnostic push
+#pragma ide diagnostic ignored "NotImplementedFunctions"
+
   /**
    * Signal emitted when the user saves a new Move Speed.
    *
@@ -325,6 +344,14 @@ class SettingsDialog : public QDialog {
    */
   void renderSkyboxChanged(bool enable);
 
+  /**
+   * Signal emitted when the user changes the background color.
+   *
+   * @param value
+   * The new value to use for the clear color
+   */
+  void backgroundColorChanged(QColor value);
+
   /**
    * Signal emitted when the user changes the
    * Building render mode.
@@ -404,6 +431,8 @@ class SettingsDialog : public QDialog {
    * with a trailing slash.
    */
   void resourcePathChanged(const QString &dir);
+
+#pragma clang diagnostic pop
 };
 
 } // namespace netsimulyzer
diff --git a/src/window/settings/SettingsDialog.ui b/src/window/settings/SettingsDialog.ui
index 7d48b90..299522b 100644
--- a/src/window/settings/SettingsDialog.ui
+++ b/src/window/settings/SettingsDialog.ui
@@ -44,111 +44,61 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>0</y>
-        <width>530</width>
-        <height>1211</height>
+        <y>-423</y>
+        <width>531</width>
+        <height>1104</height>
        </rect>
       </property>
       <layout class="QGridLayout" name="gridLayout">
-       <item row="31" column="0">
-        <widget class="QLabel" name="labelPlay">
-         <property name="text">
-          <string>Play/Pause</string>
-         </property>
-        </widget>
-       </item>
-       <item row="17" column="12">
-        <widget class="QLabel" name="labelCharts">
-         <property name="font">
-          <font>
-           <pointsize>16</pointsize>
-          </font>
-         </property>
-         <property name="text">
-          <string>Charts</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="27" column="0">
-        <widget class="QLabel" name="labelMotionTrailLength">
-         <property name="text">
-          <string>Motion Trail Length</string>
-         </property>
-        </widget>
-       </item>
-       <item row="15" column="0" colspan="2">
-        <widget class="QLabel" name="labelUp">
-         <property name="text">
-          <string>Up</string>
-         </property>
-        </widget>
-       </item>
-       <item row="26" column="0">
-        <widget class="QLabel" name="labelShowTrails">
-         <property name="text">
-          <string>Show Motion Trails</string>
-         </property>
-        </widget>
-       </item>
-       <item row="26" column="12">
-        <widget class="QComboBox" name="comboMotionTrailRender"/>
-       </item>
-       <item row="8" column="12">
-        <widget class="QSlider" name="sliderFieldOfView">
-         <property name="minimum">
-          <number>30</number>
-         </property>
-         <property name="maximum">
-          <number>90</number>
-         </property>
-         <property name="value">
-          <number>45</number>
-         </property>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="28" column="12">
-        <widget class="QComboBox" name="comboLabelRender"/>
-       </item>
-       <item row="37" column="14">
-        <widget class="QPushButton" name="buttonResource">
-         <property name="text">
-          <string>Browse</string>
-         </property>
-        </widget>
-       </item>
-       <item row="15" column="14">
-        <widget class="QPushButton" name="buttonResetUp">
+       <item row="33" column="13">
+        <widget class="QPushButton" name="buttonResetPlay">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="0" colspan="2">
-        <widget class="QLabel" name="labelForward">
-         <property name="text">
-          <string>Forward</string>
-         </property>
-        </widget>
-       </item>
-       <item row="7" column="0" colspan="4">
-        <widget class="QLabel" name="labelMouseTurnSpeed">
-         <property name="text">
-          <string>Mouse Turn Speed</string>
-         </property>
-        </widget>
+       <item row="27" column="12">
+        <widget class="QComboBox" name="comboGridSize"/>
        </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="labelTheme">
-         <property name="text">
-          <string>Theme</string>
-         </property>
-        </widget>
+       <item row="26" column="12">
+        <layout class="QHBoxLayout" name="layoutShowGrid">
+         <item>
+          <spacer name="hsGridLeft">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="checkBoxShowGrid">
+           <property name="styleSheet">
+            <string notr="true"/>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="hsGridRIght">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
        </item>
        <item row="16" column="12">
         <widget class="SingleKeySequenceEdit" name="keyDown">
@@ -157,52 +107,56 @@
          </property>
         </widget>
        </item>
-       <item row="29" column="14">
-        <widget class="QPushButton" name="buttonResetLabelScale">
+       <item row="18" column="13">
+        <widget class="QPushButton" name="buttonResetSortOrder">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="8" column="0" colspan="4">
-        <widget class="QLabel" name="labelFieldOfView">
+       <item row="7" column="13">
+        <widget class="QPushButton" name="buttonResetMouseTurnSpeed">
          <property name="text">
-          <string>Field of View</string>
+          <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="18" column="0">
-        <widget class="QLabel" name="labelSortOrder">
-         <property name="text">
-          <string>Sort Order</string>
+       <item row="19" column="12">
+        <widget class="QLabel" name="labelGraphics">
+         <property name="font">
+          <font>
+           <pointsize>16</pointsize>
+          </font>
          </property>
-        </widget>
-       </item>
-       <item row="20" column="14">
-        <widget class="QPushButton" name="buttonResetSamples">
          <property name="text">
-          <string>Default</string>
+          <string>Graphics</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
          </property>
         </widget>
        </item>
-       <item row="5" column="0" colspan="4">
-        <widget class="QLabel" name="labelMoveSpeed">
+       <item row="2" column="12">
+        <widget class="QComboBox" name="comboTheme"/>
+       </item>
+       <item row="29" column="13">
+        <widget class="QPushButton" name="buttonResetTrailLength">
          <property name="text">
-          <string>Move Speed</string>
+          <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="6" column="14">
-        <widget class="QPushButton" name="buttonResetKeyboardTurnSpeed">
-         <property name="text">
-          <string>Default</string>
+       <item row="9" column="12">
+        <widget class="SingleKeySequenceEdit" name="keyForward">
+         <property name="keySequence">
+          <string>W</string>
          </property>
         </widget>
        </item>
-       <item row="21" column="14">
-        <widget class="QPushButton" name="buttonResetSkybox">
+       <item row="9" column="0" colspan="2">
+        <widget class="QLabel" name="labelForward">
          <property name="text">
-          <string>Default</string>
+          <string>Forward</string>
          </property>
         </widget>
        </item>
@@ -213,93 +167,68 @@
          </property>
         </widget>
        </item>
-       <item row="11" column="0" colspan="2">
-        <widget class="QLabel" name="labelLeft">
+       <item row="23" column="0">
+        <widget class="QLabel" name="labelBackgroundColor">
          <property name="text">
-          <string>Left</string>
+          <string>Background Color</string>
          </property>
         </widget>
        </item>
-       <item row="27" column="14">
-        <widget class="QPushButton" name="buttonResetTrailLength">
+       <item row="34" column="0">
+        <widget class="QLabel" name="labelTimeStep">
          <property name="text">
-          <string>Default</string>
+          <string>Time Step Preference</string>
          </property>
         </widget>
        </item>
-       <item row="32" column="14">
-        <widget class="QPushButton" name="buttonResetTimeStep">
+       <item row="25" column="0">
+        <widget class="QLabel" name="labelRenderBuildingOutlines">
          <property name="text">
-          <string>Default</string>
-         </property>
-        </widget>
-       </item>
-       <item row="13" column="12">
-        <widget class="SingleKeySequenceEdit" name="keyTurnLeft">
-         <property name="keySequence">
-          <string>Q</string>
+          <string>Show Building Outlines</string>
          </property>
         </widget>
        </item>
-       <item row="12" column="14">
-        <widget class="QPushButton" name="buttonResetRight">
-         <property name="text">
-          <string>Default</string>
+       <item row="8" column="12">
+        <widget class="QSlider" name="sliderFieldOfView">
+         <property name="minimum">
+          <number>30</number>
          </property>
-        </widget>
-       </item>
-       <item row="18" column="12">
-        <widget class="QComboBox" name="comboSortOrder"/>
-       </item>
-       <item row="23" column="14">
-        <widget class="QPushButton" name="buttonResetBuildingOutlines">
-         <property name="text">
-          <string>Default</string>
+         <property name="maximum">
+          <number>90</number>
          </property>
-        </widget>
-       </item>
-       <item row="20" column="0">
-        <widget class="QLabel" name="labelSamples">
-         <property name="text">
-          <string>Samples (MSAA)</string>
+         <property name="value">
+          <number>45</number>
          </property>
-        </widget>
-       </item>
-       <item row="12" column="12">
-        <widget class="SingleKeySequenceEdit" name="keyRight">
-         <property name="keySequence">
-          <string>D</string>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
          </property>
         </widget>
        </item>
-       <item row="21" column="0">
-        <widget class="QLabel" name="labelSkybox">
+       <item row="8" column="13">
+        <widget class="QPushButton" name="buttonResetFieldOfView">
          <property name="text">
-          <string>SkyBox</string>
+          <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="31" column="12">
-        <widget class="SingleKeySequenceEdit" name="keyPlay">
-         <property name="keySequence">
-          <string>X</string>
+       <item row="14" column="13">
+        <widget class="QPushButton" name="buttonResetRightTurn">
+         <property name="text">
+          <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="24" column="14">
-        <widget class="QPushButton" name="buttonResetShowGrid">
+       <item row="16" column="13">
+        <widget class="QPushButton" name="buttonResetDown">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="21" column="12">
-        <layout class="QHBoxLayout" name="layoutSkybox" stretch="0,0,0">
-         <property name="topMargin">
-          <number>0</number>
-         </property>
+       <item row="25" column="12">
+        <layout class="QHBoxLayout" name="layoutBuildingOutlines">
          <item>
-          <spacer name="hsSkyboxLeft">
+          <spacer name="hsBuildingOutlinesLeft">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
@@ -312,29 +241,14 @@
           </spacer>
          </item>
          <item>
-          <widget class="QCheckBox" name="checkBoxSkybox">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="baseSize">
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="styleSheet">
-            <string notr="true"/>
-           </property>
+          <widget class="QCheckBox" name="checkBoxBuildingOutlines">
            <property name="text">
             <string/>
            </property>
           </widget>
          </item>
          <item>
-          <spacer name="hsSkyboxRight">
+          <spacer name="hsBuildingOutlinesRight">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
@@ -348,182 +262,188 @@
          </item>
         </layout>
        </item>
-       <item row="32" column="0">
-        <widget class="QLabel" name="labelTimeStep">
+       <item row="24" column="13">
+        <widget class="QPushButton" name="buttonResetBuildingRender">
          <property name="text">
-          <string>Time Step Preference</string>
+          <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="13" column="0" colspan="2">
-        <widget class="QLabel" name="labelTurnLeft">
-         <property name="text">
-          <string>Turn Left</string>
-         </property>
-        </widget>
+       <item row="18" column="12">
+        <widget class="QComboBox" name="comboSortOrder"/>
        </item>
-       <item row="29" column="0">
-        <widget class="QLabel" name="labelLabelScale">
+       <item row="27" column="0">
+        <widget class="QLabel" name="labelGridSize">
          <property name="text">
-          <string>Label Size</string>
+          <string>Grid Step Size</string>
          </property>
         </widget>
        </item>
-       <item row="22" column="14">
-        <widget class="QPushButton" name="buttonResetBuildingRender">
+       <item row="8" column="0" colspan="4">
+        <widget class="QLabel" name="labelFieldOfView">
          <property name="text">
-          <string>Default</string>
+          <string>Field of View</string>
          </property>
         </widget>
        </item>
-       <item row="20" column="12">
-        <widget class="QComboBox" name="comboSamples"/>
+       <item row="30" column="12">
+        <widget class="QComboBox" name="comboLabelRender"/>
        </item>
-       <item row="8" column="14">
-        <widget class="QPushButton" name="buttonResetFieldOfView">
+       <item row="0" column="12">
+        <widget class="QLabel" name="labelWindow">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="font">
+          <font>
+           <pointsize>16</pointsize>
+          </font>
+         </property>
          <property name="text">
-          <string>Default</string>
+          <string>Window</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
          </property>
         </widget>
        </item>
-       <item row="2" column="14">
+       <item row="2" column="13">
         <widget class="QPushButton" name="buttonResetTheme">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="12">
-        <widget class="QSlider" name="sliderMoveSpeed">
-         <property name="minimum">
-          <number>1</number>
-         </property>
-         <property name="maximum">
-          <number>1000</number>
-         </property>
-         <property name="singleStep">
-          <number>1</number>
+       <item row="3" column="11" colspan="2">
+        <widget class="QLabel" name="labelCamera">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
-         <property name="value">
-          <number>5</number>
+         <property name="font">
+          <font>
+           <pointsize>16</pointsize>
+          </font>
          </property>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+         <property name="text">
+          <string>Camera</string>
          </property>
-         <property name="invertedAppearance">
-          <bool>false</bool>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
          </property>
-         <property name="tickPosition">
-          <enum>QSlider::NoTicks</enum>
+        </widget>
+       </item>
+       <item row="12" column="12">
+        <widget class="SingleKeySequenceEdit" name="keyRight">
+         <property name="keySequence">
+          <string>D</string>
          </property>
         </widget>
        </item>
-       <item row="14" column="0" colspan="2">
-        <widget class="QLabel" name="labelTurnRight">
-         <property name="text">
-          <string>Turn Right</string>
+       <item row="33" column="12">
+        <widget class="SingleKeySequenceEdit" name="keyPlay">
+         <property name="keySequence">
+          <string>X</string>
          </property>
         </widget>
        </item>
-       <item row="26" column="14">
-        <widget class="QPushButton" name="buttonResetTrails">
+       <item row="26" column="13">
+        <widget class="QPushButton" name="buttonResetShowGrid">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="24" column="12">
-        <layout class="QHBoxLayout" name="layoutShowGrid">
-         <item>
-          <spacer name="hsGridLeft">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="checkBoxShowGrid">
-           <property name="styleSheet">
-            <string notr="true"/>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="hsGridRIght">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-       <item row="30" column="12">
-        <widget class="QLabel" name="labelPlayback">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
+       <item row="14" column="0" colspan="2">
+        <widget class="QLabel" name="labelTurnRight">
+         <property name="text">
+          <string>Turn Right</string>
          </property>
+        </widget>
+       </item>
+       <item row="17" column="12">
+        <widget class="QLabel" name="labelCharts">
          <property name="font">
           <font>
            <pointsize>16</pointsize>
           </font>
          </property>
          <property name="text">
-          <string>Playback</string>
+          <string>Charts</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
          </property>
         </widget>
        </item>
-       <item row="14" column="14">
-        <widget class="QPushButton" name="buttonResetRightTurn">
+       <item row="31" column="0">
+        <widget class="QLabel" name="labelLabelScale">
          <property name="text">
-          <string>Default</string>
+          <string>Label Size</string>
          </property>
         </widget>
        </item>
-       <item row="10" column="14">
-        <widget class="QPushButton" name="buttonResetBackward">
+       <item row="13" column="12">
+        <widget class="SingleKeySequenceEdit" name="keyTurnLeft">
+         <property name="keySequence">
+          <string>Q</string>
+         </property>
+        </widget>
+       </item>
+       <item row="28" column="0">
+        <widget class="QLabel" name="labelShowTrails">
          <property name="text">
-          <string>Default</string>
+          <string>Show Motion Trails</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="14">
-        <widget class="QPushButton" name="buttonResetMoveSpeed">
+       <item row="15" column="12">
+        <widget class="SingleKeySequenceEdit" name="keyUp">
+         <property name="keySequence">
+          <string>Z</string>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="13">
+        <widget class="QPushButton" name="buttonResetForward">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="23" column="12">
-        <layout class="QHBoxLayout" name="layoutBuildingOutlines">
+       <item row="39" column="12">
+        <widget class="QLineEdit" name="lineEditResource">
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="18" column="0">
+        <widget class="QLabel" name="labelSortOrder">
+         <property name="text">
+          <string>Sort Order</string>
+         </property>
+        </widget>
+       </item>
+       <item row="30" column="0">
+        <widget class="QLabel" name="labelShowLabels">
+         <property name="text">
+          <string>Show Labels</string>
+         </property>
+        </widget>
+       </item>
+       <item row="22" column="12">
+        <layout class="QHBoxLayout" name="layoutSkybox" stretch="0,0,0">
+         <property name="topMargin">
+          <number>0</number>
+         </property>
          <item>
-          <spacer name="hsBuildingOutlinesLeft">
+          <spacer name="hsSkyboxLeft">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
@@ -536,14 +456,29 @@
           </spacer>
          </item>
          <item>
-          <widget class="QCheckBox" name="checkBoxBuildingOutlines">
+          <widget class="QCheckBox" name="checkBoxSkybox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="baseSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="styleSheet">
+            <string notr="true"/>
+           </property>
            <property name="text">
             <string/>
            </property>
           </widget>
          </item>
          <item>
-          <spacer name="hsBuildingOutlinesRight">
+          <spacer name="hsSkyboxRight">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
@@ -557,65 +492,49 @@
          </item>
         </layout>
        </item>
-       <item row="29" column="12">
-        <widget class="QSlider" name="sliderLabelScale">
-         <property name="minimum">
-          <number>1</number>
-         </property>
-         <property name="maximum">
-          <number>100</number>
-         </property>
-         <property name="value">
-          <number>50</number>
+       <item row="16" column="0" colspan="2">
+        <widget class="QLabel" name="labelDown">
+         <property name="text">
+          <string>Down</string>
          </property>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+        </widget>
+       </item>
+       <item row="12" column="0" colspan="2">
+        <widget class="QLabel" name="labelRight">
+         <property name="text">
+          <string>Right</string>
          </property>
         </widget>
        </item>
-       <item row="13" column="14">
-        <widget class="QPushButton" name="buttonResetLeftTurn">
+       <item row="27" column="13">
+        <widget class="QPushButton" name="buttonResetGridSize">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="10" column="0" colspan="2">
-        <widget class="QLabel" name="labelBackward">
+       <item row="33" column="0">
+        <widget class="QLabel" name="labelPlay">
          <property name="text">
-          <string>Backward</string>
+          <string>Play/Pause</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="11" colspan="2">
-        <widget class="QLabel" name="labelCamera">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="font">
-          <font>
-           <pointsize>16</pointsize>
-          </font>
-         </property>
+       <item row="39" column="13">
+        <widget class="QPushButton" name="buttonResource">
          <property name="text">
-          <string>Camera</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
+          <string>Browse</string>
          </property>
         </widget>
        </item>
-       <item row="28" column="14">
-        <widget class="QPushButton" name="buttonResetShowLabels">
+       <item row="6" column="13">
+        <widget class="QPushButton" name="buttonResetKeyboardTurnSpeed">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="32" column="12">
+       <item row="34" column="12">
         <layout class="QHBoxLayout" name="layoutTimeStep">
          <item>
           <widget class="QSpinBox" name="spinTimeStep">
@@ -638,173 +557,234 @@
          </item>
         </layout>
        </item>
-       <item row="15" column="12">
-        <widget class="SingleKeySequenceEdit" name="keyUp">
-         <property name="keySequence">
-          <string>Z</string>
+       <item row="5" column="12">
+        <widget class="QSlider" name="sliderMoveSpeed">
+         <property name="minimum">
+          <number>1</number>
+         </property>
+         <property name="maximum">
+          <number>1000</number>
+         </property>
+         <property name="singleStep">
+          <number>1</number>
+         </property>
+         <property name="value">
+          <number>5</number>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="invertedAppearance">
+          <bool>false</bool>
+         </property>
+         <property name="tickPosition">
+          <enum>QSlider::NoTicks</enum>
          </property>
         </widget>
        </item>
-       <item row="10" column="12">
-        <widget class="SingleKeySequenceEdit" name="keyBackward">
-         <property name="keySequence">
-          <string>S</string>
+       <item row="15" column="13">
+        <widget class="QPushButton" name="buttonResetUp">
+         <property name="text">
+          <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="14">
-        <widget class="QPushButton" name="buttonResetForward">
+       <item row="31" column="13">
+        <widget class="QPushButton" name="buttonResetLabelScale">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="25" column="0">
-        <widget class="QLabel" name="labelGridSize">
+       <item row="30" column="13">
+        <widget class="QPushButton" name="buttonResetShowLabels">
          <property name="text">
-          <string>Grid Step Size</string>
+          <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="12">
-        <widget class="SingleKeySequenceEdit" name="keyForward">
-         <property name="keySequence">
-          <string>W</string>
+       <item row="5" column="0" colspan="4">
+        <widget class="QLabel" name="labelMoveSpeed">
+         <property name="text">
+          <string>Move Speed</string>
          </property>
         </widget>
        </item>
-       <item row="37" column="0" colspan="3">
-        <widget class="QLabel" name="label">
+       <item row="13" column="0" colspan="2">
+        <widget class="QLabel" name="labelTurnLeft">
          <property name="text">
-          <string>Resource Directory</string>
+          <string>Turn Left</string>
          </property>
         </widget>
        </item>
-       <item row="11" column="12">
-        <widget class="SingleKeySequenceEdit" name="keyLeft">
+       <item row="10" column="12">
+        <widget class="SingleKeySequenceEdit" name="keyBackward">
          <property name="keySequence">
-          <string>A</string>
+          <string>S</string>
          </property>
         </widget>
        </item>
-       <item row="16" column="14">
-        <widget class="QPushButton" name="buttonResetDown">
+       <item row="10" column="13">
+        <widget class="QPushButton" name="buttonResetBackward">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="22" column="12">
-        <widget class="QComboBox" name="comboBuildingRender"/>
-       </item>
-       <item row="6" column="12">
-        <widget class="QSlider" name="sliderKeyboardTurnSpeed">
+       <item row="7" column="12">
+        <widget class="QSlider" name="sliderMouseTurnSpeed">
          <property name="maximum">
           <number>20</number>
          </property>
          <property name="pageStep">
           <number>5</number>
          </property>
-         <property name="value">
-          <number>5</number>
-         </property>
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
         </widget>
        </item>
-       <item row="37" column="12">
-        <widget class="QLineEdit" name="lineEditResource">
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="22" column="0">
-        <widget class="QLabel" name="labelRenderBuildings">
-         <property name="text">
-          <string>Building Effect</string>
-         </property>
-        </widget>
-       </item>
-       <item row="25" column="12">
-        <widget class="QComboBox" name="comboGridSize"/>
-       </item>
-       <item row="24" column="0">
-        <widget class="QLabel" name="labelShowGrid">
+       <item row="7" column="0" colspan="4">
+        <widget class="QLabel" name="labelMouseTurnSpeed">
          <property name="text">
-          <string>Show Grid</string>
+          <string>Mouse Turn Speed</string>
          </property>
         </widget>
        </item>
-       <item row="27" column="12">
-        <widget class="QSlider" name="sliderTrailLength">
+       <item row="31" column="12">
+        <widget class="QSlider" name="sliderLabelScale">
          <property name="minimum">
-          <number>10</number>
+          <number>1</number>
          </property>
          <property name="maximum">
-          <number>8192</number>
+          <number>100</number>
          </property>
          <property name="value">
-          <number>100</number>
+          <number>50</number>
          </property>
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
         </widget>
        </item>
-       <item row="18" column="14">
-        <widget class="QPushButton" name="buttonResetSortOrder">
+       <item row="28" column="13">
+        <widget class="QPushButton" name="buttonResetTrails">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="25" column="14">
-        <widget class="QPushButton" name="buttonResetGridSize">
+       <item row="21" column="13">
+        <widget class="QPushButton" name="buttonResetSamples">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="12" column="0" colspan="2">
-        <widget class="QLabel" name="labelRight">
+       <item row="10" column="0" colspan="2">
+        <widget class="QLabel" name="labelBackward">
          <property name="text">
-          <string>Right</string>
+          <string>Backward</string>
          </property>
         </widget>
        </item>
-       <item row="28" column="0">
-        <widget class="QLabel" name="labelShowLabels">
+       <item row="22" column="13">
+        <widget class="QPushButton" name="buttonResetSkybox">
          <property name="text">
-          <string>Show Labels</string>
+          <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="19" column="12">
-        <widget class="QLabel" name="labelGraphics">
+       <item row="21" column="12">
+        <widget class="QComboBox" name="comboSamples"/>
+       </item>
+       <item row="38" column="12">
+        <widget class="QLabel" name="labelResources">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="font">
           <font>
            <pointsize>16</pointsize>
           </font>
          </property>
          <property name="text">
-          <string>Graphics</string>
+          <string>Resources</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
          </property>
         </widget>
        </item>
-       <item row="31" column="14">
-        <widget class="QPushButton" name="buttonResetPlay">
+       <item row="11" column="12">
+        <widget class="SingleKeySequenceEdit" name="keyLeft">
+         <property name="keySequence">
+          <string>A</string>
+         </property>
+        </widget>
+       </item>
+       <item row="22" column="0">
+        <widget class="QLabel" name="labelSkybox">
+         <property name="text">
+          <string>SkyBox</string>
+         </property>
+        </widget>
+       </item>
+       <item row="12" column="13">
+        <widget class="QPushButton" name="buttonResetRight">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="36" column="12">
-        <widget class="QLabel" name="labelResources">
+       <item row="34" column="13">
+        <widget class="QPushButton" name="buttonResetTimeStep">
+         <property name="text">
+          <string>Default</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="13">
+        <widget class="QPushButton" name="buttonResetMoveSpeed">
+         <property name="text">
+          <string>Default</string>
+         </property>
+        </widget>
+       </item>
+       <item row="11" column="0" colspan="2">
+        <widget class="QLabel" name="labelLeft">
+         <property name="text">
+          <string>Left</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="12">
+        <widget class="QSlider" name="sliderKeyboardTurnSpeed">
+         <property name="maximum">
+          <number>20</number>
+         </property>
+         <property name="pageStep">
+          <number>5</number>
+         </property>
+         <property name="value">
+          <number>5</number>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="32" column="12">
+        <widget class="QLabel" name="labelPlayback">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
@@ -823,7 +803,7 @@
           </font>
          </property>
          <property name="text">
-          <string>Resources</string>
+          <string>Playback</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -837,68 +817,116 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="14">
-        <widget class="QPushButton" name="buttonResetMouseTurnSpeed">
+       <item row="29" column="0">
+        <widget class="QLabel" name="labelMotionTrailLength">
+         <property name="text">
+          <string>Motion Trail Length</string>
+         </property>
+        </widget>
+       </item>
+       <item row="39" column="0" colspan="3">
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Resource Directory</string>
+         </property>
+        </widget>
+       </item>
+       <item row="21" column="0">
+        <widget class="QLabel" name="labelSamples">
+         <property name="text">
+          <string>Samples (MSAA)</string>
+         </property>
+        </widget>
+       </item>
+       <item row="13" column="13">
+        <widget class="QPushButton" name="buttonResetLeftTurn">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="11" column="14">
-        <widget class="QPushButton" name="buttonResetLeft">
+       <item row="25" column="13">
+        <widget class="QPushButton" name="buttonResetBuildingOutlines">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="23" column="0">
-        <widget class="QLabel" name="labelRenderBuildingOutlines">
+       <item row="15" column="0" colspan="2">
+        <widget class="QLabel" name="labelUp">
          <property name="text">
-          <string>Show Building Outlines</string>
+          <string>Up</string>
          </property>
         </widget>
        </item>
-       <item row="16" column="0" colspan="2">
-        <widget class="QLabel" name="labelDown">
+       <item row="24" column="0">
+        <widget class="QLabel" name="labelRenderBuildings">
          <property name="text">
-          <string>Down</string>
+          <string>Building Effect</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="12">
-        <widget class="QComboBox" name="comboTheme"/>
+       <item row="28" column="12">
+        <widget class="QComboBox" name="comboMotionTrailRender"/>
        </item>
-       <item row="7" column="12">
-        <widget class="QSlider" name="sliderMouseTurnSpeed">
+       <item row="26" column="0">
+        <widget class="QLabel" name="labelShowGrid">
+         <property name="text">
+          <string>Show Grid</string>
+         </property>
+        </widget>
+       </item>
+       <item row="24" column="12">
+        <widget class="QComboBox" name="comboBuildingRender"/>
+       </item>
+       <item row="29" column="12">
+        <widget class="QSlider" name="sliderTrailLength">
+         <property name="minimum">
+          <number>10</number>
+         </property>
          <property name="maximum">
-          <number>20</number>
+          <number>8192</number>
          </property>
-         <property name="pageStep">
-          <number>5</number>
+         <property name="value">
+          <number>100</number>
          </property>
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
         </widget>
        </item>
-       <item row="0" column="12">
-        <widget class="QLabel" name="labelWindow">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="font">
-          <font>
-           <pointsize>16</pointsize>
-          </font>
+       <item row="11" column="13">
+        <widget class="QPushButton" name="buttonResetLeft">
+         <property name="text">
+          <string>Default</string>
          </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="labelTheme">
          <property name="text">
-          <string>Window</string>
+          <string>Theme</string>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
+        </widget>
+       </item>
+       <item row="23" column="12">
+        <layout class="QHBoxLayout" name="layoutBackgroundColor">
+         <item>
+          <widget class="QComboBox" name="comboBackgroundColor"/>
+         </item>
+         <item>
+          <widget class="QPushButton" name="buttonSetCustomBackgroundColor">
+           <property name="text">
+            <string>Set Custom</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="23" column="13">
+        <widget class="QPushButton" name="buttonResetBackgroundColor">
+         <property name="text">
+          <string>Default</string>
          </property>
         </widget>
        </item>