diff --git a/rtdata/themes/TooWaBlue.css b/rtdata/themes/TooWaBlue.css
index fa4369894..59c12bb7f 100644
--- a/rtdata/themes/TooWaBlue.css
+++ b/rtdata/themes/TooWaBlue.css
@@ -1,7 +1,7 @@
 /*
   This file is part of RawTherapee.
 
-  Copyright (c) 2016 TooWaBoo (v1.13)
+  Copyright (c) 2016 TooWaBoo (v1.19.1)
   Many thanks to the RawTherapee Developer Team for this great piece of software
 
   RawTherapee is free software: you can redistribute it and/or modify
@@ -20,97 +20,109 @@
 
 /*** Change me *** rgb(red,green,blue) *** allowed values from 0 to 255 for each color ***/
 
-@define-color accent-color rgb(35,99,166);      /*** Highlight/selected color for List, Dropdown menu, Borders ... ***/
+@define-color accent-color rgb(35,99,166);      /*** Highlight/selected color for  Tab indicator, List, Dropdown menu, Borders ... ***/
 @define-color text-hl-color rgb(210,210,210);   /*** Highlight/selected text color ***/
 
-@define-color accent-color2 rgb(35,99,166);     /*** Slider, Progressbar, Scrollbar, Tab indicator ***/
+@define-color accent-color2 rgb(35,99,166);     /*** Slider, Progressbar, Scrollbar ***/
 
 @define-color accent-color3 rgb(35,99,166);     /*** Selected thumbnail background color ***/
 @define-color text-hl-color3 rgb(210,210,210);  /*** Selected thumbnail text color ***/
 
 /*** Change me end ************************************************************************/
 
-@define-color text-color #B0B0B0;
+@define-color text-color #B4B4B4;
 @define-color text-hl-color2 #C0C0C0;
 @define-color text-tbEntry #C0C0C0;
 @define-color bg-dark-grey #242424;
-@define-color bg-grey #474747;
-@define-color bg-light-grey #595959;
+@define-color bg-grey #464646;
+@define-color bg-light-grey #585858;
 @define-color border-color rgba(255,255,255,.25);
 @define-color bg-list-hover rgba(255,255,255,.065);
 @define-color bg-scale-entry rgba(0,0,0,.14);
-@define-color bg-button-border rgba(0,0,0,.38);
-@define-color bg-entry-border rgba(0,0,0,.26);
-@define-color bg-button-hover rgba(0,0,0,.15);
+@define-color bg-button-border rgba(0,0,0,.48);
+@define-color bg-button-border-hover rgba(0,0,0,.58);
+@define-color bg-entry-border rgba(0,0,0,.40);
+@define-color bg-button-hover rgba(0,0,0,.22);
 @define-color bg-spin-button-hover rgba(0,0,0,.25);
 @define-color bg-entry-IPTC @bg-dark-grey;
+@define-color view-grid-border #404040;
 
 * {
     color: @text-color;
-	transition: none;
-	text-shadow: none;
-	icon-shadow: none;
-	box-shadow: none;
-	outline-style: none; /* removes the ugly dotted focus line */
-	border-image: none;
+    transition: none;
+    text-shadow: none;
+    icon-shadow: none;
+    box-shadow: none;
+    outline-style: none; /* removes the ugly dotted focus line */
+    border-image: none;
+    -GtkCheckButton-indicator-size: 16;
+    -GtkCheckMenuItem-indicator-size: 16;
+    -GtkCheckButton-indicator-spacing: 2;
 }
-.undershoot.top,
-.undershoot.right, 
-.undershoot.bottom,
-.undershoot.left {
-	background-image: none; /* removes the dotted scrollbar line */
+
+.undershoot {
+    background-image: none; /* removes the dotted scrollbar line */
 }
 GtkWindow {
-	background-color: @bg-light-grey;
+    background-color: @bg-light-grey;
 }
 GtkDialog {
-	background-color: @bg-grey;
-	-GtkDialog-content-area-spacing: 4;
-	-GtkDialog-action-area-border: 0;
-	-GtkDialog-content-area-border: 8;
+    background-color: @bg-grey;
+    -GtkDialog-content-area-spacing: 7;
+    -GtkDialog-action-area-border: 0;
+    -GtkDialog-content-area-border: 8;
 }
 
 GtkFontChooser,
 GtkColorChooser {
-	-GtkDialog-action-area-border: 4;
-	-GtkDialog-content-area-border: 0;
+    -GtkDialog-action-area-border: 4;
+    -GtkDialog-content-area-border: 0;
 }
+
 .frame {
     border: none;
 }
-
-GtkPaned .frame .frame {
-	border-top: 2px solid transparent;
-	border-bottom: 4px solid transparent;
+#PrefNotebook > .frame {
+    border: 1px solid rgba(0,0,0,.50);
+    border-top: none;
 }
-GtkDialog GtkPaned .frame .frame {
-	border-top: none;
-	border-bottom: none;
+#BatchQueueButtonsMainContainer GtkFrame {
+    padding: 4px 4px 4px 10px;
+}
+
+/*** Add space between buttons and image area***/
+#BeforeAfterContainer GtkFrame {
+    padding: 2px 0 4px;
+}
+/*** Add space between before/after image ***/
+#BeforeAfterContainer GtkContainer:nth-child(1) > GtkContainer:nth-child(2) GtkFrame {
+    padding-right: 14px;
 }
 
 /*** Menu bubble box ***/
 GtkPopover {
-	background-color: @bg-dark-grey;
+    background-color: @bg-dark-grey;
     border: 1px solid @accent-color;
-	border-radius: 0;
+    border-radius: 0;
 }
+
 .menu {
     background-color: @bg-dark-grey;
     border: 1px solid @accent-color;
 }
-.menuitem {
-	padding: 3px 4px;
+.menu .menuitem {
+    padding: 2px 4px;
 }
-.menuitem:hover {
-	background-color: @accent-color;
+.menu .menuitem:hover {
+    background-color: @accent-color;
 }
-.menuitem:hover * {
-	color: @text-hl-color;
+.menu .menuitem:hover * {
+    color: @text-hl-color;
 }
 
 GtkNotebook {
     padding: 4px;
-	background-color: @bg-light-grey;
+    background-color: @bg-light-grey;
 }
 GtkDialog GtkNotebook  {
     padding: 2px 0 0;
@@ -119,173 +131,228 @@ GtkDialog GtkNotebook  {
     padding: 4px 8px;
 }
 #RightNotebook {
-	padding: 0 0 0 4px;
+    padding: 0 0 0 4px;
 }
 
 GtkPaned {
-	-GtkPaned-handle-size: 4px;
-	background-color: transparent;
+    -GtkPaned-handle-size: 4px;
+    background-color: transparent;
 }
 .pane-separator {
-	background-color: @bg-light-grey;
+    background-color: @bg-light-grey;
 }
 GtkDialog .pane-separator {
-	background-color: @bg-grey;
+    background-color: @bg-grey;
 }
 
+/*** Separator ***/
 .separator {
-	color: @bg-light-grey;
+    color: @bg-light-grey;
 }
 GtkDialog .separator {
-	color: @border-color;
+    color: @border-color;
 }
 #RightNotebook .separator {
-	color: @bg-dark-grey;
+    color: @bg-dark-grey;
 }
+    /*** Navigator ***/
+#Navigator .separator {
+    color: @view-grid-border;
+}
+/*** end ***/
 
 /*** Background color image area***/
 GtkDrawingArea {
-	background-color: @bg-grey;
+    background-color: @bg-grey;
+    border: 1px solid rgba(0,0,0,.32);
 }
 /*** Histogram ***/
-GtkGrid GtkContainer GtkDrawingArea:nth-child(1) {
-	background-color: @bg-dark-grey;
-	border: none;
+#HistogramPanel,
+#HistogramArea {
+    background-color: @bg-dark-grey;
+    border: none;
 }
 /*** Histogram RGB-Bar***/
-GtkGrid GtkContainer GtkDrawingArea:nth-child(2) {
-	background-color: #747474;
-	border: none;
+#HistogramRGBArea {
+    background-color: #808080;
+    border: none;
 }
 /*** Navigator ***/
-GtkWindow GtkPaned:nth-child(1) GtkFrame GtkVBox:nth-child(2) GtkDrawingArea {
-	background-color: @bg-dark-grey;
+#Navigator GtkDrawingArea {
+    background-color: @bg-dark-grey;
+    border: 1px solid @bg-dark-grey;
 }
+#Navigator {
+    background-color: @bg-dark-grey;
+    border-top: 156px solid @bg-light-grey;
+}
+
 #RightNotebook GtkDrawingArea {
-	background-color: @bg-dark-grey;
+    background-color: @bg-dark-grey;
 }
 
 /*** Label ***/
-.label {
-	padding: 0 4px;
+ .label {
+    padding: 0 4px;
 }
-GtkTable .label {
-	padding: 0;
+    /*** Increase space between labels in navigater ***/
+#Navigator .label {
+    padding: 6px 0 3px;
 }
+#Navigator GtkTable .label {
+    padding: 0 0 4px;
+}
+    /***/
 GtkDialog .label,
 #ToolPanelNotebook .label,
 .notebook tab .label {
-	padding: 0 1px;
+    padding: 0 1px;
 }
-.button .label,
-#ToolPanelNotebook .button .label {
-	padding: 0 0 2px;
+.button .label {
+    padding: 0;
 }
+
+    /*** Add left and right space between frame and labels ***/
 .frame > .label,
 #ToolPanelNotebook .frame > .label {
-	padding: 4px 5px;
+    padding: 4px;
 }
+#BatchQueueButtonsMainContainer GtkFrame:nth-child(3) > .label{
+    padding: 2px 0px 4px;
+}
+
 #MyExpanderTitle .label {
-	padding: 2px 3px;
+    padding: 2px 3px;
 }
 /*** end ***/
 
 .tooltip {
-	background-color: @bg-dark-grey;
-	border: 1px solid @accent-color;
-	border-radius: 0;
-	padding: 0;
+    border-radius: 0;
+    padding: 0;
+}
+.tooltip.background {
+    background-color: @bg-dark-grey;
+    border: 1px solid @accent-color;
 }
 
