diff --git a/obs/data/themes/Dark.qss b/obs/data/themes/Dark.qss
new file mode 100644
index 000000000..447753df3
--- /dev/null
+++ b/obs/data/themes/Dark.qss
@@ -0,0 +1,457 @@
+/******************************************************************************/
+/*   Copyright (C) 2014-2015 by Philippe Groarke <philippe.groarke@gmail.com> */
+/*                                                                            */
+/*                                                                            */
+/*   This program is free software: you can redistribute it and/or modify     */
+/*   it under the terms of the GNU General Public License as published by     */
+/*   the Free Software Foundation, either version 2 of the License, or        */
+/*   (at your option) any later version.                                      */
+/*                                                                            */
+/*   This program is distributed in the hope that it will be useful,          */
+/*   but WITHOUT ANY WARRANTY; without even the implied warranty of           */
+/*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            */
+/*   GNU General Public License for more details.                             */
+/*                                                                            */
+/*   You should have received a copy of the GNU General Public License        */
+/*   along with this program.  If not, see <http://www.gnu.org/licenses/>.    */
+/******************************************************************************/
+
+/* Colors */
+
+/* rgb(225,224,225); /* veryLight */
+/* rgb(200,199,200); /* lighter */
+/* rgb(122,121,122); /* light */
+/* rgb(88,87,88); /* kindaDark */
+/* rgb(58,57,58); /* dark */
+/* rgb(31,30,31); /* veryDark */
+/* rgb(11,10,11); /* veryVeryDark */
+/* rgb(42,130,218); /* blue */
+
+
+/* General style, we override only what is needed. */
+QWidget {
+    background-color: rgb(58,57,58); /* dark */
+    alternate-background-color: rgb(31,30,31); /* veryDark */
+    color: rgb(225,224,225); /* veryLight */
+    selection-background-color: rgb(42,130,218); /* blue */
+    selection-color: black;
+}
+
+
+/* Misc */
+
+QWidget::disabled {
+    color: 2px solid rgb(200,199,200); /* lighter */
+}
+
+QAbstractItemView {
+    background-color: rgb(31,30,31); /* veryDark */
+}
+
+QToolTip {
+    background-color: rgb(31,30,31); /* veryDark */
+    color: rgb(205,205,205);
+}
+
+QMenuBar::item {
+    background-color: rgb(58,57,58); /* dark */
+}
+
+
+/* Group Box */
+
+QGroupBox {
+    border: 1px solid rgb(31,30,31); /* veryDark */;
+    border-radius: 5px;
+    padding-top: 16px;
+}
+
+
+/* ScrollBars */
+
+::corner {
+    background-color: rgb(58,57,58); /* dark */
+    border: none;
+}
+
+QScrollBar:vertical {
+    background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0,
+        stop: 0 rgb(31,30,31), /* veryDark */
+        stop: 0.75 rgb(54, 53, 54),
+        stop: 1 rgb(58,57,58)); /* dark */
+    width: 14px;
+}
+
+QScrollBar::handle:vertical {
+    background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0,
+        stop: 0 rgb(122,121,122), /* light */
+        stop: 0.25 rgb(100, 99, 100),
+        stop: 1 rgb(88,87,88)); /* kindaDark */
+    min-height: 20px;
+    margin: 2px;
+    border-radius: 5px;
+    border-width: 1px;
+    border: 1px solid rgb(31,30,31); /* veryDark */
+}
+
+QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical {
+    border: none;
+    background: none;
+}
+
+QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical, QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
+    border: none;
+    background: none;
+    color: none;
+}
+
+QScrollBar:horizontal {
+    background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 rgb(31,30,31), /* veryDark */
+        stop: 0.75 rgb(54, 53, 54),
+        stop: 1 rgb(58,57,58)); /* dark */
+    height: 14px;
+}
+
+QScrollBar::handle:horizontal {
+    background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 rgb(122,121,122), /* light */
+        stop: 0.25 rgb(100, 99, 100),
+        stop: 1 rgb(88,87,88)); /* kindaDark */
+    min-width: 20px;
+    margin: 2px;
+    border-radius: 5px;
+    border-width: 1px;
+    border: 1px solid rgb(31,30,31); /* veryDark */
+}
+
+QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal {
+    border: none;
+    background: none;
+}
+
+QScrollBar::left-arrow:horizontal, QScrollBar::right-arrow:horizontal, QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
+    border: none;
+    background: none;
+    color: none;
+}
+
+
+/* Scenes and Sources toolbar */
+
+QToolBar {
+    background-color: rgb(58,57,58); /* dark */
+    border: none;
+}
+
+QToolButton:hover {
+    background-color: rgb(122,121,122); /* light */
+    border-radius: none;
+}
+
+QToolButton:pressed {
+    background-color: rgb(31,30,31); /* veryDark */
+    border-radius: none;
+}
+
+* [themeID="addIconSmall"] {
+    qproperty-icon: url(./Dark/plus.png);
+}
+
+* [themeID="removeIconSmall"] {
+    qproperty-icon: url(./Dark/minus.png);
+}
+
+* [themeID="propertiesIconSmall"] {
+    qproperty-icon: url(./Dark/cogwheel.png);
+}
+
+* [themeID="configIconSmall"] {
+    qproperty-icon: url(./Dark/cogwheel.png);
+}
+
+* [themeID="upArrowIconSmall"] {
+    qproperty-icon: url(./Dark/up_arrow.png);
+}
+
+* [themeID="downArrowIconSmall"] {
+    qproperty-icon: url(./Dark/down_arrow.png);
+}
+
+
+/* Tab Widget */
+
+QTabWidget::pane { /* The tab widget frame */
+    border-top: 1px solid rgb(31,30,31); /* veryDark */
+}
+
+QTabWidget::tab-bar {
+    alignment: center;
+}
+
+QTabBar::tab {
+    background-color: rgb(88,87,88); /* kindaDark */
+    border: none;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
+    min-width: 8ex;
+    padding-top: 4px;
+    padding-bottom: 4px;
+    padding-left: 10px;
+    padding-right: 10px;
+    margin-right: 1px;
+}
+
+QTabBar::tab:selected {
+    background-color: rgb(31,30,31); /* veryDark */
+}
+
+QTabBar::tab:hover {
+    background-color: rgb(122,121,122); /* light */
+}
+
+QTabBar::tab:pressed {
+    background-color: rgb(31,30,31); /* veryDark */
+}
+
+
+/* ComboBox */
+
+QComboBox {
+    background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 rgb(86,85,86),
+        stop: 0.1 rgb(82,81,82),
+        stop: 0.5 rgb(78,77,78),
+        stop: 0.9 rgb(74,73,74),
+        stop: 1 rgb(70,69,70));
+    border-style: solid;
+    border: 1px;
+    border-radius: 3px;
+    border-color: rgb(31,30,31); /* veryDark */
+    padding: 2px;
+    padding-left: 10px;
+}
+
+QComboBox::drop-down {
+    border:none;
+    border-left: 1px solid rgba(31,30,31,155); /* veryDark */
+    width: 20px;
+}
+
+QComboBox::down-arrow {
+    qproperty-alignment: AlignTop;
+    image: url(./Dark/updown.png);
+    width: 100%;
+}
+
+QComboBox:on {
+    background-color: rgb(31,30,31); /* veryDark */
+}
+
+QComboBox:editable {
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+}
+
+QComboBox::drop-down:editable {
+    border-top-right-radius: 3px;
+    border-bottom-right-radius: 3px;
+}
+
+QComboBox::down-arrow:editable {
+    qproperty-alignment: AlignTop;
+    image: url(./Dark/down_arrow.png);
+    width: 8%;
+}
+
+
+/* Textedits etc */
+
+QLineEdit, QTextEdit, QPlainTextEdit {
+    background-color: rgb(31,30,31); /* veryDark */
+    border: none;
+    padding-left: 2px;
+}
+
+
+/* Spinbox and doubleSpinbox */
+
+QSpinBox, QDoubleSpinBox {
+    background-color: rgb(31,30,31); /* veryDark */
+    border: none;
+    padding-left: 2px;
+    padding-right: 15px;
+    margin-right: 10px;
+}
+
+QSpinBox::up-button, QDoubleSpinBox::up-button {
+    subcontrol-origin: margin;
+    subcontrol-position: top right; /* position at the top right corner */
+
+    background-color: rgb(88,87,88); /* kindaDark */
+    border: 1px solid rgb(31,30,31); /* veryDark */
+    border-radius: 3px;
+    border-width: 0;
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+    border-bottom-width: 0;
+}
+
+QSpinBox::down-button, QDoubleSpinBox::down-button {
+    subcontrol-origin: margin;
+    subcontrol-position: bottom right; /* position at the top right corner */
+    background-color: rgb(88,87,88); /* kindaDark */
+    border: 1px solid rgb(31,30,31); /* veryDark */
+    border-radius: 3px;
+    border-width: 0;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    border-top-width: 0;
+}
+
+QSpinBox::up-button:hover, QSpinBox::down-button:hover, QDoubleSpinBox::up-button:hover, QDoubleSpinBox::down-button:hover {
+    background-color: rgb(122,121,122); /* light */
+}
+
+QSpinBox::up-button:pressed, QSpinBox::down-button:pressed, QDoubleSpinBox::up-button:pressed, QDoubleSpinBox::down-button:pressed {
+    background-color: rgb(58,57,58); /* dark */
+}
+
+QSpinBox::up-button:disabled, QSpinBox::up-button:off, QSpinBox::down-button:disabled, QSpinBox::down-button:off {
+    background-color: rgb(58,57,58); /* dark */
+}
+
+QDoubleSpinBox::up-button:disabled, QDoubleSpinBox::up-button:off, QDoubleSpinBox::down-button:disabled, QDoubleSpinBox::down-button:off {
+    background-color: rgb(58,57,58); /* dark */
+}
+
+QSpinBox::up-arrow, QDoubleSpinBox::up-arrow {
+    image: url(./Dark/up_arrow.png);
+    width: 100%;
+}
+
+QSpinBox::down-arrow, QDoubleSpinBox::down-arrow {
+    image: url(./Dark/down_arrow.png);
+    width: 100%;
+}
+
+
+/* Buttons */
+
+QPushButton {
+    color: rgb(225,224,225); /* veryLight */
+    background-color: rgb(88,87,88); /* kindaDark */
+    border: none;
+    border-radius: 3px;
+    padding: 4px;
+    padding-left: 20px;
+    padding-right: 20px;
+}
+
+QPushButton::flat {
+    background-color: rgb(58,57,58); /* dark */
+}
+
+QPushButton:hover {
+    background-color: rgb(122,121,122); /* light */
+}
+
+QPushButton:pressed {
+    background-color: rgb(31,30,31); /* veryDark */
+}
+
+
+/* Sliders */
+
+QSlider::groove:horizontal {
+    background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 rgb(31,30,31), /* veryDark */
+        stop: 0.75 rgb(50, 49, 50));
+    height: 4px;
+    border: none;
+    border-radius: 2px;
+}
+
+QSlider::handle:horizontal {
+    background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 rgb(240,239,240), /* lighter */
+        stop: 0.25 rgb(200,199,200),
+        stop: 1 rgb(162,161,162)); /* light */
+    border: 1px solid rgb(58,57,58); /* dark */
+    border-radius: 3px;
+    height: 10px;
+    width: 18px;
+    margin: -3px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
+}
+
+QSlider::handle:horizontal:pressed {
+    background-color: QLinearGradient(x1: 0, y1: 1, x2: 0, y2: 0,
+        stop: 0 rgb(240,239,240), /* lighter */
+        stop: 0.25 rgb(200,199,200),
+        stop: 1 rgb(162,161,162)); /* light */
+}
+
+QSlider::sub-page:horizontal:disabled {
+    background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 rgb(31,30,31), /* veryDark */
+        stop: 0.75 rgb(50, 49, 50));
+    border-radius: 2px;
+}
+
+QSlider::groove:vertical {
+    background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0,
+        stop: 0 rgb(31,30,31), /* veryDark */
+        stop: 0.75 rgb(50, 49, 50));
+    width: 4px;
+    border: none;
+    border-radius: 2px;
+}
+
+QSlider::handle:vertical {
+    background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0,
+        stop: 0 rgb(240,239,240), /* lighter */
+        stop: 0.25 rgb(200,199,200),
+        stop: 1 rgb(162,161,162)); /* light */
+    border: 1px solid rgb(58,57,58); /* dark */
+    border-radius: 4px;
+    width: 10px;
+    height: 18px;
+    margin: -3px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
+}
+
+QSlider::handle:vertical:pressed {
+    background-color: QLinearGradient(x1: 1, y1: 0, x2: 0, y2: 0,
+        stop: 0 rgb(240,239,240), /* lighter */
+        stop: 0.25 rgb(200,199,200),
+        stop: 1 rgb(162,161,162)); /* light */
+}
+
+QSlider::sub-page:vertical:disabled {
+    background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0,
+        stop: 0 rgb(31,30,31), /* veryDark */
+        stop: 0.75 rgb(50, 49, 50));
+    border-radius: 2px;
+}
+
+QSlider::handle:hover {
+    background-color: rgb(200,199,200); /* veryLight */
+}
+
+QSlider::sub-page {
+    background-color: rgb(42,130,218); /* blue */
+    border-radius: 2px;
+}
+
+QSlider::handle:disabled {
+    background-color: rgb(122,121,122); /* light */
+}
+
+
+/* Volume Control */
+
+VolumeMeter {
+    qproperty-bkColor: rgb(31,30,31); /* veryDark */
+    qproperty-magColor:;
+    qproperty-peakColor:;
+    qproperty-peakHoldColor: rgb(225,224,225); /* veryLight */
+}
diff --git a/obs/data/themes/Dark/cogwheel.png b/obs/data/themes/Dark/cogwheel.png
new file mode 100644
index 000000000..84d923480
Binary files /dev/null and b/obs/data/themes/Dark/cogwheel.png differ
diff --git a/obs/data/themes/Dark/down_arrow.png b/obs/data/themes/Dark/down_arrow.png
new file mode 100644
index 000000000..1904bdbc7
Binary files /dev/null and b/obs/data/themes/Dark/down_arrow.png differ
diff --git a/obs/data/themes/Dark/minus.png b/obs/data/themes/Dark/minus.png
new file mode 100644
index 000000000..68c0ac54e
Binary files /dev/null and b/obs/data/themes/Dark/minus.png differ
diff --git a/obs/data/themes/Dark/plus.png b/obs/data/themes/Dark/plus.png
new file mode 100644
index 000000000..547cfa948
Binary files /dev/null and b/obs/data/themes/Dark/plus.png differ
diff --git a/obs/data/themes/Dark/up_arrow.png b/obs/data/themes/Dark/up_arrow.png
new file mode 100644
index 000000000..36ff91508
Binary files /dev/null and b/obs/data/themes/Dark/up_arrow.png differ
diff --git a/obs/data/themes/Dark/updown.png b/obs/data/themes/Dark/updown.png
new file mode 100644
index 000000000..08cfeb6b6
Binary files /dev/null and b/obs/data/themes/Dark/updown.png differ
diff --git a/obs/data/themes/Default.qss b/obs/data/themes/Default.qss
new file mode 100644
index 000000000..b5e04ca81
--- /dev/null
+++ b/obs/data/themes/Default.qss
@@ -0,0 +1,46 @@
+/* Intentionnally left blank */
+/* Themes are created using Qt CSS, you can visit */
+/* http://doc.qt.io/qt-5/stylesheet-reference.html and */
+/* http://doc.qt.io/qt-5/stylesheet-examples.html for examples. */
+
+/* OBS will use the theme filename for the settings. */
+/* You can ship images using relative paths in qss. */
+/* Dark Theme is a good place to start if you need */
+/* a template. */
+
+
+/* We need to set back the icons, or the preview wont stick. */
+
+* [themeID="addIconSmall"] {
+    qproperty-icon: url(:/res/images/add.png);
+}
+
+* [themeID="removeIconSmall"] {
+    qproperty-icon: url(:/res/images/list_remove.png);
+}
+
+* [themeID="propertiesIconSmall"] {
+    qproperty-icon: url(:/res/images/properties.png);
+}
+
+* [themeID="configIconSmall"] {
+    qproperty-icon: url(:/res/images/configuration21_16.png);
+}
+
+* [themeID="upArrowIconSmall"] {
+    qproperty-icon: url(:/res/images/up.png);
+}
+
+* [themeID="downArrowIconSmall"] {
+    qproperty-icon: url(:/res/images/down.png);
+}
+
+
+/* Volume Control */
+
+VolumeMeter {
+    qproperty-bkColor: rgb(221, 221, 221);
+    qproperty-magColor: rgb(32, 125, 23);
+    qproperty-peakColor: rgb(62, 241, 43);
+    qproperty-peakHoldColor: rgb(0, 0, 0);
+}
diff --git a/obs/forms/OBSBasic.ui b/obs/forms/OBSBasic.ui
index 8e22f7a7d..02dfb3b8e 100644
--- a/obs/forms/OBSBasic.ui
+++ b/obs/forms/OBSBasic.ui
@@ -220,6 +220,9 @@
            <property name="flat">
             <bool>true</bool>
            </property>
