diff --git a/rtdata/themes/TooWaBlue-Dark-GTK3-20_.css b/rtdata/themes/TooWaBlue-Dark-GTK3-20_.css
index 12e4383cb..9b1a9466f 100644
--- a/rtdata/themes/TooWaBlue-Dark-GTK3-20_.css
+++ b/rtdata/themes/TooWaBlue-Dark-GTK3-20_.css
@@ -2,7 +2,7 @@
   This file is part of RawTherapee.
 
   Copyright (c) 2016 TooWaBoo
-  Version 2.28 - requires RT 4.2.1445 or higher
+  Version 2.31 - requires RT 4.2.1445 or higher
 
   RawTherapee is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -215,27 +215,31 @@ frame > checkbutton label{
 /*** end ***************************************************************************************/
 
 /*** Lists & Views *****************************************************************************/
-.view {
+textview.view, treeview.view {
     background-color: @bg-dark-grey;
     border-color: @view-grid-border;
-    padding: 2px;
+    padding: 1px;
     margin: 0;
 }
-.view:hover {
+#RightNotebook > stack > :nth-child(3) treeview {
+    border: 1px solid @bg-dark-grey;
+    border-bottom: none;
+}
+#PrefNotebook textview:selected:hover, #PrefNotebook treeview:selected:hover,
+textview:hover, treeview:hover {
     background-color: @bg-list-hover;
 }
-.view:selected {
+textview:selected, treeview:selected {
     color: @text-hl-color;
     background-color: @accent-color;
-    border-color: transparent;
+    border-top-color: transparent;
+}
+#PrefNotebook textview:selected, #PrefNotebook treeview:selected {
+    color: @text-color;
+    background-color: @bg-dark-grey;
 }
 
-#PrefNotebook .view {
-    min-height: 12px;
-    padding: 1px;
-}
-
-#PlacesPaned .view {
+#PlacesPaned treeview {
     padding-left: 5px;
     padding-right: 0;
     -gtk-icon-style: symbolic;
@@ -299,11 +303,15 @@ filechooser * {
 }
 filechooser #pathbarbox {
     border: none;
+    background-color: @bg-dark-grey;
 }
 
 filechooser box {
     border-color: transparent;
 }
+filechooser > box > paned > box {
+    border: 1px solid @bg-dark-grey;
+}
 
 filechooser placessidebar {
     padding: 0 1px;
@@ -319,7 +327,7 @@ filechooser list {
 }
 filechooser list row {
     margin: 0;
-    min-height: 25px;
+    min-height: 23px;
 }
 filechooser list row label{
     margin: 0;
@@ -375,7 +383,7 @@ separator {
 }
 grid separator.horizontal, box separator.horizontal {
     margin: 2px 0;
-    padding: 0
+    padding: 0;
 }
 grid separator.vertical, box separator.vertical {
     margin: 0 3px;
@@ -475,7 +483,7 @@ menu separator {
 /*** Scrollbar *********************************************************************************/
 scrollbar {
     background-color: rgba(0,0,0,.30);
-    border: none;
+    border: none;margin: 0;
 }
 scrollbar slider {
     background-color: @text-color;
@@ -542,7 +550,7 @@ scale:disabled trough {
 /*** Progressbar *******************************************************************************/
 progressbar.vertical {
     min-width: 0;
-    margin-right: 6px
+    margin-right: 7px;
 }
 progressbar.vertical text {
     color: transparent;
@@ -618,19 +626,24 @@ notebook header.left {
 notebook tabs {
     background-color: transparent;
 }
-notebook tab {
+notebook header tab {
     background-color: transparent;
     margin: 5px;
+    padding: 0 4px;
+}
+notebook header.left tab {
+    padding: 4px 0;
 }
 notebook header tab > grid > image {
     min-height: 28px;
     min-width: 0;
-    padding: 0 3px;
+    padding: 0 2px 0 0;
+    margin: 0;
 }
 notebook header.left tab > grid > image {
     min-height: 0;
     min-width: 28px;
-    padding: 3px 0;
+    padding: 2px 0 0;
 }
 notebook header tab label {
     margin: 3px;
@@ -691,13 +704,19 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
 }
 /**/
 
-#ToolPanelNotebook > header tab image {
-    min-height: 28px;
-    min-width: 30px;
-}
 #ToolPanelNotebook > header tabs {
     margin-bottom: 3px;
 }
+#ToolPanelNotebook > header tab {
+    margin: 5px 3px;
+    padding: 0 5px;
+}
+#ToolPanelNotebook > header tab image{
+    min-height: 30px;
+    min-width: 0;
+    padding: 0;
+    margin: 0;
+}
 
 #RightNotebook {
     margin: 5px 0 0 0;
@@ -774,18 +793,27 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
     padding: 0 4px;
     background-color: @bg-dark-grey;
     margin: 0;
+    border-radius: 0;
 }
 
 #MetaPanelNotebook > stack > box:nth-child(2) > scrolledwindow scrolledwindow {
     background-color: @bg-dark-grey;
     padding: 0;
     margin: 0;
-    border-radius: 2px;
 }
-#MetaPanelNotebook textview,
-#MetaPanelNotebook text {
+#MetaPanelNotebook .view {
+    border: 1px solid @bg-dark-grey;
+    padding: 2px;
+    margin: 0;
+}
+#MetaPanelNotebook textview.view {
     background-color: @bg-dark-grey;
-    padding: 2px 5px;
+    padding: 1px 4px;
+    margin: 0;
+}
+#MetaPanelNotebook text {
+    background-color: transparent;
+    padding: 0;
     margin: 0;
 }
 