-#partialPasteHeaderSep {color: @accent-color;}
-#partialPasteHeader * {color: #E0E0E0;}
+/*** PartialPaste ***/
+#PartialPaste:nth-child(2) {
+    background-color: @bg-light-grey;
+    border: 1px solid rgba(0,0,0,.50);
+}
+#PartialPaste > .frame {
+    padding: 8px 10px;
+}
+#PartialPasteHeaderSep {
+    color: #C0C0C0;
+}
+#PartialPasteHeader .label {
+    color: #D5D5D5;
+}
+/*** end ***/
 
 /*** Scrollbar ***/
 .scrollbar.trough {
-	background-color: rgba(0,0,0,.38);
-	background-image: none;
-	border: none;
+    background-color: rgba(0,0,0,.38);
+    background-image: none;
+    border: none;
 }
 .scrollbar.slider:active {
-	background-color: shade(@accent-color2,1.12);
+    background-color: shade(@accent-color2,1.12);
 }
 
 /*** end ***/
 
 /*** Scale & Progressbar ***/
 .scale {
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(242, 242, 242, 0.1);
     -GtkRange-trough-border: 6;
-	-GtkScale-slider-length: 15;
+    -GtkScale-slider-length: 15;
     -GtkRange-slider-width: 15;
 }
-.scale.trough {
+.scale.trough,
+#ToolPanelNotebook .scale.trough {
     background-color: @bg-scale-entry;
-	border-color: @bg-dark-grey;
+    border-color: @bg-dark-grey;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(242, 242, 242, 0.1);
+}
+.scale.trough.highlight,
+#ToolPanelNotebook .scale.trough.highlight {
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(242, 242, 242, 0.1);
+    background-image: none;
+    background-color: @accent-color2;
+    border: 1px solid @bg-dark-grey;
+    color: @text-hl-color2;
 }
 .scale.slider,
-.scale.trough.highlight,
-#ToolPanelNotebook .scale.trough.highlight,
 #ToolPanelNotebook .scale.slider {
-	background-image: none;
-	background-color: @accent-color2;
-	border: 1px solid @bg-dark-grey;
-	color: @text-hl-color2;
+    box-shadow: inset 0 2px rgba(255, 255, 255, 0.08), inset 0 -2px rgba(0, 0, 0, 0.09);
+    background-image: none;
+    background-color: @accent-color2;
+    border: 1px solid shade(@bg-dark-grey, 1.12);
 }
 .scale.fine-tune {
     -GtkRange-trough-border: 5;
 }
-GtkFontChooser .scale {
+.scale.scale-has-marks-below {
     -GtkRange-trough-border: 6;
-	-GtkScale-slider-length: 6;
+    -GtkScale-slider-length: 6;
     -GtkRange-slider-width: 19;
 }
-GtkFontChooser .scale.slider {
-	border-radius: 0 0 20px 20px;
-	border: 1px solid @bg-dark-grey;
+.scale.slider.scale-has-marks-below {
+    border-radius: 0 0 20px 20px;
+    border: 1px solid @bg-dark-grey;
 }
-GtkFontChooser .scale.fine-tune {
+.scale.fine-tune.scale-has-marks-below {
     -GtkRange-trough-border: 5;
 }
 .scale.slider:active,
 #ToolPanelNotebook .scale.slider:active {
-	border-color:  shade (@accent-color2,.55);
+    border-color:  shade (@accent-color2,.55);
 }
 
 GtkProgressBar {
     -GtkProgressBar-min-vertical-bar-width: 8;
     -GtkProgressBar-min-horizontal-bar-height: 8;
-	-GtkProgressBar-yspacing: 6px;
-	border-radius: 10px;
+    -GtkProgressBar-yspacing: 4px;
+    border-radius: 10px;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(242, 242, 242, 0.1);
 }
 .progressbar {
     background-image: none;
     background-color: @accent-color2;
-	border-color: @bg-dark-grey;
+    border-color: @bg-dark-grey;
 }
 GtkProgressBar.trough {
     background-image: none;
     background-color: @bg-scale-entry;
 }
+#MainNotebook > GtkGrid GtkProgressBar {
+    box-shadow: none;
+}
 #MainNotebook > GtkGrid GtkProgressBar.trough {
     background-image: none;
     background-color: @bg-dark-grey;
-	border-color: @bg-dark-grey;
+    border-color: @bg-dark-grey;
 }
 /*** end ***/
 
 /*** Load/Save ***/
 GtkFileChooserWidget {
-	background-color: transparent;
+    background-color: @bg-grey;
+}
+GtkFileChooserWidget > GtkBox {
+    border-bottom-color: @bg-dark-grey;
 }
 GtkFileChooserWidget GtkBox {
-	background-color: transparent;
+    background-color: transparent;
 }
 GtkFileChooserWidget GtkListBox * {
-	padding-top: 1px;
-	padding-bottom: 1px;
+    padding-top: 1px;
+    padding-bottom: 1px;
 }
 GtkFileChooserWidget GtkListBox {
-	background-color: @bg-dark-grey;
+    background-color: @bg-dark-grey;
 }
 GtkFileChooserWidget .list-row * {
     padding: 1px 4px;
@@ -294,7 +361,7 @@ GtkFileChooserWidget .list-row:hover {
     background-color: @bg-list-hover;
 }
 GtkFileChooserWidget .list-row:hover * {
-	color: @text-hl-color2;
+    color: @text-hl-color2;
 }
 GtkFileChooserWidget .list-row:selected {
     background-color: @accent-color;
@@ -307,98 +374,99 @@ GtkFileChooserWidget .list-row:selected * {
 /*** Tab Bars ***/
 .notebook tab, .notebook.header {
     background-color: @bg-dark-grey;
-	border-color: @bg-dark-grey;
+    border-color: @bg-dark-grey;
 }
 #MainNotebook tab {
-	padding: 5px;
+    padding: 5px;
 }
 .notebook tab.top {
-	border-width: 0 0 5px 0;
+    border-width: 0 0 5px 0;
 }
 .notebook tab.left {
-	border-width: 0 5px 0 0;
+    border-width: 0 5px 0 0;
 }
 #RightNotebook tab.left,
 #PrefNotebook tab,
 GtkDialog tab {
-	padding: 9px;
+    padding: 9px;
 }
 #ToolPanelNotebook tab {
-	padding: 10px 4px 7px;
+    padding: 10px 4px 7px;
 }
 #MetaPanelNotebook tab {
-	padding: 8px 4px;
+    padding: 8px 4px;
 }
 
 .notebook tab:active {
-	border-color: @accent-color2;
+    border-color: @accent-color;
 }
 
 /*** end ***/
 
 /*** File Browser ***/
 #FileBrowser GtkDrawingArea {
-	background-color: @bg-grey;
+    background-color: @bg-grey;
 }
 #FileBrowser GtkDrawingArea:selected {
     background-color: @accent-color3;
-	color: @text-hl-color3;
+    color: @text-hl-color3;
 }
 /*** end ***/
 
 /*** Image ***/
 GtkImage {
-	padding: 0;
+    padding: 0;
 }
 #MainNotebook > GtkGrid GtkImage  {
     padding: 1px;
 }
 
 #ToolPanelNotebook GtkImage{
-	padding: 0 4px;
+    padding: 0 4px;
 }
 #MyExpanderTitle GtkImage{
-	padding: 0;
+    padding: 0;
 }
 
 #ToolPanelNotebook tab GtkImage,
 #ToolPanelNotebook .button GtkImage {
-	padding: 1px 0;
+    padding: 1px 0;
 }
 
 GtkDialog .button GtkImage{
-	padding: 0;
+    padding: 0;
 }
 GtkFileChooserWidget .button GtkImage{
-	padding: 0 4px;
+    padding: 0 4px;
 }
 /*** end ***/
 
 /*** Toolpanel ***/
 #ToolPanelNotebook {
-	background-color: @bg-dark-grey;
-	padding: 0;
-	border-top: 4px solid @bg-dark-grey;
+    background-color: @bg-dark-grey;
+    padding: 0;
+    border-top: 4px solid @bg-dark-grey;
 }
 
 #ToolPanelNotebook GtkScrolledWindow GtkViewport.frame {
-	padding: 0 4px;
+    padding: 0 4px;
 }
 #ToolPanelNotebook .separator {
-	color: transparent;
+    color: transparent;
 }
 #ToolPanelNotebook GtkFrame, #PrefNotebook GtkFrame {
     border: 1px solid @border-color;
     border-radius: 0;
-	padding: 5px;
+    padding: 5px;
 }
 
 #ToolPanelNotebook GtkDrawingArea {
-	background-color: @bg-dark-grey;
-	border-color: @bg-light-grey;
+    background-color: @bg-dark-grey;
+    border-color: @bg-light-grey;
+    color: @text-color;
 }
 #ToolPanelNotebook GtkDrawingArea {
-	border-radius: 1px; /* BUG: if 0, scale mini sliders look funny */
+    border-radius: 1px; /* BUG: if 0, scale mini sliders look funny */
 }
 
 #ExpanderBox #ExpanderBox, #ExpanderBox2, #ExpanderBox3 {
@@ -421,26 +489,27 @@ GtkFileChooserWidget .button GtkImage{
 /*** View ***/
 .view {
     background-color: @bg-dark-grey;
+    border-color: @view-grid-border;
 }
 #PrefNotebook .view {
     background-color: @bg-grey;
 }
 #MainNotebook .view.cell:nth-child(2) {
-	padding: 1px 0px 1px 4px;
+    padding: 1px 0px 1px 4px;
 }
-.view:hover {
+.view row:hover {
     background-color: @bg-list-hover;
-	color: @text-hl-color2;
+    color: @text-hl-color2;
 }
-#PrefNotebook .view:hover {
+#PrefNotebook .view row:hover {
     background-color: @bg-light-grey;
-	color: @text-hl-color2;
+    color: @text-hl-color2;
 }
