diff --git a/rtdata/themes/TooWaBlue.css b/rtdata/themes/TooWaBlue.css
index ace83aa01..24442aae3 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.19.3)
+  Copyright (c) 2016 TooWaBoo (v1.19.4)
   Many thanks to the RawTherapee Developer Team for this great piece of software
 
   RawTherapee is free software: you can redistribute it and/or modify
@@ -31,12 +31,12 @@
 
 /*** Change me end ************************************************************************/
 
-@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 #464646;
-@define-color bg-light-grey #585858;
+@define-color text-color rgb(180,180,180);
+@define-color text-hl-color2 rgb(192,192,192);
+@define-color text-tbEntry rgb(192,192,192);
+@define-color bg-dark-grey rgb(36,36,36);
+@define-color bg-grey rgb(70,70,70);
+@define-color bg-light-grey rgb(88,88,88);
 @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);
@@ -46,7 +46,7 @@
 @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;
+@define-color view-grid-border rgb(64,64,64);
 
 * {
     color: @text-color;
@@ -176,7 +176,7 @@ GtkDrawingArea {
 }
 /*** Histogram RGB-Bar***/
 #HistogramRGBArea {
-    background-color: #808080;
+    background-color: rgb(128,128,128);
     border: none;
 }
 /*** Navigator ***/
@@ -246,10 +246,10 @@ GtkDialog .label,
     padding: 8px 10px;
 }
 #PartialPasteHeaderSep {
-    color: #C0C0C0;
+    color: rgb(192,192,192);
 }
 #PartialPasteHeader .label {
-    color: #D5D5D5;
+    color: rgb(213,213,213);
 }
 /*** end ***/
 
@@ -460,7 +460,8 @@ GtkFileChooserWidget .button GtkImage{
 #ToolPanelNotebook .separator {
     color: transparent;
 }
-#ToolPanelNotebook GtkFrame, #PrefNotebook GtkFrame {
+#ToolPanelNotebook GtkFrame,
+#PrefNotebook GtkFrame {
     border: 1px solid @border-color;
     border-radius: 0;
     padding: 5px;
@@ -475,11 +476,15 @@ GtkFileChooserWidget .button GtkImage{
     border-radius: 1px; /* BUG: if 0, scale mini sliders look funny */
 }
 
-#ExpanderBox #ExpanderBox, #ExpanderBox2, #ExpanderBox3 {
+#ExpanderBox #ExpanderBox,
+#ExpanderBox2,
+#ExpanderBox3 {
     border: 1px solid @border-color;
 }
 
-#ExpanderBox, #ExpanderBox2, #ExpanderBox3 {
+#ExpanderBox,
+#ExpanderBox2,
+#ExpanderBox3 {
     background-color: @bg-grey;
     border-radius: 0;
 }