@@ -823,18 +851,6 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
     margin: 5px 0 0;
 }
 
-#FileBrowser entry + button {
-    margin: 0 0 0 2px;
-    padding: 2px;
-}
-#FileBrowser entry + button,
-#FileBrowser entry {
-    min-height: 15px;
-    min-width: 15px;
-}
-#FileBrowser label {
-    margin: 0 4px 0 10px;
-}
 #ToolBarPanelFileBrowser {
     margin: 3px -1px;
     min-height: 0;
@@ -855,6 +871,26 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
     background-image: none;
     box-shadow: none;
 }
+
+#ToolBarPanelFileBrowser entry + button.flat,
+#FileBrowser entry + button.flat {
+    min-height: 20px;
+    min-width: 19px;
+    margin: 0 0 0 -20px;
+    border-radius: 0 2px 2px 0;
+    border: 1px solid transparent;
+}
+#ToolBarPanelFileBrowser entry,
+#FileBrowser entry {
+    min-height: 20px;
+    min-width: 144px;
+    margin: 0 -1px 0 0;
+    padding: 0 24px 0 4px;
+}
+#ToolBarPanelFileBrowser label,
+#FileBrowser label {
+    margin: 0 4px 0 6px;
+}
 /*** end ***************************************************************************************/
 
 /*** Image Editor ******************************************************************************/
@@ -996,7 +1032,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
     border: none;
     border-radius: 0;
     margin: 0;
-    padding: 7px;
+    padding: 6px;
 }
 
     /* Sub-tool (MyExpander) */
@@ -1183,6 +1219,8 @@ scale + button.flat {
 }
 /**/
 
+#ToolBarPanelFileBrowser entry + button:hover,
+#FileBrowser entry + button:hover,
 button.flat:hover,
 button:hover  {
     border: 1px solid @bg-button-border;
@@ -1191,6 +1229,8 @@ button:hover  {
     background-color: @bg-button-hover;
 }
 
+#ToolBarPanelFileBrowser entry + button:active,
+#FileBrowser entry + button:active,
 button.flat:active,
 button.flat:checked,
 button:active,
@@ -1299,6 +1339,10 @@ dialog combobox .combo,
     min-width: 0;
 }
 
+button.color {
+    padding: 3px;
+}
+
 /* Save, Cancel, OK ... buttons */
 .dialog-action-area button {
     min-height: 26px;
@@ -1438,7 +1482,7 @@ messagedialog headerbar button.titlebutton {
 
 #MainNotebook tab #CloseButton {
     padding: 0;
-    margin: 4px 1px;
+    margin: 4px -3px 4px 1px;
     min-height: 18px;
     min-width: 18px;
 }
@@ -1486,104 +1530,63 @@ radiobutton {
     min-height: 16px;
 }
 check,
-check row,
-radio,
-radio row {
-    border: none;
+radio {
+    border: 1.16px solid shade(@text-color, .9);
     background-image: none;
-    border-radius: 0;
+    background-color: transparent;
     margin: 0;
     padding: 0;
-    min-height: 16px;
+    min-height: 14px;
     min-width: 14px;
     box-shadow: none;
-    -gtk-icon-source: none;
     background-repeat: no-repeat;
+    -gtk-icon-shadow: none;
 }
-
 radiobutton label,
 checkbutton label {
     margin: 0 6px 0 6px;
     padding: 0;
 }
-frame > checkbutton check{
-    margin-left: 6px;
-    padding: 0;
+check,
+check:indeterminate {
+    border-radius: 2px;
+}
+check:checked {
+    padding: 0 2px 0 0;
+    min-width: 12px;
+}
+radio{
+    border-radius: 20px;
+}
+check:disabled,
+radio:disabled {
+    border-color: rgb(120,120,120);
 }
 
-#PartialPaste checkbutton {
-    padding: 0;
+frame > checkbutton check{
+    margin-left: 6px;
 }
-#PartialPaste check {
+
+#PartialPaste checkbutton:not(#PartialPasteHeader) {
+    padding: 0;
     margin-left: 14px;
 }
-#PartialPasteHeader check {
+#PartialPasteHeader {
     margin-left: 6px;
 }
 #PrefNotebook checkbutton {
     padding: 0;
 }