-.view:selected {
+.view row:selected {
     color: @text-hl-color;
     background-color: @accent-color;
 }
-#PrefNotebook .view:selected {
+#PrefNotebook .view row:selected {
     color: @text-hl-color;
     background-color: @accent-color;
 }
@@ -448,37 +517,37 @@ GtkFileChooserWidget .button GtkImage{
 
 /*** Metadata ***/
 #MetaPanelNotebook {
-	padding: 8px 11px 0;
+    padding: 8px 11px 0;
 }
 #MetaPanelNotebook GtkScrolledWindow GtkViewport.frame {
-	padding: 8px 10px;
+    padding: 8px 10px;
 }
 #MetaPanelNotebook.frame {
-	background-color: @bg-grey;
- 	border-bottom: none;
-	border-top: 4px solid @bg-dark-grey;
-	border-left: 9px solid @bg-dark-grey;
-	border-right: 9px solid @bg-dark-grey;
+    background-color: @bg-grey;
+    border-bottom: none;
+    border-top: 4px solid @bg-dark-grey;
+    border-left: 9px solid @bg-dark-grey;
+    border-right: 9px solid @bg-dark-grey;
 }
 #MetaPanelNotebook .separator {
-	color: @border-color;
+    color: @border-color;
 }
 #MetaPanelNotebook.header {
-	background-color: @bg-dark-grey;
+    background-color: @bg-dark-grey;
 
 }
 #MetaPanelNotebook GtkTreeView {
-	padding: 1px;
-	background-color: @bg-grey;
+    padding: 1px;
+    background-color: @bg-grey;
 }
 #MetaPanelNotebook .frame GtkTreeView {
-	padding: 0px;
-	background-color: @bg-entry-IPTC;
+    padding: 0px;
+    background-color: @bg-entry-IPTC;
 }
 #MetaPanelNotebook GtkTreeView:hover,
 #MetaPanelNotebook .frame GtkTreeView:hover {
     background-color: @bg-list-hover;
-	color: @text-hl-color;
+    color: @text-hl-color;
 }
 #MetaPanelNotebook GtkTreeView:selected,
 #MetaPanelNotebook .frame GtkTreeView:selected {
@@ -488,18 +557,19 @@ GtkFileChooserWidget .button GtkImage{
 #MetaPanelNotebook GtkTextView {
     color: @text-color;
     background-color: @bg-entry-IPTC;
-	padding: 2px 4px;
+    padding: 2px 4px;
 }
 /*** end ***/
 
 /*** Entry ***/
 .entry {
-	background-image: none;
-	background-color: @bg-scale-entry;
-	border: 1px solid @bg-entry-border;
-	border-radius: 0;
-	padding: 2px 4px;
-	color: @text-color;
+    background-image: none;
+    background-color: @bg-scale-entry;
+    border: 1px solid @bg-entry-border;
+    border-radius: 0;
+    padding: 3px 4px;
+    color: @text-color;
+    box-shadow: inset 1px 1px rgba(0, 0, 0, 0.08), 0 1px rgba(242 , 242, 242, 0.1);
 }
 .entry:focused:selected {
     color: @text-hl-color;
@@ -515,10 +585,11 @@ GtkFileChooserWidget .button GtkImage{
 }
 #ToolPanelNotebook .entry {
     padding: 0 4px 0 8px;
-	border-radius: 20px 0 0 20px;
-	background-color: rgba(255,255,255,.12);
-	border: 1px solid rgba(0,0,0,.48);
-	color: @text-tbEntry;
+    border-radius: 20px 0 0 20px;
+    background-color: rgba(255,255,255,.12);
+    border: 1px solid rgba(0,0,0,.46);
+    color: @text-tbEntry;
+    box-shadow: inset 1px  1px rgba(0, 0, 0, .12), 0 1px rgba(255 , 255, 255, 0.12);
 }
 #ToolPanelNotebook .entry:focused:selected {
     color: @text-hl-color;
@@ -533,202 +604,226 @@ GtkFileChooserWidget .button GtkImage{
     background-color: rgba(255,255,255,.12);
 }
 
-#MetaPanelNotebook .entry:not(:selected):not(:insensitive) {
+#MetaPanelNotebook .entry {
     color: @text-color;
     background-color: @bg-entry-IPTC;
-	border: 1px solid rgba(0,0,0,.50);
-	border-radius: 0;
-	padding: 2px 4px;
+    border: none;
+    border-radius: 0;
+    padding: 2px 4px;
+    box-shadow: none;
 }
 #MetaPanelNotebook .entry:focused:selected {
     color: @text-hl-color;
     background-color: @accent-color;
+    box-shadow: none;
 }
 #MetaPanelNotebook .entry:not(:focused):not(:insensitive) {/*Workaround*/
     color: @text-color;
     background-color: transparent;
+    box-shadow: none;
 }
 #MetaPanelNotebook  .entry:not(:selected):not(:insensitive) {
     color: @text-color;
     background-color: @bg-entry-IPTC;
+    box-shadow: none;
 }
 /*** end ***/
 
 /*** Buttons ***/
 .button {
-	background-image: linear-gradient(to bottom, rgba(0,0,0,.07), rgba(0,0,0,.22));
-	background-color: transparent;
-	border: 1px solid @bg-button-border;
-	border-radius: 0;
-	padding: 3px 4px;
+    background-color: transparent;
+    border: 1px solid @bg-button-border;
+    border-radius: 0;
+    padding: 3px 4px;
+    box-shadow: inset 0 1px rgba(242, 242, 242, 0.1), 0 1px rgba(242, 242, 242, 0.1);
+    background-image: linear-gradient(to bottom, rgba(0,0,0,.05), rgba(0,0,0,.14) 40%, rgba(0,0,0,.26));
+}
+.message-dialog .dialog-action-area .button {
+    padding: 6px;
+ }
+
+.button.Left + .button:not(.image-button).Right {
+    border-left: none;
 }
 GtkComboBox .button {
-	padding: 4px 3px;
+    padding: 4px 3px;
 }
 #ToolPanelNotebook .button,
-GtkDialog .button {
+GtkDialog .button,
+#BatchQueueButtonsMainContainer .button {
     padding: 0px 3px;
 }
-
-#ToolPanelNotebook GtkComboBox {
-	padding-left: 4px;  /*** Space between label and Dropbox ***/
+#BatchQueueButtons .button {
+    padding-top: 6px;
+    padding-bottom: 6px
 }
-#MetaPanelNotebook GtkComboBox {
-	padding-left: 0;
+#BeforeAfterContainer .button {
+    padding: 2px;
+}
+    
+    /*** Fix: Space between first Retinex Comboboxes ***/
+GtkLabel + GtkComboBox + GtkComboBox {
+    padding-left: 4px;
 }
 
 .text-button {
-	padding: 1px 0;
-	-GtkButton-child-displacement-x: 0;
-	-GtkButton-child-displacement-y: 0;
-	-GtkCheckButton-indicator-size: 16;
-	-GtkCheckButton-indicator-spacing: 3;
+    padding: 0 2px 0 0;
 }
-#ToolPanelNotebook .text-button {
-	padding: 0 5px 0 0;
+#PartialPaste .text-button {
+    padding: 0 8px 0 2px;
+    -GtkCheckButton-indicator-spacing: 1;
 }
+#ToolPanelNotebook GtkFrame > .text-button {
+    padding: 0 3px 0 0;
+}
+
 .button.text-button {
-     padding: 4px 10px;
+    padding: 5px 12px;
 }
-#ToolPanelNotebook .button.text-button {
-     padding: 0px 3px;
+#ToolPanelNotebook .button.text-button,
+#PrefNotebook .button.text-button,
+GtkFileChooserWidget .button.text-button,
+#RightNotebook .button.text-button {
+    padding: 3px 4px;
 }
 
 .spinbutton .button {
-	background-image: none;
-	background-color: transparent;
-	border: none;
-	border-radius: 0;
-	padding: 2px;
+    background-image: none;
+    background-color: transparent;
+    border: none;
+    border-radius: 0;
+    padding: 2px;
+    box-shadow: none;
 }
 #ToolPanelNotebook .spinbutton .button {
-	padding: 0;
+    padding: 0;
 }
 
-#fullButton,
-#histButton {
-	padding: 4px;
-}
 .button:hover {
-	background-color: @bg-button-hover;
+    background-color: rgba(0, 0, 0,.18);
 }
 #ToolPanelNotebook .spinbutton .button:hover {
-	background-color: @bg-spin-button-hover;
+    background-color: @bg-spin-button-hover;
 }
 
 .button:active,
 .button:checked {
-	background-image: linear-gradient(to bottom, #292929, #202020);
-	background-color: transparent;
-	border-color: black;
+    background-image: linear-gradient(to bottom, #292929, #252525 40%, #191919);
+    background-color: transparent;
+    border-color: black;
 }
 
 #MainNotebook > GtkGrid .button {
-	padding: 2px;
-	border: 4px solid @bg-dark-grey;
-	background-color: transparent;
-	background-image: none;
+    padding: 2px;
+    border: 4px solid @bg-dark-grey;
+    background-color: transparent;
+    background-image: none;
+    box-shadow: none;
 }
 #MainNotebook tab .button {
-	padding: 1px;
-	border-top: 4px solid @bg-dark-grey;
-	border-bottom: 4px solid @bg-dark-grey;
-	border-left: none;
-	border-right: none;
-	background-color: transparent;
-	background-image: none;
+    padding: 1px;
+    border-top: 4px solid @bg-dark-grey;
+    border-bottom: 4px solid @bg-dark-grey;
+    border-left: none;
+    border-right: none;
+    background-color: transparent;
+    background-image: none;
+    box-shadow: none;
 }
 #MainNotebook > GtkGrid .button:hover,
 #MainNotebook tab .button:hover {
-	background-color: rgba(255,255,255,.14);
+    background-color: rgba(255,255,255,.20);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.12);
+    background-image: linear-gradient(to bottom, rgba(0,0,0,.05), rgba(0,0,0,.12) 40%, rgba(0,0,0,.24));
 }
 #MainNotebook > GtkGrid .button:active,
 #MainNotebook tab .button:active {