+           <property name="themeID" stdset="0">
+            <string notr="true">configIconSmall</string>
+           </property>
           </widget>
          </item>
          <item>
@@ -594,6 +597,9 @@
    <property name="text">
     <string>Add</string>
    </property>
+   <property name="themeID" stdset="0">
+    <string notr="true">addIconSmall</string>
+   </property>
   </action>
   <action name="actionAddSource">
    <property name="icon">
@@ -603,6 +609,9 @@
    <property name="text">
     <string>Add</string>
    </property>
+   <property name="themeID" stdset="0">
+    <string notr="true">addIconSmall</string>
+   </property>
   </action>
   <action name="actionRemoveScene">
    <property name="icon">
@@ -618,6 +627,9 @@
    <property name="shortcutContext">
     <enum>Qt::WidgetWithChildrenShortcut</enum>
    </property>
+   <property name="themeID" stdset="0">
+    <string notr="true">removeIconSmall</string>
+   </property>
   </action>
   <action name="actionRemoveSource">
    <property name="icon">
@@ -633,6 +645,9 @@
    <property name="shortcutContext">
     <enum>Qt::WidgetWithChildrenShortcut</enum>
    </property>
+   <property name="themeID" stdset="0">
+    <string notr="true">removeIconSmall</string>
+   </property>
   </action>
   <action name="actionSceneProperties">
    <property name="enabled">