+#PrefNotebook radiobutton,
 #PrefNotebook stack > box:nth-child(3) checkbutton,
 #PrefNotebook stack > box:nth-child(4) checkbutton {
     padding: 3px 0;
 }
-#PrefNotebook radiobutton {
-    padding: 3px 0;
-}
-/* What a lousy checkbox without label in White Picture :-) */
+
 #MyExpander button + checkbutton:last-child {
     margin-left: 4px;
 }
 
-check,
-check row {
-    background-image: url("images/twb/checkbox-unchecked.png");
-}
-check:checked,
-check row:checked {
-    background-image: url("images/twb/checkbox-checked.png");
-}
-check:disabled,
-check row:disabled {
-    background-image: url("images/twb/checkbox-unchecked-disabled.png");
-}
-check:checked:disabled,
-check row:checked:disabled {
-    background-image: url("images/twb/checkbox-checked-disabled.png");
-}
-check:indeterminate,
-check row:indeterminate {
-    background-image: url("images/twb/checkbox-inconsistent.png");
-}
-check:indeterminate:disabled,
-check row:indeterminate:disabled {
-    background-image: url("images/twb/checkbox-inconsistent-disabled.png");
-}
-
-radio,
-radio row {
-    background-image: url("images/twb/radio-unchecked.png");
-}
-radio:checked,
-radio row:checked {
-    background-image: url("images/twb/radio-checked.png");
-}
-radio:disabled,
-radio row:disabled {
-    background-image: url("images/twb/radio-unchecked-disabled.png");
-}
-radio:checked:disabled,
-radio row:checked:disabled {
-    background-image: url("images/twb/radio-checked-disabled.png");
-}
-radio:indeterminate,
-radio row:indeterminate {
-    background-image: url("images/twb/radio-inconsistent.png");
-}
-radio:indeterminate:disabled,
-radio row:indeterminate:disabled {
-    background-image: url("images/twb/radio-inconsistent-disabled.png");
-}
 /*** end ***************************************************************************************/
 
 /*** Entry & Spinbutton ************************************************************************/
@@ -1621,6 +1624,7 @@ spinbutton {
     color: @text-tbEntry;
     box-shadow: inset 1px  1px rgba(0, 0, 0, .12), 0 1px rgba(255 , 255, 255, 0.12);
 }
+#MyExpander checkbutton + label + spinbutton,
 #MyExpander button + label + spinbutton {
     margin: 3px 0; /* Needed for Reset & and Auto button height*/
 }
@@ -1697,6 +1701,13 @@ entry:focus > selection  {
     background-color: @bg-highlighted-text-color;
     color: @highlighted-text-color;
 }
+
+.view entry {
+    background-color: @bg-dark-grey;
+    margin: 0 -1px;
+    border: none;
+    box-shadow: none;
+}
     /* end*/
 
 /*** end ***************************************************************************************/
@@ -1708,14 +1719,14 @@ entry:focus > selection  {
     border-radius: 4px 4px 0 0;
     border: none;
     padding: 0;
-    box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgb(30,30,30);
+    box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px @bg-dark-grey;
     margin: 10px;
 }
 headerbar {
-    background-color: @winHeaderbar;
+    background-color: shade(@winHeaderbar,1.12);
     box-shadow: inset 0 1px rgba(200,200,200,.13);
     background-image: linear-gradient(shade(@winHeaderbar,1.14), shade(@winHeaderbar,.86));
-    border-bottom: 1px solid rgb(30,30,30);
+    border-bottom: 1px solid @bg-dark-grey;
     border-radius: 4px 4px 0 0;
     min-height: 0;
     padding: 4px 5px 3px;
@@ -1733,22 +1744,16 @@ headerbar .title{
 
 /* Window in background */
 :not(.popup):not(tooltip) > decoration:backdrop {
-    box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.3), 0 0 0 1px rgb(30,30,30);
+    box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.3), 0 0 0 1px @bg-dark-grey;
 }
 headerbar:backdrop {
-    box-shadow: inset 0 1px rgba(200,200,200,.11);
-    background-image: linear-gradient(shade(@winHeaderbar,1.07), shade(@winHeaderbar,.93));
+    box-shadow: none;
+    background-image: none;
 }
 headerbar .title:backdrop {
-    color: alpha(@winTitle,.55);
+    color: alpha(@winTitle,.60);
 }
 /**/
 
 /*** end ***************************************************************************************/
 