-	background-color: rgba(255,255,255,.2);
+    background-color: rgba(255,255,255,.27);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.12);
+    background-image: linear-gradient(to bottom, rgba(0,0,0,.05), rgba(0,0,0,.12) 40%, rgba(0,0,0,.24));
 }
 .view .button {
-    background-color: #181818;
-    padding: 2px 6px;
+    background-color: #141414;
+    padding: 1px 5px 2px;
+    background-image: none;
+    border-color: black;
+    box-shadow: none;
+}
+.menu .button.bottom,
+.menu .button.bottom:insensitive {
+    background-color: #141414;
+    border-color: @accent-color;
+    border-width: 0 1px 1px 1px;
+    background-image: none;
+    box-shadow: none;
+}
+.menu .button.top,
+.menu .button.top:insensitive {
+    background-color: #141414;
+    border-color: @accent-color;
+    border-width: 1px 1px 0 1px;
+    background-image: none;
+    box-shadow: none;
+}
+#fullButton,
+#histButton {
+    padding: 5px;
+    border: none;
+    background-color: @bg-dark-grey;
+    background-image: none;
+    box-shadow: none;
 }
 /*** end ***/
 
 /*** Check & Radio buttons ***/
 .check,
 .check row {
-	-gtk-icon-source:
-				-gtk-gradient (radial,
-				center center, 0,
-				center center, 1,
-				color-stop (1, @bg-dark-grey));
+    -gtk-icon-source: url("images/twb/checkbox-unchecked.png");
 }
 .check:checked,
 .check row:checked {
-	-gtk-icon-source:
-				-gtk-gradient (radial,
-				center center, 0,
-				center center, 1,
-				color-stop (0.22, @text-color),
-				color-stop (0.30, @bg-dark-grey),
-				color-stop (0.50, @bg-dark-grey));
+    -gtk-icon-source: url("images/twb/checkbox-checked.png");
 }
 .check:insensitive,
 .check row:insensitive {
-	-gtk-icon-source:
-				-gtk-gradient (radial,
-				center center, 0,
-				center center, 1,
-				color-stop (1, rgba(0,0,0,.24)));
+    -gtk-icon-source: url("images/twb/checkbox-unchecked-disabled.png");
 }
 .check:checked:insensitive,
 .check row:checked:insensitive {
-	-gtk-icon-source:
-				-gtk-gradient (radial,
-				center center, 0,
-				center center, 1,
-				color-stop (0.22, rgba(255,255,255,.08)),
-				color-stop (0.30, rgba(0,0,0,.24)),
-				color-stop (0.50, rgba(0,0,0,.24)));
+    -gtk-icon-source: url("images/twb/checkbox-checked-disabled.png");
+}
+.check:inconsistent,
+.check row:inconsistent {
+    -gtk-icon-source: url("images/twb/checkbox-inconsistent.png");
+}
+.check:inconsistent:insensitive,
+.check row:inconsistent:insensitive {
+    -gtk-icon-source: url("images/twb/checkbox-inconsistent-disabled.png");
 }
 
 .radio,
 .radio row {
-	-gtk-icon-source:
-				-gtk-gradient (radial,
-				center center, 0,
-				center center, 1,
-				color-stop (0.44, @bg-dark-grey),
-				color-stop (0.5, transparent));
+    -gtk-icon-source: url("images/twb/radio-unchecked.png");
 }
 .radio:checked,
 .radio row:checked {
-	-gtk-icon-source:
-				-gtk-gradient (radial,
-				center center, 0,
-				center center, 1,
-				color-stop (0.14, @text-color),
-				color-stop (0.21, @bg-dark-grey),
-				color-stop (0.44, @bg-dark-grey),
-				color-stop (0.5, transparent));
+    -gtk-icon-source: url("images/twb/radio-checked.png");
 }
 .radio:insensitive,
 .radio row:insensitive {
-	-gtk-icon-source:
-				-gtk-gradient (radial,
-				center center, 0,
-				center center, 1,
-				color-stop (0.44, rgba(0,0,0,.24)),
-				color-stop (0.5, transparent));
+    -gtk-icon-source: url("images/twb/radio-unchecked-disabled.png");
 }
 .radio:checked:insensitive,
 .radio row:checked:insensitive {
-	-gtk-icon-source:
-				-gtk-gradient (radial,
-				center center, 0,
-				center center, 1,
-				color-stop (0.14, rgba(255,255,255,.08)),
-				color-stop (0.21, rgba(0, 0, 0,.24)),
-				color-stop (0.44, rgba(0, 0, 0,.24)),
-				color-stop (0.5, transparent));
+    -gtk-icon-source: url("images/twb/radio-checked-disabled.png");
+}
+.radio:inconsistent,
+.radio row:inconsistent {
+    -gtk-icon-source: url("images/twb/radio-inconsistent.png");
+}
+.radio:inconsistent:insensitive,
+.radio row:inconsistent:insensitive {
+    -gtk-icon-source: url("images/twb/radio-inconsistent-disabled.png");
 }
 /*** end ***/
 
@@ -736,21 +831,25 @@ GtkDialog .button {
 
 *:insensitive,
 #ToolPanelNotebook *:insensitive {
-	color: #808080;
+    color: #808080;
+    box-shadow: none;
 }
 #ToolPanelNotebook .entry:insensitive {
-	color: #909090;
-	background-color: rgba(255,255,255,.04);
+    color: #909090;
+    background-color: rgba(255,255,255,.06);
+    box-shadow: none;
 }
 .button:insensitive {
-	background-image: none;
-	background-color: rgba(0,0,0,.07);
-	border-color: rgba(0,0,0,.22);
+    background-image: none;
+    background-color: rgba(0,0,0,.10);
+    border-color: rgba(0,0,0,.30);
+    box-shadow: none;
 }
 .spinbutton .button:insensitive {
-	background-image: none;
-	background-color: transparent;
-	border: none;
+    background-image: none;
+    background-color: transparent;
+    border: none;
+    box-shadow: none;
 }
 .scale.slider:insensitive,
 .scale.trough.highlight:insensitive,
@@ -758,6 +857,7 @@ GtkDialog .button {
 #ToolPanelNotebook .scale.slider:insensitive,
 #ToolPanelNotebook .scale.trough.highlight:insensitive,
 #ToolPanelNotebook .scale.trough:insensitive {
-	background-color: #414141;
+    background-color: #414141;
+    box-shadow: none;
 }
 /*** end ***/