@@ -645,6 +660,9 @@
    <property name="text">
     <string>Properties</string>
    </property>
+   <property name="themeID" stdset="0">
+    <string notr="true">propertiesIconSmall</string>
+   </property>
   </action>
   <action name="actionSourceProperties">
    <property name="enabled">
@@ -657,6 +675,9 @@
    <property name="text">
     <string>Properties</string>
    </property>
+   <property name="themeID" stdset="0">
+    <string notr="true">propertiesIconSmall</string>
+   </property>
   </action>
   <action name="actionSceneUp">
    <property name="enabled">
@@ -669,6 +690,9 @@
    <property name="text">
     <string>Basic.Main.MoveUp</string>
    </property>
+   <property name="themeID" stdset="0">
+    <string notr="true">upArrowIconSmall</string>
+   </property>
   </action>
   <action name="actionSourceUp">
    <property name="enabled">
@@ -681,6 +705,9 @@
    <property name="text">
     <string>MoveUp</string>
    </property>
+   <property name="themeID" stdset="0">
+    <string notr="true">upArrowIconSmall</string>
+   </property>
   </action>
   <action name="actionSceneDown">
    <property name="enabled">
@@ -693,6 +720,9 @@
    <property name="text">
     <string>Basic.Main.MoveDown</string>
    </property>
+   <property name="themeID" stdset="0">
+    <string notr="true">downArrowIconSmall</string>
+   </property>
   </action>
   <action name="actionSourceDown">
    <property name="enabled">
@@ -705,6 +735,9 @@
    <property name="text">
     <string>MoveDown</string>
    </property>
+   <property name="themeID" stdset="0">
+    <string notr="true">downArrowIconSmall</string>
+   </property>
   </action>
   <action name="action_New">
    <property name="text">