-/* TooWaBoo's personal settings * /
-#PartialPaste {min-width: 811px; min-height: 589px;}
-tooltip {background-color: transparent; border: none;}
-tooltip label {color: transparent;}
-/ * end */
-
diff --git a/rtdata/themes/TooWaBlue-GTK3-20_.css b/rtdata/themes/TooWaBlue-GTK3-20_.css
index c19984edb..8ba82412f 100644
--- a/rtdata/themes/TooWaBlue-GTK3-20_.css
+++ b/rtdata/themes/TooWaBlue-GTK3-20_.css
@@ -2,7 +2,7 @@
   This file is part of RawTherapee.
 
   Copyright (c) 2016 TooWaBoo
-  Version 2.28 - requires RT 4.2.1445 or higher
+  Version 2.31 - requires RT 4.2.1445 or higher
 
   RawTherapee is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -215,27 +215,31 @@ frame > checkbutton label{
 /*** end ***************************************************************************************/
 
 /*** Lists & Views *****************************************************************************/
-.view {
+textview.view, treeview.view {
     background-color: @bg-dark-grey;
     border-color: @view-grid-border;
-    padding: 2px;
+    padding: 1px;
     margin: 0;
 }
-.view:hover {
+#RightNotebook > stack > :nth-child(3) treeview {
+    border: 1px solid @bg-dark-grey;
+    border-bottom: none;
+}
+#PrefNotebook textview:selected:hover, #PrefNotebook treeview:selected:hover,
+textview:hover, treeview:hover {
     background-color: @bg-list-hover;
 }
-.view:selected {
+textview:selected, treeview:selected {
     color: @text-hl-color;
     background-color: @accent-color;
-    border-color: transparent;
+    border-top-color: transparent;
+}
+#PrefNotebook textview:selected, #PrefNotebook treeview:selected {
+    color: @text-color;
+    background-color: @bg-dark-grey;
 }
 
-#PrefNotebook .view {
-    min-height: 12px;
-    padding: 1px;
-}
-
-#PlacesPaned .view {
+#PlacesPaned treeview {
     padding-left: 5px;
     padding-right: 0;
     -gtk-icon-style: symbolic;
@@ -299,11 +303,15 @@ filechooser * {
 }
 filechooser #pathbarbox {
     border: none;
+    background-color: @bg-dark-grey;
 }
 
 filechooser box {
     border-color: transparent;
 }
