diff --git a/Builds/QDarkStyleSheet/qdarkstyle/style.qss b/Builds/QDarkStyleSheet/qdarkstyle/style.qss
index 2fc5481..eb87ce5 100644
--- a/Builds/QDarkStyleSheet/qdarkstyle/style.qss
+++ b/Builds/QDarkStyleSheet/qdarkstyle/style.qss
@@ -85,6 +85,13 @@ TransferListWidget {
 	qproperty-unknownStateForeground: rgb(255, 0, 0);
 }
 
+QTabWidget QListView::item {
+  padding: 0px; }
+
+QTabWidget QListView QLabel {
+  padding: -2px;
+  font-size: 1.1em;
+  background: transparent; }
 
 QWidget {
   background-color: #19232D;
@@ -528,8 +535,6 @@ QAbstractScrollArea {
   border-radius: 4px;
   padding: 2px;
   /* fix #159 */
-  min-height: 1.25em;
-  /* fix #159 */
   color: #F0F0F0;
 }
 
@@ -1778,37 +1783,41 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qlistview
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtableview
 
 --------------------------------------------------------------------------- */
-QTreeView:branch:selected, QTreeView:branch:hover {
+QTreeView:branch:selected, QTreeView:branch:hover, QCheckBox:branch:selected, QCheckBox:branch:hover  {
   background: url(":/uitheme/qss_icons/rc/transparent.png");
 }
 
-QTreeView:branch:has-siblings:!adjoins-item {
+QTreeView:branch:has-siblings:!adjoins-item, QCheckBox:branch:has-siblings:!adjoins-item {
   border-image: url(":/uitheme/qss_icons/rc/branch_line.png") 0;
 }
 
-QTreeView:branch:has-siblings:adjoins-item {
+QTreeView:branch:has-siblings:adjoins-item, QCheckBox:branch:has-siblings:adjoins-item {
   border-image: url(":/uitheme/qss_icons/rc/branch_more.png") 0;
 }
 
-QTreeView:branch:!has-children:!has-siblings:adjoins-item {
+QTreeView:branch:!has-children:!has-siblings:adjoins-item, QCheckBox:branch:!has-children:!has-siblings:adjoins-item {
   border-image: url(":/uitheme/qss_icons/rc/branch_end.png") 0;
 }
 
-QTreeView:branch:has-children:!has-siblings:closed, QTreeView:branch:closed:has-children:has-siblings {
+QTreeView:branch:has-children:!has-siblings:closed, QTreeView:branch:closed:has-children:has-siblings,
+QCheckBox:branch:has-children:!has-siblings:closed, QCheckBox:branch:closed:has-children:has-siblings {
   border-image: none;
   image: url(":/uitheme/qss_icons/rc/branch_closed.png");
 }
 
-QTreeView:branch:open:has-children:!has-siblings, QTreeView:branch:open:has-children:has-siblings {
+QTreeView:branch:open:has-children:!has-siblings, QTreeView:branch:open:has-children:has-siblings,
+QCheckBox:branch:open:has-children:!has-siblings, QCheckBox:branch:open:has-children:has-siblings {
   border-image: none;
   image: url(":/uitheme/qss_icons/rc/branch_open.png");
 }
 
-QTreeView:branch:has-children:!has-siblings:closed:hover, QTreeView:branch:closed:has-children:has-siblings:hover {
+QTreeView:branch:has-children:!has-siblings:closed:hover, QTreeView:branch:closed:has-children:has-siblings:hover,
+QCheckBox:branch:has-children:!has-siblings:closed:hover, QCheckBox:branch:closed:has-children:has-siblings:hover {
   image: url(":/uitheme/qss_icons/rc/branch_closed_focus.png");
 }
 
-QTreeView:branch:open:has-children:!has-siblings:hover, QTreeView:branch:open:has-children:has-siblings:hover {
+QTreeView:branch:open:has-children:!has-siblings:hover, QTreeView:branch:open:has-children:has-siblings:hover,
+QCheckBox:branch:open:has-children:!has-siblings:hover, QCheckBox:branch:open:has-children:has-siblings:hover {
   image: url(":/uitheme/qss_icons/rc/branch_open_focus.png");
 }
 
@@ -1905,15 +1914,22 @@ QColumnView::item:selected:active {
   background-color: #1464A0;
 }
 
-QTreeView::item:!selected:hover,
-QListView::item:!selected:hover,
-QTableView::item:!selected:hover,
-QColumnView::item:!selected:hover {
+QTreeView::item:hover,
+QListView::item:hover,
+QTableView::item:hover,
+QColumnView::item:hover {
   outline: 0;
   color: #148CD2;
   background-color: #32414B;
 }
 
+QTreeView::item,
+QListView::item,
+QTableView::item,
+QColumnView::item {
+  color: #F0F0F0;
+}
+
 QTableCornerButton::section {
   background-color: #19232D;
   border: 1px transparent #32414B;
diff --git a/Builds/build-mumble-dark.bat b/Builds/build-mumble-dark.bat
index 9c0fc1c..bd92229 100644
--- a/Builds/build-mumble-dark.bat
+++ b/Builds/build-mumble-dark.bat
@@ -1,2 +1,6 @@
 set SCRIPT_DIR=mumble-theme
+set PATH=%PATH%;C:\Users\Prince\Downloads\Compressed\qtsass_0.2.2_win64;
+pushd %SCRIPT_DIR%\source
+qtsass -o ../Dark.qss Dark.scss
+popd
 make-resource.py -base-dir %SCRIPT_DIR%\ -find-files -output mumble-dark -style dark.qss 
\ No newline at end of file
diff --git a/Builds/build-mumble-lite.bat b/Builds/build-mumble-lite.bat
index b729888..056a954 100644
--- a/Builds/build-mumble-lite.bat
+++ b/Builds/build-mumble-lite.bat
@@ -1,2 +1,6 @@
 set SCRIPT_DIR=mumble-theme
+set PATH=%PATH%;C:\Users\Prince\Downloads\Compressed\qtsass_0.2.2_win64;
+pushd %SCRIPT_DIR%\source
+qtsass -o ../Lite.qss Lite.scss
+popd
 make-resource.py -base-dir %SCRIPT_DIR%\ -find-files -output mumble-lite -style lite.qss 
\ No newline at end of file
diff --git a/Builds/mumble-theme/Dark,qss b/Builds/mumble-theme/Dark,qss
deleted file mode 100644
index 01d88c8..0000000
--- a/Builds/mumble-theme/Dark,qss
+++ /dev/null
@@ -1,906 +0,0 @@
-/*
- * Mumble Dark Theme
- * https://github.com/mumble-voip/mumble-theme
- *
- * Based on MetroMumble Theme by xPoke
- * https://github.com/xPoke
- *
- * Originally forked from Flat Mumble Theme by xPaw (xpaw.ru)
- *
- * Licensed under The Do What The Fuck You Want To Public License (WTFPL)
- */
-/*

- * YOU SHOULD NOT MODIFY THIS FILE

- * Edit the files in the "source" folder instead.

- * See project README

- *

- */
-TransferListWidget {
-  qproperty-downloadingStateForeground: limegreen;
-  qproperty-forcedDownloadingStateForeground: limegreen;
-  qproperty-downloadingMetadataStateForeground: limegreen;
-  qproperty-allocatingStateForeground: #cccccc;
-  qproperty-stalledDownloadingStateForeground: #cccccc;
-  qproperty-stalledUploadingStateForeground: #cccccc;
-  qproperty-uploadingStateForeground: #63b8ff;
-  qproperty-forcedUploadingStateForeground: #63b8ff;
-  qproperty-pausedDownloadingStateForeground: #fa8090;
-  qproperty-pausedUploadingStateForeground: #4f94cd;
-  qproperty-errorStateForeground: red;
-  qproperty-missingFilesStateForeground: red;
-  qproperty-queuedDownloadingStateForeground: #00cdcd;
-  qproperty-queuedUploadingStateForeground: #00cdcd;
-  qproperty-checkingDownloadingStateForeground: #00cdcd;
-  qproperty-checkingUploadingStateForeground: #00cdcd;
-  qproperty-checkingResumeDataStateForeground: #00cdcd;
-  qproperty-movingStateForeground: #00cdcd;
-  qproperty-unknownStateForeground: red; }
-
-QTabWidget QListView::item {
-  padding: 0px; }
-
-QTabWidget QListView QLabel {
-  padding: -2px;
-  font-size: 1em; }
-
-QObject,
-QObject::separator,
-QObject::handle,
-QObject::tab-bar,
-QObject::tab,
-QObject::section {
-  font-family: "Segoe UI", Frutiger, "Frutiger Linotype", "Dejavu Sans", "Helvetica Neue", Arial, sans-serif;
-  margin: 0;
-  padding: 0;
-  outline: 0;
-  border: 0;
-  selection-background-color: #298ce1;
-  selection-color: #FFF;
-  alternate-background-color: transparent;
-  color: #eee;
-  border-radius: 2px; }
-
-QMainWindow,
-QDockWidget {
-  background-color: #2e2e2e; }
-
-QDialog,
-QWizard *,
-QCalendarWidget *,
-#qswPages > QObject {
-  background-color: #1D1D1D;
-  color: #d8d8d8; }
-
-QAbstractScrollArea {
-  background-color: #2e2e2e; }
-
-QObject:disabled,
-QObject::item:disabled {
-  color: #484848; }
-
-a {
-  color: #39a5dd;
-  text-decoration: none; }
-
-QObject::separator {
-  height: 4px;
-  width: 4px; }
-
-QObject::separator:hover {
-  background: #333; }
-
-QToolTip,
-QWhatsThis {
-  font-size: 8pt;
-  min-height: 1.3em;
-  border: 1px solid #888;
-  border-radius: 0;
-  background-color: #191919;
-  color: #d8d8d8; }
-
-QTextBrowser,
-QTextEdit {
-  background-color: #191919;
-  color: #d8d8d8;
-  border: 1px solid #1c1c1c; }
-
-QToolBar {
-  background-color: #2e2e2e;
-  spacing: 0;
-  padding: 2px; }
-
-QToolButton {
-  border: 1px solid transparent;
-  border-radius: 2px;
-  padding: 1px;
-  margin: 1px; }
-
-QToolButton:on {
-  background-color: #444;
-  border: 1px solid #444; }
-
-QToolButton:hover {
-  background-color: #3e4f5e;
-  border: 1px solid #3e4f5e; }
-
-QToolButton:pressed {
-  background-color: #484848; }
-
-QToolBar::separator {
-  background: #555;
-  height: 1px;
-  margin: 4px;
-  width: 1px; }
-
-QToolBar::separator:hover {
-  background: #555;
-  border: 0; }
-
-QToolButton#qt_toolbar_ext_button {
-  min-width: 8px;
-  width: 8px;
-  padding: 1px;
-  qproperty-icon: url(:/uitheme/controls/toolbar_ext.svg); }
-
-QToolBar::handle:horizontal {
-  image: url(:/uitheme/controls/handle_horizontal.svg);
-  width: 8px;
-  padding: 4px; }
-
-QToolBar::handle:vertical {
-  image: url(:/uitheme/controls/handle_vertical.svg);
-  height: 8px;
-  padding: 4px; }
-
-QMenuBar::item {
-  background-color: transparent;
-  padding: 4px 12px; }
-
-QMenuBar::item:selected {
-  background: #298ce1;
-  color: #FFF; }
-
-QMenuBar::item:pressed {
-  background: #1979ca;
-  color: #FFF; }
-
-QMenu {
-  background: #2b2b2b;
-  border: 1px solid #1c1c1c;
-  color: #d8d8d8; }
-
-QMenu::item {
-  border: 1px solid transparent;
-  color: #d8d8d8;
-  padding: 5px 16px;
-  padding-left: 25px;
-  border-radius: 2px; }
-
-QMenu::item:selected {
-  background: #3e4f5e;
-  border: 1px solid #3e4f5e; }
-
-QMenu::item:disabled {
-  border: 1px solid transparent;
-  background: transparent; }
-
-QMenu::separator {
-  background: #555;
-  height: 1px; }
-
-QMenu::indicator {
-  padding-top: 2px;
-  height: 25px;
-  width: 25px; }
-
-QPushButton {
-  background-color: #444;
-  border: 1px solid #444;
-  color: #d8d8d8;
-  padding: 3px 20px; }
-
-QPushButton:focus {
-  background-color: #3e4f5e; }
-
-QPushButton:hover {
-  background-color: #595959;
-  border-color: #555; }
-
-QPushButton:hover:focus {
-  background-color: #485d6f;
-  border-color: #485d6f; }
-
-QPushButton:focus {
-  border-color: #3e4f5e; }
-
-QPushButton:pressed,
-QPushButton:pressed:focus {
-  background-color: #298ce1;
-  border-color: #298ce1;
-  color: #FFF; }
-
-QGroupBox,
-#qwMacWarning,
-#qwInlineNotice {
-  background-color: #2d2d2d;
-  border: 1px solid #1c1c1c;
-  color: #d8d8d8;
-  padding: 4px;
-  padding-top: 1em; }
-
-QGroupBox::title {
-  background-color: transparent;
-  margin: 6px;
-  margin-left: 8px;
-  margin-right: 8px; }
-
-QListView {
-  background-color: #191919;
-  border: 1px solid #1c1c1c; }
-
-QListView::item {
-  border-radius: 2px;
-  border: 1px solid transparent;
-  color: #d8d8d8;
-  selection-color: #d8d8d8;
-  padding: 2px 4px; }
-
-QListView::item:hover {
-  background-color: #333;
-  border: 1px solid #333; }
-
-QListView::item:selected {
-  background-color: #3b3b3b;
-  border: 1px solid #3b3b3b; }
-
-QListView::item:selected:active {
-  background-color: #3e4f5e;
-  border: 1px solid #3e4f5e; }
-
-QTreeView {
-  background-color: #191919;
-  color: #d8d8d8;
-  selection-background-color: #191919;
-  selection-color: #d8d8d8;
-  border: 1px solid #1c1c1c; }
-
-QTreeView::item {
-  min-width: 60px;
-  border: 1px solid transparent;
-  border-left: 0;
-  border-right: 0;
-  color: #d8d8d8;
-  padding: 2px 4px;
-  selection-color: #d8d8d8;
-  border-radius: 0; }
-
-QTreeView::item:first,
-QTreeView::item:only-one {
-  border-left: 1px solid transparent;
-  border-top-left-radius: 2px;
-  border-bottom-left-radius: 2px; }
-
-QTreeView::item:last,
-QTreeView::item:only-one {
-  border-right: 1px solid transparent;
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px; }
-
-QTreeView::item:hover,
-QTreeView::item:focus {
-  background-color: #333;
-  border-color: #333; }
-
-QTreeView::item:selected {
-  background-color: #3b3b3b;
-  border: 1px solid #3b3b3b;
-  border-right: 0;
-  border-left: 0; }
-
-QTreeView::item:selected:first,
-QTreeView::item:selected:only-one {
-  border-left: 1px solid #3b3b3b; }
-
-QTreeView::item:selected:last,
-QTreeView::item:selected:only-one {
-  border-right: 1px solid #3b3b3b; }
-
-QTreeView::item:selected:active {
-  background-color: #3e4f5e;
-  border: 1px solid #3e4f5e;
-  border-right: 0;
-  border-left: 0; }
-
-QTreeView::item:selected:active:first,
-QTreeView::item:selected:active:only-one {
-  border-left: 1px solid #3e4f5e; }
-
-QTreeView::item:selected:active:last,
-QTreeView::item:selected:active:only-one {
-  border-right: 1px solid #3e4f5e; }
-
-QTreeView::branch {
-  border-image: none;
-  image: none;
-  margin-left: 3px;
-  margin-top: 1px;
-  padding-left: 3px; }
-
-QTreeView::branch:has-children:closed {
-  image: url(:/uitheme/controls/branch_closed.svg); }
-
-QTreeView::branch:has-children:open {
-  image: url(:/uitheme/controls/branch_open.svg); }
-
-QHeaderView {
-  border-bottom: 1px solid #1c1c1c;
-  border-radius: 0;
-  background-color: #2e2e2e; }
-
-QHeaderView::section {
-  background-color: #2d2d2d;
-  color: #d8d8d8;
-  padding: 4px;
-  padding-left: 8px;
-  padding-right: 20px;
-  border-radius: 0; }
-
-QHeaderView::down-arrow,
-QHeaderView::up-arrow {
-  margin: 1px;
-  top: 1px;
-  right: 5px;
-  width: 14px; }
-
-QHeaderView::down-arrow {
-  image: url(:/uitheme/controls/arrow_down.svg); }
-
-QHeaderView::up-arrow {
-  image: url(:/uitheme/controls/arrow_up.svg); }
-
-QTabWidget::pane {
-  background-color: #2d2d2d;
-  border: 1px solid #1c1c1c; }
-
-QTabWidget::pane:top {
-  margin-top: -1px;
-  border-radius: 2px;
-  border-top-left-radius: 0; }
-
-QTabWidget::pane:right {
-  margin-right: -1px;
-  border-radius: 2px;
-  border-top-left-radius: 0; }
-
-QTabWidget::pane:left {
-  margin-left: -1px;
-  border-radius: 2px;
-  border-top-left-radius: 0; }
-
-QTabWidget::pane:bottom {
-  margin-bottom: -1px;
-  border-radius: 2px;
-  border-bottom-left-radius: 0; }
-
-QTabWidget::tab-bar {
-  background-color: #1D1D1D; }
-
-QTabBar::tab {
-  color: #ccc;
-  background-color: #1e1e1e;
-  padding: 6px 16px;
-  border-radius: 0;
-  border: 1px solid #1c1c1c;
-  border-right: 0; }
-
-QTabBar::tab:last,
-QTabBar::tab:only-one {
-  border-right: 1px solid #1c1c1c; }
-
-QTabBar::tab:hover {
-  background-color: #3e4f5e; }
-
-QTabBar::tab:disabled {
-  color: #484848; }
-
-QTabBar::tab:selected {
-  color: #d8d8d8;
-  background-color: #2d2d2d; }
-
-QTabBar::tab:top {
-  border-bottom: 0;
-  margin-bottom: 1px; }
-
-QTabBar::tab:right {
-  border-left: 0;
-  margin-left: 1px; }
-
-QTabBar::tab:left {
-  border-right: 0;
-  margin-right: 1px; }
-
-QTabBar::tab:bottom {
-  border-top: 0;
-  margin-top: 1px; }
-
-QTabBar::tab:top:selected {
-  padding-bottom: 7px;
-  margin-bottom: 0; }
-
-QTabBar::tab:right:selected {
-  padding-left: 7px;
-  margin-left: 0; }
-
-QTabBar::tab:left:selected {
-  padding-right: 7px;
-  margin-right: 0; }
-
-QTabBar::tab:bottom:selected {
-  padding-top: 7px;
-  margin-top: 0; }
-
-QTabBar::tab:top:first,
-QTabBar::tab:top:only-one {
-  border-top-left-radius: 2px; }
-
-QTabBar::tab:top:last,
-QTabBar::tab:top:only-one {
-  border-top-right-radius: 2px; }
-
-QTabBar::tab:bottom:first,
-QTabBar::tab:bottom:only-one {
-  border-bottom-left-radius: 2px; }
-
-QTabBar::tab:bottom:last,
-QTabBar::tab:bottom:only-one {
-  border-bottom-right-radius: 2px; }
-
-QScrollBar {
-  border-radius: 0; }
-
-QScrollBar:vertical {
-  border-left: 1px solid #1c1c1c;
-  width: 1em; }
-
-QScrollBar:horizontal {
-  border-top: 1px solid #1c1c1c;
-  height: 1em; }
-
-QScrollBar::handle {
-  margin: -1px;
-  background: #666;
-  border: 1px solid #1c1c1c; }
-
-QScrollBar::handle:vertical {
-  min-height: 10px; }
-
-QScrollBar::handle:horizontal {
-  min-width: 10px; }
-
-QScrollBar::handle:hover {
-  background: #888; }
-
-QScrollBar::left-arrow,
-QScrollBar::right-arrow,
-QScrollBar::up-arrow,
-QScrollBar::down-arrow,
-QScrollBar::sub-line,
-QScrollBar::add-line,
-QScrollBar::add-page,
-QScrollBar::sub-page {
-  background: #2e2e2e;
-  height: 0;
-  width: 0;
-  border-radius: 0;
-  border: 0; }
-
-QAbstractScrollArea::corner {
-  border-left: 1px solid #1c1c1c;
-  border-top: 1px solid #1c1c1c;
-  height: 0;
-  width: 0;
-  border-radius: 0;
-  border-top: 1px solid #1c1c1c;
-  border-left: 1px solid #1c1c1c;
-  background: #191919; }
-
-QLineEdit,
-QComboBox,
-QSpinBox,
-QAbstractSpinBox {
-  color: #d8d8d8;
-  padding: 4px;
-  min-height: 1em; }
-
-QComboBox,
-QSpinBox,
-QAbstractSpinBox {
-  border: 1px solid #444;
-  background-color: #444; }
-
-QLineEdit,
-QTextEdit,
-QPlainTextEdit,
-QSpinBox,
-QAbstractSpinBox,
-QComboBox:editable {
-  border: 1px solid #2e2e2e;
-  background-color: #191919; }
-
-QSpinBox,
-QAbstractSpinBox {
-  min-width: 2.5em;
-  padding-right: 10px; }
-
-QPushButton:disabled,
-QLineEdit:disabled,
-QTextEdit:disabled,
-QPlainTextEdit:disabled,
-QListWidget:disabled,
-QTreeWidget:disabled,
-QComboBox:disabled,
-QSpinBox:disabled,
-QAbstractSpinBox:disabled {
-  border: 1px solid transparent;
-  background-color: #282828; }
-
-QComboBox::drop-down,
-QAbstractSpinBox::drop-down,
-QSpinBox::drop-down,
-QDateTimeEdit::drop-down {
-  background-color: #191919;
-  border: 0;
-  margin-left: 4px;
-  margin-right: 12px;
-  margin-top: 5px; }
-
-QComboBox::down-arrow,
-QDateTimeEdit::down-arrow {
-  margin-top: -2px;
-  image: url(:/uitheme/controls/arrow_down.svg);
-  width: 14px; }
-
-QComboBox::down-arrow:disabled,
-QDateTimeEdit::down-arrow:disabled {
-  image: url(:/uitheme/controls/arrow_down_disabled.svg); }
-
-QToolButton[popupMode="1"],
-QToolButton[popupMode="2"],
-QPushButton[popupMode="1"],
-QPushButton[popupMode="2"] {
-  padding-right: 14px; }
-
-QToolButton::menu-arrow,
-QToolButton::menu-indicator,
-QPushButton::menu-arrow,
-QPushButton::menu-indicator {
-  image: url(:/uitheme/controls/arrow_down.svg);
-  subcontrol-origin: padding;
-  subcontrol-position: center right;
-  top: 2px;
-  right: 2px;
-  width: 14px; }
-
-QSpinBox::down-button,
-QAbstractSpinBox::down-button {
-  padding-right: 4px;
-  image: url(:/uitheme/controls/arrow_down.svg);
-  width: 14px;
-  padding-bottom: 1px; }
-
-QSpinBox::down-button:disabled,
-QAbstractSpinBox::down-button:disabled {
-  image: url(:/uitheme/controls/arrow_down_disabled.svg); }
-
-QSpinBox::up-button,
-QAbstractSpinBox::up-button {
-  padding-right: 4px;
-  image: url(:/uitheme/controls/arrow_up.svg);
-  width: 14px;
-  padding-top: 1px; }
-
-QSpinBox::up-button:disabled,
-QAbstractSpinBox::up-button:disabled {
-  image: url(:/uitheme/controls/arrow_up_disabled.svg); }
-
-QComboBox QAbstractItemView {
-  background-color: #191919;
-  border: 1px solid #1c1c1c;
-  color: #d8d8d8;
-  border-radius: 0; }
-
-QLabel,
-QCheckBox,
-QAbstractCheckBox,
-QTreeView::indicator,
-QGroupBox::indicator,
-QRadioButton {
-  color: #d8d8d8;
-  background: transparent; }
-
-QCheckBox::indicator,
-QTreeView::indicator,
-QGroupBox::indicator {
-  background-color: #444;
-  border: 1px solid #444;
-  height: 13px;
-  width: 13px;
-  margin-top: 1px; }
-
-QMenu::indicator {
-  width: 12px;
-  left: 6px; }
-
-QCheckBox::indicator:checked,
-QMenu::indicator:checked,
-QTreeView::indicator:checked,
-QGroupBox::indicator:checked {
-  image: url(:/uitheme/controls/checkbox_check_dark.svg); }
-
-QCheckBox::indicator:disabled,
-QTreeView::indicator:disabled,
-QGroupBox::indicator:disabled {
-  border: 1px solid #2d2d2d;
-  background-color: #282828; }
-
-QCheckBox::indicator:checked:disabled,
-QTreeView::indicator:checked:disabled,
-QGroupBox::indicator:checked:disabled {
-  border: 1px solid transparent;
-  image: url(:/uitheme/controls/checkbox_check_disabled.svg); }
-
-QRadioButton::indicator {
-  background: #444;
-  border: 1px solid #444;
-  border-radius: 7px;
-  height: 12px;
-  width: 12px; }
-
-QTreeView::indicator {
-  background: #444; }
-
-QRadioButton::indicator:disabled {
-  background-color: #282828;
-  margin: 1px;
-  border: 1px solid transparent; }
-
-QRadioButton::indicator:checked {
-  image: url(:/uitheme/controls/radio_check_dark.svg); }
-
-QRadioButton::indicator:checked:disabled {
-  image: url(:/uitheme/controls/radio_check_disabled.svg); }
-
-QSlider::groove {
-  background: #393939;
-  border: 1px solid #393939;
-  border-radius: 2px; }
-
-QSlider::groove:horizontal {
-  height: 0.8em; }
-
-QSlider::groove:vertical {
-  width: 0.8em; }
-
-QSlider::groove:disabled,
-QSlider::sub-page:disabled {
-  background: #282828;
-  border: 1px solid transparent;
-  border-radius: 2px; }
-
-QSlider::sub-page {
-  background: #486d8d;
-  border: 1px solid #486d8d;
-  border-radius: 2px; }
-
-QSlider::handle {
-  background: #777;
-  border: 1px solid #222;
-  border-radius: 3px; }
-
-QSlider::handle:horizontal {
-  margin: -5px -1px;
-  width: 4.5em; }
-
-QSlider::handle:vertical {
-  margin: -1px -5px;
-  height: 4.5em; }
-
-QSlider::handle:focus {
-  background-color: #6d96ba;
-  border-color: #226; }
-
-QSlider::handle:hover {
-  background-color: #999; }
-
-QSlider::handle:pressed {
-  background-color: #bbb;
-  border-color: #222; }
-
-QSlider::handle:disabled {
-  background-color: #282828;
-  border: 1px solid #282828; }
-
-QCheckBox::indicator:focus,
-QTreeView::indicator:focus,
-QRadioButton::indicator:focus,
-QGroupBox::indicator:focus,
-QComboBox:focus {
-  background-color: #3e4f5e; }
-
-QCheckBox::indicator:focus:hover,
-QTreeView::indicator:focus:hover,
-QRadioButton::indicator:focus:hover,
-QGroupBox::indicator:focus:hover,
-QComboBox:focus:hover {
-  background-color: #485d6f;
-  border-color: #485d6f; }
-
-QCheckBox::indicator:hover,
-QTreeView::indicator:hover,
-QRadioButton::indicator:hover,
-QGroupBox::indicator:hover,
-QComboBox:hover {
-  background-color: #595959;
-  border-color: #555; }
-
-QLineEdit:focus,
-QSpinBox:focus,
-QAbstractSpinBox:focus,
-QComboBox:editable:focus {
-  background-color: #191919; }
-
-QLineEdit:focus:hover,
-QSpinBox:focus:hover,
-QAbstractSpinBox:focus:hover,
-QComboBox:editable:focus:hover {
-  border-color: #485d6f; }
-
-QLineEdit:hover,
-QSpinBox:hover,
-QAbstractSpinBox:hover,
-QComboBox:editable:hover {
-  background-color: #191919;
-  border-color: #555; }
-
-QCheckBox::indicator:focus,
-QTreeView::indicator:focus,
-QRadioButton::indicator:focus,
-QGroupBox::indicator:focus,
-QComboBox:focus,
-QLineEdit:focus,
-QTextEdit:focus,
-QPlainTextEdit:focus,
-QSpinBox:focus,
-QAbstractSpinBox:focus,
-QComboBox:editable:focus {
-  border-color: #3e4f5e; }
-
-QFontDialog {
-  min-width: 32em;
-  min-height: 24em; }
-
-QColorDialog QColorLuminancePicker {
-  background-color: transparent; }
-
-QMessageBox,
-QDialogButtonBox {
-  dialogbuttonbox-buttons-have-icons: 0; }
-
-/* Mumble Specifics */
-LogTextBrowser,
-#qdsChat {
-  margin: 0 2px;
-  min-height: 120px;
-  min-width: 40px;
-  border-color: #1c1c1c; }
-
-UserView {
-  margin: 0 2px;
-  min-height: 120px;
-  min-width: 40px; }
-
-UserView::item {
-  padding: 0;
-  padding-top: -1px; }
-
-#qdwChat > QTextEdit {
-  padding: -2px;
-  margin: 0 2px;
-  margin-bottom: 2px; }
-
-.log-time {
-  background-color: transparent;
-  color: #95a5a6; }
-
-.log-server {
-  background-color: transparent;
-  color: #F9655D;
-  font-weight: bold; }
-
-.log-channel {
-  background-color: transparent;
-  color: #e67e22;
-  font-weight: bold; }
-
-.log-privilege {
-  background-color: transparent;
-  color: #c0392b;
-  font-weight: bold; }
-
-.log-target {
-  background-color: transparent;
-  color: #27ae60;
-  font-weight: bold; }
-
-.log-source {
-  background-color: transparent;
-  color: #27ae60;
-  font-weight: bold; }
-
-QListView#qlwIcons {
-  padding: 0;
-  background-color: transparent;
-  border: 0;
-  min-width: 165%;
-  margin-left: 4px;
-  margin-top: 12px; }
-
-QListView#qlwIcons::item {
-  margin-bottom: 1px;
-  padding: 5px 7px; }
-
-QListView#qlwIcons::item:hover {
-  border-color: #333;
-  background-color: #333; }
-
-QListView#qlwIcons::item:selected {
-  background-color: #444;
-  border: 1px solid #444; }
-
-QListView#qlwIcons::item:focus {
-  background-color: #3e4f5e;
-  border: 1px solid #3e4f5e; }
-
-QSlider {
-  margin-left: 30px;
-  margin-right: 30px; }
-
-#qswPages > * > * > QScrollBar {
-  margin: 0; }
-
-#qswPages > * > QWidget {
-  margin: 2px; }
-
-QListView::item QListWidgetItem,
-QListView::item QLineEdit,
-QTreeView::item QComboBox,
-QTreeView::item QLineEdit {
-  background: #444;
-  margin: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-  padding-left: 4px;
-  padding-right: 4px; }
-
-QListView::item QListWidgetItem:hover,
-QListView::item QLineEdit:hover,
-QTreeView::item QComboBox:hover,
-QTreeView::item QLineEdit:hover {
-  background: #444; }
-
-AboutDialog > QTextBrowser,
-AboutDialog QTextEdit {
-  border: 0; }
-
-#qtbToolBar {
-  border: 1px solid transparent;
-  background: transparent; }
-
-#BanEditor {
-  min-width: 600px; }
-
-#GlobalShortcutTarget {
-  min-height: 600px; }
-
-ViewCert {
-  min-height: 600px; }
diff --git a/Builds/mumble-theme/Dark.qss b/Builds/mumble-theme/Dark.qss
index 8775e24..696b471 100644
--- a/Builds/mumble-theme/Dark.qss
+++ b/Builds/mumble-theme/Dark.qss
@@ -15,33 +15,12 @@
  * See project README

  *

  */
-TransferListWidget {
-  qproperty-downloadingStateForeground: limegreen;
-  qproperty-forcedDownloadingStateForeground: limegreen;
-  qproperty-downloadingMetadataStateForeground: limegreen;
-  qproperty-allocatingStateForeground: #cccccc;
-  qproperty-stalledDownloadingStateForeground: #cccccc;
-  qproperty-stalledUploadingStateForeground: #cccccc;
-  qproperty-uploadingStateForeground: #63b8ff;
-  qproperty-forcedUploadingStateForeground: #63b8ff;
-  qproperty-pausedDownloadingStateForeground: #fa8090;
-  qproperty-pausedUploadingStateForeground: #4f94cd;
-  qproperty-errorStateForeground: red;
-  qproperty-missingFilesStateForeground: red;
-  qproperty-queuedDownloadingStateForeground: #00cdcd;
-  qproperty-queuedUploadingStateForeground: #00cdcd;
-  qproperty-checkingDownloadingStateForeground: #00cdcd;
-  qproperty-checkingUploadingStateForeground: #00cdcd;
-  qproperty-checkingResumeDataStateForeground: #00cdcd;
-  qproperty-movingStateForeground: #00cdcd;
-  qproperty-unknownStateForeground: red; }
-
 QTabWidget QListView::item {
   padding: 0px; }
 
 QTabWidget QListView QLabel {
   padding: -2px;
-  font-size: 1em; }
+  font-size: 1.1em; }
 
 QObject,
 QObject::separator,
@@ -269,7 +248,6 @@ QTreeView::item {
   border: 1px solid transparent;
   border-left: 0;
   border-right: 0;
-  color: #d8d8d8;
   padding: 2px 4px;
   selection-color: #d8d8d8;
   border-radius: 0; }
@@ -332,13 +310,20 @@ QTreeView::branch:has-children:closed {
 QTreeView::branch:has-children:open {
   image: url(:/uitheme/controls/branch_open.svg); }
 
+QCheckBox::branch:has-children:closed {
+  image: url(:/uitheme/controls/branch_closed.svg); }
+
+QCheckBox::branch:has-children:open {
+  image: url(:/uitheme/controls/branch_open.svg); }
+
 QHeaderView {
   border-bottom: 1px solid #1c1c1c;
   border-radius: 0;
-  background-color: #2e2e2e; }
+  background-color: #2d2d2d; }
 
 QHeaderView::section {
   background-color: #2d2d2d;
+  border-right: 1px solid #1c1c1c;
   color: #d8d8d8;
   padding: 4px;
   padding-left: 8px;
@@ -904,3 +889,24 @@ AboutDialog QTextEdit {
 
 ViewCert {
   min-height: 600px; }
+
+TransferListWidget {
+  qproperty-downloadingStateForeground: limegreen;
+  qproperty-forcedDownloadingStateForeground: limegreen;
+  qproperty-downloadingMetadataStateForeground: limegreen;
+  qproperty-allocatingStateForeground: #cccccc;
+  qproperty-stalledDownloadingStateForeground: #cccccc;
+  qproperty-stalledUploadingStateForeground: #cccccc;
+  qproperty-uploadingStateForeground: #63b8ff;
+  qproperty-forcedUploadingStateForeground: #63b8ff;
+  qproperty-pausedDownloadingStateForeground: #fa8090;
+  qproperty-pausedUploadingStateForeground: #4f94cd;
+  qproperty-errorStateForeground: red;
+  qproperty-missingFilesStateForeground: red;
+  qproperty-queuedDownloadingStateForeground: #00cdcd;
+  qproperty-queuedUploadingStateForeground: #00cdcd;
+  qproperty-checkingDownloadingStateForeground: #00cdcd;
+  qproperty-checkingUploadingStateForeground: #00cdcd;
+  qproperty-checkingResumeDataStateForeground: #00cdcd;
+  qproperty-movingStateForeground: #00cdcd;
+  qproperty-unknownStateForeground: red; }
diff --git a/Builds/mumble-theme/Lite.qss b/Builds/mumble-theme/Lite.qss
index f379bf1..c46f9ba 100644
--- a/Builds/mumble-theme/Lite.qss
+++ b/Builds/mumble-theme/Lite.qss
@@ -15,33 +15,12 @@
  * See project README

  *

  */
-TransferListWidget {
-  qproperty-downloadingStateForeground: limegreen;
-  qproperty-forcedDownloadingStateForeground: limegreen;
-  qproperty-downloadingMetadataStateForeground: limegreen;
-  qproperty-allocatingStateForeground: #cccccc;
-  qproperty-stalledDownloadingStateForeground: #cccccc;
-  qproperty-stalledUploadingStateForeground: #cccccc;
-  qproperty-uploadingStateForeground: #63b8ff;
-  qproperty-forcedUploadingStateForeground: #63b8ff;
-  qproperty-pausedDownloadingStateForeground: #fa8090;
-  qproperty-pausedUploadingStateForeground: #4f94cd;
-  qproperty-errorStateForeground: red;
-  qproperty-missingFilesStateForeground: red;
-  qproperty-queuedDownloadingStateForeground: #00cdcd;
-  qproperty-queuedUploadingStateForeground: #00cdcd;
-  qproperty-checkingDownloadingStateForeground: #00cdcd;
-  qproperty-checkingUploadingStateForeground: #00cdcd;
-  qproperty-checkingResumeDataStateForeground: #00cdcd;
-  qproperty-movingStateForeground: #00cdcd;
-  qproperty-unknownStateForeground: red; }
-
 QTabWidget QListView::item {
   padding: 0px; }
 
 QTabWidget QListView QLabel {
   padding: -2px;
-  font-size: 1em; }
+  font-size: 1.1em; }
 
 QObject,
 QObject::separator,
@@ -269,7 +248,6 @@ QTreeView::item {
   border: 1px solid transparent;
   border-left: 0;
   border-right: 0;
-  color: #111;
   padding: 2px 4px;
   selection-color: #111;
   border-radius: 0; }
@@ -332,13 +310,20 @@ QTreeView::branch:has-children:closed {
 QTreeView::branch:has-children:open {
   image: url(:/uitheme/controls/branch_open.svg); }
 
+QCheckBox::branch:has-children:closed {
+  image: url(:/uitheme/controls/branch_closed.svg); }
+
+QCheckBox::branch:has-children:open {
+  image: url(:/uitheme/controls/branch_open.svg); }
+
 QHeaderView {
   border-bottom: 1px solid #D2D2D2;
   border-radius: 0;
-  background-color: #F2F2F2; }
+  background-color: #FDFDFD; }
 
 QHeaderView::section {
   background-color: #FDFDFD;
+  border-right: 1px solid #D2D2D2;
   color: #111;
   padding: 4px;
   padding-left: 8px;
diff --git a/Builds/mumble-theme/source/Dark.scss b/Builds/mumble-theme/source/Dark.scss
index f2412e7..ede9551 100644
--- a/Builds/mumble-theme/source/Dark.scss
+++ b/Builds/mumble-theme/source/Dark.scss
@@ -20,4 +20,27 @@
 // Import base theme CSS
 @import 'Imports/Base Theme';
 
+
+TransferListWidget {
+	qproperty-downloadingStateForeground: rgb(50,205,50);
+	qproperty-forcedDownloadingStateForeground: rgb(50,205,50);
+	qproperty-downloadingMetadataStateForeground: rgb(50,205,50);
+	qproperty-allocatingStateForeground: rgb(204,204,204);
+	qproperty-stalledDownloadingStateForeground: rgb(204,204,204);
+	qproperty-stalledUploadingStateForeground: rgb(204,204,204);
+	qproperty-uploadingStateForeground: rgb(99,184,255);
+	qproperty-forcedUploadingStateForeground: rgb(99,184,255);
+	qproperty-pausedDownloadingStateForeground: rgb(250,128,144);
+	qproperty-pausedUploadingStateForeground: rgb(79,148,205);
+	qproperty-errorStateForeground: rgb(255, 0, 0);
+	qproperty-missingFilesStateForeground: rgb(255, 0, 0);
+	qproperty-queuedDownloadingStateForeground: rgb(0, 205, 205);
+	qproperty-queuedUploadingStateForeground: rgb(0, 205, 205);
+	qproperty-checkingDownloadingStateForeground: rgb(0, 205, 205);
+	qproperty-checkingUploadingStateForeground: rgb(0, 205, 205);
+	qproperty-checkingResumeDataStateForeground: rgb(0, 205, 205);
+	qproperty-movingStateForeground: rgb(0, 205, 205);
+	qproperty-unknownStateForeground: rgb(255, 0, 0);
+}
+
 // Add or import your own custom QSS below
diff --git a/Builds/mumble-theme/source/Imports/Base Theme.scss b/Builds/mumble-theme/source/Imports/Base Theme.scss
index f41b959..9300107 100644
--- a/Builds/mumble-theme/source/Imports/Base Theme.scss	
+++ b/Builds/mumble-theme/source/Imports/Base Theme.scss	
@@ -5,35 +5,13 @@
  *
  */
 
-TransferListWidget {
-	qproperty-downloadingStateForeground: rgb(50,205,50);
-	qproperty-forcedDownloadingStateForeground: rgb(50,205,50);
-	qproperty-downloadingMetadataStateForeground: rgb(50,205,50);
-	qproperty-allocatingStateForeground: rgb(204,204,204);
-	qproperty-stalledDownloadingStateForeground: rgb(204,204,204);
-	qproperty-stalledUploadingStateForeground: rgb(204,204,204);
-	qproperty-uploadingStateForeground: rgb(99,184,255);
-	qproperty-forcedUploadingStateForeground: rgb(99,184,255);
-	qproperty-pausedDownloadingStateForeground: rgb(250,128,144);
-	qproperty-pausedUploadingStateForeground: rgb(79,148,205);
-	qproperty-errorStateForeground: rgb(255, 0, 0);
-	qproperty-missingFilesStateForeground: rgb(255, 0, 0);
-	qproperty-queuedDownloadingStateForeground: rgb(0, 205, 205);
-	qproperty-queuedUploadingStateForeground: rgb(0, 205, 205);
-	qproperty-checkingDownloadingStateForeground: rgb(0, 205, 205);
-	qproperty-checkingUploadingStateForeground: rgb(0, 205, 205);
-	qproperty-checkingResumeDataStateForeground: rgb(0, 205, 205);
-	qproperty-movingStateForeground: rgb(0, 205, 205);
-	qproperty-unknownStateForeground: rgb(255, 0, 0);
-}
-
 QTabWidget QListView::item {
   padding: 0px;
 }
 
 QTabWidget QListView QLabel { 
   padding: -2px;
-  font-size: 1em;
+  font-size: 1.1em;
 }
 
 QObject,
@@ -355,7 +333,6 @@ QTreeView::item
 	border:1px solid transparent;
 	border-left:0;
 	border-right:0;
-	color:$sub-text;
 	padding:$base-padding/2 $base-padding;
 	selection-color:$sub-text;
 	border-radius:0;
@@ -443,16 +420,25 @@ QTreeView::branch:has-children:open
 	image:url(:/uitheme/controls/branch_open.svg);
 }
 
+QCheckBox::branch:has-children:closed {
+  image: url(:/uitheme/controls/branch_closed.svg); 
+}
+
+QCheckBox::branch:has-children:open {
+  image: url(:/uitheme/controls/branch_open.svg); 
+}
+  
 QHeaderView
 {
 	border-bottom:1px solid $base-border;
 	border-radius:0;
-	background-color: $base-bg;
+	background-color: $median-bg;
 }
 
 QHeaderView::section
 {
 	background-color:$median-bg;
+	border-right:1px solid $base-border;
 	color:$sub-text;
 	padding:$base-padding;
 	padding-left:$base-padding * 2;
diff --git a/darkstylesheet.qbtheme b/darkstylesheet.qbtheme
index 3ab7883..db367cc 100644
Binary files a/darkstylesheet.qbtheme and b/darkstylesheet.qbtheme differ
diff --git a/mumble-dark.qbtheme b/mumble-dark.qbtheme
index 3331854..eae7cb3 100644
Binary files a/mumble-dark.qbtheme and b/mumble-dark.qbtheme differ
diff --git a/mumble-lite.qbtheme b/mumble-lite.qbtheme
index ff5b410..d1305a2 100644
Binary files a/mumble-lite.qbtheme and b/mumble-lite.qbtheme differ