@@ -720,7 +725,7 @@ GtkPopover .button.text-button {
 
 .button:active,
 .button:checked {
-    background-image: linear-gradient(to bottom, #292929, #252525 40%, #191919);
+    background-image: linear-gradient(to bottom, rgb(41,41,41), rgb(37,37,37) 40%, rgb(25,25,25));
     background-color: transparent;
     border-color: black;
 }
@@ -755,7 +760,7 @@ GtkPopover .button.text-button {
     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: #141414;
+    background-color: rgb(20,20,20);
     padding: 1px 5px 2px;
     background-image: none;
     border-color: black;
@@ -763,7 +768,7 @@ GtkPopover .button.text-button {
 }
 .menu .button.bottom,
 .menu .button.bottom:insensitive {
-    background-color: #141414;
+    background-color: rgb(20,20,20);
     border-color: @accent-color;
     border-width: 0 1px 1px 1px;
     background-image: none;
@@ -771,7 +776,7 @@ GtkPopover .button.text-button {
 }
 .menu .button.top,
 .menu .button.top:insensitive {
-    background-color: #141414;
+    background-color: rgb(20,20,20);
     border-color: @accent-color;
     border-width: 1px 1px 0 1px;
     background-image: none;
@@ -843,11 +848,11 @@ GtkPopover .button.text-button {
 
 *:insensitive,
 #ToolPanelNotebook *:insensitive {
-    color: #808080;
+    color: rgb(128,128,128);
     box-shadow: none;
 }
 #ToolPanelNotebook .entry:insensitive {
-    color: #909090;
+    color: rgb(144,144,144);
     background-color: rgba(255,255,255,.06);
     box-shadow: none;
 }
@@ -869,7 +874,7 @@ GtkPopover .button.text-button {
 #ToolPanelNotebook .scale.slider:insensitive,
 #ToolPanelNotebook .scale.trough.highlight:insensitive,
 #ToolPanelNotebook .scale.trough:insensitive {
-    background-color: #414141;
+    background-color: rgb(65,65,65);
     box-shadow: none;
     background-image: none;
 }
diff --git a/rtdata/themes/images/svg/twb/checkbox-checked-disabled.svg b/rtdata/themes/images/svg/twb/checkbox-checked-disabled.svg
index 351c07d88..1103ee917 100644
--- a/rtdata/themes/images/svg/twb/checkbox-checked-disabled.svg
+++ b/rtdata/themes/images/svg/twb/checkbox-checked-disabled.svg
@@ -107,7 +107,7 @@
      id="layer1"
      transform="translate(0,-1036.3622)">
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;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"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:1.2;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"
diff --git a/rtdata/themes/images/svg/twb/checkbox-checked.svg b/rtdata/themes/images/svg/twb/checkbox-checked.svg
index 502d48b05..c7d28d45d 100644
--- a/rtdata/themes/images/svg/twb/checkbox-checked.svg
+++ b/rtdata/themes/images/svg/twb/checkbox-checked.svg
@@ -29,7 +29,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="56.0625"
-     inkscape:cx="8"
+     inkscape:cx="7.9821628"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -107,7 +107,7 @@
      id="layer1"
      transform="translate(0,-1036.3622)">
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#b4b4b4;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"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#b4b4b4;stroke-width:1.2;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"
diff --git a/rtdata/themes/images/svg/twb/checkbox-inconsistent-disabled.svg b/rtdata/themes/images/svg/twb/checkbox-inconsistent-disabled.svg
index b79b0e40c..ee55c4f6f 100644
--- a/rtdata/themes/images/svg/twb/checkbox-inconsistent-disabled.svg
+++ b/rtdata/themes/images/svg/twb/checkbox-inconsistent-disabled.svg
@@ -29,7 +29,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="56.0625"
-     inkscape:cx="8"
+     inkscape:cx="5.039019"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -97,7 +97,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -119,6 +119,6 @@
        height="11.999906"
        width="11.999984"
        id="rect6602"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;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" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:1.2;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-inconsistent.svg b/rtdata/themes/images/svg/twb/checkbox-inconsistent.svg
index f1a6dcd1e..e0f5bd362 100644
--- a/rtdata/themes/images/svg/twb/checkbox-inconsistent.svg
+++ b/rtdata/themes/images/svg/twb/checkbox-inconsistent.svg
@@ -29,7 +29,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="56.0625"
-     inkscape:cx="8"
+     inkscape:cx="5.039019"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -119,6 +119,6 @@
        height="11.999906"
        width="11.999984"
        id="rect6602"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#b4b4b4;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" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#b4b4b4;stroke-width:1.2;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-disabled.svg b/rtdata/themes/images/svg/twb/checkbox-unchecked-disabled.svg
index b3510bddb..635dae59b 100644
--- a/rtdata/themes/images/svg/twb/checkbox-unchecked-disabled.svg
+++ b/rtdata/themes/images/svg/twb/checkbox-unchecked-disabled.svg
@@ -29,7 +29,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="56.0625"
-     inkscape:cx="8"
+     inkscape:cx="5.039019"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -97,7 +97,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -113,6 +113,6 @@
        height="11.999906"
        width="11.999984"
        id="rect6602"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;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" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:1.2;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.svg b/rtdata/themes/images/svg/twb/checkbox-unchecked.svg
index 832c403ad..0adfe66cc 100644
--- a/rtdata/themes/images/svg/twb/checkbox-unchecked.svg
+++ b/rtdata/themes/images/svg/twb/checkbox-unchecked.svg
@@ -29,7 +29,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="56.0625"
-     inkscape:cx="8"
+     inkscape:cx="5.039019"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -113,6 +113,6 @@
        height="11.999906"
        width="11.999984"
        id="rect6602"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#b4b4b4;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" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#b4b4b4;stroke-width:1.2;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/twb/checkbox-checked-disabled.png b/rtdata/themes/images/twb/checkbox-checked-disabled.png
index f6932b773..8458b5987 100644
Binary files a/rtdata/themes/images/twb/checkbox-checked-disabled.png 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
index 358fc65b8..83d3744d3 100644
Binary files a/rtdata/themes/images/twb/checkbox-checked.png 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
index 0c5ded4be..96c5fbe5f 100644
Binary files a/rtdata/themes/images/twb/checkbox-inconsistent-disabled.png 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
index 55244d970..373f218be 100644
Binary files a/rtdata/themes/images/twb/checkbox-inconsistent.png 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
index bae70a681..985dd07cc 100644
Binary files a/rtdata/themes/images/twb/checkbox-unchecked-disabled.png 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
index 3527176be..747a9c8c3 100644
Binary files a/rtdata/themes/images/twb/checkbox-unchecked.png and b/rtdata/themes/images/twb/checkbox-unchecked.png differ