+filechooser > box > paned > box {
+    border: 1px solid @bg-dark-grey;
+}
 
 filechooser placessidebar {
     padding: 0 1px;
@@ -319,7 +327,7 @@ filechooser list {
 }
 filechooser list row {
     margin: 0;
-    min-height: 25px;
+    min-height: 23px;
 }
 filechooser list row label{
     margin: 0;
@@ -375,7 +383,7 @@ separator {
 }
 grid separator.horizontal, box separator.horizontal {
     margin: 2px 0;
-    padding: 0
+    padding: 0;
 }
 grid separator.vertical, box separator.vertical {
     margin: 0 3px;
@@ -475,7 +483,7 @@ menu separator {
 /*** Scrollbar *********************************************************************************/
 scrollbar {
     background-color: rgba(0,0,0,.30);
-    border: none;
+    border: none;margin: 0;
 }
 scrollbar slider {
     background-color: @text-color;
@@ -542,7 +550,7 @@ scale:disabled trough {
 /*** Progressbar *******************************************************************************/
 progressbar.vertical {
     min-width: 0;
-    margin-right: 6px
+    margin-right: 7px;
 }
 progressbar.vertical text {
     color: transparent;
@@ -618,19 +626,24 @@ notebook header.left {
 notebook tabs {
     background-color: transparent;
 }
-notebook tab {
+notebook header tab {
     background-color: transparent;
     margin: 5px;
+    padding: 0 4px;
+}
+notebook header.left tab {
+    padding: 4px 0;
 }
 notebook header tab > grid > image {
     min-height: 28px;
     min-width: 0;
-    padding: 0 3px;
+    padding: 0 2px 0 0;
+    margin: 0;
 }
 notebook header.left tab > grid > image {
     min-height: 0;
     min-width: 28px;
-    padding: 3px 0;
+    padding: 2px 0 0;
 }
 notebook header tab label {
     margin: 3px;
@@ -691,13 +704,19 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
 }
 /**/
 
-#ToolPanelNotebook > header tab image {
-    min-height: 28px;
-    min-width: 30px;
-}
 #ToolPanelNotebook > header tabs {
     margin-bottom: 3px;
 }
+#ToolPanelNotebook > header tab {
+    margin: 5px 3px;
+    padding: 0 5px;
+}
+#ToolPanelNotebook > header tab image{
+    min-height: 30px;
+    min-width: 0;
+    padding: 0;
+    margin: 0;
+}
 
 #RightNotebook {
     margin: 5px 0 0 0;
@@ -774,18 +793,27 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
     padding: 0 4px;
     background-color: @bg-dark-grey;
     margin: 0;
+    border-radius: 0;
 }
 
 #MetaPanelNotebook > stack > box:nth-child(2) > scrolledwindow scrolledwindow {
     background-color: @bg-dark-grey;
     padding: 0;
     margin: 0;
-    border-radius: 2px;
 }
-#MetaPanelNotebook textview,
-#MetaPanelNotebook text {
+#MetaPanelNotebook .view {
+    border: 1px solid @bg-dark-grey;
+    padding: 2px;
+    margin: 0;
+}
+#MetaPanelNotebook textview.view {
     background-color: @bg-dark-grey;
-    padding: 2px 5px;
+    padding: 1px 4px;
+    margin: 0;
+}
+#MetaPanelNotebook text {
+    background-color: transparent;
+    padding: 0;
     margin: 0;
 }
 
@@ -823,18 +851,6 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
     margin: 5px 0 0;
 }
 
-#FileBrowser entry + button {
-    margin: 0 0 0 2px;
-    padding: 2px;
-}
-#FileBrowser entry + button,
-#FileBrowser entry {
-    min-height: 15px;
-    min-width: 15px;
-}
-#FileBrowser label {
-    margin: 0 4px 0 10px;
-}
 #ToolBarPanelFileBrowser {
     margin: 3px -1px;
     min-height: 0;
@@ -855,6 +871,26 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
     background-image: none;
     box-shadow: none;
 }
+
+#ToolBarPanelFileBrowser entry + button.flat,
+#FileBrowser entry + button.flat {
+    min-height: 20px;
+    min-width: 19px;
+    margin: 0 0 0 -20px;
+    border-radius: 0 2px 2px 0;
+    border: 1px solid transparent;
+}
+#ToolBarPanelFileBrowser entry,
+#FileBrowser entry {
+    min-height: 20px;
+    min-width: 144px;
+    margin: 0 -1px 0 0;
+    padding: 0 24px 0 4px;
+}
+#ToolBarPanelFileBrowser label,
+#FileBrowser label {
+    margin: 0 4px 0 6px;
+}
 /*** end ***************************************************************************************/
 
 /*** Image Editor ******************************************************************************/
@@ -996,7 +1032,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
     border: none;
     border-radius: 0;
     margin: 0;
-    padding: 7px;
+    padding: 6px;
 }
 
     /* Sub-tool (MyExpander) */
@@ -1183,6 +1219,8 @@ scale + button.flat {
 }
 /**/
 
+#ToolBarPanelFileBrowser entry + button:hover,
+#FileBrowser entry + button:hover,
 button.flat:hover,
 button:hover  {
     border: 1px solid @bg-button-border;
@@ -1191,6 +1229,8 @@ button:hover  {
     background-color: @bg-button-hover;
 }
 
+#ToolBarPanelFileBrowser entry + button:active,
+#FileBrowser entry + button:active,
 button.flat:active,
 button.flat:checked,
 button:active,
@@ -1299,6 +1339,10 @@ dialog combobox .combo,
     min-width: 0;
 }
 