diff --git a/rtdata/themes/TooWaBlueCheckbox.css b/rtdata/themes/TooWaBlueCheckbox.css
deleted file mode 100644
index 91afb475b..000000000
--- a/rtdata/themes/TooWaBlueCheckbox.css
+++ /dev/null
@@ -1,840 +0,0 @@
-/*
-  This file is part of RawTherapee.
-
-  Copyright (c) 2016 TooWaBoo (v1.16.b1)
-  Many thanks to the RawTherapee Developer Team for this great piece of software
-
-  RawTherapee 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 3 of the License, or
-  (at your option) any later version.
-
-  RawTherapee 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 RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*** Change me *** rgb(red,green,blue) *** allowed values from 0 to 255 for each color ***/
-
-@define-color accent-color rgb(35,99,166);      /*** Highlight/selected color for List, Dropdown menu, Borders ... ***/
-@define-color text-hl-color rgb(210,210,210);   /*** Highlight/selected text color ***/
-
-@define-color accent-color2 rgb(35,99,166);     /*** Slider, Progressbar, Scrollbar, Tab indicator ***/
-
-@define-color accent-color3 rgb(35,99,166);     /*** Selected thumbnail background color ***/
-@define-color text-hl-color3 rgb(210,210,210);  /*** Selected thumbnail text color ***/
-
-/*** Change me end ************************************************************************/
-
-@define-color text-color #B0B0B0;
-@define-color text-hl-color2 #C0C0C0;
-@define-color text-tbEntry #C0C0C0;
-@define-color bg-dark-grey #242424;
-@define-color bg-grey #474747;
-@define-color bg-light-grey #595959;
-@define-color border-color rgba(255,255,255,.25);
-@define-color bg-list-hover rgba(255,255,255,.065);
-@define-color bg-scale-entry rgba(0,0,0,.14);
-@define-color bg-button-border rgba(0,0,0,.48);
-@define-color bg-button-border-hover rgba(0,0,0,.60);
-@define-color bg-entry-border rgba(0,0,0,.40);
-@define-color bg-button-hover rgba(0,0,0,.22);
-@define-color bg-spin-button-hover rgba(0,0,0,.25);
-@define-color bg-entry-IPTC @bg-dark-grey;
-@define-color view-grid-border #404040;
-
-* {
-    color: @text-color;
-	transition: none;
-	text-shadow: none;
-	icon-shadow: none;
-	box-shadow: none;
-	outline-style: none; /* removes the ugly dotted focus line */
-	border-image: none;
-	-GtkButton-child-displacement-x: 0;
-	-GtkButton-child-displacement-y: 0;
-	-GtkCheckButton-indicator-size: 16;
-	-GtkCheckButton-indicator-spacing: 2;
-}
-.undershoot {
-	background-image: none; /* removes the dotted scrollbar line */
-}
-GtkWindow {
-	background-color: @bg-light-grey;
-}
-GtkDialog {
-	background-color: @bg-grey;
-	-GtkDialog-content-area-spacing: 7;
-	-GtkDialog-action-area-border: 0;
-	-GtkDialog-content-area-border: 8;
-}
-
-GtkFontChooser,
-GtkColorChooser {
-	-GtkDialog-action-area-border: 4;
-	-GtkDialog-content-area-border: 0;
-}
-
-.frame {
-    border: none;
-}
-#PrefNotebook > .frame {
-    border: 1px solid rgba(0,0,0,.50);
-	border-top: none;
-}
-#BatchQueueButtonsMainContainer GtkFrame {
-	padding: 4px 4px 4px 10px;
-}
-
-/*** Add space between buttons and image area***/
-#BeforeAfterContainer GtkFrame {
-	padding: 2px 0 4px;
-}
-/*** Add space between before/after image ***/
-#BeforeAfterContainer GtkContainer:nth-child(1) > GtkContainer:nth-child(2) GtkFrame {
-	padding-right: 14px;
-}
-
-/*** Menu bubble box ***/
-GtkPopover {
-	background-color: @bg-dark-grey;
-    border: 1px solid @accent-color;
-	border-radius: 0;
-}
-
-.menu {
-    background-color: @bg-dark-grey;
-    border: 1px solid @accent-color;
-}
-.menu .menuitem {
-	padding: 2px 4px;
-}
-.menu .menuitem:hover {
-	background-color: @accent-color;
-}
-.menu .menuitem:hover * {
-	color: @text-hl-color;
-}
-
-GtkNotebook {
-    padding: 4px;
-	background-color: @bg-light-grey;
-}
-GtkDialog GtkNotebook  {
-    padding: 2px 0 0;
-}
-#PrefNotebook  {
-    padding: 4px 8px;
-}
-#RightNotebook {
-	padding: 0 0 0 4px;
-}
-
-GtkPaned {
-	-GtkPaned-handle-size: 4px;
-	background-color: transparent;
-}
-.pane-separator {
-	background-color: @bg-light-grey;
-}
-GtkDialog .pane-separator {
-	background-color: @bg-grey;
-}
-
-/*** Separator ***/
-.separator {
-	color: @bg-light-grey;
-}
-GtkDialog .separator {
-	color: @border-color;
-}
-#RightNotebook .separator {
-	color: @bg-dark-grey;
-}
-	/*** Navigator ***/
-#Navigator .separator {
-	color: @view-grid-border;
-}
-/*** end ***/
-
-/*** Background color image area***/
-GtkDrawingArea {
-	background-color: @bg-grey;
-	border: 1px solid rgba(0,0,0,.32);
-}
-/*** Histogram ***/
-#HistogramPanel,
-#HistogramArea {
-	background-color: @bg-dark-grey;
-	border: none;
-}
-/*** Histogram RGB-Bar***/
-#HistogramRGBArea {
-	background-color: #808080;
-	border: none;
-}
-/*** Navigator ***/
-#Navigator GtkDrawingArea {
-	background-color: @bg-dark-grey;
-	border: 1px solid @bg-dark-grey;
-}
-#Navigator {
-	background-color: @bg-dark-grey;
-	border-top: 156px solid @bg-light-grey;
-}
-
-#RightNotebook GtkDrawingArea {
-	background-color: @bg-dark-grey;
-}
-
-/*** Label ***/
- .label {
-	padding: 0 4px;
-}
-	/*** Increase space between labels in navigater ***/
-#Navigator .label {
-	padding: 6px 0 3px;
-}
-#Navigator GtkTable .label {
-	padding: 0 0 4px;
-}
-	/***/
-GtkDialog .label,
-#ToolPanelNotebook .label,
-.notebook tab .label {
-	padding: 0 1px;
-}
-.button .label {
-	padding: 0px;
-}
-.text-button .label {
-	padding: 0;
-}
-	/*** Add left and right space between frame and labels ***/
-GtkFrame > .label,
-#ToolPanelNotebook GtkFrame > .label {
-	padding: 2px 4px 4px;
-}
-#BatchQueueButtonsMainContainer GtkFrame:nth-child(3) > .label{
-	padding: 2px 0px 4px;
-}
-
-#MyExpanderTitle .label {
-	padding: 2px 3px;
-}
-/*** end ***/
-
-.tooltip {
-	border-radius: 0;
-	padding: 0;
-}
-.tooltip.background {
-    background-color: @bg-dark-grey;
-    border: 1px solid @accent-color;
-}
-
-/*** PartialPaste ***/
-/* #PartialPaste {
-	background-color: @bg-light-grey;
-	border: 1px solid @bg-button-border;
-}
-#PartialPaste GtkViewport {
-	padding: 5px 10px 2px;
-} */
-/* #PartialPaste .text-button {
-	-GtkCheckButton-indicator-spacing: 2;
-	padding: 0 6px 0 3px;
-} */
-#PartialPasteHeaderSep {
-	color: #C0C0C0;
-}
-#PartialPasteHeader .label {
-	color: #D5D5D5;
-}
-/*** end ***/
-
-/*** Scrollbar ***/
-.scrollbar.trough {
-	background-color: rgba(0,0,0,.38);
-	background-image: none;
-	border: none;
-}
-.scrollbar.slider:active {
-	background-color: shade(@accent-color2,1.12);
-}
-
-/*** end ***/
-
-/*** Scale & Progressbar ***/
-.scale {
-	box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(242, 242, 242, 0.1);
-    -GtkRange-trough-border: 6;
-	-GtkScale-slider-length: 15;
-    -GtkRange-slider-width: 15;
-}
-.scale.trough {
-    background-color: @bg-scale-entry;
-	border-color: @bg-dark-grey;
-}
-.scale.trough.highlight,
-#ToolPanelNotebook .scale.trough.highlight {
-	box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(242, 242, 242, 0.1);
-	background-image: none;
-	background-color: @accent-color2;
-	border: 1px solid @bg-dark-grey;
-	color: @text-hl-color2;
-}
-.scale.slider,
-#ToolPanelNotebook .scale.slider {
-	box-shadow: inset 0 2px 0 0 rgba(255, 255, 255, 0.07), inset 0 0 2px 0 rgba(0, 0, 0, 0.12);
-	background-image: none;
-	background-color: @accent-color2;
-	border: 1px solid @bg-dark-grey;
-	color: @text-hl-color2;
-}
-.scale.fine-tune {
-    -GtkRange-trough-border: 5;
-}
-GtkFontChooser .scale {
-    -GtkRange-trough-border: 6;
-	-GtkScale-slider-length: 6;
-    -GtkRange-slider-width: 19;
-}
-GtkFontChooser .scale.slider {
-	border-radius: 0 0 20px 20px;
-	border: 1px solid @bg-dark-grey;
-}
-GtkFontChooser .scale.fine-tune {
-    -GtkRange-trough-border: 5;
-}
-.scale.slider:active,
-#ToolPanelNotebook .scale.slider:active {
-	border-color:  shade (@accent-color2,.55);
-}
-
-GtkProgressBar {
-    -GtkProgressBar-min-vertical-bar-width: 8;
-    -GtkProgressBar-min-horizontal-bar-height: 8;
-	-GtkProgressBar-yspacing: 4px;
-	border-radius: 10px;
-	box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(242, 242, 242, 0.1);
-}
-.progressbar {
-    background-image: none;
-    background-color: @accent-color2;
-	border-color: @bg-dark-grey;
-}
-GtkProgressBar.trough {
-    background-image: none;
-    background-color: @bg-scale-entry;
-}
-#MainNotebook > GtkGrid GtkProgressBar {
-	box-shadow: none;
-}
-#MainNotebook > GtkGrid GtkProgressBar.trough {
-    background-image: none;
-    background-color: @bg-dark-grey;
-	border-color: @bg-dark-grey;
-}
-/*** end ***/
-
-/*** Load/Save ***/
-GtkFileChooserWidget {
-	background-color: @bg-grey;
-}
-GtkFileChooserWidget > GtkBox {
-	border-bottom-color: @bg-dark-grey;
-}
-GtkFileChooserWidget GtkBox {
-	background-color: transparent;
-}
-GtkFileChooserWidget GtkListBox * {
-	padding-top: 1px;
-	padding-bottom: 1px;
-}
-GtkFileChooserWidget GtkListBox {
-	background-color: @bg-dark-grey;
-}
-GtkFileChooserWidget .list-row * {
-    padding: 1px 4px;
-}
-GtkFileChooserWidget .list-row:hover {
-    background-color: @bg-list-hover;
-}
-GtkFileChooserWidget .list-row:hover * {
-	color: @text-hl-color2;
-}
-GtkFileChooserWidget .list-row:selected {
-    background-color: @accent-color;
-}
-GtkFileChooserWidget .list-row:selected * {
-    color: @text-hl-color;
-}
-/*** end ***/
-
-/*** Tab Bars ***/
-.notebook tab, .notebook.header {
-    background-color: @bg-dark-grey;
-	border-color: @bg-dark-grey;
-}
-#MainNotebook tab {
-	padding: 5px;
-}
-.notebook tab.top {
-	border-width: 0 0 5px 0;
-}
-.notebook tab.left {
-	border-width: 0 5px 0 0;
-}
-#RightNotebook tab.left,
-#PrefNotebook tab,
-GtkDialog tab {
-	padding: 9px;
-}
-#ToolPanelNotebook tab {
-	padding: 10px 4px 7px;
-}
-#MetaPanelNotebook tab {
-	padding: 8px 4px;
-}
-
-.notebook tab:active {
-	border-color: @accent-color2;
-}
-
-/*** end ***/
-
-/*** File Browser ***/
-#FileBrowser GtkDrawingArea {
-	background-color: @bg-grey;
-}
-#FileBrowser GtkDrawingArea:selected {
-    background-color: @accent-color3;
-	color: @text-hl-color3;
-}
-/*** end ***/
-
-/*** Image ***/
-GtkImage {
-	padding: 0;
-}
-#MainNotebook > GtkGrid GtkImage  {
-    padding: 1px;
-}
-
-#ToolPanelNotebook GtkImage{
-	padding: 0 4px;
-}
-#MyExpanderTitle GtkImage{
-	padding: 0;
-}
-
-#ToolPanelNotebook tab GtkImage,
-#ToolPanelNotebook .button GtkImage {
-	padding: 1px 0;
-}
-
-GtkDialog .button GtkImage{
-	padding: 0;
-}
-GtkFileChooserWidget .button GtkImage{
-	padding: 0 4px;
-}
-/*** end ***/
-
-/*** Toolpanel ***/
-#ToolPanelNotebook {
-	background-color: @bg-dark-grey;
-	padding: 0;
-	border-top: 4px solid @bg-dark-grey;
-}
-
-#ToolPanelNotebook GtkScrolledWindow GtkViewport.frame {
-	padding: 0 4px;
-}
-#ToolPanelNotebook .separator {
-	color: transparent;
-}
-#ToolPanelNotebook GtkFrame, #PrefNotebook GtkFrame {
-    border: 1px solid @border-color;
-    border-radius: 0;
-	padding: 5px;
-}
-
-#ToolPanelNotebook GtkDrawingArea {
-	background-color: @bg-dark-grey;
-	border-color: @bg-light-grey;
-	color: @text-color;
-}
-#ToolPanelNotebook GtkDrawingArea {
-	border-radius: 1px; /* BUG: if 0, scale mini sliders look funny */
-}
-
-#ExpanderBox #ExpanderBox, #ExpanderBox2, #ExpanderBox3 {
-    border: 1px solid @border-color;
-}
-
-#ExpanderBox, #ExpanderBox2, #ExpanderBox3 {
-    background-color: @bg-grey;
-    border-radius: 0;
-}
-
-#MyExpanderTitle .label {
-    color: @text-color;
-}
-#MyExpanderTitle:hover .label {
-    color: @text-hl-color2;
-}
-/*** end ***/
-
-/*** View ***/
-.view {
-    background-color: @bg-dark-grey;
-	border-color: @view-grid-border;
-}
-#PrefNotebook .view {
-    background-color: @bg-grey;
-}
-#MainNotebook .view.cell:nth-child(2) {
-	padding: 1px 0px 1px 4px;
-}
-.view:hover {
-    background-color: @bg-list-hover;
-	color: @text-hl-color2;
-}
-#PrefNotebook .view:hover {
-    background-color: @bg-light-grey;
-	color: @text-hl-color2;
-}
-.view:selected {
-    color: @text-hl-color;
-    background-color: @accent-color;
-}
-#PrefNotebook .view:selected {
-    color: @text-hl-color;
-    background-color: @accent-color;
-}
-/*** end ***/
-
-/*** Metadata ***/
-#MetaPanelNotebook {
-	padding: 8px 11px 0;
-}
-#MetaPanelNotebook GtkScrolledWindow GtkViewport.frame {
-	padding: 8px 10px;
-}
-#MetaPanelNotebook.frame {
-	background-color: @bg-grey;
- 	border-bottom: none;
-	border-top: 4px solid @bg-dark-grey;
-	border-left: 9px solid @bg-dark-grey;
-	border-right: 9px solid @bg-dark-grey;
-}
-#MetaPanelNotebook .separator {
-	color: @border-color;
-}
-#MetaPanelNotebook.header {
-	background-color: @bg-dark-grey;
-
-}
-#MetaPanelNotebook GtkTreeView {
-	padding: 1px;
-	background-color: @bg-grey;
-}
-#MetaPanelNotebook .frame GtkTreeView {
-	padding: 0px;
-	background-color: @bg-entry-IPTC;
-}
-#MetaPanelNotebook GtkTreeView:hover,
-#MetaPanelNotebook .frame GtkTreeView:hover {
-    background-color: @bg-list-hover;
-	color: @text-hl-color;
-}
-#MetaPanelNotebook GtkTreeView:selected,
-#MetaPanelNotebook .frame GtkTreeView:selected {
-    color: @text-hl-color;
-    background-color: @accent-color;
-}
-#MetaPanelNotebook GtkTextView {
-    color: @text-color;
-    background-color: @bg-entry-IPTC;
-	padding: 2px 4px;
-}
-/*** end ***/
-
-/*** Entry ***/
-.entry {
-	background-image: none;
-	background-color: @bg-scale-entry;
-	border: 1px solid @bg-entry-border;
-	border-radius: 0;
-	padding: 2px 4px;
-	color: @text-color;
-	box-shadow: inset 0 1px rgba(0, 0, 0, 0.08), 0 1px rgba(242 , 242, 242, 0.1);
-}
-.entry:focused:selected {
-    color: @text-hl-color;
-    background-color: @accent-color;
-}
-.entry:not(:focused):not(:insensitive) {/*Workaround*/
-    color: @text-color;
-    background-color: transparent;
-}
-.entry:not(:selected):not(:insensitive) {
-    color: @text-color;
-    background-color: @bg-scale-entry;
-}
-#ToolPanelNotebook .entry {
-    padding: 0 4px 0 8px;
-	border-radius: 20px 0 0 20px;
-	background-color: rgba(255,255,255,.12);
-	border: 1px solid rgba(0,0,0,.46);
-	color: @text-tbEntry;
-	box-shadow: inset 1px  1px 0 1px rgba(0, 0, 0, 0.04), 0 1px rgba(255 , 255, 255, 0.1);
-}
-#ToolPanelNotebook .entry:focused:selected {
-    color: @text-hl-color;
-    background-color: @accent-color;
-}
-#ToolPanelNotebook .entry:not(:focused):not(:insensitive) {/*Workaround*/
-    color: @text-tbEntry;
-    background-color: transparent;
-}
-#ToolPanelNotebook  .entry:not(:selected):not(:insensitive) {
-    color: @text-tbEntry;
-    background-color: rgba(255,255,255,.12);
-}
-
-#MetaPanelNotebook .entry {
-    color: @text-color;
-    background-color: @bg-entry-IPTC;
-	border: none;
-	border-radius: 0;
-	padding: 2px 4px;
-	box-shadow: none;
-}
-#MetaPanelNotebook .entry:focused:selected {
-    color: @text-hl-color;
-    background-color: @accent-color;
-	box-shadow: none;
-}
-#MetaPanelNotebook .entry:not(:focused):not(:insensitive) {/*Workaround*/
-    color: @text-color;
-    background-color: transparent;
-	box-shadow: none;
-}
-#MetaPanelNotebook  .entry:not(:selected):not(:insensitive) {
-    color: @text-color;
-    background-color: @bg-entry-IPTC;
-	box-shadow: none;
-}
-/*** end ***/
-
-/*** Buttons ***/
-.button {
-	background-color: transparent;
-	border: 1px solid @bg-button-border;
-	border-radius: 0;
-	padding: 3px 4px;
-	box-shadow: inset 0 1px rgba(242, 242, 242, 0.1), 0 1px rgba(242, 242, 242, 0.1);
-	background-image: linear-gradient(to bottom, rgba(0,0,0,.05), rgba(0,0,0,.14) 40%, rgba(0,0,0,.28));
-}
-.button.Left + .button:not(.image-button).Right {
-	border-left: none;
-}
-GtkComboBox .button {
-	padding: 4px 3px;
-}
-#ToolPanelNotebook .button,
-GtkDialog .button {
-     padding: 0px 3px;
-}
-
-#BeforeAfterContainer .button {
-	padding: 2px;
-}
-
-	/*** Queue ***/
-#BatchQueueButtonsMainContainer .button {
-	padding: 0px 3px;
-}
-#BatchQueueButtons .button {
-	padding-top: 6px;
-	padding-bottom: 6px
-}
-	/***/
-	
-	/*** Fix: Space between first Retinex Comboboxes ***/
-GtkLabel + GtkComboBox + GtkComboBox {
-	padding-left: 4px;
-}
-
-.text-button {
-	padding: 0 2px 0 0;
-}
-#ToolPanelNotebook GtkFrame > .text-button {
-	padding: 0 5px 0 0;
-	-GtkCheckButton-indicator-spacing: 3;
-}
-
-.button.text-button {
-     padding: 5px 12px;
-}
-#ToolPanelNotebook .button.text-button,
-#PrefNotebook .button.text-button,
-GtkFileChooserWidget .button.text-button {
-     padding: 3px 4px;
-}
-
-.spinbutton .button {
-	background-image: none;
-	background-color: transparent;
-	border: none;
-	border-radius: 0;
-	padding: 2px;
-	box-shadow: none;
-}
-#ToolPanelNotebook .spinbutton .button {
-	padding: 0;
-}
-
-.button:hover {
-	background-image: linear-gradient(to bottom, rgba(0,0,0,.17), rgba(0,0,0,.27) 40%, rgba(0,0,0,.42));
-	border-color: @bg-button-border-hover;
-}
-#ToolPanelNotebook .spinbutton .button:hover {
-	background-color: @bg-spin-button-hover;
-}
-
-.button:active,
-.button:checked {
-	background-image: linear-gradient(to bottom, #292929, #242424 40%, #191919);
-	background-color: transparent;
-	border-color: black;
-}
-
-#MainNotebook > GtkGrid .button {
-	padding: 2px;
-	border: 4px solid @bg-dark-grey;
-	background-color: transparent;
-	background-image: none;
-	box-shadow: none;
-}
-#MainNotebook tab .button {
-	padding: 1px;
-	border-top: 4px solid @bg-dark-grey;
-	border-bottom: 4px solid @bg-dark-grey;
-	border-left: none;
-	border-right: none;
-	background-color: transparent;
-	background-image: none;
-	box-shadow: none;
-}
-#MainNotebook > GtkGrid .button:hover,
-#MainNotebook tab .button:hover {
-	background-color: rgba(255,255,255,.14);
-}
-#MainNotebook > GtkGrid .button:active,
-#MainNotebook tab .button:active {
-	background-color: rgba(255,255,255,.2);
-}
-.view .button {
-    background-color: #141414;
-    padding: 1px 5px 2px;
-	background-image: none;
-	border: 1px solid black;
-	box-shadow: none;
-}
-#fullButton,
-#histButton {
-	padding: 5px;
-	border: none;
-	background-color: @bg-dark-grey;
-	background-image: none;
-	box-shadow: none;
-}
-/*** end ***/
-
-/*** Check & Radio buttons ***/
-.check,
-.check row {
-	-gtk-icon-source: url("./TooWaBlueImages/TWB-checkbox-unchecked.png");
-}
-.check:checked,
-.check row:checked {
-	-gtk-icon-source: url("./TooWaBlueImages/TWB-checkbox-checked.png");
-}
-.check:insensitive,
-.check row:insensitive {
-	-gtk-icon-source: url("./TooWaBlueImages/TWB-checkbox-unchecked-d.png");
-}
-.check:checked:insensitive,
-.check row:checked:insensitive {
-	-gtk-icon-source: url("./TooWaBlueImages/TWB-checkbox-checked-d.png");
-}
-.check:inconsistent,
-.check row:inconsistent {
-	-gtk-icon-source: url("./TooWaBlueImages/TWB-checkbox-inconsistent.png");
-}
-.check:inconsistent:insensitive,
-.check row:inconsistent:insensitive {
-	-gtk-icon-source: url("./TooWaBlueImages/TWB-checkbox-inconsistent-d.png");
-}
-
-.radio,
-.radio row {
-	-gtk-icon-source: url("./TooWaBlueImages/TWB-radio-unchecked.png");
-}
-.radio:checked,
-.radio row:checked {
-	-gtk-icon-source: url("./TooWaBlueImages/TWB-radio-checked.png");
-}
-.radio:insensitive,
-.radio row:insensitive {
-	-gtk-icon-source: url("./TooWaBlueImages/TWB-radio-unchecked-d.png");
-}
-.radio:checked:insensitive,
-.radio row:checked:insensitive {
-	-gtk-icon-source: url("./TooWaBlueImages/TWB-radio-checked-d.png");
-}
-/*** end ***/
-
-/*** Disabled Items  ***/
-
-*:insensitive,
-#ToolPanelNotebook *:insensitive {
-	color: #808080;
-	box-shadow: none;
-}
-#ToolPanelNotebook .entry:insensitive {
-	color: #909090;
-	background-color: rgba(255,255,255,.04);
-	box-shadow: none;
-}
-.button:insensitive {
-	background-image: none;
-	background-color: rgba(0,0,0,.10);
-	border-color: rgba(0,0,0,.30);
-	box-shadow: none;
-}
-.spinbutton .button:insensitive {
-	background-image: none;
-	background-color: transparent;
-	border: none;
-	box-shadow: none;
-}
-.scale.slider:insensitive,
-.scale.trough.highlight:insensitive,
-.scale.trough:insensitive,
-#ToolPanelNotebook .scale.slider:insensitive,
-#ToolPanelNotebook .scale.trough.highlight:insensitive,
-#ToolPanelNotebook .scale.trough:insensitive {
-	background-color: #414141;
-	box-shadow: none;
-}
-/*** end ***/
-
diff --git a/rtdata/themes/TooWaBlueImages/TWB-checkbox-checked-d.png b/rtdata/themes/TooWaBlueImages/TWB-checkbox-checked-d.png
deleted file mode 100644
index 9b88e995f..000000000
Binary files a/rtdata/themes/TooWaBlueImages/TWB-checkbox-checked-d.png and /dev/null differ
diff --git a/rtdata/themes/TooWaBlueImages/TWB-checkbox-checked.png b/rtdata/themes/TooWaBlueImages/TWB-checkbox-checked.png
deleted file mode 100644
index f762794af..000000000
Binary files a/rtdata/themes/TooWaBlueImages/TWB-checkbox-checked.png and /dev/null differ
diff --git a/rtdata/themes/TooWaBlueImages/TWB-checkbox-inconsistent-d.png b/rtdata/themes/TooWaBlueImages/TWB-checkbox-inconsistent-d.png
deleted file mode 100644
index d2d73953e..000000000
Binary files a/rtdata/themes/TooWaBlueImages/TWB-checkbox-inconsistent-d.png and /dev/null differ
diff --git a/rtdata/themes/TooWaBlueImages/TWB-checkbox-inconsistent.png b/rtdata/themes/TooWaBlueImages/TWB-checkbox-inconsistent.png
deleted file mode 100644
index 82e5ce97f..000000000
Binary files a/rtdata/themes/TooWaBlueImages/TWB-checkbox-inconsistent.png and /dev/null differ
diff --git a/rtdata/themes/TooWaBlueImages/TWB-checkbox-unchecked-d.png b/rtdata/themes/TooWaBlueImages/TWB-checkbox-unchecked-d.png
deleted file mode 100644
index 1ce836ee4..000000000
Binary files a/rtdata/themes/TooWaBlueImages/TWB-checkbox-unchecked-d.png and /dev/null differ
diff --git a/rtdata/themes/TooWaBlueImages/TWB-checkbox-unchecked.png b/rtdata/themes/TooWaBlueImages/TWB-checkbox-unchecked.png
deleted file mode 100644
index 924ae9789..000000000
Binary files a/rtdata/themes/TooWaBlueImages/TWB-checkbox-unchecked.png and /dev/null differ
diff --git a/rtdata/themes/TooWaBlueImages/TWB-radio-checked-d.png b/rtdata/themes/TooWaBlueImages/TWB-radio-checked-d.png
deleted file mode 100644
index c9f923ab2..000000000
Binary files a/rtdata/themes/TooWaBlueImages/TWB-radio-checked-d.png and /dev/null differ
diff --git a/rtdata/themes/TooWaBlueImages/TWB-radio-checked.png b/rtdata/themes/TooWaBlueImages/TWB-radio-checked.png
deleted file mode 100644
index f4d64a5f0..000000000
Binary files a/rtdata/themes/TooWaBlueImages/TWB-radio-checked.png and /dev/null differ
diff --git a/rtdata/themes/TooWaBlueImages/TWB-radio-unchecked-d.png b/rtdata/themes/TooWaBlueImages/TWB-radio-unchecked-d.png
deleted file mode 100644
index 6aa75a7a6..000000000
Binary files a/rtdata/themes/TooWaBlueImages/TWB-radio-unchecked-d.png and /dev/null differ
diff --git a/rtdata/themes/TooWaBlueImages/TWB-radio-unchecked.png b/rtdata/themes/TooWaBlueImages/TWB-radio-unchecked.png
deleted file mode 100644
index 0e08dd23f..000000000
Binary files a/rtdata/themes/TooWaBlueImages/TWB-radio-unchecked.png and /dev/null differ
diff --git a/rtdata/themes/images/svg/twb/checkbox-checked.file b/rtdata/themes/images/svg/twb/checkbox-checked.file
new file mode 100644
index 000000000..e73336e49
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/checkbox-checked.file
@@ -0,0 +1 @@
+checkbox-checked.png,w16,actions
diff --git a/rtdata/themes/images/svg/twb/checkbox-checked.svg b/rtdata/themes/images/svg/twb/checkbox-checked.svg
new file mode 100644
index 000000000..dfb8cdb1d
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/checkbox-checked.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg6018"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="checkbox-checked.svg"
+   inkscape:export-filename="/tmp/16.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs6020" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="68.999862"
+     inkscape:cx="7.9999989"
+     inkscape:cy="8.500013"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:showpageshadow="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     units="px"
+     inkscape:snap-bbox="false"
+     inkscape:snap-midpoints="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-grids="true"
+     inkscape:bbox-paths="false"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-intersection-paths="false"
+     inkscape:object-paths="false"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-nodes="true">
+    <sodipodi:guide
+       position="8,15"
+       orientation="0,1"
+       id="guide6035"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="8,1"
+       orientation="0,1"
+       id="guide6037"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="1,8"
+       orientation="1,0"
+       id="guide6039"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="15,8"
+       orientation="1,0"
+       id="guide6041"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid6611"
+       enabled="true"
+       visible="true"
+       empspacing="8"
+       color="#ff0000"
+       opacity="0.1254902"
+       originx="0"
+       dotted="false"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6023">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       d="m 13.5,1043.3622 0,6.5 -12,0 0,-12 0,0 7.5,0"
+       id="path6609"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2.19409847;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-mid:none;enable-background:accumulate"
+       d="m 3.960076,1041.2107 3.5956705,3.5958 6.6685155,-6.6686"
+       id="path5910-7"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/tmp/16.png"
+       inkscape:export-xdpi="1.4400001"
+       inkscape:export-ydpi="1.4400001" />
+  </g>
+</svg>
diff --git a/rtdata/themes/images/svg/twb/checkbox-inconsistent.file b/rtdata/themes/images/svg/twb/checkbox-inconsistent.file
new file mode 100644
index 000000000..3cf556015
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/checkbox-inconsistent.file
@@ -0,0 +1 @@
+checkbox-inconsistent.png,w16,actions
diff --git a/rtdata/themes/images/svg/twb/checkbox-inconsistent.svg b/rtdata/themes/images/svg/twb/checkbox-inconsistent.svg
new file mode 100644
index 000000000..6f84862ab
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/checkbox-inconsistent.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg6018"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="checkbox-inconsistent.svg"
+   inkscape:export-filename="/tmp/16.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs6020" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="64"
+     inkscape:cx="6.7252931"
+     inkscape:cy="7.5150551"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:showpageshadow="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     units="px"
+     inkscape:snap-bbox="false"
+     inkscape:snap-midpoints="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-grids="true"
+     inkscape:bbox-paths="false"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-intersection-paths="false"
+     inkscape:object-paths="false"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-nodes="true">
+    <sodipodi:guide
+       position="8,15"
+       orientation="0,1"
+       id="guide6035"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="8,1"
+       orientation="0,1"
+       id="guide6037"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="1,8"
+       orientation="1,0"
+       id="guide6039"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="15,8"
+       orientation="1,0"
+       id="guide6041"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid6611"
+       enabled="true"
+       visible="true"
+       empspacing="8"
+       color="#ff0000"
+       opacity="0.1254902"
+       originx="0"
+       dotted="false"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6023">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 5,1041.3622 0,5 5,0 0,-5 z"
+       id="path5910-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <rect
+       ry="0"
+       y="1037.8622"
+       x="1.5"
+       height="11.999906"
+       width="11.999984"
+       id="rect6602"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/rtdata/themes/images/svg/twb/checkbox-unchecked.file b/rtdata/themes/images/svg/twb/checkbox-unchecked.file
new file mode 100644
index 000000000..830b9580f
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/checkbox-unchecked.file
@@ -0,0 +1 @@
+checkbox-unchecked.png,w16,actions
diff --git a/rtdata/themes/images/svg/twb/checkbox-unchecked.svg b/rtdata/themes/images/svg/twb/checkbox-unchecked.svg
new file mode 100644
index 000000000..fbff9883e
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/checkbox-unchecked.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg6018"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="checkbox-unchecked.svg"
+   inkscape:export-filename="/tmp/16.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs6020" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="69.000501"
+     inkscape:cx="7.4999919"
+     inkscape:cy="8.5000646"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:showpageshadow="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     units="px"
+     inkscape:snap-bbox="false"
+     inkscape:snap-midpoints="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-grids="true"
+     inkscape:bbox-paths="false"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-intersection-paths="false"
+     inkscape:object-paths="false"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-nodes="true">
+    <sodipodi:guide
+       position="8,15"
+       orientation="0,1"
+       id="guide6035"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="8,1"
+       orientation="0,1"
+       id="guide6037"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="1,8"
+       orientation="1,0"
+       id="guide6039"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="15,8"
+       orientation="1,0"
+       id="guide6041"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid6611"
+       enabled="true"
+       visible="true"
+       empspacing="8"
+       color="#ff0000"
+       opacity="0.1254902"
+       originx="0"
+       dotted="false"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6023">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       ry="0"
+       y="1037.8622"
+       x="1.5"
+       height="11.999906"
+       width="11.999984"
+       id="rect6602"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/rtdata/themes/images/svg/twb/radio-checked.file b/rtdata/themes/images/svg/twb/radio-checked.file
new file mode 100644
index 000000000..c6fda7ded
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/radio-checked.file
@@ -0,0 +1 @@
+radio-checked.png,w16,actions
diff --git a/rtdata/themes/images/svg/twb/radio-checked.svg b/rtdata/themes/images/svg/twb/radio-checked.svg
new file mode 100644
index 000000000..338a9927a
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/radio-checked.svg
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg6018"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="radio-checked.svg"
+   inkscape:export-filename="/tmp/16.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs6020" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="69.000182"
+     inkscape:cx="7.5000086"
+     inkscape:cy="8.5000174"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:showpageshadow="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     units="px"
+     inkscape:snap-bbox="false"
+     inkscape:snap-midpoints="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-grids="true"
+     inkscape:bbox-paths="false"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-intersection-paths="false"
+     inkscape:object-paths="false"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-nodes="true">
+    <sodipodi:guide
+       position="8,15"
+       orientation="0,1"
+       id="guide6035"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="8,1"
+       orientation="0,1"
+       id="guide6037"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="1,8"
+       orientation="1,0"
+       id="guide6039"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="15,8"
+       orientation="1,0"
+       id="guide6041"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid6611"
+       enabled="true"
+       visible="true"
+       empspacing="8"
+       color="#ff0000"
+       opacity="0.1254902"
+       originx="0"
+       dotted="false"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6023">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <circle
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path6734"
+       cx="7.5000086"
+       cy="1043.8622"
+       r="5.9999828" />
+    <circle
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path6736"
+       r="2.4999826"
+       cy="1043.8622"
+       cx="7.5" />
+  </g>
+</svg>
diff --git a/rtdata/themes/images/svg/twb/radio-inconsistent.file b/rtdata/themes/images/svg/twb/radio-inconsistent.file
new file mode 100644
index 000000000..811aad4e3
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/radio-inconsistent.file
@@ -0,0 +1 @@
+radio-inconsistent.png,w16,actions
diff --git a/rtdata/themes/images/svg/twb/radio-inconsistent.svg b/rtdata/themes/images/svg/twb/radio-inconsistent.svg
new file mode 100644
index 000000000..45da3f39e
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/radio-inconsistent.svg
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg6018"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="radio-inconsistent.svg"
+   inkscape:export-filename="/tmp/16.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs6020" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="69.000182"
+     inkscape:cx="7.5000086"
+     inkscape:cy="8.5000174"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:showpageshadow="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     units="px"
+     inkscape:snap-bbox="false"
+     inkscape:snap-midpoints="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-grids="true"
+     inkscape:bbox-paths="false"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-intersection-paths="false"
+     inkscape:object-paths="false"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-nodes="true">
+    <sodipodi:guide
+       position="8,15"
+       orientation="0,1"
+       id="guide6035"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="8,1"
+       orientation="0,1"
+       id="guide6037"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="1,8"
+       orientation="1,0"
+       id="guide6039"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="15,8"
+       orientation="1,0"
+       id="guide6041"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid6611"
+       enabled="true"
+       visible="true"
+       empspacing="8"
+       color="#ff0000"
+       opacity="0.1254902"
+       originx="0"
+       dotted="false"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6023">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <circle
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path6734"
+       cx="7.5000086"
+       cy="1043.8622"
+       r="5.9999828" />
+    <circle
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path6736"
+       r="2.4999826"
+       cy="1043.8622"
+       cx="7.5" />
+  </g>
+</svg>
diff --git a/rtdata/themes/images/svg/twb/radio-unchecked.file b/rtdata/themes/images/svg/twb/radio-unchecked.file
new file mode 100644
index 000000000..bc2ab4d30
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/radio-unchecked.file
@@ -0,0 +1 @@
+radio-unchecked.png,w16,actions
diff --git a/rtdata/themes/images/svg/twb/radio-unchecked.svg b/rtdata/themes/images/svg/twb/radio-unchecked.svg
new file mode 100644
index 000000000..07e824660
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/radio-unchecked.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg6018"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="radio-unchecked.svg"
+   inkscape:export-filename="/tmp/16.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs6020" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="56.0625"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:showpageshadow="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     units="px"
+     inkscape:snap-bbox="false"
+     inkscape:snap-midpoints="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-grids="true"
+     inkscape:bbox-paths="false"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-intersection-paths="false"
+     inkscape:object-paths="false"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-nodes="true">
+    <sodipodi:guide
+       position="8,15"
+       orientation="0,1"
+       id="guide6035"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="8,1"
+       orientation="0,1"
+       id="guide6037"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="1,8"
+       orientation="1,0"
+       id="guide6039"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="15,8"
+       orientation="1,0"
+       id="guide6041"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid6611"
+       enabled="true"
+       visible="true"
+       empspacing="8"
+       color="#ff0000"
+       opacity="0.1254902"
+       originx="0"
+       dotted="false"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6023">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <circle
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path6734"
+       cx="7.5000086"
+       cy="1043.8622"
+       r="5.9999828" />
+  </g>
+</svg>
diff --git a/rtdata/themes/images/twb/checkbox-checked-disabled.png b/rtdata/themes/images/twb/checkbox-checked-disabled.png
new file mode 100644
index 000000000..e7f38c713
Binary files /dev/null and b/rtdata/themes/images/twb/checkbox-checked-disabled.png differ
diff --git a/rtdata/themes/images/twb/checkbox-checked.png b/rtdata/themes/images/twb/checkbox-checked.png
new file mode 100644
index 000000000..50958a578
Binary files /dev/null and b/rtdata/themes/images/twb/checkbox-checked.png differ
diff --git a/rtdata/themes/images/twb/checkbox-inconsistent-disabled.png b/rtdata/themes/images/twb/checkbox-inconsistent-disabled.png
new file mode 100644
index 000000000..3391c847a
Binary files /dev/null and b/rtdata/themes/images/twb/checkbox-inconsistent-disabled.png differ
diff --git a/rtdata/themes/images/twb/checkbox-inconsistent.png b/rtdata/themes/images/twb/checkbox-inconsistent.png
new file mode 100644
index 000000000..d235d9bb1
Binary files /dev/null and b/rtdata/themes/images/twb/checkbox-inconsistent.png differ
diff --git a/rtdata/themes/images/twb/checkbox-unchecked-disabled.png b/rtdata/themes/images/twb/checkbox-unchecked-disabled.png
new file mode 100644
index 000000000..9a9dec468
Binary files /dev/null and b/rtdata/themes/images/twb/checkbox-unchecked-disabled.png differ
diff --git a/rtdata/themes/images/twb/checkbox-unchecked.png b/rtdata/themes/images/twb/checkbox-unchecked.png
new file mode 100644
index 000000000..82ff8d595
Binary files /dev/null and b/rtdata/themes/images/twb/checkbox-unchecked.png differ
diff --git a/rtdata/themes/images/twb/radio-checked-disabled.png b/rtdata/themes/images/twb/radio-checked-disabled.png
new file mode 100644
index 000000000..439c99845
Binary files /dev/null and b/rtdata/themes/images/twb/radio-checked-disabled.png differ
diff --git a/rtdata/themes/images/twb/radio-checked.png b/rtdata/themes/images/twb/radio-checked.png
new file mode 100644
index 000000000..a18c5d57b
Binary files /dev/null and b/rtdata/themes/images/twb/radio-checked.png differ
diff --git a/rtdata/themes/images/twb/radio-inconsistent-disabled.png b/rtdata/themes/images/twb/radio-inconsistent-disabled.png
new file mode 100644
index 000000000..6fd7019d0
Binary files /dev/null and b/rtdata/themes/images/twb/radio-inconsistent-disabled.png differ
diff --git a/rtdata/themes/images/twb/radio-inconsistent.png b/rtdata/themes/images/twb/radio-inconsistent.png
new file mode 100644
index 000000000..a983331e1
Binary files /dev/null and b/rtdata/themes/images/twb/radio-inconsistent.png differ
diff --git a/rtdata/themes/images/twb/radio-unchecked-disabled.png b/rtdata/themes/images/twb/radio-unchecked-disabled.png
new file mode 100644
index 000000000..6f2cea18e
Binary files /dev/null and b/rtdata/themes/images/twb/radio-unchecked-disabled.png differ
diff --git a/rtdata/themes/images/twb/radio-unchecked.png b/rtdata/themes/images/twb/radio-unchecked.png
new file mode 100644
index 000000000..aba74b65b
Binary files /dev/null and b/rtdata/themes/images/twb/radio-unchecked.png differ