+button.color {
+    padding: 3px;
+}
+
 /* Save, Cancel, OK ... buttons */
 .dialog-action-area button {
     min-height: 26px;
@@ -1438,7 +1482,7 @@ messagedialog headerbar button.titlebutton {
 
 #MainNotebook tab #CloseButton {
     padding: 0;
-    margin: 4px 1px;
+    margin: 4px -3px 4px 1px;
     min-height: 18px;
     min-width: 18px;
 }
@@ -1486,104 +1530,63 @@ radiobutton {
     min-height: 16px;
 }
 check,
-check row,
-radio,
-radio row {
-    border: none;
+radio {
+    border: 1.16px solid shade(@text-color, .9);
     background-image: none;
-    border-radius: 0;
+    background-color: transparent;
     margin: 0;
     padding: 0;
-    min-height: 16px;
+    min-height: 14px;
     min-width: 14px;
     box-shadow: none;
-    -gtk-icon-source: none;
     background-repeat: no-repeat;
+    -gtk-icon-shadow: none;
 }
-
 radiobutton label,
 checkbutton label {
     margin: 0 6px 0 6px;
     padding: 0;
 }
-frame > checkbutton check{
-    margin-left: 6px;
-    padding: 0;
+check,
+check:indeterminate {
+    border-radius: 2px;
+}
+check:checked {
+    padding: 0 2px 0 0;
+    min-width: 12px;
+}
+radio{
+    border-radius: 20px;
+}
+check:disabled,
+radio:disabled {
+    border-color: rgb(120,120,120);
 }
 
-#PartialPaste checkbutton {
-    padding: 0;
+frame > checkbutton check{
+    margin-left: 6px;
 }
-#PartialPaste check {
+
+#PartialPaste checkbutton:not(#PartialPasteHeader) {
+    padding: 0;
     margin-left: 14px;
 }
-#PartialPasteHeader check {
+#PartialPasteHeader {
     margin-left: 6px;
 }
 #PrefNotebook checkbutton {
     padding: 0;
 }
+#PrefNotebook radiobutton,
 #PrefNotebook stack > box:nth-child(3) checkbutton,
 #PrefNotebook stack > box:nth-child(4) checkbutton {
     padding: 3px 0;
 }
-#PrefNotebook radiobutton {
-    padding: 3px 0;
-}
-/* What a lousy checkbox without label in White Picture :-) */
+
 #MyExpander button + checkbutton:last-child {
     margin-left: 4px;
 }
 
-check,
-check row {
-    background-image: url("images/twb/checkbox-unchecked.png");
-}
-check:checked,
-check row:checked {
-    background-image: url("images/twb/checkbox-checked.png");
-}
-check:disabled,
-check row:disabled {
-    background-image: url("images/twb/checkbox-unchecked-disabled.png");
-}
-check:checked:disabled,
-check row:checked:disabled {
-    background-image: url("images/twb/checkbox-checked-disabled.png");
-}
-check:indeterminate,
-check row:indeterminate {
-    background-image: url("images/twb/checkbox-inconsistent.png");
-}
-check:indeterminate:disabled,
-check row:indeterminate:disabled {
-    background-image: url("images/twb/checkbox-inconsistent-disabled.png");
-}
-
-radio,
-radio row {
-    background-image: url("images/twb/radio-unchecked.png");
-}
-radio:checked,
-radio row:checked {
-    background-image: url("images/twb/radio-checked.png");
-}
-radio:disabled,
-radio row:disabled {
-    background-image: url("images/twb/radio-unchecked-disabled.png");
-}
-radio:checked:disabled,
-radio row:checked:disabled {
-    background-image: url("images/twb/radio-checked-disabled.png");
-}
-radio:indeterminate,
-radio row:indeterminate {
-    background-image: url("images/twb/radio-inconsistent.png");
-}
-radio:indeterminate:disabled,
-radio row:indeterminate:disabled {
-    background-image: url("images/twb/radio-inconsistent-disabled.png");
-}
 /*** end ***************************************************************************************/
 
 /*** Entry & Spinbutton ************************************************************************/
@@ -1621,6 +1624,7 @@ spinbutton {
     color: @text-tbEntry;
     box-shadow: inset 1px  1px rgba(0, 0, 0, .12), 0 1px rgba(255 , 255, 255, 0.12);
 }
+#MyExpander checkbutton + label + spinbutton,
 #MyExpander button + label + spinbutton {
     margin: 3px 0; /* Needed for Reset & and Auto button height*/
 }
@@ -1697,6 +1701,13 @@ entry:focus > selection  {
     background-color: @bg-highlighted-text-color;
     color: @highlighted-text-color;
 }
+
+.view entry {
+    background-color: @bg-dark-grey;
+    margin: 0 -1px;
+    border: none;
+    box-shadow: none;
+}
     /* end*/
 
 /*** end ***************************************************************************************/
@@ -1708,14 +1719,14 @@ entry:focus > selection  {
     border-radius: 4px 4px 0 0;
     border: none;
     padding: 0;
-    box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgb(30,30,30);
+    box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px @bg-dark-grey;
     margin: 10px;
 }
 headerbar {
-    background-color: @winHeaderbar;
+    background-color: shade(@winHeaderbar,1.12);
     box-shadow: inset 0 1px rgba(200,200,200,.13);
     background-image: linear-gradient(shade(@winHeaderbar,1.14), shade(@winHeaderbar,.86));
-    border-bottom: 1px solid rgb(30,30,30);
+    border-bottom: 1px solid @bg-dark-grey;
     border-radius: 4px 4px 0 0;
     min-height: 0;
     padding: 4px 5px 3px;
@@ -1733,22 +1744,16 @@ headerbar .title{
 
 /* Window in background */
 :not(.popup):not(tooltip) > decoration:backdrop {
-    box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.3), 0 0 0 1px rgb(30,30,30);
+    box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.3), 0 0 0 1px @bg-dark-grey;
 }
 headerbar:backdrop {
-    box-shadow: inset 0 1px rgba(200,200,200,.11);
-    background-image: linear-gradient(shade(@winHeaderbar,1.07), shade(@winHeaderbar,.93));
+    box-shadow: none;
+    background-image: none;
 }
 headerbar .title:backdrop {
-    color: alpha(@winTitle,.55);
+    color: alpha(@winTitle,.60);
 }
 /**/
 
 /*** end ***************************************************************************************/
 
-/* TooWaBoo's personal settings * /
-#PartialPaste {min-width: 811px; min-height: 589px;}
-tooltip {background-color: transparent; border: none;}
-tooltip label {color: transparent;}
-/ * end */
-
diff --git a/rtdata/themes/images/svg/twb/checkbox-checked-disabled.svg b/rtdata/themes/images/svg/twb/checkbox-checked-disabled.svg
deleted file mode 100644
index 1103ee917..000000000
--- a/rtdata/themes/images/svg/twb/checkbox-checked-disabled.svg
+++ /dev/null
@@ -1,124 +0,0 @@
-<?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-disabled.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)">
-    <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.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"
-       sodipodi:nodetypes="cccccc" />
-    <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:2.194;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-checked.svg b/rtdata/themes/images/svg/twb/checkbox-checked.svg
deleted file mode 100644
index c7d28d45d..000000000
--- a/rtdata/themes/images/svg/twb/checkbox-checked.svg
+++ /dev/null
@@ -1,124 +0,0 @@
-<?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="56.0625"
-     inkscape:cx="7.9821628"
-     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)">
-    <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.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"
-       sodipodi:nodetypes="cccccc" />
-    <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#b4b4b4;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-disabled.svg b/rtdata/themes/images/svg/twb/checkbox-inconsistent-disabled.svg
deleted file mode 100644
index ee55c4f6f..000000000
--- a/rtdata/themes/images/svg/twb/checkbox-inconsistent-disabled.svg
+++ /dev/null
@@ -1,124 +0,0 @@
-<?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-disabled.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="5.039019"
-     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)">
-    <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:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;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: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
deleted file mode 100644
index e0f5bd362..000000000
--- a/rtdata/themes/images/svg/twb/checkbox-inconsistent.svg
+++ /dev/null
@@ -1,124 +0,0 @@
-<?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="56.0625"
-     inkscape:cx="5.039019"
-     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)">
-    <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:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#b4b4b4;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: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
deleted file mode 100644
index 635dae59b..000000000
--- a/rtdata/themes/images/svg/twb/checkbox-unchecked-disabled.svg
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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-disabled.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="5.039019"
-     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)">
-    <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: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
deleted file mode 100644
index 0adfe66cc..000000000
--- a/rtdata/themes/images/svg/twb/checkbox-unchecked.svg
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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="56.0625"
-     inkscape:cx="5.039019"
-     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)">
-    <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: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/radio-checked-disabled.svg b/rtdata/themes/images/svg/twb/radio-checked-disabled.svg
deleted file mode 100644
index f415b4be7..000000000
--- a/rtdata/themes/images/svg/twb/radio-checked-disabled.svg
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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-disabled.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></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:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;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:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:#808080;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-checked.svg b/rtdata/themes/images/svg/twb/radio-checked.svg
deleted file mode 100644
index c6f9b4ee8..000000000
--- a/rtdata/themes/images/svg/twb/radio-checked.svg
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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="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:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#b4b4b4;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:1;fill:#b4b4b4;fill-opacity:1;fill-rule:nonzero;stroke:#b4b4b4;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-disabled.svg b/rtdata/themes/images/svg/twb/radio-inconsistent-disabled.svg
deleted file mode 100644
index e41f3ff9c..000000000
--- a/rtdata/themes/images/svg/twb/radio-inconsistent-disabled.svg
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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-disabled.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></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:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;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:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;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.svg b/rtdata/themes/images/svg/twb/radio-inconsistent.svg
deleted file mode 100644
index 65ea2a8e8..000000000
--- a/rtdata/themes/images/svg/twb/radio-inconsistent.svg
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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="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:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#b4b4b4;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:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#b4b4b4;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-disabled.svg b/rtdata/themes/images/svg/twb/radio-unchecked-disabled.svg
deleted file mode 100644
index 60098048f..000000000
--- a/rtdata/themes/images/svg/twb/radio-unchecked-disabled.svg
+++ /dev/null
@@ -1,116 +0,0 @@
-<?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-disabled.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></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:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;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/svg/twb/radio-unchecked.svg b/rtdata/themes/images/svg/twb/radio-unchecked.svg
deleted file mode 100644
index 8b448f3cf..000000000
--- a/rtdata/themes/images/svg/twb/radio-unchecked.svg
+++ /dev/null
@@ -1,116 +0,0 @@
-<?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:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#b4b4b4;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
deleted file mode 100644
index 8458b5987..000000000
Binary files a/rtdata/themes/images/twb/checkbox-checked-disabled.png and /dev/null differ
diff --git a/rtdata/themes/images/twb/checkbox-checked.png b/rtdata/themes/images/twb/checkbox-checked.png
deleted file mode 100644
index 83d3744d3..000000000
Binary files a/rtdata/themes/images/twb/checkbox-checked.png and /dev/null differ
diff --git a/rtdata/themes/images/twb/checkbox-inconsistent-disabled.png b/rtdata/themes/images/twb/checkbox-inconsistent-disabled.png
deleted file mode 100644
index 96c5fbe5f..000000000
Binary files a/rtdata/themes/images/twb/checkbox-inconsistent-disabled.png and /dev/null differ
diff --git a/rtdata/themes/images/twb/checkbox-inconsistent.png b/rtdata/themes/images/twb/checkbox-inconsistent.png
deleted file mode 100644
index 373f218be..000000000
Binary files a/rtdata/themes/images/twb/checkbox-inconsistent.png and /dev/null differ
diff --git a/rtdata/themes/images/twb/checkbox-unchecked-disabled.png b/rtdata/themes/images/twb/checkbox-unchecked-disabled.png
deleted file mode 100644
index 985dd07cc..000000000
Binary files a/rtdata/themes/images/twb/checkbox-unchecked-disabled.png and /dev/null differ
diff --git a/rtdata/themes/images/twb/checkbox-unchecked.png b/rtdata/themes/images/twb/checkbox-unchecked.png
deleted file mode 100644
index 747a9c8c3..000000000
Binary files a/rtdata/themes/images/twb/checkbox-unchecked.png and /dev/null differ
diff --git a/rtdata/themes/images/twb/radio-checked-disabled.png b/rtdata/themes/images/twb/radio-checked-disabled.png
deleted file mode 100644
index 0947a5e06..000000000
Binary files a/rtdata/themes/images/twb/radio-checked-disabled.png and /dev/null differ
diff --git a/rtdata/themes/images/twb/radio-checked.png b/rtdata/themes/images/twb/radio-checked.png
deleted file mode 100644
index 48cfc16ae..000000000
Binary files a/rtdata/themes/images/twb/radio-checked.png and /dev/null differ
diff --git a/rtdata/themes/images/twb/radio-inconsistent-disabled.png b/rtdata/themes/images/twb/radio-inconsistent-disabled.png
deleted file mode 100644
index a59b179e1..000000000
Binary files a/rtdata/themes/images/twb/radio-inconsistent-disabled.png and /dev/null differ
diff --git a/rtdata/themes/images/twb/radio-inconsistent.png b/rtdata/themes/images/twb/radio-inconsistent.png
deleted file mode 100644
index abe1e28ba..000000000
Binary files a/rtdata/themes/images/twb/radio-inconsistent.png and /dev/null differ
diff --git a/rtdata/themes/images/twb/radio-unchecked-disabled.png b/rtdata/themes/images/twb/radio-unchecked-disabled.png
deleted file mode 100644
index 6cbc076f2..000000000
Binary files a/rtdata/themes/images/twb/radio-unchecked-disabled.png and /dev/null differ
diff --git a/rtdata/themes/images/twb/radio-unchecked.png b/rtdata/themes/images/twb/radio-unchecked.png
deleted file mode 100644
index e28db04f9..000000000
Binary files a/rtdata/themes/images/twb/radio-unchecked.png and /dev/null differ