Merge commit '1a5ce59f7d0c2ffbf3021ff306d8802d478f16be' into debian/master

138 files changed, 8314 insertions, 1175 deletions

diff --git a/LISEZ-MOI.md b/LISEZ-MOI.md
index 68a45c1..a5abba4 100644
--- a/LISEZ-MOI.md
+++ b/LISEZ-MOI.md
@@ -111,13 +111,13 @@ L'arrière-plan utilisé dans la capture d'écran du bureau de Gnome est disponi
 
 ### Icônes
 
-Le thème d'icônes utilisé dans la même capture d'écran est Mist, installé avec le paquet [`gnome-themes`](http://packages.ubuntu.com/oneiric/gnome-themes), sous licence LGPL. Cependant, ce paquet n'est plus disponible pour les dernières versions d'Ubuntu. Voici une méthode simple pour installer Mist:
+Le thème d'icônes utilisé dans la même capture d'écran est Mist, installé avec le paquet `gnome-themes`, sous licence LGPL. Cependant, ce paquet n'est plus disponible pour les dernières versions d'Ubuntu. Voici une méthode simple pour installer Mist:
 
-- [Télécharger l'archive du thème d'icônes Mist.](http://www.jpfleury.net/site/fichiers/Mist.tar)
+- [Télécharger l'archive du thème d'icônes Mist.](http://mirror.centos.org/centos/6/os/i386/Packages/gnome-themes-2.28.1-6.el6.noarch.rpm)
 
 - Extraire l'archive.
 
-- Copier le dossier `Mist` dans un des deux emplacements suivants:
+- Copier le dossier `usr/share/icons/Mist` dans un des deux emplacements suivants:
 
 	- `~/.icons/` pour l'utilisateur courant;
 	
diff --git a/README.md b/README.md
index 84aa766..9208009 100644
--- a/README.md
+++ b/README.md
@@ -111,13 +111,13 @@ The wallpaper used for the Gnome 3 desktop screenshot is available in the folder
 
 ### Icons
 
-The icon theme used for the same screenshot is Mist, installed with the package [`gnome-themes`](http://packages.ubuntu.com/oneiric/gnome-themes), under LGPL. However, this package is no longer available with last Ubuntu versions. Here's an easy way to install Mist:
+The icon theme used for the same screenshot is Mist, installed with the package `gnome-themes`, under LGPL. However, this package is no longer available with last Ubuntu versions. Here's an easy way to install Mist:
 
-- [Download the archive of the Mist icon theme.](http://www.jpfleury.net/site/fichiers/Mist.tar)
+- [Download the archive of the Mist icon theme.](http://mirror.centos.org/centos/6/os/i386/Packages/gnome-themes-2.28.1-6.el6.noarch.rpm)
 
 - Extract the archive.
 
-- Copy the folder `Mist` in one of the following two locations:
+- Copy the folder `usr/share/icons/Mist` in one of the following two locations:
 
 	- `~/.icons/` for the current user;
 	
diff --git a/_src/Makefile b/_src/Makefile
new file mode 100644
index 0000000..51888db
--- /dev/null
+++ b/_src/Makefile
@@ -0,0 +1,13 @@
+SVGS = $(wildcard *.svg)
+PNGS = $(SVGS:%.svg=../gtk-3.0/img/%.png) $(SVGS:%.svg=../gtk-3.0/img/%@2.png)
+
+all: $(PNGS)
+
+clean:
+	-rm -f $(PNGS)
+
+../gtk-3.0/img/%.png: %.svg
+	inkscape --without-gui --export-dpi=90 --export-background-opacity=0 --export-png=$@ $<
+
+../gtk-3.0/img/%@2.png: %.svg
+	inkscape --without-gui --export-dpi=180 --export-background-opacity=0 --export-png=$@ $<
diff --git a/_src/checkbox-checked-hover.svg b/_src/checkbox-checked-hover.svg
new file mode 100644
index 0000000..10c5aa8
--- /dev/null
+++ b/_src/checkbox-checked-hover.svg
@@ -0,0 +1,136 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="checkbox-checked-hover.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/checkbox-checked-hover@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3820"
+       id="linearGradient3826"
+       x1="1"
+       y1="1037.3622"
+       x2="15"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3820">
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1;"
+         offset="0"
+         id="stop3822" />
+      <stop
+         id="stop3830"
+         offset="0.46428695"
+         style="stop-color:#e0dedd;stop-opacity:1;" />
+      <stop
+         id="stop3828"
+         offset="0.53571439"
+         style="stop-color:#fbfbfa;stop-opacity:1;" />
+      <stop
+         style="stop-color:#fbfbfa;stop-opacity:1;"
+         offset="1"
+         id="stop3824" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(0,0.0128)"
+       y2="1051.3622"
+       x2="15"
+       y1="1037.3622"
+       x1="1"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3849"
+       xlink:href="#linearGradient3820"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6c25e2"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="72.75"
+     inkscape:cx="7.3402062"
+     inkscape:cy="7.5051546"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1983"
+     inkscape:window-x="1920"
+     inkscape:window-y="144"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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)">
+    <path
+       transform="translate(0,-0.0128)"
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1"
+       inkscape:original="M 3.5 1038.875 C 2.946 1038.875 2.5 1039.321 2.5 1039.875 L 2.5 1048.875 C 2.5 1049.429 2.946 1049.875 3.5 1049.875 L 12.5 1049.875 C 13.054 1049.875 13.5 1049.429 13.5 1048.875 L 13.5 1039.875 C 13.5 1039.321 13.054 1038.875 12.5 1038.875 L 3.5 1038.875 z "
+       xlink:href="#rect2987"
+       style="fill:none;stroke:url(#linearGradient3849);stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3042"
+       inkscape:href="#rect2987"
+       d="m 3.5,1037.875 c -1.0907028,0 -2,0.9093 -2,2 l 0,9 c 0,1.0907 0.9092972,2 2,2 l 9,0 c 1.090703,0 2,-0.9093 2,-2 l 0,-9 c 0,-1.0907 -0.909297,-2 -2,-2 l -9,0 z" />
+    <rect
+       style="fill:#c9daef;fill-opacity:1;stroke:#4b6e99;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect2987"
+       width="11"
+       height="11"
+       x="2.5"
+       y="1038.8624"
+       rx="1"
+       ry="1" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.19999999999999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 4,7.5 7.5,12 C 7.5,12 9,6.5 12,4"
+       id="path3861"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/_src/checkbox-checked-insensitive.svg b/_src/checkbox-checked-insensitive.svg
new file mode 100644
index 0000000..bed91b6
--- /dev/null
+++ b/_src/checkbox-checked-insensitive.svg
@@ -0,0 +1,136 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="checkbox-checked-insensitive.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/checkbox-checked-insensitive@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3820"
+       id="linearGradient3826"
+       x1="1"
+       y1="1037.3622"
+       x2="15"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3820">
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1;"
+         offset="0"
+         id="stop3822" />
+      <stop
+         id="stop3830"
+         offset="0.46428695"
+         style="stop-color:#e0dedd;stop-opacity:1;" />
+      <stop
+         id="stop3828"
+         offset="0.53571439"
+         style="stop-color:#fbfbfa;stop-opacity:1;" />
+      <stop
+         style="stop-color:#fbfbfa;stop-opacity:1;"
+         offset="1"
+         id="stop3824" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(0,0.0128)"
+       y2="1051.3622"
+       x2="15"
+       y1="1037.3622"
+       x1="1"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3849"
+       xlink:href="#linearGradient3820"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6c25e2"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="72.75"
+     inkscape:cx="7.3402062"
+     inkscape:cy="7.5051546"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1983"
+     inkscape:window-x="1920"
+     inkscape:window-y="144"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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)">
+    <rect
+       style="fill:#edeceb;fill-opacity:1;stroke:#a7a3a0;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect2987"
+       width="11"
+       height="11"
+       x="2.5"
+       y="1038.8624"
+       rx="1"
+       ry="1" />
+    <path
+       style="fill:none;stroke:#787571;stroke-width:1.19999999999999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 4,7.5 7.5,12 C 7.5,12 9,6.5 12,4"
+       id="path3861"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)"
+       sodipodi:nodetypes="ccc" />
+    <path
+       transform="translate(0,-0.0128)"
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1"
+       inkscape:original="M 3.5 1038.875 C 2.946 1038.875 2.5 1039.321 2.5 1039.875 L 2.5 1048.875 C 2.5 1049.429 2.946 1049.875 3.5 1049.875 L 12.5 1049.875 C 13.054 1049.875 13.5 1049.429 13.5 1048.875 L 13.5 1039.875 C 13.5 1039.321 13.054 1038.875 12.5 1038.875 L 3.5 1038.875 z "
+       xlink:href="#rect2987"
+       style="fill:none;stroke:url(#linearGradient3849);stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3042"
+       inkscape:href="#rect2987"
+       d="m 3.5,1037.875 c -1.0907028,0 -2,0.9093 -2,2 l 0,9 c 0,1.0907 0.9092972,2 2,2 l 9,0 c 1.090703,0 2,-0.9093 2,-2 l 0,-9 c 0,-1.0907 -0.909297,-2 -2,-2 l -9,0 z" />
+  </g>
+</svg>
diff --git a/_src/checkbox-checked.svg b/_src/checkbox-checked.svg
new file mode 100644
index 0000000..3196648
--- /dev/null
+++ b/_src/checkbox-checked.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="checkbox-checked.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/checkbox-checked@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3820">
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1;"
+         offset="0"
+         id="stop3822" />
+      <stop
+         id="stop3830"
+         offset="0.46428695"
+         style="stop-color:#e0dedd;stop-opacity:1;" />
+      <stop
+         id="stop3828"
+         offset="0.53571439"
+         style="stop-color:#fbfbfa;stop-opacity:1;" />
+      <stop
+         style="stop-color:#fbfbfa;stop-opacity:1;"
+         offset="1"
+         id="stop3824" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3820"
+       id="linearGradient3826"
+       x1="1"
+       y1="1037.3622"
+       x2="15"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6c25e2"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="65.75"
+     inkscape:cx="7.9695817"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2019"
+     inkscape:window-x="1920"
+     inkscape:window-y="108"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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)">
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1"
+       inkscape:original="M 3.5 1038.875 C 2.946 1038.875 2.5 1039.321 2.5 1039.875 L 2.5 1048.875 C 2.5 1049.429 2.946 1049.875 3.5 1049.875 L 12.5 1049.875 C 13.054 1049.875 13.5 1049.429 13.5 1048.875 L 13.5 1039.875 C 13.5 1039.321 13.054 1038.875 12.5 1038.875 L 3.5 1038.875 z "
+       xlink:href="#rect2987"
+       style="fill:none;fill-opacity:1;stroke:url(#linearGradient3826);stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3042"
+       inkscape:href="#rect2987"
+       d="m 3.5,1038.875 c -0.554,0 -1,0.446 -1,1 l 0,9 c 0,0.554 0.446,1 1,1 l 9,0 c 0.554,0 1,-0.446 1,-1 l 0,-9 c 0,-0.554 -0.446,-1 -1,-1 l -9,0 z" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#787571;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect2987"
+       width="11"
+       height="11"
+       x="2.5"
+       y="1038.8624"
+       rx="1"
+       ry="1" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.19999999999999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 4,7.5 7.5,12 C 7.5,12 9,6.5 12,4"
+       id="path3861"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/_src/checkbox-mixed-hover.svg b/_src/checkbox-mixed-hover.svg
new file mode 100644
index 0000000..e57a5dd
--- /dev/null
+++ b/_src/checkbox-mixed-hover.svg
@@ -0,0 +1,135 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="checkbox-mixed-hover.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/checkbox-mixed-hover@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3820"
+       id="linearGradient3826"
+       x1="1"
+       y1="1037.3622"
+       x2="15"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3820">
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1;"
+         offset="0"
+         id="stop3822" />
+      <stop
+         id="stop3830"
+         offset="0.46428695"
+         style="stop-color:#e0dedd;stop-opacity:1;" />
+      <stop
+         id="stop3828"
+         offset="0.53571439"
+         style="stop-color:#fbfbfa;stop-opacity:1;" />
+      <stop
+         style="stop-color:#fbfbfa;stop-opacity:1;"
+         offset="1"
+         id="stop3824" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(0,0.0128)"
+       y2="1051.3622"
+       x2="15"
+       y1="1037.3622"
+       x1="1"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3849"
+       xlink:href="#linearGradient3820"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6c25e2"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="72.75"
+     inkscape:cx="7.3402062"
+     inkscape:cy="7.5051546"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1983"
+     inkscape:window-x="1920"
+     inkscape:window-y="144"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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)">
+    <rect
+       style="fill:#c9daef;fill-opacity:1;stroke:#4b6e99;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect2987"
+       width="11"
+       height="11"
+       x="2.5"
+       y="1038.8624"
+       rx="1"
+       ry="1" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 3,8 13,8"
+       id="path3939"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)" />
+    <path
+       transform="translate(0,-0.0128)"
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1"
+       inkscape:original="M 3.5 1038.875 C 2.946 1038.875 2.5 1039.321 2.5 1039.875 L 2.5 1048.875 C 2.5 1049.429 2.946 1049.875 3.5 1049.875 L 12.5 1049.875 C 13.054 1049.875 13.5 1049.429 13.5 1048.875 L 13.5 1039.875 C 13.5 1039.321 13.054 1038.875 12.5 1038.875 L 3.5 1038.875 z "
+       xlink:href="#rect2987"
+       style="fill:none;stroke:url(#linearGradient3849);stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3042"
+       inkscape:href="#rect2987"
+       d="m 3.5,1037.875 c -1.0907028,0 -2,0.9093 -2,2 l 0,9 c 0,1.0907 0.9092972,2 2,2 l 9,0 c 1.090703,0 2,-0.9093 2,-2 l 0,-9 c 0,-1.0907 -0.909297,-2 -2,-2 l -9,0 z" />
+  </g>
+</svg>
diff --git a/_src/checkbox-mixed-insensitive.svg b/_src/checkbox-mixed-insensitive.svg
new file mode 100644
index 0000000..607ff4a
--- /dev/null
+++ b/_src/checkbox-mixed-insensitive.svg
@@ -0,0 +1,135 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="checkbox-mixed-insensitive.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/checkbox-mixed-insensitive@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3820"
+       id="linearGradient3826"
+       x1="1"
+       y1="1037.3622"
+       x2="15"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3820">
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1;"
+         offset="0"
+         id="stop3822" />
+      <stop
+         id="stop3830"
+         offset="0.46428695"
+         style="stop-color:#e0dedd;stop-opacity:1;" />
+      <stop
+         id="stop3828"
+         offset="0.53571439"
+         style="stop-color:#fbfbfa;stop-opacity:1;" />
+      <stop
+         style="stop-color:#fbfbfa;stop-opacity:1;"
+         offset="1"
+         id="stop3824" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(0,0.0128)"
+       y2="1051.3622"
+       x2="15"
+       y1="1037.3622"
+       x1="1"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3849"
+       xlink:href="#linearGradient3820"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6c25e2"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="72.75"
+     inkscape:cx="7.3402062"
+     inkscape:cy="7.5051546"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1983"
+     inkscape:window-x="1920"
+     inkscape:window-y="144"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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)">
+    <rect
+       style="fill:#edeceb;fill-opacity:1;stroke:#a7a3a0;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect2987"
+       width="11"
+       height="11"
+       x="2.5"
+       y="1038.8624"
+       rx="1"
+       ry="1" />
+    <path
+       style="fill:none;stroke:#787571;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 3,8 13,8"
+       id="path3939"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)" />
+    <path
+       transform="translate(0,-0.0128)"
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1"
+       inkscape:original="M 3.5 1038.875 C 2.946 1038.875 2.5 1039.321 2.5 1039.875 L 2.5 1048.875 C 2.5 1049.429 2.946 1049.875 3.5 1049.875 L 12.5 1049.875 C 13.054 1049.875 13.5 1049.429 13.5 1048.875 L 13.5 1039.875 C 13.5 1039.321 13.054 1038.875 12.5 1038.875 L 3.5 1038.875 z "
+       xlink:href="#rect2987"
+       style="fill:none;stroke:url(#linearGradient3849);stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3042"
+       inkscape:href="#rect2987"
+       d="m 3.5,1037.875 c -1.0907028,0 -2,0.9093 -2,2 l 0,9 c 0,1.0907 0.9092972,2 2,2 l 9,0 c 1.090703,0 2,-0.9093 2,-2 l 0,-9 c 0,-1.0907 -0.909297,-2 -2,-2 l -9,0 z" />
+  </g>
+</svg>
diff --git a/_src/checkbox-mixed.svg b/_src/checkbox-mixed.svg
new file mode 100644
index 0000000..b0a1b4e
--- /dev/null
+++ b/_src/checkbox-mixed.svg
@@ -0,0 +1,135 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="checkbox-mixed.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/checkbox-mixed@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3820"
+       id="linearGradient3826"
+       x1="1"
+       y1="1037.3622"
+       x2="15"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3820">
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1;"
+         offset="0"
+         id="stop3822" />
+      <stop
+         id="stop3830"
+         offset="0.46428695"
+         style="stop-color:#e0dedd;stop-opacity:1;" />
+      <stop
+         id="stop3828"
+         offset="0.53571439"
+         style="stop-color:#fbfbfa;stop-opacity:1;" />
+      <stop
+         style="stop-color:#fbfbfa;stop-opacity:1;"
+         offset="1"
+         id="stop3824" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(0,0.0128)"
+       y2="1051.3622"
+       x2="15"
+       y1="1037.3622"
+       x1="1"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3849"
+       xlink:href="#linearGradient3820"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6c25e2"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="72.75"
+     inkscape:cx="7.3402062"
+     inkscape:cy="7.5051546"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1983"
+     inkscape:window-x="1920"
+     inkscape:window-y="144"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#787571;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect2987"
+       width="11"
+       height="11"
+       x="2.5"
+       y="1038.8624"
+       rx="1"
+       ry="1" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 3,8 13,8"
+       id="path3939"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)" />
+    <path
+       transform="translate(0,-0.0128)"
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1"
+       inkscape:original="M 3.5 1038.875 C 2.946 1038.875 2.5 1039.321 2.5 1039.875 L 2.5 1048.875 C 2.5 1049.429 2.946 1049.875 3.5 1049.875 L 12.5 1049.875 C 13.054 1049.875 13.5 1049.429 13.5 1048.875 L 13.5 1039.875 C 13.5 1039.321 13.054 1038.875 12.5 1038.875 L 3.5 1038.875 z "
+       xlink:href="#rect2987"
+       style="fill:none;stroke:url(#linearGradient3849);stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3042"
+       inkscape:href="#rect2987"
+       d="m 3.5,1037.875 c -1.0907028,0 -2,0.9093 -2,2 l 0,9 c 0,1.0907 0.9092972,2 2,2 l 9,0 c 1.090703,0 2,-0.9093 2,-2 l 0,-9 c 0,-1.0907 -0.909297,-2 -2,-2 l -9,0 z" />
+  </g>
+</svg>
diff --git a/_src/checkbox-unchecked-hover.svg b/_src/checkbox-unchecked-hover.svg
new file mode 100644
index 0000000..8ca23dc
--- /dev/null
+++ b/_src/checkbox-unchecked-hover.svg
@@ -0,0 +1,129 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="checkbox-unchecked-hover.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/checkbox-unchecked-hover@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3820"
+       id="linearGradient3826"
+       x1="1"
+       y1="1037.3622"
+       x2="15"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3820">
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1;"
+         offset="0"
+         id="stop3822" />
+      <stop
+         id="stop3830"
+         offset="0.46428695"
+         style="stop-color:#e0dedd;stop-opacity:1;" />
+      <stop
+         id="stop3828"
+         offset="0.53571439"
+         style="stop-color:#fbfbfa;stop-opacity:1;" />
+      <stop
+         style="stop-color:#fbfbfa;stop-opacity:1;"
+         offset="1"
+         id="stop3824" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(0,0.0128)"
+       y2="1051.3622"
+       x2="15"
+       y1="1037.3622"
+       x1="1"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3849"
+       xlink:href="#linearGradient3820"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6c25e2"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="72.75"
+     inkscape:cx="7.3402062"
+     inkscape:cy="7.5051546"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1983"
+     inkscape:window-x="1920"
+     inkscape:window-y="144"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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)">
+    <rect
+       style="fill:#c9daef;fill-opacity:1;stroke:#4b6e99;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect2987"
+       width="11"
+       height="11"
+       x="2.5"
+       y="1038.8624"
+       rx="1"
+       ry="1" />
+    <path
+       transform="translate(0,-0.0128)"
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1"
+       inkscape:original="M 3.5 1038.875 C 2.946 1038.875 2.5 1039.321 2.5 1039.875 L 2.5 1048.875 C 2.5 1049.429 2.946 1049.875 3.5 1049.875 L 12.5 1049.875 C 13.054 1049.875 13.5 1049.429 13.5 1048.875 L 13.5 1039.875 C 13.5 1039.321 13.054 1038.875 12.5 1038.875 L 3.5 1038.875 z "
+       xlink:href="#rect2987"
+       style="fill:none;stroke:url(#linearGradient3849);stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3042"
+       inkscape:href="#rect2987"
+       d="m 3.5,1037.875 c -1.0907028,0 -2,0.9093 -2,2 l 0,9 c 0,1.0907 0.9092972,2 2,2 l 9,0 c 1.090703,0 2,-0.9093 2,-2 l 0,-9 c 0,-1.0907 -0.909297,-2 -2,-2 l -9,0 z" />
+  </g>
+</svg>
diff --git a/_src/checkbox-unchecked-insensitive.svg b/_src/checkbox-unchecked-insensitive.svg
new file mode 100644
index 0000000..54999b4
--- /dev/null
+++ b/_src/checkbox-unchecked-insensitive.svg
@@ -0,0 +1,128 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="checkbox-unchecked-insensitive.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/checkbox-unchecked-insensitive@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3820"
+       id="linearGradient3826"
+       x1="1"
+       y1="1037.3622"
+       x2="15"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3820">
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1;"
+         offset="0"
+         id="stop3822" />
+      <stop
+         id="stop3830"
+         offset="0.46428695"
+         style="stop-color:#e0dedd;stop-opacity:1;" />
+      <stop
+         id="stop3828"
+         offset="0.53571439"
+         style="stop-color:#fbfbfa;stop-opacity:1;" />
+      <stop
+         style="stop-color:#fbfbfa;stop-opacity:1;"
+         offset="1"
+         id="stop3824" />
+    </linearGradient>
+    <linearGradient
+       y2="1051.3622"
+       x2="15"
+       y1="1037.3622"
+       x1="1"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3849"
+       xlink:href="#linearGradient3820"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6c25e2"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="72.75"
+     inkscape:cx="7.3402062"
+     inkscape:cy="7.5051546"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1983"
+     inkscape:window-x="1920"
+     inkscape:window-y="144"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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)">
+    <rect
+       style="fill:#edeceb;fill-opacity:1;stroke:#a7a3a0;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect2987"
+       width="11"
+       height="11"
+       x="2.5"
+       y="1038.8624"
+       rx="1"
+       ry="1" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1"
+       inkscape:original="M 3.5 1038.875 C 2.946 1038.875 2.5 1039.321 2.5 1039.875 L 2.5 1048.875 C 2.5 1049.429 2.946 1049.875 3.5 1049.875 L 12.5 1049.875 C 13.054 1049.875 13.5 1049.429 13.5 1048.875 L 13.5 1039.875 C 13.5 1039.321 13.054 1038.875 12.5 1038.875 L 3.5 1038.875 z "
+       xlink:href="#rect2987"
+       style="fill:none;stroke:url(#linearGradient3849);stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3042"
+       inkscape:href="#rect2987"
+       d="m 3.5,1037.875 c -1.0907028,0 -2,0.9093 -2,2 l 0,9 c 0,1.0907 0.9092972,2 2,2 l 9,0 c 1.090703,0 2,-0.9093 2,-2 l 0,-9 c 0,-1.0907 -0.909297,-2 -2,-2 l -9,0 z" />
+  </g>
+</svg>
diff --git a/_src/checkbox-unchecked.svg b/_src/checkbox-unchecked.svg
new file mode 100644
index 0000000..018b07c
--- /dev/null
+++ b/_src/checkbox-unchecked.svg
@@ -0,0 +1,129 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="checkbox-unchecked.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/checkbox-unchecked@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3820"
+       id="linearGradient3826"
+       x1="1"
+       y1="1037.3622"
+       x2="15"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3820">
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1;"
+         offset="0"
+         id="stop3822" />
+      <stop
+         id="stop3830"
+         offset="0.46428695"
+         style="stop-color:#e0dedd;stop-opacity:1;" />
+      <stop
+         id="stop3828"
+         offset="0.53571439"
+         style="stop-color:#fbfbfa;stop-opacity:1;" />
+      <stop
+         style="stop-color:#fbfbfa;stop-opacity:1;"
+         offset="1"
+         id="stop3824" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(0,0.0128)"
+       y2="1051.3622"
+       x2="15"
+       y1="1037.3622"
+       x1="1"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3849"
+       xlink:href="#linearGradient3820"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="72.75"
+     inkscape:cx="7.3402062"
+     inkscape:cy="7.5051546"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1983"
+     inkscape:window-x="1920"
+     inkscape:window-y="144"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#787571;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect2987"
+       width="11"
+       height="11"
+       x="2.5"
+       y="1038.8624"
+       rx="1"
+       ry="1" />
+    <path
+       transform="translate(0,-0.0128)"
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1"
+       inkscape:original="M 3.5 1038.875 C 2.946 1038.875 2.5 1039.321 2.5 1039.875 L 2.5 1048.875 C 2.5 1049.429 2.946 1049.875 3.5 1049.875 L 12.5 1049.875 C 13.054 1049.875 13.5 1049.429 13.5 1048.875 L 13.5 1039.875 C 13.5 1039.321 13.054 1038.875 12.5 1038.875 L 3.5 1038.875 z "
+       xlink:href="#rect2987"
+       style="fill:none;stroke:url(#linearGradient3849);stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3042"
+       inkscape:href="#rect2987"
+       d="m 3.5,1037.875 c -1.0907028,0 -2,0.9093 -2,2 l 0,9 c 0,1.0907 0.9092972,2 2,2 l 9,0 c 1.090703,0 2,-0.9093 2,-2 l 0,-9 c 0,-1.0907 -0.909297,-2 -2,-2 l -9,0 z" />
+  </g>
+</svg>
diff --git a/_src/menuitem-checkbox-checked-hover.svg b/_src/menuitem-checkbox-checked-hover.svg
new file mode 100644
index 0000000..239b2f3
--- /dev/null
+++ b/_src/menuitem-checkbox-checked-hover.svg
@@ -0,0 +1,85 @@
+<?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="10"
+   height="10"
+   id="svg3998"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-checkbox-checked.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/menuitem-checkbox-checked@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4000" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="105.81818"
+     inkscape:cx="5.5"
+     inkscape:cy="5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1983"
+     inkscape:window-x="1920"
+     inkscape:window-y="144"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4006"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4003">
+    <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,-1042.3622)">
+    <rect
+       style="fill:#c9daef;fill-opacity:1;stroke:#4b6e99;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4008"
+       width="9"
+       height="9"
+       x="0.5"
+       y="1042.8622"
+       rx="0"
+       ry="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.20000005000000010;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 2,1047.3622 2.5,3 c 0,0 0.95,-3.875 3.5,-6"
+       id="path3861"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/_src/menuitem-checkbox-checked-insensitive.svg b/_src/menuitem-checkbox-checked-insensitive.svg
new file mode 100644
index 0000000..d5e977e
--- /dev/null
+++ b/_src/menuitem-checkbox-checked-insensitive.svg
@@ -0,0 +1,85 @@
+<?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="11"
+   height="10"
+   id="svg3998"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-checkbox-insensitive.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/menuitem-checkbox-checked-insensitive@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4000" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="105.81818"
+     inkscape:cx="5.5"
+     inkscape:cy="5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1983"
+     inkscape:window-x="1920"
+     inkscape:window-y="144"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4006"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4003">
+    <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,-1042.3622)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#aaaaaa;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4008"
+       width="9"
+       height="9"
+       x="1.5"
+       y="1042.8622"
+       rx="0"
+       ry="0" />
+    <path
+       style="fill:none;stroke:#8c8c8c;stroke-width:1.20000005000000010;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 3,1047.3622 2.5,3 c 0,0 0.95,-3.875 3.5,-6"
+       id="path3861"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/_src/menuitem-checkbox-checked.svg b/_src/menuitem-checkbox-checked.svg
new file mode 100644
index 0000000..c331862
--- /dev/null
+++ b/_src/menuitem-checkbox-checked.svg
@@ -0,0 +1,85 @@
+<?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="10"
+   height="10"
+   id="svg3998"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-checkbox-checked-insensitive.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/menuitem-checkbox-checked-insensitive@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4000" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="105.81818"
+     inkscape:cx="5.5"
+     inkscape:cy="5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1983"
+     inkscape:window-x="1920"
+     inkscape:window-y="144"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4006"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4003">
+    <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,-1042.3622)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#797979;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4008"
+       width="9"
+       height="9"
+       x="0.5"
+       y="1042.8622"
+       rx="0"
+       ry="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.20000005000000010;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 2,1047.3622 2.5,3 c 0,0 0.95,-3.875 3.5,-6"
+       id="path3861"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/_src/menuitem-checkbox-hover.svg b/_src/menuitem-checkbox-hover.svg
new file mode 100644
index 0000000..248f274
--- /dev/null
+++ b/_src/menuitem-checkbox-hover.svg
@@ -0,0 +1,79 @@
+<?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="10"
+   height="11"
+   id="svg3998"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-checkbox.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/menuitem-checkbox@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4000" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="106.18182"
+     inkscape:cx="5.2268836"
+     inkscape:cy="5.5282534"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2019"
+     inkscape:window-x="1920"
+     inkscape:window-y="108"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4006"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4003">
+    <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,-1041.3622)">
+    <rect
+       style="fill:#c9daef;fill-opacity:1;stroke:#4b6e99;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4008"
+       width="9"
+       height="9"
+       x="0.5"
+       y="1041.8622"
+       rx="0"
+       ry="0" />
+  </g>
+</svg>
diff --git a/_src/menuitem-checkbox-insensitive.svg b/_src/menuitem-checkbox-insensitive.svg
new file mode 100644
index 0000000..396a680
--- /dev/null
+++ b/_src/menuitem-checkbox-insensitive.svg
@@ -0,0 +1,79 @@
+<?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="11"
+   height="10"
+   id="svg3998"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-checkbox-insensitive.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/menuitem-checkbox-checked-insensitive@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4000" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="105.81818"
+     inkscape:cx="5.5"
+     inkscape:cy="5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1983"
+     inkscape:window-x="1920"
+     inkscape:window-y="144"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4006"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4003">
+    <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,-1042.3622)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#aaaaaa;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4008"
+       width="9"
+       height="9"
+       x="1.5"
+       y="1042.8622"
+       rx="0"
+       ry="0" />
+  </g>
+</svg>
diff --git a/_src/menuitem-checkbox-mixed-hover.svg b/_src/menuitem-checkbox-mixed-hover.svg
new file mode 100644
index 0000000..2fc131b
--- /dev/null
+++ b/_src/menuitem-checkbox-mixed-hover.svg
@@ -0,0 +1,85 @@
+<?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="10"
+   height="10"
+   id="svg3998"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-checkbox-checked-hover.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/menuitem-checkbox-checked-hover@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4000" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="105.81818"
+     inkscape:cx="5.5"
+     inkscape:cy="5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1983"
+     inkscape:window-x="1920"
+     inkscape:window-y="144"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4006"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4003">
+    <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,-1042.3622)">
+    <rect
+       style="fill:#c9daef;fill-opacity:1;stroke:#4b6e99;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4008"
+       width="9"
+       height="9"
+       x="0.5"
+       y="1042.8622"
+       rx="0"
+       ry="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 1,5 9,5"
+       id="path4769"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1042.3622)" />
+  </g>
+</svg>
diff --git a/_src/menuitem-checkbox-mixed-insensitive.svg b/_src/menuitem-checkbox-mixed-insensitive.svg
new file mode 100644
index 0000000..7ad0b20
--- /dev/null
+++ b/_src/menuitem-checkbox-mixed-insensitive.svg
@@ -0,0 +1,84 @@
+<?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="11"
+   height="11"
+   id="svg3998"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-checkbox-mixed-insensitive.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/menuitem-checkbox-mixed-insensitive@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4000" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="105.81818"
+     inkscape:cx="4.8857388"
+     inkscape:cy="4.9621993"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1947"
+     inkscape:window-x="1920"
+     inkscape:window-y="180"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4006"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4003">
+    <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,-1041.3622)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#aaaaaa;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4008"
+       width="9"
+       height="9"
+       x="1.5"
+       y="1042.8622"
+       rx="0"
+       ry="0" />
+    <path
+       style="fill:none;stroke:#787571;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 2,1047.3622 8,0"
+       id="path4769"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/_src/menuitem-checkbox-mixed.svg b/_src/menuitem-checkbox-mixed.svg
new file mode 100644
index 0000000..6669363
--- /dev/null
+++ b/_src/menuitem-checkbox-mixed.svg
@@ -0,0 +1,84 @@
+<?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="11"
+   height="11"
+   id="svg3998"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-checkbox-mixed.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/menuitem-checkbox-mixed@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4000" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="105.81818"
+     inkscape:cx="5.5"
+     inkscape:cy="5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1911"
+     inkscape:window-x="1920"
+     inkscape:window-y="216"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4006"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4003">
+    <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,-1041.3622)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#797979;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4008"
+       width="9"
+       height="9"
+       x="1.5"
+       y="1042.8622"
+       rx="0"
+       ry="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 2,1047.3622 8,0"
+       id="path4769"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/_src/menuitem-checkbox.svg b/_src/menuitem-checkbox.svg
new file mode 100644
index 0000000..9ac935e
--- /dev/null
+++ b/_src/menuitem-checkbox.svg
@@ -0,0 +1,76 @@
+<?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="11"
+   height="11"
+   id="svg3998"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 13">
+  <defs
+     id="defs4000" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="106.18182"
+     inkscape:cx="5.4811644"
+     inkscape:cy="5.5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2019"
+     inkscape:window-x="1920"
+     inkscape:window-y="108"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4006"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4003">
+    <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,-1041.3622)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#797979;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4008"
+       width="9"
+       height="9"
+       x="1.5"
+       y="1.5"
+       transform="translate(0,1041.3622)"
+       rx="0"
+       ry="0" />
+  </g>
+</svg>
diff --git a/_src/menuitem-radio-checked-hover.svg b/_src/menuitem-radio-checked-hover.svg
new file mode 100644
index 0000000..136d6c5
--- /dev/null
+++ b/_src/menuitem-radio-checked-hover.svg
@@ -0,0 +1,128 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10"
+   height="11"
+   id="svg3998"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-radio-checked-hover.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/menuitem-radio-checked-hover@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4000">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3860"
+       id="radialGradient3858"
+       cx="7"
+       cy="7"
+       fx="7"
+       fy="7"
+       r="3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.66666667,-2.6666667e-8,2.6666667e-8,0.66666667,2.3333332,2.3333335)" />
+    <linearGradient
+       id="linearGradient3860">
+      <stop
+         id="stop3862"
+         offset="0"
+         style="stop-color:#717171;stop-opacity:1;" />
+      <stop
+         id="stop3864"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       r="3"
+       fy="2.4997663"
+       fx="2.5"
+       cy="2.4997663"
+       cx="2.5"
+       gradientTransform="matrix(0.80000001,-3.2000213e-8,3.2e-8,0.80000534,4.7999998,4.8001857)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6945"
+       xlink:href="#linearGradient3860"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="105.81818"
+     inkscape:cx="5.5"
+     inkscape:cy="5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1911"
+     inkscape:window-x="1920"
+     inkscape:window-y="216"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4006"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4003">
+    <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,-1041.3622)">
+    <path
+       style="fill:#c9daef;fill-opacity:1;stroke:#4b6e99;stroke-width:0.88888884;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path6258"
+       sodipodi:cx="5.5"
+       sodipodi:cy="5.5"
+       sodipodi:rx="4"
+       sodipodi:ry="4"
+       d="m 9.5,5.5 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z"
+       transform="matrix(1.125,0,0,1.125,-1.1875,1040.1747)"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.83333332,0,0,0.83332778,-1.6666665,1039.6956)"
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient6945);fill-opacity:1;stroke:none"
+       id="path3846"
+       sodipodi:cx="8"
+       sodipodi:cy="8"
+       sodipodi:rx="3"
+       sodipodi:ry="3"
+       d="m 11,8 a 3,3 0 1 1 -1.3e-5,-0.0089"
+       sodipodi:start="0"
+       sodipodi:end="6.2802177"
+       sodipodi:open="true" />
+  </g>
+</svg>
diff --git a/_src/menuitem-radio-checked-insensitive.svg b/_src/menuitem-radio-checked-insensitive.svg
new file mode 100644
index 0000000..c31fbe8
--- /dev/null
+++ b/_src/menuitem-radio-checked-insensitive.svg
@@ -0,0 +1,128 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10"
+   height="10"
+   id="svg3998"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-radio-checked-insensitive.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/menuitem-radio-insensitive@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4000">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3860"
+       id="radialGradient3858"
+       cx="7"
+       cy="7"
+       fx="7"
+       fy="7"
+       r="3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.66666667,-2.6666667e-8,2.6666667e-8,0.66666667,2.3333332,2.3333335)" />
+    <linearGradient
+       id="linearGradient3860">
+      <stop
+         id="stop3862"
+         offset="0"
+         style="stop-color:#aaaaaa;stop-opacity:1;" />
+      <stop
+         id="stop3864"
+         offset="1"
+         style="stop-color:#787571;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       r="3"
+       fy="2.4997663"
+       fx="2.5"
+       cy="2.4997663"
+       cx="2.5"
+       gradientTransform="matrix(0.80000001,-3.2000213e-8,3.2e-8,0.80000534,4.7999999,4.800139)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6945"
+       xlink:href="#linearGradient3860"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="105.81818"
+     inkscape:cx="5.5"
+     inkscape:cy="5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1947"
+     inkscape:window-x="1920"
+     inkscape:window-y="180"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4006"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4003">
+    <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,-1042.3622)">
+    <path
+       style="fill:#edeceb;fill-opacity:1;stroke:#aaaaaa;stroke-width:0.88888884;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path6258"
+       sodipodi:cx="5.5"
+       sodipodi:cy="5.5"
+       sodipodi:rx="4"
+       sodipodi:ry="4"
+       d="m 9.5,5.5 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z"
+       transform="matrix(1.125,0,0,1.125,-1.1875001,1041.1747)"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.83333332,0,0,0.83332778,-1.6666666,1040.6956)"
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient6945);fill-opacity:1;stroke:none"
+       id="path3846"
+       sodipodi:cx="8"
+       sodipodi:cy="8"
+       sodipodi:rx="3"
+       sodipodi:ry="3"
+       d="m 11,8 a 3,3 0 1 1 -1.3e-5,-0.0089"
+       sodipodi:start="0"
+       sodipodi:end="6.2802177"
+       sodipodi:open="true" />
+  </g>
+</svg>
diff --git a/_src/menuitem-radio-checked.svg b/_src/menuitem-radio-checked.svg
new file mode 100644
index 0000000..8ba7970
--- /dev/null
+++ b/_src/menuitem-radio-checked.svg
@@ -0,0 +1,128 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10"
+   height="10"
+   id="svg3998"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-radio-checked-insensitive.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/menuitem-radio-checked-insensitive@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4000">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3860"
+       id="radialGradient3858"
+       cx="7"
+       cy="7"
+       fx="7"
+       fy="7"
+       r="3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.66666667,-2.6666667e-8,2.6666667e-8,0.66666667,2.3333332,2.3333335)" />
+    <linearGradient
+       id="linearGradient3860">
+      <stop
+         id="stop3862"
+         offset="0"
+         style="stop-color:#717171;stop-opacity:1;" />
+      <stop
+         id="stop3864"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       r="3"
+       fy="2.4997663"
+       fx="2.5"
+       cy="2.4997663"
+       cx="2.5"
+       gradientTransform="matrix(0.80000001,-3.2000213e-8,3.2e-8,0.80000534,4.7999999,4.800139)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6945"
+       xlink:href="#linearGradient3860"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="105.81818"
+     inkscape:cx="5.5"
+     inkscape:cy="5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1911"
+     inkscape:window-x="1920"
+     inkscape:window-y="216"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4006"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4003">
+    <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,-1042.3622)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#797979;stroke-width:0.88888884000000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path6258"
+       sodipodi:cx="5.5"
+       sodipodi:cy="5.5"
+       sodipodi:rx="4"
+       sodipodi:ry="4"
+       d="m 9.5,5.5 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z"
+       transform="matrix(1.125,0,0,1.125,-1.1875001,1041.1747)"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.83333332,0,0,0.83332778,-1.6666666,1040.6956)"
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient6945);fill-opacity:1;stroke:none"
+       id="path3846"
+       sodipodi:cx="8"
+       sodipodi:cy="8"
+       sodipodi:rx="3"
+       sodipodi:ry="3"
+       d="m 11,8 a 3,3 0 1 1 -1.3e-5,-0.0089"
+       sodipodi:start="0"
+       sodipodi:end="6.2802177"
+       sodipodi:open="true" />
+  </g>
+</svg>
diff --git a/_src/menuitem-radio-hover.svg b/_src/menuitem-radio-hover.svg
new file mode 100644
index 0000000..55b7e84
--- /dev/null
+++ b/_src/menuitem-radio-hover.svg
@@ -0,0 +1,80 @@
+<?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="10"
+   height="10"
+   id="svg3998"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-radio.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/menuitem-radio@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4000" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="116.4"
+     inkscape:cx="5"
+     inkscape:cy="5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1983"
+     inkscape:window-x="1920"
+     inkscape:window-y="144"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4006"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4003">
+    <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,-1042.3622)">
+    <path
+       style="fill:#c9daef;fill-opacity:1;stroke:#4b6e99;stroke-width:0.88888884000000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path6258"
+       sodipodi:cx="5.5"
+       sodipodi:cy="5.5"
+       sodipodi:rx="4"
+       sodipodi:ry="4"
+       d="m 9.5,5.5 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z"
+       transform="matrix(1.125,0,0,1.125,-1.1875,1041.1747)"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/_src/menuitem-radio-insensitive.svg b/_src/menuitem-radio-insensitive.svg
new file mode 100644
index 0000000..7efa3cb
--- /dev/null
+++ b/_src/menuitem-radio-insensitive.svg
@@ -0,0 +1,80 @@
+<?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="11"
+   height="10"
+   id="svg3998"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-radio-hover.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/menuitem-radio-hover@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4000" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="105.81818"
+     inkscape:cx="5.5"
+     inkscape:cy="5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1983"
+     inkscape:window-x="1920"
+     inkscape:window-y="144"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4006"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4003">
+    <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,-1042.3622)">
+    <path
+       style="fill:#edeceb;fill-opacity:1;stroke:#aaaaaa;stroke-width:0.88888884000000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path6258"
+       sodipodi:cx="5.5"
+       sodipodi:cy="5.5"
+       sodipodi:rx="4"
+       sodipodi:ry="4"
+       d="m 9.5,5.5 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z"
+       transform="matrix(1.125,0,0,1.125,-0.18750003,1041.1747)"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/_src/menuitem-radio.svg b/_src/menuitem-radio.svg
new file mode 100644
index 0000000..f4ba353
--- /dev/null
+++ b/_src/menuitem-radio.svg
@@ -0,0 +1,76 @@
+<?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="11"
+   height="11"
+   id="svg3998"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="menuitem-checkbox.svg">
+  <defs
+     id="defs4000" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="106.18182"
+     inkscape:cx="5.4811644"
+     inkscape:cy="5.5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1983"
+     inkscape:window-x="1920"
+     inkscape:window-y="144"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4006"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4003">
+    <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,-1041.3622)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#a7a3a0;stroke-width:0.88888884000000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path6258"
+       sodipodi:cx="5.5"
+       sodipodi:cy="5.5"
+       sodipodi:rx="4"
+       sodipodi:ry="4"
+       d="m 9.5,5.5 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z"
+       transform="matrix(1.125,0,0,1.125,-0.18749992,1041.1747)"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/_src/pane-separator-grip-horz.svg b/_src/pane-separator-grip-horz.svg
new file mode 100644
index 0000000..a88b461
--- /dev/null
+++ b/_src/pane-separator-grip-horz.svg
@@ -0,0 +1,607 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="5"
+   height="47"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/pane-separator-grip-horz@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180"
+   sodipodi:docname="New document 1">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient5074">
+      <stop
+         style="stop-color:#b0adaa;stop-opacity:1;"
+         offset="0"
+         id="stop5076" />
+      <stop
+         style="stop-color:#f7f6f6;stop-opacity:1;"
+         offset="1"
+         id="stop5078" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5074"
+       id="radialGradient5080"
+       cx="0.5"
+       cy="0.5"
+       fx="0.5"
+       fy="0.5"
+       r="1.5"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2"
+     inkscape:cx="1.2609917"
+     inkscape:cy="22.486033"
+     inkscape:document-units="px"
+     inkscape:current-layer="svg2"
+     showgrid="false"
+     inkscape:snap-bbox="true"
+     inkscape:snap-global="true"
+     showborder="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2055"
+     inkscape:window-x="1920"
+     inkscape:window-y="72"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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,-1005.3622)">
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082"
+       width="2"
+       height="2"
+       x="0"
+       y="1005.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084"
+       width="1"
+       height="1"
+       x="0"
+       y="1005.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7"
+       width="2"
+       height="2"
+       x="0"
+       y="1008.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9"
+       width="1"
+       height="1"
+       x="0"
+       y="1008.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-5"
+       width="2"
+       height="2"
+       x="3"
+       y="1005.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-2"
+       width="1"
+       height="1"
+       x="3"
+       y="1005.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7-5"
+       width="2"
+       height="2"
+       x="3"
+       y="1008.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9-5"
+       width="1"
+       height="1"
+       x="3"
+       y="1008.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-2"
+       width="2"
+       height="2"
+       x="0"
+       y="1011.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-91"
+       width="1"
+       height="1"
+       x="0"
+       y="1011.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7-0"
+       width="2"
+       height="2"
+       x="0"
+       y="1014.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9-9"
+       width="1"
+       height="1"
+       x="0"
+       y="1014.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-5-2"
+       width="2"
+       height="2"
+       x="3"
+       y="1011.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-2-7"
+       width="1"
+       height="1"
+       x="3"
+       y="1011.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7-5-0"
+       width="2"
+       height="2"
+       x="3"
+       y="1014.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9-5-7"
+       width="1"
+       height="1"
+       x="3"
+       y="1014.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-1"
+       width="2"
+       height="2"
+       x="0"
+       y="1017.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-5"
+       width="1"
+       height="1"
+       x="0"
+       y="1017.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7-09"
+       width="2"
+       height="2"
+       x="0"
+       y="1020.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9-4"
+       width="1"
+       height="1"
+       x="0"
+       y="1020.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-5-1"
+       width="2"
+       height="2"
+       x="3"
+       y="1017.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-2-74"
+       width="1"
+       height="1"
+       x="3"
+       y="1017.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7-5-2"
+       width="2"
+       height="2"
+       x="3"
+       y="1020.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9-5-8"
+       width="1"
+       height="1"
+       x="3"
+       y="1020.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-2-6"
+       width="2"
+       height="2"
+       x="0"
+       y="1023.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-91-7"
+       width="1"
+       height="1"
+       x="0"
+       y="1023.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7-0-0"
+       width="2"
+       height="2"
+       x="0"
+       y="1026.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9-9-7"
+       width="1"
+       height="1"
+       x="0"
+       y="1026.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-5-2-2"
+       width="2"
+       height="2"
+       x="3"
+       y="1023.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-2-7-4"
+       width="1"
+       height="1"
+       x="3"
+       y="1023.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7-5-0-2"
+       width="2"
+       height="2"
+       x="3"
+       y="1026.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9-5-7-7"
+       width="1"
+       height="1"
+       x="3"
+       y="1026.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-21"
+       width="2"
+       height="2"
+       x="0"
+       y="1029.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-0"
+       width="1"
+       height="1"
+       x="0"
+       y="1029.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7-52"
+       width="2"
+       height="2"
+       x="0"
+       y="1032.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9-2"
+       width="1"
+       height="1"
+       x="0"
+       y="1032.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-5-7"
+       width="2"
+       height="2"
+       x="3"
+       y="1029.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-2-9"
+       width="1"
+       height="1"
+       x="3"
+       y="1029.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7-5-24"
+       width="2"
+       height="2"
+       x="3"
+       y="1032.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9-5-3"
+       width="1"
+       height="1"
+       x="3"
+       y="1032.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-2-9"
+       width="2"
+       height="2"
+       x="0"
+       y="1035.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-91-3"
+       width="1"
+       height="1"
+       x="0"
+       y="1035.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7-0-4"
+       width="2"
+       height="2"
+       x="0"
+       y="1038.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9-9-5"
+       width="1"
+       height="1"
+       x="0"
+       y="1038.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-5-2-6"
+       width="2"
+       height="2"
+       x="3"
+       y="1035.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-2-7-1"
+       width="1"
+       height="1"
+       x="3"
+       y="1035.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7-5-0-9"
+       width="2"
+       height="2"
+       x="3"
+       y="1038.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9-5-7-1"
+       width="1"
+       height="1"
+       x="3"
+       y="1038.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-1-0"
+       width="2"
+       height="2"
+       x="0"
+       y="1041.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-5-7"
+       width="1"
+       height="1"
+       x="0"
+       y="1041.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7-09-6"
+       width="2"
+       height="2"
+       x="0"
+       y="1044.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9-4-2"
+       width="1"
+       height="1"
+       x="0"
+       y="1044.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-5-1-4"
+       width="2"
+       height="2"
+       x="3"
+       y="1041.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-2-74-1"
+       width="1"
+       height="1"
+       x="3"
+       y="1041.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7-5-2-8"
+       width="2"
+       height="2"
+       x="3"
+       y="1044.3622"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9-5-8-8"
+       width="1"
+       height="1"
+       x="3"
+       y="1044.3622" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-2-6-7"
+       width="2"
+       height="2"
+       x="0"
+       y="1047.3623"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-91-7-0"
+       width="1"
+       height="1"
+       x="0"
+       y="1047.3623" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7-0-0-2"
+       width="2"
+       height="2"
+       x="0"
+       y="1050.3623"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9-9-7-0"
+       width="1"
+       height="1"
+       x="0"
+       y="1050.3623" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-5-2-2-5"
+       width="2"
+       height="2"
+       x="3"
+       y="1047.3623"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-2-7-4-4"
+       width="1"
+       height="1"
+       x="3"
+       y="1047.3623" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7-5-0-2-2"
+       width="2"
+       height="2"
+       x="3"
+       y="1050.3623"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9-5-7-7-4"
+       width="1"
+       height="1"
+       x="3"
+       y="1050.3623" />
+  </g>
+</svg>
diff --git a/_src/pane-separator-grip-vert.svg b/_src/pane-separator-grip-vert.svg
new file mode 100644
index 0000000..d4ed48e
--- /dev/null
+++ b/_src/pane-separator-grip-vert.svg
@@ -0,0 +1,606 @@
+<?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="47.000122"
+   height="5"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/pane-separator-grip-vert@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180"
+   sodipodi:docname="pane-separator-grip-horz.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient5074">
+      <stop
+         style="stop-color:#b0adaa;stop-opacity:1;"
+         offset="0"
+         id="stop5076" />
+      <stop
+         style="stop-color:#f7f6f6;stop-opacity:1;"
+         offset="1"
+         id="stop5078" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="23.195785"
+     inkscape:cy="4.1939164"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:snap-bbox="true"
+     inkscape:snap-global="true"
+     showborder="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2055"
+     inkscape:window-x="1920"
+     inkscape:window-y="72"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px"
+       originx="21.000017px"
+       originy="-21px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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(21.000017,-1026.3622)">
+    <g
+       id="g5612"
+       transform="matrix(0,1,1,0,-1026.3622,1026.3622)">
+      <rect
+         ry="0"
+         rx="0"
+         y="1005.3622"
+         x="0"
+         height="2"
+         width="2"
+         id="rect5082"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1005.3622"
+         x="0"
+         height="1"
+         width="1"
+         id="rect5084"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1008.3622"
+         x="0"
+         height="2"
+         width="2"
+         id="rect5082-7"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1008.3622"
+         x="0"
+         height="1"
+         width="1"
+         id="rect5084-9"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1005.3622"
+         x="3"
+         height="2"
+         width="2"
+         id="rect5082-5"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1005.3622"
+         x="3"
+         height="1"
+         width="1"
+         id="rect5084-2"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1008.3622"
+         x="3"
+         height="2"
+         width="2"
+         id="rect5082-7-5"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1008.3622"
+         x="3"
+         height="1"
+         width="1"
+         id="rect5084-9-5"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1011.3622"
+         x="0"
+         height="2"
+         width="2"
+         id="rect5082-2"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1011.3622"
+         x="0"
+         height="1"
+         width="1"
+         id="rect5084-91"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1014.3622"
+         x="0"
+         height="2"
+         width="2"
+         id="rect5082-7-0"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1014.3622"
+         x="0"
+         height="1"
+         width="1"
+         id="rect5084-9-9"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1011.3622"
+         x="3"
+         height="2"
+         width="2"
+         id="rect5082-5-2"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1011.3622"
+         x="3"
+         height="1"
+         width="1"
+         id="rect5084-2-7"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1014.3622"
+         x="3"
+         height="2"
+         width="2"
+         id="rect5082-7-5-0"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1014.3622"
+         x="3"
+         height="1"
+         width="1"
+         id="rect5084-9-5-7"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1017.3622"
+         x="0"
+         height="2"
+         width="2"
+         id="rect5082-1"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1017.3622"
+         x="0"
+         height="1"
+         width="1"
+         id="rect5084-5"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1020.3622"
+         x="0"
+         height="2"
+         width="2"
+         id="rect5082-7-09"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1020.3622"
+         x="0"
+         height="1"
+         width="1"
+         id="rect5084-9-4"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1017.3622"
+         x="3"
+         height="2"
+         width="2"
+         id="rect5082-5-1"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1017.3622"
+         x="3"
+         height="1"
+         width="1"
+         id="rect5084-2-74"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1020.3622"
+         x="3"
+         height="2"
+         width="2"
+         id="rect5082-7-5-2"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1020.3622"
+         x="3"
+         height="1"
+         width="1"
+         id="rect5084-9-5-8"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1023.3622"
+         x="0"
+         height="2"
+         width="2"
+         id="rect5082-2-6"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1023.3622"
+         x="0"
+         height="1"
+         width="1"
+         id="rect5084-91-7"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1026.3622"
+         x="0"
+         height="2"
+         width="2"
+         id="rect5082-7-0-0"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1026.3622"
+         x="0"
+         height="1"
+         width="1"
+         id="rect5084-9-9-7"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1023.3622"
+         x="3"
+         height="2"
+         width="2"
+         id="rect5082-5-2-2"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1023.3622"
+         x="3"
+         height="1"
+         width="1"
+         id="rect5084-2-7-4"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1026.3622"
+         x="3"
+         height="2"
+         width="2"
+         id="rect5082-7-5-0-2"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1026.3622"
+         x="3"
+         height="1"
+         width="1"
+         id="rect5084-9-5-7-7"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1029.3622"
+         x="0"
+         height="2"
+         width="2"
+         id="rect5082-21"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1029.3622"
+         x="0"
+         height="1"
+         width="1"
+         id="rect5084-0"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1032.3622"
+         x="0"
+         height="2"
+         width="2"
+         id="rect5082-7-52"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1032.3622"
+         x="0"
+         height="1"
+         width="1"
+         id="rect5084-9-2"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1029.3622"
+         x="3"
+         height="2"
+         width="2"
+         id="rect5082-5-7"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1029.3622"
+         x="3"
+         height="1"
+         width="1"
+         id="rect5084-2-9"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1032.3622"
+         x="3"
+         height="2"
+         width="2"
+         id="rect5082-7-5-24"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1032.3622"
+         x="3"
+         height="1"
+         width="1"
+         id="rect5084-9-5-3"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1035.3622"
+         x="0"
+         height="2"
+         width="2"
+         id="rect5082-2-9"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1035.3622"
+         x="0"
+         height="1"
+         width="1"
+         id="rect5084-91-3"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1038.3622"
+         x="0"
+         height="2"
+         width="2"
+         id="rect5082-7-0-4"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1038.3622"
+         x="0"
+         height="1"
+         width="1"
+         id="rect5084-9-9-5"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1035.3622"
+         x="3"
+         height="2"
+         width="2"
+         id="rect5082-5-2-6"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1035.3622"
+         x="3"
+         height="1"
+         width="1"
+         id="rect5084-2-7-1"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1038.3622"
+         x="3"
+         height="2"
+         width="2"
+         id="rect5082-7-5-0-9"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1038.3622"
+         x="3"
+         height="1"
+         width="1"
+         id="rect5084-9-5-7-1"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1041.3622"
+         x="0"
+         height="2"
+         width="2"
+         id="rect5082-1-0"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1041.3622"
+         x="0"
+         height="1"
+         width="1"
+         id="rect5084-5-7"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1044.3622"
+         x="0"
+         height="2"
+         width="2"
+         id="rect5082-7-09-6"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1044.3622"
+         x="0"
+         height="1"
+         width="1"
+         id="rect5084-9-4-2"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1041.3622"
+         x="3"
+         height="2"
+         width="2"
+         id="rect5082-5-1-4"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1041.3622"
+         x="3"
+         height="1"
+         width="1"
+         id="rect5084-2-74-1"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1044.3622"
+         x="3"
+         height="2"
+         width="2"
+         id="rect5082-7-5-2-8"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1044.3622"
+         x="3"
+         height="1"
+         width="1"
+         id="rect5084-9-5-8-8"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1047.3623"
+         x="0"
+         height="2"
+         width="2"
+         id="rect5082-2-6-7"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1047.3623"
+         x="0"
+         height="1"
+         width="1"
+         id="rect5084-91-7-0"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1050.3623"
+         x="0"
+         height="2"
+         width="2"
+         id="rect5082-7-0-0-2"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1050.3623"
+         x="0"
+         height="1"
+         width="1"
+         id="rect5084-9-9-7-0"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1047.3623"
+         x="3"
+         height="2"
+         width="2"
+         id="rect5082-5-2-2-5"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1047.3623"
+         x="3"
+         height="1"
+         width="1"
+         id="rect5084-2-7-4-4"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+      <rect
+         ry="0"
+         rx="0"
+         y="1050.3623"
+         x="3"
+         height="2"
+         width="2"
+         id="rect5082-7-5-0-2-2"
+         style="fill:#f7f6f6;fill-opacity:1;stroke:none" />
+      <rect
+         y="1050.3623"
+         x="3"
+         height="1"
+         width="1"
+         id="rect5084-9-5-7-7-4"
+         style="fill:#b0adaa;fill-opacity:1;stroke:none" />
+    </g>
+  </g>
+</svg>
diff --git a/_src/radio-checked-hover.svg b/_src/radio-checked-hover.svg
new file mode 100644
index 0000000..3737ec4
--- /dev/null
+++ b/_src/radio-checked-hover.svg
@@ -0,0 +1,153 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="radio-checked.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/radio-checked@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3860">
+      <stop
+         id="stop3862"
+         offset="0"
+         style="stop-color:#717171;stop-opacity:1;" />
+      <stop
+         id="stop3864"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3764">
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1;"
+         offset="0"
+         id="stop3766" />
+      <stop
+         style="stop-color:#fbfbfa;stop-opacity:1;"
+         offset="1"
+         id="stop3768" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3764"
+       id="linearGradient3778"
+       x1="3.8461759"
+       y1="3.8460705"
+       x2="12.615407"
+       y2="11.692225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,7.9999909,-3.3137304)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3860"
+       id="radialGradient3858"
+       cx="7"
+       cy="7"
+       fx="7"
+       fy="7"
+       r="3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.66666667,-2.6666667e-8,2.6666667e-8,0.66666667,2.3333332,2.3333335)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6c25e2"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="73"
+     inkscape:cx="7.9726027"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2019"
+     inkscape:window-x="1920"
+     inkscape:window-y="108"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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)">
+    <path
+       transform="matrix(0.76603232,-0.76603232,0.76603232,0.76603232,-4.2565174,1044.3623)"
+       sodipodi:open="true"
+       sodipodi:end="6.2802177"
+       sodipodi:start="0"
+       d="m 14,8 a 6,6 0 1 1 -2.6e-5,-0.017806"
+       sodipodi:ry="6"
+       sodipodi:rx="6"
+       sodipodi:cy="8"
+       sodipodi:cx="8"
+       id="path2994"
+       style="fill:none;stroke:url(#linearGradient3778);stroke-width:0.92307693000000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#c9daef;fill-opacity:1;stroke:#51729c;stroke-width:1.09090912000000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4898"
+       sodipodi:cx="8"
+       sodipodi:cy="8"
+       sodipodi:rx="6"
+       sodipodi:ry="6"
+       d="m 14,8 c 0,3.313708 -2.686292,6 -6,6 C 4.6862915,14 2,11.313708 2,8 2,4.6862915 4.6862915,2 8,2 c 3.306757,0 5.99016,2.6754518 5.999974,5.9821944"
+       sodipodi:start="0"
+       sodipodi:end="6.2802177"
+       sodipodi:open="true"
+       transform="matrix(0.91666667,0,0,0.91666666,0.66666665,1037.0288)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3858);fill-opacity:1;stroke:none"
+       id="path3846"
+       sodipodi:cx="8"
+       sodipodi:cy="8"
+       sodipodi:rx="3"
+       sodipodi:ry="3"
+       d="m 11,8 a 3,3 0 1 1 -1.3e-5,-0.0089"
+       transform="translate(0,1036.3622)"
+       sodipodi:start="0"
+       sodipodi:end="6.2802177"
+       sodipodi:open="true" />
+  </g>
+</svg>
diff --git a/_src/radio-checked-insensitive.svg b/_src/radio-checked-insensitive.svg
new file mode 100644
index 0000000..1b4ae2c
--- /dev/null
+++ b/_src/radio-checked-insensitive.svg
@@ -0,0 +1,153 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="radio-unchecked-insensitive.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/radio-unchecked-insensitive@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3860">
+      <stop
+         id="stop3862"
+         offset="0"
+         style="stop-color:#aaaaaa;stop-opacity:1;" />
+      <stop
+         id="stop3864"
+         offset="1"
+         style="stop-color:#787571;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3764">
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1;"
+         offset="0"
+         id="stop3766" />
+      <stop
+         style="stop-color:#fbfbfa;stop-opacity:1;"
+         offset="1"
+         id="stop3768" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3764"
+       id="linearGradient3778"
+       x1="3.8461759"
+       y1="3.8460705"
+       x2="12.615407"
+       y2="11.692225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,7.9999909,-3.3137304)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3860"
+       id="radialGradient3858"
+       cx="7"
+       cy="7"
+       fx="7"
+       fy="7"
+       r="3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.66666667,-2.6666667e-8,2.6666667e-8,0.66666667,2.3333332,2.3333335)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6c25e2"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="73"
+     inkscape:cx="7.9726027"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2055"
+     inkscape:window-x="1920"
+     inkscape:window-y="72"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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)">
+    <path
+       transform="matrix(0.76603232,-0.76603232,0.76603232,0.76603232,-4.2565174,1044.3623)"
+       sodipodi:open="true"
+       sodipodi:end="6.2802177"
+       sodipodi:start="0"
+       d="m 14,8 a 6,6 0 1 1 -2.6e-5,-0.017806"
+       sodipodi:ry="6"
+       sodipodi:rx="6"
+       sodipodi:cy="8"
+       sodipodi:cx="8"
+       id="path2994"
+       style="fill:none;stroke:url(#linearGradient3778);stroke-width:0.92307693000000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#edeceb;fill-opacity:1;stroke:#aaaaaa;stroke-width:1.09090912000000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4898"
+       sodipodi:cx="8"
+       sodipodi:cy="8"
+       sodipodi:rx="6"
+       sodipodi:ry="6"
+       d="m 14,8 c 0,3.313708 -2.686292,6 -6,6 C 4.6862915,14 2,11.313708 2,8 2,4.6862915 4.6862915,2 8,2 c 3.306757,0 5.99016,2.6754518 5.999974,5.9821944"
+       sodipodi:start="0"
+       sodipodi:end="6.2802177"
+       sodipodi:open="true"
+       transform="matrix(0.91666667,0,0,0.91666666,0.66666665,1037.0288)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3858);fill-opacity:1;stroke:none"
+       id="path3846"
+       sodipodi:cx="8"
+       sodipodi:cy="8"
+       sodipodi:rx="3"
+       sodipodi:ry="3"
+       d="m 11,8 a 3,3 0 1 1 -1.3e-5,-0.0089"
+       transform="translate(0,1036.3622)"
+       sodipodi:start="0"
+       sodipodi:end="6.2802177"
+       sodipodi:open="true" />
+  </g>
+</svg>
diff --git a/_src/radio-checked.svg b/_src/radio-checked.svg
new file mode 100644
index 0000000..38b5153
--- /dev/null
+++ b/_src/radio-checked.svg
@@ -0,0 +1,153 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="radio-checked-insensitive.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/radio-checked-insensitive@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3860">
+      <stop
+         id="stop3862"
+         offset="0"
+         style="stop-color:#717171;stop-opacity:1;" />
+      <stop
+         id="stop3864"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3764">
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1;"
+         offset="0"
+         id="stop3766" />
+      <stop
+         style="stop-color:#fbfbfa;stop-opacity:1;"
+         offset="1"
+         id="stop3768" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3764"
+       id="linearGradient3778"
+       x1="3.8461759"
+       y1="3.8460705"
+       x2="12.615407"
+       y2="11.692225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,7.9999909,-3.3137304)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3860"
+       id="radialGradient3858"
+       cx="7"
+       cy="7"
+       fx="7"
+       fy="7"
+       r="3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.66666667,-2.6666667e-8,2.6666667e-8,0.66666667,2.3333332,2.3333335)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6c25e2"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="73"
+     inkscape:cx="7.9726027"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2055"
+     inkscape:window-x="1920"
+     inkscape:window-y="72"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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)">
+    <path
+       transform="matrix(0.76603232,-0.76603232,0.76603232,0.76603232,-4.2565174,1044.3623)"
+       sodipodi:open="true"
+       sodipodi:end="6.2802177"
+       sodipodi:start="0"
+       d="m 14,8 a 6,6 0 1 1 -2.6e-5,-0.017806"
+       sodipodi:ry="6"
+       sodipodi:rx="6"
+       sodipodi:cy="8"
+       sodipodi:cx="8"
+       id="path2994"
+       style="fill:none;stroke:url(#linearGradient3778);stroke-width:0.92307693000000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:#787571;stroke-width:1.09090912000000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4898"
+       sodipodi:cx="8"
+       sodipodi:cy="8"
+       sodipodi:rx="6"
+       sodipodi:ry="6"
+       d="m 14,8 c 0,3.313708 -2.686292,6 -6,6 C 4.6862915,14 2,11.313708 2,8 2,4.6862915 4.6862915,2 8,2 c 3.306757,0 5.99016,2.6754518 5.999974,5.9821944"
+       sodipodi:start="0"
+       sodipodi:end="6.2802177"
+       sodipodi:open="true"
+       transform="matrix(0.91666667,0,0,0.91666666,0.66666665,1037.0288)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3858);fill-opacity:1;stroke:none"
+       id="path3846"
+       sodipodi:cx="8"
+       sodipodi:cy="8"
+       sodipodi:rx="3"
+       sodipodi:ry="3"
+       d="m 11,8 a 3,3 0 1 1 -1.3e-5,-0.0089"
+       transform="translate(0,1036.3622)"
+       sodipodi:start="0"
+       sodipodi:end="6.2802177"
+       sodipodi:open="true" />
+  </g>
+</svg>
diff --git a/_src/radio-mixed-hover.svg b/_src/radio-mixed-hover.svg
new file mode 100644
index 0000000..30d39ad
--- /dev/null
+++ b/_src/radio-mixed-hover.svg
@@ -0,0 +1,146 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="radio-checked-hover.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/radio-checked-hover@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3860">
+      <stop
+         id="stop3862"
+         offset="0"
+         style="stop-color:#717171;stop-opacity:1;" />
+      <stop
+         id="stop3864"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3764">
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1;"
+         offset="0"
+         id="stop3766" />
+      <stop
+         style="stop-color:#fbfbfa;stop-opacity:1;"
+         offset="1"
+         id="stop3768" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3764"
+       id="linearGradient3778"
+       x1="3.8461759"
+       y1="3.8460705"
+       x2="12.615407"
+       y2="11.692225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,7.9999909,-3.3137304)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3860"
+       id="radialGradient3858"
+       cx="7"
+       cy="7"
+       fx="7"
+       fy="7"
+       r="3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.66666667,-2.6666667e-8,2.6666667e-8,0.66666667,2.3333332,2.3333335)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6c25e2"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="73"
+     inkscape:cx="7.9726027"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2019"
+     inkscape:window-x="1920"
+     inkscape:window-y="108"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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)">
+    <path
+       transform="matrix(0.76603232,-0.76603232,0.76603232,0.76603232,-4.2565174,1044.3623)"
+       sodipodi:open="true"
+       sodipodi:end="6.2802177"
+       sodipodi:start="0"
+       d="m 14,8 a 6,6 0 1 1 -2.6e-5,-0.017806"
+       sodipodi:ry="6"
+       sodipodi:rx="6"
+       sodipodi:cy="8"
+       sodipodi:cx="8"
+       id="path2994"
+       style="fill:none;stroke:url(#linearGradient3778);stroke-width:0.92307693000000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#c9daef;fill-opacity:1;stroke:#51729c;stroke-width:1.09090912000000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4898"
+       sodipodi:cx="8"
+       sodipodi:cy="8"
+       sodipodi:rx="6"
+       sodipodi:ry="6"
+       d="m 14,8 c 0,3.313708 -2.686292,6 -6,6 C 4.6862915,14 2,11.313708 2,8 2,4.6862915 4.6862915,2 8,2 c 3.306757,0 5.99016,2.6754518 5.999974,5.9821944"
+       sodipodi:start="0"
+       sodipodi:end="6.2802177"
+       sodipodi:open="true"
+       transform="matrix(0.91666667,0,0,0.91666666,0.66666665,1037.0288)" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="M 3.09375 7 C 3.0271455 7.325488 3 7.654822 3 8 C 3 8.345178 3.0271455 8.674512 3.09375 9 L 12.90625 9 C 12.972854 8.674512 13 8.345178 13 8 C 12.999009 7.6661462 12.969608 7.3153808 12.90625 7 L 3.09375 7 z "
+       transform="translate(0,1036.3622)"
+       id="path4490" />
+  </g>
+</svg>
diff --git a/_src/radio-mixed-insensitive.svg b/_src/radio-mixed-insensitive.svg
new file mode 100644
index 0000000..82ecb6a
--- /dev/null
+++ b/_src/radio-mixed-insensitive.svg
@@ -0,0 +1,146 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="radio-mixed.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/radio-mixed@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3860">
+      <stop
+         id="stop3862"
+         offset="0"
+         style="stop-color:#717171;stop-opacity:1;" />
+      <stop
+         id="stop3864"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3764">
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1;"
+         offset="0"
+         id="stop3766" />
+      <stop
+         style="stop-color:#fbfbfa;stop-opacity:1;"
+         offset="1"
+         id="stop3768" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3764"
+       id="linearGradient3778"
+       x1="3.8461759"
+       y1="3.8460705"
+       x2="12.615407"
+       y2="11.692225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,7.9999909,-3.3137304)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3860"
+       id="radialGradient3858"
+       cx="7"
+       cy="7"
+       fx="7"
+       fy="7"
+       r="3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.66666667,-2.6666667e-8,2.6666667e-8,0.66666667,2.3333332,2.3333335)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6c25e2"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="73"
+     inkscape:cx="7.9726027"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2019"
+     inkscape:window-x="1920"
+     inkscape:window-y="108"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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)">
+    <path
+       transform="matrix(0.76603232,-0.76603232,0.76603232,0.76603232,-4.2565174,1044.3623)"
+       sodipodi:open="true"
+       sodipodi:end="6.2802177"
+       sodipodi:start="0"
+       d="m 14,8 a 6,6 0 1 1 -2.6e-5,-0.017806"
+       sodipodi:ry="6"
+       sodipodi:rx="6"
+       sodipodi:cy="8"
+       sodipodi:cx="8"
+       id="path2994"
+       style="fill:none;stroke:url(#linearGradient3778);stroke-width:0.92307693000000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#edeceb;fill-opacity:1;stroke:#a7a3a0;stroke-width:1.09090912000000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4898"
+       sodipodi:cx="8"
+       sodipodi:cy="8"
+       sodipodi:rx="6"
+       sodipodi:ry="6"
+       d="m 14,8 c 0,3.313708 -2.686292,6 -6,6 C 4.6862915,14 2,11.313708 2,8 2,4.6862915 4.6862915,2 8,2 c 3.306757,0 5.99016,2.6754518 5.999974,5.9821944"
+       sodipodi:start="0"
+       sodipodi:end="6.2802177"
+       sodipodi:open="true"
+       transform="matrix(0.91666667,0,0,0.91666666,0.66666665,1037.0288)" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#787571;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="M 3.09375 7 C 3.0271455 7.325488 3 7.654822 3 8 C 3 8.345178 3.0271455 8.674512 3.09375 9 L 12.90625 9 C 12.972854 8.674512 13 8.345178 13 8 C 12.999009 7.6661462 12.969608 7.3153808 12.90625 7 L 3.09375 7 z "
+       transform="translate(0,1036.3622)"
+       id="path4490" />
+  </g>
+</svg>
diff --git a/_src/radio-mixed.svg b/_src/radio-mixed.svg
new file mode 100644
index 0000000..73c1a4f
--- /dev/null
+++ b/_src/radio-mixed.svg
@@ -0,0 +1,146 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="radio-mixed-hover.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/radio-mixed-hover@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3860">
+      <stop
+         id="stop3862"
+         offset="0"
+         style="stop-color:#717171;stop-opacity:1;" />
+      <stop
+         id="stop3864"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3764">
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1;"
+         offset="0"
+         id="stop3766" />
+      <stop
+         style="stop-color:#fbfbfa;stop-opacity:1;"
+         offset="1"
+         id="stop3768" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3764"
+       id="linearGradient3778"
+       x1="3.8461759"
+       y1="3.8460705"
+       x2="12.615407"
+       y2="11.692225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,7.9999909,-3.3137304)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3860"
+       id="radialGradient3858"
+       cx="7"
+       cy="7"
+       fx="7"
+       fy="7"
+       r="3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.66666667,-2.6666667e-8,2.6666667e-8,0.66666667,2.3333332,2.3333335)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6c25e2"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="73"
+     inkscape:cx="7.9726027"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2019"
+     inkscape:window-x="1920"
+     inkscape:window-y="108"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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)">
+    <path
+       transform="matrix(0.76603232,-0.76603232,0.76603232,0.76603232,-4.2565174,1044.3623)"
+       sodipodi:open="true"
+       sodipodi:end="6.2802177"
+       sodipodi:start="0"
+       d="m 14,8 a 6,6 0 1 1 -2.6e-5,-0.017806"
+       sodipodi:ry="6"
+       sodipodi:rx="6"
+       sodipodi:cy="8"
+       sodipodi:cx="8"
+       id="path2994"
+       style="fill:none;stroke:url(#linearGradient3778);stroke-width:0.92307693000000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:#787571;stroke-width:1.09090912000000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4898"
+       sodipodi:cx="8"
+       sodipodi:cy="8"
+       sodipodi:rx="6"
+       sodipodi:ry="6"
+       d="m 14,8 c 0,3.313708 -2.686292,6 -6,6 C 4.6862915,14 2,11.313708 2,8 2,4.6862915 4.6862915,2 8,2 c 3.306757,0 5.99016,2.6754518 5.999974,5.9821944"
+       sodipodi:start="0"
+       sodipodi:end="6.2802177"
+       sodipodi:open="true"
+       transform="matrix(0.91666667,0,0,0.91666666,0.66666665,1037.0288)" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="M 3.09375 7 C 3.0271455 7.325488 3 7.654822 3 8 C 3 8.345178 3.0271455 8.674512 3.09375 9 L 12.90625 9 C 12.972854 8.674512 13 8.345178 13 8 C 12.999009 7.6661462 12.969608 7.3153808 12.90625 7 L 3.09375 7 z "
+       transform="translate(0,1036.3622)"
+       id="path4490" />
+  </g>
+</svg>
diff --git a/_src/radio-unchecked-hover.svg b/_src/radio-unchecked-hover.svg
new file mode 100644
index 0000000..d5792c0
--- /dev/null
+++ b/_src/radio-unchecked-hover.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="radio-unchecked.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/radio-unchecked@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3764">
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1;"
+         offset="0"
+         id="stop3766" />
+      <stop
+         style="stop-color:#fbfbfa;stop-opacity:1;"
+         offset="1"
+         id="stop3768" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3764"
+       id="linearGradient3778"
+       x1="3.8461759"
+       y1="3.8460705"
+       x2="12.615407"
+       y2="11.692225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,7.9999909,-3.3137304)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6c25e2"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="73"
+     inkscape:cx="7.9726027"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2055"
+     inkscape:window-x="1920"
+     inkscape:window-y="72"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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)">
+    <path
+       transform="matrix(0.76603232,-0.76603232,0.76603232,0.76603232,-4.2565174,1044.3623)"
+       sodipodi:open="true"
+       sodipodi:end="6.2802177"
+       sodipodi:start="0"
+       d="m 14,8 a 6,6 0 1 1 -2.6e-5,-0.017806"
+       sodipodi:ry="6"
+       sodipodi:rx="6"
+       sodipodi:cy="8"
+       sodipodi:cx="8"
+       id="path2994"
+       style="fill:none;stroke:url(#linearGradient3778);stroke-width:0.92307693000000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#c9daef;fill-opacity:1;stroke:#51729c;stroke-width:1.09090912000000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4898"
+       sodipodi:cx="8"
+       sodipodi:cy="8"
+       sodipodi:rx="6"
+       sodipodi:ry="6"
+       d="m 14,8 c 0,3.313708 -2.686292,6 -6,6 C 4.6862915,14 2,11.313708 2,8 2,4.6862915 4.6862915,2 8,2 c 3.306757,0 5.99016,2.6754518 5.999974,5.9821944"
+       sodipodi:start="0"
+       sodipodi:end="6.2802177"
+       sodipodi:open="true"
+       transform="matrix(0.91666667,0,0,0.91666666,0.66666665,1037.0288)" />
+  </g>
+</svg>
diff --git a/_src/radio-unchecked-insensitive.svg b/_src/radio-unchecked-insensitive.svg
new file mode 100644
index 0000000..82f3708
--- /dev/null
+++ b/_src/radio-unchecked-insensitive.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="radio-unchecked-hover.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/radio-unchecked-hover@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3764">
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1;"
+         offset="0"
+         id="stop3766" />
+      <stop
+         style="stop-color:#fbfbfa;stop-opacity:1;"
+         offset="1"
+         id="stop3768" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3764"
+       id="linearGradient3778"
+       x1="3.8461759"
+       y1="3.8460705"
+       x2="12.615407"
+       y2="11.692225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,7.9999909,-3.3137304)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6c25e2"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="73"
+     inkscape:cx="7.9726027"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2055"
+     inkscape:window-x="1920"
+     inkscape:window-y="72"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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)">
+    <path
+       transform="matrix(0.76603232,-0.76603232,0.76603232,0.76603232,-4.2565174,1044.3623)"
+       sodipodi:open="true"
+       sodipodi:end="6.2802177"
+       sodipodi:start="0"
+       d="m 14,8 a 6,6 0 1 1 -2.6e-5,-0.017806"
+       sodipodi:ry="6"
+       sodipodi:rx="6"
+       sodipodi:cy="8"
+       sodipodi:cx="8"
+       id="path2994"
+       style="fill:none;stroke:url(#linearGradient3778);stroke-width:0.92307693000000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#edeceb;fill-opacity:1;stroke:#aaaaaa;stroke-width:1.09090912000000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4898"
+       sodipodi:cx="8"
+       sodipodi:cy="8"
+       sodipodi:rx="6"
+       sodipodi:ry="6"
+       d="m 14,8 c 0,3.313708 -2.686292,6 -6,6 C 4.6862915,14 2,11.313708 2,8 2,4.6862915 4.6862915,2 8,2 c 3.306757,0 5.99016,2.6754518 5.999974,5.9821944"
+       sodipodi:start="0"
+       sodipodi:end="6.2802177"
+       sodipodi:open="true"
+       transform="matrix(0.91666667,0,0,0.91666666,0.66666665,1037.0288)" />
+  </g>
+</svg>
diff --git a/_src/radio-unchecked.svg b/_src/radio-unchecked.svg
new file mode 100644
index 0000000..c8cd86b
--- /dev/null
+++ b/_src/radio-unchecked.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="radio-unchecked.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/checkbox-mixed-insensitive@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3764">
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1;"
+         offset="0"
+         id="stop3766" />
+      <stop
+         style="stop-color:#fbfbfa;stop-opacity:1;"
+         offset="1"
+         id="stop3768" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3764"
+       id="linearGradient3778"
+       x1="3.8461759"
+       y1="3.8460705"
+       x2="12.615407"
+       y2="11.692225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,7.9999909,-3.3137304)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6c25e2"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="73"
+     inkscape:cx="7.9726027"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2055"
+     inkscape:window-x="1920"
+     inkscape:window-y="72"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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)">
+    <path
+       transform="matrix(0.76603232,-0.76603232,0.76603232,0.76603232,-4.2565174,1044.3623)"
+       sodipodi:open="true"
+       sodipodi:end="6.2802177"
+       sodipodi:start="0"
+       d="m 14,8 a 6,6 0 1 1 -2.6e-5,-0.017806"
+       sodipodi:ry="6"
+       sodipodi:rx="6"
+       sodipodi:cy="8"
+       sodipodi:cx="8"
+       id="path2994"
+       style="fill:none;stroke:url(#linearGradient3778);stroke-width:0.92307693000000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:#787571;stroke-width:1.09090912;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4898"
+       sodipodi:cx="8"
+       sodipodi:cy="8"
+       sodipodi:rx="6"
+       sodipodi:ry="6"
+       d="m 14,8 c 0,3.313708 -2.686292,6 -6,6 C 4.6862915,14 2,11.313708 2,8 2,4.6862915 4.6862915,2 8,2 c 3.306757,0 5.99016,2.6754518 5.999974,5.9821944"
+       sodipodi:start="0"
+       sodipodi:end="6.2802177"
+       sodipodi:open="true"
+       transform="matrix(0.91666667,0,0,0.91666666,0.66666665,1037.0288)" />
+  </g>
+</svg>
diff --git a/_src/resize-grip.svg b/_src/resize-grip.svg
new file mode 100644
index 0000000..6322168
--- /dev/null
+++ b/_src/resize-grip.svg
@@ -0,0 +1,272 @@
+<?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="11"
+   height="11"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/resize-grip@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180"
+   sodipodi:docname="resize-grip.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient5074">
+      <stop
+         style="stop-color:#b0adaa;stop-opacity:1;"
+         offset="0"
+         id="stop5076" />
+      <stop
+         style="stop-color:#f7f6f6;stop-opacity:1;"
+         offset="1"
+         id="stop5078" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="69.810724"
+     inkscape:cx="5.4003567"
+     inkscape:cy="5.2751046"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-global="true"
+     showborder="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2055"
+     inkscape:window-x="1920"
+     inkscape:window-y="72"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     showguides="false"
+     inkscape:bbox-paths="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px"
+       originx="21.000017px"
+       originy="-21px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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(21.000017,-1020.3622)">
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7"
+       width="2"
+       height="2"
+       x="1026.3622"
+       y="-18.000017"
+       rx="0"
+       ry="0"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9"
+       width="1"
+       height="1"
+       x="1026.3622"
+       y="-18.000017"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-5"
+       width="2"
+       height="2"
+       x="1029.3622"
+       y="-21.000017"
+       rx="0"
+       ry="0"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-2"
+       width="1"
+       height="1"
+       x="1029.3622"
+       y="-21.000017"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7-5"
+       width="2"
+       height="2"
+       x="1029.3622"
+       y="-18.000017"
+       rx="0"
+       ry="0"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9-5"
+       width="1"
+       height="1"
+       x="1029.3622"
+       y="-18.000017"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-2"
+       width="2"
+       height="2"
+       x="1026.3622"
+       y="-15.000017"
+       rx="0"
+       ry="0"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-91"
+       width="1"
+       height="1"
+       x="1026.3622"
+       y="-15.000017"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7-0"
+       width="2"
+       height="2"
+       x="1026.3622"
+       y="-12.000017"
+       rx="0"
+       ry="0"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9-9"
+       width="1"
+       height="1"
+       x="1026.3622"
+       y="-12.000017"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-5-2"
+       width="2"
+       height="2"
+       x="1029.3622"
+       y="-15.000017"
+       rx="0"
+       ry="0"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-2-7"
+       width="1"
+       height="1"
+       x="1029.3622"
+       y="-15.000017"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-7-5-0"
+       width="2"
+       height="2"
+       x="1029.3622"
+       y="-12.000017"
+       rx="0"
+       ry="0"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-9-5-7"
+       width="1"
+       height="1"
+       x="1029.3622"
+       y="-12.000017"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-1"
+       width="2"
+       height="2"
+       x="1023.3622"
+       y="-12"
+       rx="0"
+       ry="0"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-5"
+       width="1"
+       height="1"
+       x="1023.3622"
+       y="-12"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082-5-1"
+       width="2"
+       height="2"
+       x="1020.3622"
+       y="-12"
+       rx="0"
+       ry="0"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084-2-74"
+       width="1"
+       height="1"
+       x="1020.3622"
+       y="-12"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#f7f6f6;fill-opacity:1;stroke:none"
+       id="rect5082"
+       width="2"
+       height="2"
+       x="1023.3622"
+       y="-15"
+       rx="0"
+       ry="0"
+       transform="matrix(0,1,1,0,0,0)" />
+    <rect
+       style="fill:#b0adaa;fill-opacity:1;stroke:none"
+       id="rect5084"
+       width="1"
+       height="1"
+       x="1023.3622"
+       y="-15"
+       transform="matrix(0,1,1,0,0,0)" />
+  </g>
+</svg>
diff --git a/_src/scale-slider-horz-hover.svg b/_src/scale-slider-horz-hover.svg
new file mode 100644
index 0000000..fee4a03
--- /dev/null
+++ b/_src/scale-slider-horz-hover.svg
@@ -0,0 +1,144 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="21"
+   height="13"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="scale-slider-horz-hover.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/scale-slider-horz-hover@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.5"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:0.5"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3759" />
+      <stop
+         id="stop3856"
+         offset="0.45454547"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#edeceb;stop-opacity:1"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="10.5"
+       y1="1"
+       x2="10.5"
+       y2="12"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3773"
+       x1="1"
+       y1="6.5"
+       x2="20"
+       y2="6.5"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="55.619048"
+     inkscape:cx="10.464041"
+     inkscape:cy="6.5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2055"
+     inkscape:window-x="1920"
+     inkscape:window-y="72"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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,-1039.3622)">
+    <rect
+       style="fill:url(#linearGradient3763);fill-opacity:1;stroke:#4b6e99;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3755"
+       width="20"
+       height="12"
+       x="0.5"
+       y="0.5"
+       transform="translate(0,1039.3622)"
+       ry="2.5" />
+    <path
+       style="fill:none;stroke:#6d6a68;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 10.5,1043.3622 0,5"
+       id="path3799"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#6d6a68;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7.5,1043.3622 0,5"
+       id="path3799-8"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-2.5"
+       inkscape:transform-center-y="-1" />
+    <path
+       style="fill:none;stroke:#6d6a68;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13.5,1043.3622 0,5"
+       id="path3799-8-7"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-2.5"
+       inkscape:transform-center-y="-1" />
+  </g>
+</svg>
diff --git a/_src/scale-slider-horz-insensitive.svg b/_src/scale-slider-horz-insensitive.svg
new file mode 100644
index 0000000..6bbad0f
--- /dev/null
+++ b/_src/scale-slider-horz-insensitive.svg
@@ -0,0 +1,150 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="21"
+   height="13"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="scale-slider-horz.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/scale-slider-horz@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.5"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:0.5"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#fdfdfd;stop-opacity:1"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="10.5"
+       y1="1"
+       x2="10.5"
+       y2="12"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3773"
+       x1="1"
+       y1="6.5"
+       x2="20"
+       y2="6.5"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="55.619048"
+     inkscape:cx="10.5"
+     inkscape:cy="6.5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2019"
+     inkscape:window-x="1920"
+     inkscape:window-y="108"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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,-1039.3622)">
+    <rect
+       style="fill:url(#linearGradient3763);fill-opacity:1;stroke:#b1b0ae;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3755"
+       width="20"
+       height="12"
+       x="0.5"
+       y="0.5"
+       transform="translate(0,1039.3622)"
+       ry="2.5" />
+    <rect
+       style="fill:url(#linearGradient3773);fill-opacity:1;stroke:none;"
+       id="rect3765"
+       width="19"
+       height="11"
+       x="1"
+       y="1"
+       transform="translate(0,1039.3622)"
+       ry="2" />
+    <path
+       style="fill:none;stroke:#a19f9d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 10.5,1043.3622 0,5"
+       id="path3799"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#a19f9d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7.5,1043.3622 0,5"
+       id="path3799-8"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-2.5"
+       inkscape:transform-center-y="-1" />
+    <path
+       style="fill:none;stroke:#a19f9d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13.5,1043.3622 0,5"
+       id="path3799-8-7"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-2.5"
+       inkscape:transform-center-y="-1" />
+  </g>
+</svg>
diff --git a/_src/scale-slider-horz.svg b/_src/scale-slider-horz.svg
new file mode 100644
index 0000000..9369680
--- /dev/null
+++ b/_src/scale-slider-horz.svg
@@ -0,0 +1,150 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="21"
+   height="13"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="scale-slider-horz.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/scale-slider-horz@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.5"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:0.5"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#fdfdfd;stop-opacity:1"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="10.5"
+       y1="1"
+       x2="10.5"
+       y2="12"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3773"
+       x1="1"
+       y1="6.5"
+       x2="20"
+       y2="6.5"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="55.619048"
+     inkscape:cx="10.464041"
+     inkscape:cy="6.5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2055"
+     inkscape:window-x="1920"
+     inkscape:window-y="72"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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,-1039.3622)">
+    <rect
+       style="fill:url(#linearGradient3763);fill-opacity:1;stroke:#868482;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3755"
+       width="20"
+       height="12"
+       x="0.5"
+       y="0.5"
+       transform="translate(0,1039.3622)"
+       ry="2.5" />
+    <rect
+       style="fill:url(#linearGradient3773);fill-opacity:1;stroke:none;"
+       id="rect3765"
+       width="19"
+       height="11"
+       x="1"
+       y="1"
+       transform="translate(0,1039.3622)"
+       ry="2" />
+    <path
+       style="fill:none;stroke:#6d6a68;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 10.5,1043.3622 0,5"
+       id="path3799"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#6d6a68;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7.5,1043.3622 0,5"
+       id="path3799-8"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-2.5"
+       inkscape:transform-center-y="-1" />
+    <path
+       style="fill:none;stroke:#6d6a68;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13.5,1043.3622 0,5"
+       id="path3799-8-7"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-2.5"
+       inkscape:transform-center-y="-1" />
+  </g>
+</svg>
diff --git a/_src/scale-slider-vert-hover.svg b/_src/scale-slider-vert-hover.svg
new file mode 100644
index 0000000..205ab71
--- /dev/null
+++ b/_src/scale-slider-vert-hover.svg
@@ -0,0 +1,171 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="13"
+   height="21"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="scale-slider-vert-hover.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/scale-slider-vert-hover@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.5"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:0.5"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3759" />
+      <stop
+         id="stop3856"
+         offset="0.45454547"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#edeceb;stop-opacity:1"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="10.5"
+       y1="1"
+       x2="10.5"
+       y2="12"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3773"
+       x1="1"
+       y1="6.5"
+       x2="20"
+       y2="6.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient5255"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="1"
+       x2="10.5"
+       y2="12"
+       gradientTransform="matrix(0,-1,1,0,4,17)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient5261"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,1,0,1035.3622,-4)"
+       x1="5"
+       y1="6.5"
+       x2="16"
+       y2="6.5" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="55.619048"
+     inkscape:cx="6.464041"
+     inkscape:cy="10.499983"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1983"
+     inkscape:window-x="1920"
+     inkscape:window-y="144"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px"
+       originx="-4px"
+       originy="3.9999826px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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(-4,-1035.3622)">
+    <rect
+       rx="2.5"
+       style="fill:url(#linearGradient5261);fill-opacity:1;stroke:#4b6e99;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3755"
+       width="20"
+       height="12"
+       x="1035.8622"
+       y="-16.5"
+       transform="matrix(0,1,-1,0,0,0)"
+       ry="2.5" />
+    <path
+       style="fill:none;stroke:#6d6a68;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13,1045.8622 -5,0"
+       id="path3799"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#6d6a68;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13,1042.8622 -5,0"
+       id="path3799-8"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-2.5"
+       inkscape:transform-center-y="-1" />
+    <path
+       style="fill:none;stroke:#6d6a68;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13,1048.8622 -5,0"
+       id="path3799-8-7"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-2.5"
+       inkscape:transform-center-y="-1" />
+  </g>
+</svg>
diff --git a/_src/scale-slider-vert-insensitive.svg b/_src/scale-slider-vert-insensitive.svg
new file mode 100644
index 0000000..b1ccc35
--- /dev/null
+++ b/_src/scale-slider-vert-insensitive.svg
@@ -0,0 +1,218 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="13"
+   height="21"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="scale-slider-vert-insensitive.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/scale-slider-vert-insensitive@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.5"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:0.5"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#fdfdfd;stop-opacity:1"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="10.5"
+       y1="1"
+       x2="10.5"
+       y2="12"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3773"
+       x1="1"
+       y1="6.5"
+       x2="20"
+       y2="6.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient4476"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="1"
+       x2="10.5"
+       y2="12"
+       gradientTransform="matrix(0,-1,1,0,4,17)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4478"
+       gradientUnits="userSpaceOnUse"
+       x1="1"
+       y1="6.5"
+       x2="20"
+       y2="6.5"
+       gradientTransform="matrix(0,-1,1,0,4,17)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient4489"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,1,0,4,17)"
+       x1="10.5"
+       y1="1"
+       x2="10.5"
+       y2="12" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4491"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,1,0,4,17)"
+       x1="1"
+       y1="6.5"
+       x2="20"
+       y2="6.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4497"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,1,0,1035.3622,-4)"
+       x1="10.5"
+       y1="-3"
+       x2="10.5"
+       y2="16" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient4500"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,1,0,1035.3622,-4)"
+       x1="5"
+       y1="6.5"
+       x2="16"
+       y2="6.5" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="55.619048"
+     inkscape:cx="6.464041"
+     inkscape:cy="10.499965"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2055"
+     inkscape:window-x="1920"
+     inkscape:window-y="72"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px"
+       originx="-4px"
+       originy="3.9999652px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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(-4,-1035.3622)">
+    <rect
+       rx="2.5"
+       style="fill:url(#linearGradient4500);fill-opacity:1;stroke:#b1b0ae;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3755"
+       width="20"
+       height="12"
+       x="1035.8622"
+       y="-16.5"
+       transform="matrix(0,1,-1,0,0,0)"
+       ry="2.5" />
+    <rect
+       rx="2"
+       style="fill:url(#linearGradient4497);fill-opacity:1;stroke:none"
+       id="rect3765"
+       width="19"
+       height="11"
+       x="1036.3622"
+       y="-16"
+       transform="matrix(0,1,-1,0,0,0)"
+       ry="2" />
+    <path
+       style="fill:none;stroke:#a19f9d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13,1045.8622 -5,0"
+       id="path3799"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#a19f9d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13,1042.8622 -5,0"
+       id="path3799-8"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-2.5"
+       inkscape:transform-center-y="-1" />
+    <path
+       style="fill:none;stroke:#a19f9d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13,1048.8622 -5,0"
+       id="path3799-8-7"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-2.5"
+       inkscape:transform-center-y="-1" />
+  </g>
+</svg>
diff --git a/_src/scale-slider-vert.svg b/_src/scale-slider-vert.svg
new file mode 100644
index 0000000..dec8c27
--- /dev/null
+++ b/_src/scale-slider-vert.svg
@@ -0,0 +1,198 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="13"
+   height="21"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="scale-slider-vert.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/scale-slider-vert@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.5"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:0.5"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#fdfdfd;stop-opacity:1"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e0dedd;stop-opacity:1"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="10.5"
+       y1="1"
+       x2="10.5"
+       y2="12"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3773"
+       x1="1"
+       y1="6.5"
+       x2="20"
+       y2="6.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient4593"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="1"
+       x2="10.5"
+       y2="12"
+       gradientTransform="matrix(0,-1,1,0,4,17)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4595"
+       gradientUnits="userSpaceOnUse"
+       x1="1"
+       y1="6.5"
+       x2="20"
+       y2="6.5"
+       gradientTransform="matrix(0,-1,1,0,4,17)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4601"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,1,0,1035.3622,-4)"
+       x1="10.5"
+       y1="-3"
+       x2="10.5"
+       y2="16" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient4604"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,1,0,1035.3622,-4)"
+       x1="5"
+       y1="6.5"
+       x2="16"
+       y2="6.5" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="55.619048"
+     inkscape:cx="6.464041"
+     inkscape:cy="10.499983"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2019"
+     inkscape:window-x="1920"
+     inkscape:window-y="108"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px"
+       originx="-4px"
+       originy="3.9999826px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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(-4,-1035.3622)">
+    <rect
+       rx="2.5"
+       style="fill:url(#linearGradient4604);fill-opacity:1;stroke:#868482;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3755"
+       width="20"
+       height="12"
+       x="1035.8622"
+       y="-16.5"
+       transform="matrix(0,1,-1,0,0,0)"
+       ry="2.5" />
+    <rect
+       rx="2"
+       style="fill:url(#linearGradient4601);fill-opacity:1;stroke:none"
+       id="rect3765"
+       width="19"
+       height="11"
+       x="1036.3622"
+       y="-16"
+       transform="matrix(0,1,-1,0,0,0)"
+       ry="2" />
+    <path
+       style="fill:none;stroke:#6d6a68;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13,1045.8622 -5,0"
+       id="path3799"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#6d6a68;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13,1042.8622 -5,0"
+       id="path3799-8"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-2.5"
+       inkscape:transform-center-y="-1" />
+    <path
+       style="fill:none;stroke:#6d6a68;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13,1048.8622 -5,0"
+       id="path3799-8-7"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-2.5"
+       inkscape:transform-center-y="-1" />
+  </g>
+</svg>
diff --git a/_src/slider-horz-grip.svg b/_src/slider-horz-grip.svg
new file mode 100644
index 0000000..ebf6fee
--- /dev/null
+++ b/_src/slider-horz-grip.svg
@@ -0,0 +1,87 @@
+<?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="8"
+   height="5"
+   id="svg5263"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="slider-horz.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/slider-horz@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs5265" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="146"
+     inkscape:cx="4"
+     inkscape:cy="2.5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="2055"
+     inkscape:window-x="1920"
+     inkscape:window-y="72"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5779"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5268">
+    <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,-1047.3622)">
+    <path
+       style="fill:none;stroke:#4a4847;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0.5,0 0,5"
+       id="path5781"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1047.3622)" />
+    <path
+       style="fill:none;stroke:#4a4847;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.5,1047.3622 0,5"
+       id="path5781-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#4a4847;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 6.5,1047.3622 0,5"
+       id="path5781-38"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/_src/slider-vert-grip.svg b/_src/slider-vert-grip.svg
new file mode 100644
index 0000000..75aee0e
--- /dev/null
+++ b/_src/slider-vert-grip.svg
@@ -0,0 +1,92 @@
+<?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="5"
+   height="8"
+   id="svg5263"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="slider-vert.svg"
+   inkscape:export-filename="/usr/share/themes/Clearlooks-Phenix-HiDPI/gtk-3.0/img/slider-vert@2.png"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs5265" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="146"
+     inkscape:cx="3.0128"
+     inkscape:cy="3.5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:window-width="1918"
+     inkscape:window-height="1983"
+     inkscape:window-x="1920"
+     inkscape:window-y="144"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5779"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px"
+       originx="-0.9872px"
+       originy="1px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5268">
+    <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.9872,-1045.3622)">
+    <path
+       style="fill:none;stroke:#4a4847;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.9872,1045.8622 -5,0"
+       id="path5781"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#4a4847;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.9872,1048.8622 -5,0"
+       id="path5781-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#4a4847;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.9872,1051.8622 -5,0"
+       id="path5781-38"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/gtk-3.0/applications.css b/gtk-3.0/applications.css
index f4e4d43..c66350c 100644
--- a/gtk-3.0/applications.css
+++ b/gtk-3.0/applications.css
@@ -2,90 +2,22 @@
  * Nautilus *
  ************/
 
-/*
 .nautilus-desktop.nautilus-canvas-item {
 	color: @theme_base_color;
-	text-shadow: 1 1 alpha (@theme_fg_color, 0.8);
+	text-shadow: 1px 1px alpha (@theme_fg_color, 0.8);
 }
 
 .nautilus-desktop.nautilus-canvas-item:active,
-.nautilus-desktop.nautilus-canvas-item:prelight,
+.nautilus-desktop.nautilus-canvas-item:hover,
 .nautilus-desktop.nautilus-canvas-item:selected {
 	text-shadow: none;
 }
-*/
 
 .nautilus-desktop .entry {
 	background-image: none;
 	border-image: none;
 }
 
-NautilusToolbar .linked.raised GtkToggleButton.button:first-child,
-NautilusToolbar .linked.raised GtkToggleButton.button:first-child:active:hover {
-	border-right-width: 1px;
-}
-
-/*********
- * gedit *
- *********/
-
-GeditMenuStackSwitcher.button.flat {
-	border-image: url("img/border.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-	border-radius: 3px;
-	border-width: 1px 1px 2px 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.gedit-side-panel-paned,
-.gedit-bottom-panel-paned,
-.gedit-bottom-panel-stack-switcher .notebook GtkBox.vertical {
-	border-style: solid;
-	border-color: @toolbar_border_top_color;
-}
-
-.gedit-side-panel-paned {
-	border-width: 0px 1px 0px 0px;
-}
-
-.gedit-bottom-panel-paned {
-	border-width: 1px 0px 0px 0px;
-}
-
-.gedit-bottom-panel-stack-switcher .notebook GtkBox.vertical {
-	border-width: 1px;
-}
-
-.gedit-menu-stack-switcher {
-	padding: 15px 15px 2px 15px;
-}
-
-GeditMultiNotebook .notebook {
-	border-width: 0px 0px 1px 1px;
-}
-
-GeditViewFrame .gedit-search-slider {
-	padding: 4px;
-	border-image: url("img/border-focused.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-}
-
-.gedit-search-entry-occurrences-tag {
-	color: @theme_text_color;
-	background-color: @theme_bg_color;
-	margin: 2px 0px 2px 2px;
-	padding: 2px;
-}
-
-GeditStatusbar .frame.flat {
-	border: none;
-}
-
-/**********
- * evince *
- **********/
-
-EvPageActionWidget .linked .entry:first-child {
-	border-right-width: 0px;
 }
 
 /*******************
@@ -101,7 +33,7 @@ EvPageActionWidget .linked .entry:first-child {
 	background-color: @theme_base_color;
 }
 
-GtkIconView.documents-main-view.check {
+iconview.documents-main-view.check {
 	background-repeat: no-repeat;
 	background-position: center;
 	background-color: @theme_base_color;
@@ -210,7 +142,7 @@ UnityPanelWidget,
 	border-width: 0;
 }
 
-.unity-panel.menubar.menuitem:hover {
+.unity-panel menubar menuitem:hover {
 	background-color: @menu_bg_color;
 	border-style: solid;
 	border-width: 1px 1px 0px;
diff --git a/gtk-3.0/gtk-widgets-img.css b/gtk-3.0/gtk-widgets-img.css
index 2e10f50..3573ba0 100644
--- a/gtk-3.0/gtk-widgets-img.css
+++ b/gtk-3.0/gtk-widgets-img.css
@@ -6,24 +6,26 @@
  * GtkSwitch *
  *************/
 
-GtkSwitch.slider {
+switch slider {
 	background-image: linear-gradient(to bottom,
 	                      alpha (@switch_slider_gradient_a, 0.5),
 	                      alpha (@switch_slider_gradient_b, 0.5) 50%,
 	                      alpha (@switch_slider_gradient_c, 0.5) 50%,
 	                      alpha (@switch_slider_gradient_d, 0.5)),
-	                  url("img/slider-horz-grip.png");
+	                  -gtk-scaled(url("img/slider-horz-grip.png"),
+	                      url("img/slider-horz-grip@2.png"));
 	background-repeat: no-repeat;
 	background-position: center center;
 }
 
-GtkSwitch.slider:insensitive {
+switch:disabled slider {
 	background-image: linear-gradient(to bottom,
 	                      alpha (@switch_slider_insensitive_gradient_a, 0.8),
 	                      alpha (@switch_slider_insensitive_gradient_b, 0.8) 50%,
 	                      alpha (@switch_slider_insensitive_gradient_c, 0.8) 50%,
 	                      alpha (@switch_slider_insensitive_gradient_d, 0.8)),
-	                  url("img/slider-horz-grip.png");
+	                  -gtk-scaled(url("img/slider-horz-grip.png"),
+	                      url("img/slider-horz-grip@2.png"));
 }
 
 /***************
@@ -31,19 +33,19 @@ GtkSwitch.slider:insensitive {
  ***************/
 
 .grip {
-	background-image: url("img/resize-grip.png");
+	background-image: -gtk-scaled(url("img/resize-grip.png"), url("img/resize-grip@2.png"));
 }
 
 /*************
  * Scrollbar *
  *************/
 
-.scrollbar.slider {
+scrollbar slider {
 	background-repeat: no-repeat;
 	background-position: center center;
 }
 
-.scrollbar.slider.vertical {
+scrollbar.vertical slider {
 	background-image: linear-gradient(to right,
 	                      alpha (@scrollbar_slider_inner_border_color, 0.5),
 	                      alpha (@scrollbar_slider_gradient_a, 0.5) 1px,
@@ -51,10 +53,11 @@ GtkSwitch.slider:insensitive {
 	                      alpha (@scrollbar_slider_gradient_c, 0.5) 50%,
 	                      alpha (@scrollbar_slider_gradient_d, 0.5) 95%,
 	                      alpha (@scrollbar_slider_inner_border_color, 0.5)),
-	                  url("img/slider-vert-grip.png");
+	                  -gtk-scaled(url("img/slider-vert-grip.png"),
+	                      url("img/slider-vert-grip@2.png"));
 }
 
-.scrollbar.slider.horizontal {
+scrollbar.horizontal slider {
 	background-image: linear-gradient(to bottom,
 	                      alpha (@scrollbar_slider_inner_border_color, 0.5),
 	                      alpha (@scrollbar_slider_gradient_a, 0.5) 1px,
@@ -62,10 +65,11 @@ GtkSwitch.slider:insensitive {
 	                      alpha (@scrollbar_slider_gradient_c, 0.5) 50%,
 	                      alpha (@scrollbar_slider_gradient_d, 0.5) 95%,
 	                      alpha (@scrollbar_slider_inner_border_color, 0.5)),
-	                  url("img/slider-horz-grip.png");
+	                  -gtk-scaled(url("img/slider-horz-grip.png"),
+	                      url("img/slider-horz-grip@2.png"));
 }
 
-.scrollbar.slider.vertical:hover {
+scrollbar.vertical slider:hover {
 	background-image: linear-gradient(to right,
 	                      alpha (@scrollbar_slider_inner_border_color, 0.5),
 	                      alpha (@scrollbar_slider_hover_gradient_a, 0.5) 1px,
@@ -73,10 +77,11 @@ GtkSwitch.slider:insensitive {
 	                      alpha (@scrollbar_slider_hover_gradient_c, 0.5) 50%,
 	                      alpha (@scrollbar_slider_hover_gradient_d, 0.5) 95%,
 	                      alpha (@scrollbar_slider_inner_border_color, 0.5)),
-	                  url("img/slider-vert-grip.png");
+	                  -gtk-scaled(url("img/slider-vert-grip.png"),
+	                      url("img/slider-vert-grip@2.png"));
 }
 
-.scrollbar.slider.horizontal:hover {
+scrollbar.horizontal slider:hover {
 	background-image: linear-gradient(to bottom,
 	                      alpha (@scrollbar_slider_inner_border_color, 0.5),
 	                      alpha (@scrollbar_slider_hover_gradient_a, 0.5) 1px,
@@ -84,301 +89,361 @@ GtkSwitch.slider:insensitive {
 	                      alpha (@scrollbar_slider_hover_gradient_c, 0.5) 50%,
 	                      alpha (@scrollbar_slider_hover_gradient_d, 0.5) 95%,
 	                      alpha (@scrollbar_slider_inner_border_color, 0.5)),
-	                  url("img/slider-horz-grip.png");
+	                  -gtk-scaled(url("img/slider-horz-grip.png"),
+	                      url("img/slider-horz-grip@2.png"));
 }
 
 /*************************
  * Check and Radio items *
  *************************/
 
-.check,
-.check row:selected,
-.check row:selected:focus {
-	-gtk-icon-source: url("img/checkbox-unchecked.png");
+check,
+check row:selected,
+check row:selected:focus {
+	-gtk-icon-source: -gtk-scaled(url("img/checkbox-unchecked.png"),
+		url("img/checkbox-unchecked@2.png"));
 }
 
-.check:hover,
-.check row:selected:hover,
-.check row:selected:focus:hover {
-	-gtk-icon-source: url("img/checkbox-unchecked-hover.png");
+check:hover,
+check row:selected:hover,
+check row:selected:focus:hover {
+	-gtk-icon-source: -gtk-scaled(url("img/checkbox-unchecked-hover.png"),
+		url("img/checkbox-unchecked-hover@2.png"));
 }
 
-.check:insensitive,
-.check row:selected:insensitive,
-.check row:selected:focus:insensitive {
-	-gtk-icon-source: url("img/checkbox-unchecked-insensitive.png");
+check:disabled,
+check row:selected:disabled,
+check row:selected:focus:disabled {
+	-gtk-icon-source: -gtk-scaled(url("img/checkbox-unchecked-insensitive.png"),
+		url("img/checkbox-unchecked-insensitive@2.png"));
+}
+
+check:checked,
+check row:selected:checked,
+check row:selected:focus:checked,
+check:active,
+check row:selected:active,
+check row:selected:focus:active {
+	-gtk-icon-source: -gtk-scaled(url("img/checkbox-checked.png"),
+		url("img/checkbox-checked@2.png"));
 }
 
-.check:checked,
-.check row:selected:checked,
-.check row:selected:focus:checked,
-.check:active,
-.check row:selected:active,
-.check row:selected:focus:active {
-	-gtk-icon-source: url("img/checkbox-checked.png");
+check:checked:hover,
+check row:selected:checked:hover,
+check row:selected:focus:checked:hover,
+check:active:hover,
+check row:selected:active:hover,
+check row:selected:focus:active:hover {
+	-gtk-icon-source: -gtk-scaled(url("img/checkbox-checked-hover.png"),
+		url("img/checkbox-checked-hover@2.png"));
 }
 
-.check:checked:hover,
-.check row:selected:checked:hover,
-.check row:selected:focus:checked:hover,
-.check:active:hover,
-.check row:selected:active:hover,
-.check row:selected:focus:active:hover {
-	-gtk-icon-source: url("img/checkbox-checked-hover.png");
+check:checked:disabled,
+check row:selected:checked:disabled,
+check row:selected:focus:checked:disabled,
+check:active:disabled,
+check row:selected:active:disabled,
+check row:selected:focus:active:disabled {
+	-gtk-icon-source: -gtk-scaled(url("img/checkbox-checked-insensitive.png"),
+		url("img/checkbox-checked-insensitive@2.png"));
 }
 
-.check:checked:insensitive,
-.check row:selected:checked:insensitive,
-.check row:selected:focus:checked:insensitive,
-.check:active:insensitive,
-.check row:selected:active:insensitive,
-.check row:selected:focus:active:insensitive {
-	-gtk-icon-source: url("img/checkbox-checked-insensitive.png");
+check:indeterminate,
+check row:selected:indeterminate,
+check row:selected:focus:indeterminate {
+	-gtk-icon-source: -gtk-scaled(url("img/checkbox-mixed.png"),
+		url("img/checkbox-mixed@2.png"));
 }
 
-.check:inconsistent,
-.check row:selected:inconsistent,
-.check row:selected:focus:inconsistent {
-	-gtk-icon-source: url("img/checkbox-mixed.png");
+check:indeterminate:hover,
+check row:selected:indeterminate:hover,
+check row:selected:focus:indeterminate:hover {
+	-gtk-icon-source: -gtk-scaled(url("img/checkbox-mixed-hover.png"),
+		url("img/checkbox-mixed-hover@2.png"));
 }
 
-.check:inconsistent:hover,
-.check row:selected:inconsistent:hover,
-.check row:selected:focus:inconsistent:hover {
-	-gtk-icon-source: url("img/checkbox-mixed-hover.png");
+check:indeterminate:disabled,
+check row:selected:indeterminate:disabled,
+check row:selected:focus:indeterminate:disabled {
+	-gtk-icon-source: -gtk-scaled(url("img/checkbox-mixed-insensitive.png"),
+		url("img/checkbox-mixed-insensitive@2.png"));
 }
 
-.check:inconsistent:insensitive,
-.check row:selected:inconsistent:insensitive,
-.check row:selected:focus:inconsistent:insensitive {
-	-gtk-icon-source: url("img/checkbox-mixed-insensitive.png");
+radio,
+radio row:selected,
+radio row:selected:focus {
+	-gtk-icon-source: -gtk-scaled(url("img/radio-unchecked.png"),
+		url("img/radio-unchecked@2.png"));
 }
 
-.radio,
-.radio row:selected,
-.radio row:selected:focus {
-	-gtk-icon-source: url("img/radio-unchecked.png");
+radio:hover,
+radio row:selected:hover,
+radio row:selected:focus:hover {
+	-gtk-icon-source: -gtk-scaled(url("img/radio-unchecked-hover.png"),
+		url("img/radio-unchecked-hover@2.png"));
 }
 
-.radio:hover,
-.radio row:selected:hover,
-.radio row:selected:focus:hover {
-	-gtk-icon-source: url("img/radio-unchecked-hover.png");
+radio:disabled,
+radio row:selected:disabled,
+radio row:selected:focus:disabled {
+	-gtk-icon-source: -gtk-scaled(url("img/radio-unchecked-insensitive.png"),
+		url("img/radio-unchecked-insensitive@2.png"));
 }
 
-.radio:insensitive,
-.radio row:selected:insensitive,
-.radio row:selected:focus:insensitive {
-	-gtk-icon-source: url("img/radio-unchecked-insensitive.png");
+radio:checked,
+radio row:selected:checked,
+radio row:selected:focus:checked,
+radio:active,
+radio row:selected:active,
+radio row:selected:focus:active {
+	-gtk-icon-source: -gtk-scaled(url("img/radio-checked.png"),
+		url("img/radio-checked@2.png"));
 }
 
-.radio:checked,
-.radio row:selected:checked,
-.radio row:selected:focus:checked,
-.radio:active,
-.radio row:selected:active,
-.radio row:selected:focus:active {
-	-gtk-icon-source: url("img/radio-checked.png");
+radio:checked:hover,
+radio row:selected:checked:hover,
+radio row:selected:focus:checked:hover,
+radio:active:hover,
+radio row:selected:active:hover,
+radio row:selected:focus:active:hover {
+	-gtk-icon-source: -gtk-scaled(url("img/radio-checked-hover.png"),
+		url("img/radio-checked-hover@2.png"));
 }
 
-.radio:checked:hover,
-.radio row:selected:checked:hover,
-.radio row:selected:focus:checked:hover,
-.radio:active:hover,
-.radio row:selected:active:hover,
-.radio row:selected:focus:active:hover {
-	-gtk-icon-source: url("img/radio-checked-hover.png");
+radio:checked:disabled,
+radio row:selected:checked:disabled,
+radio row:selected:focus:checked:disabled,
+radio:active:disabled,
+radio row:selected:active:disabled,
+radio row:selected:focus:active:disabled {
+	-gtk-icon-source: -gtk-scaled(url("img/radio-checked-insensitive.png"),
+		url("img/radio-checked-insensitive@2.png"));
 }
 
-.radio:checked:insensitive,
-.radio row:selected:checked:insensitive,
-.radio row:selected:focus:checked:insensitive,
-.radio:active:insensitive,
-.radio row:selected:active:insensitive,
-.radio row:selected:focus:active:insensitive {
-	-gtk-icon-source: url("img/radio-checked-insensitive.png");
+radio:indeterminate,
+radio row:selected:indeterminate,
+radio row:selected:focus:indeterminate {
+	-gtk-icon-source: -gtk-scaled(url("img/radio-mixed.png"),
+		url("img/radio-mixed@2.png"));
 }
 
-.radio:inconsistent,
-.radio row:selected:inconsistent,
-.radio row:selected:focus:inconsistent {
-	-gtk-icon-source: url("img/radio-mixed.png");
+radio:indeterminate:hover,
+radio row:selected:indeterminate:hover,
+radio row:selected:focus:indeterminate:hover {
+	-gtk-icon-source: -gtk-scaled(url("img/radio-mixed-hover.png"),
+		url("img/radio-mixed-hover@2.png"));
 }
 
-.radio:inconsistent:hover,
-.radio row:selected:inconsistent:hover,
-.radio row:selected:focus:inconsistent:hover {
-	-gtk-icon-source: url("img/radio-mixed-hover.png");
-}
-
-.radio:inconsistent:insensitive,
-.radio row:selected:inconsistent:insensitive,
-.radio row:selected:focus:inconsistent:insensitive {
-	-gtk-icon-source: url("img/radio-mixed-insensitive.png");
+radio:indeterminate:disabled,
+radio row:selected:indeterminate:disabled,
+radio row:selected:focus:indeterminate:disabled {
+	-gtk-icon-source: -gtk-scaled(url("img/radio-mixed-insensitive.png"),
+		url("img/radio-mixed-insensitive@2.png"));
 }
 
 /*********************
  * GtkScale's slider *
  *********************/
  
-GtkScale.slider,
-GtkScale.slider.horizontal {
-	background-image: url("img/scale-slider-horz.png");
+scale slider,
+scale.horizontal slider {
+	background-image: -gtk-scaled(url("img/scale-slider-horz.png"),
+		url("img/scale-slider-horz@2.png"));
 }
 
-GtkScale.slider:hover,
-GtkScale.slider.horizontal:hover {
-	background-image: url("img/scale-slider-horz-hover.png");
+scale slider:hover,
+scale.horizontal slider:hover {
+	background-image: -gtk-scaled(url("img/scale-slider-horz-hover.png"),
+		url("img/scale-slider-horz-hover@2.png"));
 }
 
-GtkScale.slider:insensitive,
-GtkScale.slider.horizontal:insensitive {
-	background-image: url("img/scale-slider-horz-insensitive.png");
+scale:disabled slider,
+scale slider:disabled,
+scale.horizontal slider:disabled {
+	background-image: -gtk-scaled(url("img/scale-slider-horz-insensitive.png"),
+		url("img/scale-slider-horz-insensitive@2.png"));
 }
 
-GtkScale.slider.vertical {
-	background-image: url("img/scale-slider-vert.png");
+scale.vertical slider {
+	background-image: -gtk-scaled(url("img/scale-slider-vert.png"),
+		url("img/scale-slider-vert@2.png"));
 }
 
-GtkScale.slider.vertical:hover {
-	background-image: url("img/scale-slider-vert-hover.png");
+scale.vertical slider:hover {
+	background-image: -gtk-scaled(url("img/scale-slider-vert-hover.png"),
+		url("img/scale-slider-vert-hover@2.png"));
 }
 
-GtkScale.slider.vertical:insensitive {
-	background-image: url("img/scale-slider-vert-insensitive.png");
+scale.vertical:disabled slider,
+scale.vertical slider:disabled {
+	background-image: -gtk-scaled(url("img/scale-slider-vert-insensitive.png"),
+		url("img/scale-slider-vert-insensitive@2.png"));
 }
 
-GtkScale.scale-has-marks-above.slider.horizontal {
-	background-image: url("img/scale-slider-horz.png");
+scale.horizontal.scale-has-marks-above slider {
+	background-image: -gtk-scaled(url("img/scale-slider-horz.png"),
+		url("img/scale-slider-horz@2.png"));
 }
 
-GtkScale.scale-has-marks-above.slider.horizontal:hover {
-	background-image: url("img/scale-slider-horz-hover.png");
+scale.horizontal.scale-has-marks-above slider:hover {
+	background-image: -gtk-scaled(url("img/scale-slider-horz-hover.png"),
+		url("img/scale-slider-horz-hover@2.png"));
 }
 
-GtkScale.scale-has-marks-above.slider.horizontal:insensitive {
-	background-image: url("img/scale-slider-horz-insensitive.png");
+scale.horizontal.scale-has-marks-above slider:disabled {
+	background-image: -gtk-scaled(url("img/scale-slider-horz-insensitive.png"),
+		url("img/scale-slider-horz-insensitive@2.png"));
 }
 
-GtkScale.scale-has-marks-above.slider.vertical {
-	background-image: url("img/scale-slider-vert.png");
+scale.vertical.scale-has-marks-above slider {
+	background-image: -gtk-scaled(url("img/scale-slider-vert.png"),
+		url("img/scale-slider-vert@2.png"));
 }
 
-GtkScale.scale-has-marks-above.slider.vertical:hover {
-	background-image: url("img/scale-slider-vert-hover.png");
+scale.vertical.scale-has-marks-above slider:hover {
+	background-image: -gtk-scaled(url("img/scale-slider-vert-hover.png"),
+		url("img/scale-slider-vert-hover@2.png"));
 }
 
-GtkScale.scale-has-marks-above.slider.vertical:insensitive {
-	background-image: url("img/scale-slider-vert-insensitive.png");
+scale.vertical.scale-has-marks-above slider:disabled {
+	background-image: -gtk-scaled(url("img/scale-slider-vert-insensitive.png"),
+		url("img/scale-slider-vert-insensitive@2.png"));
 }
 
-GtkScale.scale-has-marks-below.slider.horizontal {
-	background-image: url("img/scale-slider-horz.png");
+scale.horizontal.scale-has-marks-below slider {
+	background-image: -gtk-scaled(url("img/scale-slider-horz.png"),
+		url("img/scale-slider-horz@2.png"));
 }
 
-GtkScale.scale-has-marks-below.slider.horizontal:hover {
-	background-image: url("img/scale-slider-horz-hover.png");
+scale.horizontal.scale-has-marks-below slider:hover {
+	background-image: -gtk-scaled(url("img/scale-slider-horz-hover.png"),
+		url("img/scale-slider-horz-hover@2.png"));
 }
 
-GtkScale.scale-has-marks-below.slider.horizontal:insensitive {
-	background-image: url("img/scale-slider-horz-insensitive.png");
+scale.horizontal.scale-has-marks-below slider:disabled {
+	background-image: -gtk-scaled(url("img/scale-slider-horz-insensitive.png"),
+		url("img/scale-slider-horz-insensitive@2.png"));
 }
 
-GtkScale.scale-has-marks-below.slider.vertical {
-	background-image: url("img/scale-slider-vert.png");
+scale.vertical.scale-has-marks-below slider {
+	background-image: -gtk-scaled(url("img/scale-slider-vert.png"),
+		url("img/scale-slider-vert@2.png"));
 }
 
-GtkScale.scale-has-marks-below.slider.vertical:hover {
-	background-image: url("img/scale-slider-vert-hover.png");
+scale.vertical.scale-has-marks-below slider:hover {
+	background-image: -gtk-scaled(url("img/scale-slider-vert-hover.png"),
+		url("img/scale-slider-vert-hover@2.png"));
 }
 
-GtkScale.scale-has-marks-below.slider.vertical:insensitive {
-	background-image: url("img/scale-slider-vert-insensitive.png");
+scale.vertical.scale-has-marks-below slider:disabled {
+	background-image: -gtk-scaled(url("img/scale-slider-vert-insensitive.png"),
+		url("img/scale-slider-vert-insensitive@2.png"));
 }
 
 /*********
  * Menus *
  *********/
 
-.menu .menuitem.check {
-	-gtk-icon-source: url("img/menuitem-checkbox.png");
+menu menuitem check {
+	-gtk-icon-source: -gtk-scaled(url("img/menuitem-checkbox.png"),
+		url("img/menuitem-checkbox@2.png"));
 }
 
-.menu .menuitem.check:hover {
-	-gtk-icon-source: url("img/menuitem-checkbox-hover.png");
+menu menuitem check:hover {
+	-gtk-icon-source: -gtk-scaled(url("img/menuitem-checkbox-hover.png"),
+		url("img/menuitem-checkbox-hover@2.png"));
 }
 
-.menu .menuitem.check:insensitive {
-	-gtk-icon-source: url("img/menuitem-checkbox-insensitive.png");
+menu menuitem check:disabled {
+	-gtk-icon-source: -gtk-scaled(url("img/menuitem-checkbox-insensitive.png"),
+		url("img/menuitem-checkbox-insensitive@2.png"));
 }
 
-.menu .menuitem.check:checked,
-.menu .menuitem.check:active {
-	-gtk-icon-source: url("img/menuitem-checkbox-checked.png");
+menu menuitem check:checked,
+menu menuitem check:active {
+	-gtk-icon-source: -gtk-scaled(url("img/menuitem-checkbox-checked.png"),
+		url("img/menuitem-checkbox-checked@2.png"));
 }
 
-.menu .menuitem.check:checked:hover,
-.menu .menuitem.check:active:hover {
-	-gtk-icon-source: url("img/menuitem-checkbox-checked-hover.png");
+menu menuitem check:checked:hover,
+menu menuitem check:active:hover {
+	-gtk-icon-source: -gtk-scaled(url("img/menuitem-checkbox-checked-hover.png"),
+		url("img/menuitem-checkbox-checked-hover@2.png"));
 }
 
-.menu .menuitem.check:checked:insensitive,
-.menu .menuitem.check:active:insensitive {
-	-gtk-icon-source: url("img/menuitem-checkbox-checked-insensitive.png");
+menu menuitem check:checked:disabled,
+menu menuitem check:active:disabled {
+	-gtk-icon-source: -gtk-scaled(url("img/menuitem-checkbox-checked-insensitive.png"),
+		url("img/menuitem-checkbox-checked-insensitive@2.png"));
 }
 
-.menu .menuitem.check:inconsistent,
-.menu .menuitem.radio:inconsistent {
-	-gtk-icon-source: url("img/menuitem-checkbox-mixed.png");
+menu menuitem check:indeterminate,
+menu menuitem radio:indeterminate {
+	-gtk-icon-source: -gtk-scaled(url("img/menuitem-checkbox-mixed.png"),
+		url("img/menuitem-checkbox-mixed@2.png"));
 }
 
-.menu .menuitem.check:inconsistent:hover,
-.menu .menuitem.radio:inconsistent:hover {
-	-gtk-icon-source: url("img/menuitem-checkbox-mixed-hover.png");
+menu menuitem check:indeterminate:hover,
+menu menuitem radio:indeterminate:hover {
+	-gtk-icon-source: -gtk-scaled(url("img/menuitem-checkbox-mixed-hover.png"),
+		url("img/menuitem-checkbox-mixed-hover@2.png"));
 }
 
-.menu .menuitem.check:inconsistent:insensitive,
-.menu .menuitem.radio:inconsistent:insensitive {
-	-gtk-icon-source: url("img/menuitem-checkbox-mixed-insensitive.png");
+menu menuitem check:indeterminate:disabled,
+menu menuitem radio:indeterminate:disabled {
+	-gtk-icon-source: -gtk-scaled(url("img/menuitem-checkbox-mixed-insensitive.png"),
+		url("img/menuitem-checkbox-mixed-insensitive@2.png"));
 }
 
-.menu .menuitem.radio {
-	-gtk-icon-source: url("img/menuitem-radio.png");
+menu menuitem radio {
+	-gtk-icon-source: -gtk-scaled(url("img/menuitem-radio.png"),
+		url("img/menuitem-radio@2.png"));
 }
 
-.menu .menuitem.radio:hover {
-	-gtk-icon-source: url("img/menuitem-radio-hover.png");
+menu menuitem radio:hover {
+	-gtk-icon-source: -gtk-scaled(url("img/menuitem-radio-hover.png"),
+		url("img/menuitem-radio-hover@2.png"));
 }
 
-.menu .menuitem.radio:insensitive {
-	-gtk-icon-source: url("img/menuitem-radio-insensitive.png");
+menu menuitem radio:disabled {
+	-gtk-icon-source: -gtk-scaled(url("img/menuitem-radio-insensitive.png"),
+		url("img/menuitem-radio-insensitive@2.png"));
 }
 
-.menu .menuitem.radio:checked,
-.menu .menuitem.radio:active {
-	-gtk-icon-source: url("img/menuitem-radio-checked.png");
+menu menuitem radio:checked,
+menu menuitem radio:active {
+	-gtk-icon-source: -gtk-scaled(url("img/menuitem-radio-checked.png"),
+		url("img/menuitem-radio-checked@2.png"));
 }
 
-.menu .menuitem.radio:checked:hover,
-.menu .menuitem.radio:active:hover {
-	-gtk-icon-source: url("img/menuitem-radio-checked-hover.png");
+menu menuitem radio:checked:hover,
+menu menuitem radio:active:hover {
+	-gtk-icon-source: -gtk-scaled(url("img/menuitem-radio-checked-hover.png"),
+		url("img/menuitem-radio-checked-hover@2.png"));
 }
 
-.menu .menuitem.radio:checked:insensitive,
-.menu .menuitem.radio:active:insensitive {
-	-gtk-icon-source: url("img/menuitem-radio-checked-insensitive.png");
+menu menuitem radio:checked:disabled,
+menu menuitem radio:active:disabled {
+	-gtk-icon-source: -gtk-scaled(url("img/menuitem-radio-checked-insensitive.png"),
+		url("img/menuitem-radio-checked-insensitive@2.png"));
 }
 
 /*********
  * Panes *
  *********/
 
-.pane-separator {
-	background-image: url("img/pane-separator-grip-horz.png");
+paned.horizontal > separator {
+	background-repeat: no-repeat;
+	background-position: center center;
+	background-image: -gtk-scaled(url("img/pane-separator-grip-horz.png"),
+		url("img/pane-separator-grip-horz@2.png"));
 }
 
-.pane-separator.vertical {
-	background-image: url("img/pane-separator-grip-vert.png");
+paned.vertical > separator {
+	background-repeat: no-repeat;
+	background-position: center center;
+	background-image: -gtk-scaled(url("img/pane-separator-grip-vert.png"),
+		url("img/pane-separator-grip-vert@2.png"));
 }
 
 /***********
@@ -386,38 +451,48 @@ GtkScale.scale-has-marks-below.slider.vertical:insensitive {
  ***********/
 
 /* generic element borders */
-.entry,
-.combobox-entry .entry,
-.combobox-entry .button,
-.button:active,
-.trough,
-.trough.highlight,
-GtkSwitch.trough,
+entry,
+combobox entry,
+combobox entry button,
+button:active,
+trough,
+trough highlight,
+switch,
 /* generic button borders */
-.button,
-.button.flat:active,
-.button.flat:hover,
+button,
+button.flat:active,
+button.flat:hover,
 .menu-button:active,
-.titlebar .titlebutton:hover,
-.primary-toolbar .button:checked,
-.primary-toolbar .button.raised,
-.primary-toolbar .raised .button,
-.primary-toolbar GtkComboBox .button,
+.titlebar button.titlebutton:hover,
+toolbar.primary-toolbar button:checked,
+toolbar.primary-toolbar button.raised,
+toolbar.primary-toolbar .linked button.raised,
+toolbar.primary-toolbar .linked button.raised:hover,
+toolbar.primary-toolbar .linked button.raised:focus,
+toolbar.primary-toolbar .linked button.raised:focus:hover,
+toolbar.primary-toolbar .linked button.raised:focus:hover:active,
+toolbar.primary-toolbar .raised.linked button,
+toolbar.primary-toolbar .raised.linked button:hover,
+toolbar.primary-toolbar .raised.linked button:focus,
+toolbar.primary-toolbar .raised.linked button:focus:hover,
+toolbar.primary-toolbar .raised.linked button:focus:hover:active,
+toolbar.primary-toolbar .raised.raised button:disabled,
+toolbar.primary-toolbar combobox button,
 /* primary toolbar - generic element borders */
-.primary-toolbar .entry,
-.primary-toolbar .combobox-entry .entry,
-.primary-toolbar .combobox-entry .button,
-.primary-toolbar .button:active,
-.primary-toolbar .button.raised:active,
-.primary-toolbar .raised .button:active,
-.primary-toolbar .button.raised:insensitive,
-.primary-toolbar .raised .button:insensitive,
-.primary-toolbar GtkSwitch.trough,
-.primary-toolbar GtkSwitch.trough:insensitive,
-.primary-toolbar GtkComboBox .button:active,
-.primary-toolbar GtkComboBox .button:insensitive,
+toolbar.primary-toolbar entry,
+toolbar.primary-toolbar combobox entry,
+toolbar.primary-toolbar combobox button,
+toolbar.primary-toolbar button:active,
+toolbar.primary-toolbar button.raised:active,
+toolbar.primary-toolbar .raised button:active,
+toolbar.primary-toolbar button.raised:disabled,
+toolbar.primary-toolbar .raised button:disabled,
+toolbar.primary-toolbar switch,
+toolbar.primary-toolbar switch:disabled,
+toolbar.primary-toolbar combobox button:active,
+toolbar.primary-toolbar combobox button:disabled,
 /* primary toolbar - hover button borders */
-.primary-toolbar .button:hover {
+toolbar.primary-toolbar button:hover {
 	border-image: url("img/border.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
 	border-radius: 3px;
 	border-width: 1px 1px 2px 1px;
@@ -425,131 +500,131 @@ GtkSwitch.trough,
 	border-color: transparent;
 }
 
-.primary-toolbar .entry,
-.primary-toolbar .combobox-entry .entry {
+toolbar.primary-toolbar entry,
+toolbar.primary-toolbar combobox entry {
 	border-width: 1px 2px 2px;
 }
 
-.primary-toolbar .entry:focus,
-.primary-toolbar .combobox-entry .entry:focus {
+toolbar.primary-toolbar entry:focus,
+toolbar.primary-toolbar combobox entry:focus {
 	border-width: 1px 2px 2px;
 }
 
 /* Linked single button */
-.linked .entry:only-child,
-.linked .button:only-child,
-.linked .button:active:only-child,
-.linked .button:active:hover:only-child,
-.linked .button:focus:only-child,
-.linked .button:focus:active:only-child,
-.linked .button:insensitive:only-child,
+.linked entry:only-child,
+.linked button:only-child,
+.linked button:active:only-child,
+.linked button:active:hover:only-child,
+.linked button:focus:only-child,
+.linked button:focus:active:only-child,
+.linked button:disabled:only-child,
 /* Middle button (vertical) */
-.linked.vertical .entry,
-.linked.vertical .button,
-.linked.vertical .button:active,
-.linked.vertical .button:active:hover,
-.linked.vertical .button:focus,
-.linked.vertical .button:focus:active,
-.linked.vertical .button:insensitive,
+.linked.vertical entry,
+.linked.vertical button,
+.linked.vertical button:active,
+.linked.vertical button:active:hover,
+.linked.vertical button:focus,
+.linked.vertical button:focus:active,
+.linked.vertical button:disabled,
 /* Top button (vertical) */
-.linked.vertical .entry:first-child,
-.linked.vertical .button:first-child,
-.linked.vertical .button:active:first-child,
-.linked.vertical .button:active:hover:first-child,
-.linked.vertical .button:focus:first-child,
-.linked.vertical .button:focus:active:first-child,
-.linked.vertical .button:insensitive:first-child,
+.linked.vertical entry:first-child,
+.linked.vertical button:first-child,
+.linked.vertical button:active:first-child,
+.linked.vertical button:active:hover:first-child,
+.linked.vertical button:focus:first-child,
+.linked.vertical button:focus:active:first-child,
+.linked.vertical button:disabled:first-child,
 /* Bottom button (vertical) */
-.linked.vertical .entry:last-child,
-.linked.vertical .button:last-child,
-.linked.vertical .button:active:last-child,
-.linked.vertical .button:active:hover:last-child,
-.linked.vertical .button:focus:last-child,
-.linked.vertical .button:focus:active:last-child,
-.linked.vertical .button:insensitive:last-child,
+.linked.vertical entry:last-child,
+.linked.vertical button:last-child,
+.linked.vertical button:active:last-child,
+.linked.vertical button:active:hover:last-child,
+.linked.vertical button:focus:last-child,
+.linked.vertical button:focus:active:last-child,
+.linked.vertical button:disabled:last-child,
 /* Linked single button (vertical) */
-.linked.vertical .entry:only-child,
-.linked.vertical .button:only-child,
-.linked.vertical .button:active:only-child,
-.linked.vertical .button:active:hover:only-child,
-.linked.vertical .button:focus:only-child,
-.linked.vertical .button:focus:active:only-child,
-.linked.vertical .button:insensitive:only-child,
+.linked.vertical entry:only-child,
+.linked.vertical button:only-child,
+.linked.vertical button:active:only-child,
+.linked.vertical button:active:hover:only-child,
+.linked.vertical button:focus:only-child,
+.linked.vertical button:focus:active:only-child,
+.linked.vertical button:disabled:only-child,
 /* Linked buttons on primary toolbars */
 /* Middle button */
-.primary-toolbar .button.raised.linked,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .button.raised.linked:focus,
-.primary-toolbar .button.raised.linked:focus:active,
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .raised.linked .button,
-.primary-toolbar .raised.linked .button:active,
-.primary-toolbar .raised.linked .button:focus,
-.primary-toolbar .raised.linked .button:focus:active,
-.primary-toolbar .raised.linked .button:insensitive,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar .button:focus,
-.inline-toolbar.toolbar .button:focus:active,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton .button,
-.inline-toolbar.toolbar GtkToolButton .button:active,
-.inline-toolbar.toolbar GtkToolButton .button:focus,
-.inline-toolbar.toolbar GtkToolButton .button:focus:active,
-.inline-toolbar.toolbar GtkToolButton .button:insensitive,
+toolbar.primary-toolbar button.raised.linked,
+toolbar.primary-toolbar button.raised.linked:active,
+toolbar.primary-toolbar button.raised.linked:focus,
+toolbar.primary-toolbar button.raised.linked:focus:active,
+toolbar.primary-toolbar button.raised.linked:disabled,
+toolbar.primary-toolbar .raised.linked button,
+toolbar.primary-toolbar .raised.linked button:active,
+toolbar.primary-toolbar .raised.linked button:focus,
+toolbar.primary-toolbar .raised.linked button:focus:active,
+toolbar.primary-toolbar .raised.linked button:disabled,
+toolbar.inline-toolbar button,
+toolbar.inline-toolbar button:active,
+toolbar.inline-toolbar button:focus,
+toolbar.inline-toolbar button:focus:active,
+toolbar.inline-toolbar button:disabled,
+toolbar.inline-toolbar toolbutton button,
+toolbar.inline-toolbar toolbutton button:active,
+toolbar.inline-toolbar toolbutton button:focus,
+toolbar.inline-toolbar toolbutton button:focus:active,
+toolbar.inline-toolbar toolbutton button:disabled,
 /* Leftmost button */
-.primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .button.raised.linked:active:first-child,
-.primary-toolbar .button.raised.linked:focus:first-child,
-.primary-toolbar .button.raised.linked:focus:active:first-child,
-.primary-toolbar .button.raised.linked:insensitive:first-child,
-.primary-toolbar .raised.linked .button:first-child,
-.primary-toolbar .raised.linked .button:active:first-child,
-.primary-toolbar .raised.linked .button:focus:first-child,
-.primary-toolbar .raised.linked .button:focus:active:first-child,
-.primary-toolbar .raised.linked .button:insensitive:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar .button:active:first-child,
-.inline-toolbar.toolbar .button:focus:first-child,
-.inline-toolbar.toolbar .button:focus:active:first-child,
-.inline-toolbar.toolbar .button:insensitive:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child .button,
-.inline-toolbar.toolbar GtkToolButton:first-child .button:active,
-.inline-toolbar.toolbar GtkToolButton:first-child .button:focus,
-.inline-toolbar.toolbar GtkToolButton:first-child .button:focus:active,
-.inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive,
+toolbar.primary-toolbar button.raised.linked:first-child,
+toolbar.primary-toolbar button.raised.linked:active:first-child,
+toolbar.primary-toolbar button.raised.linked:focus:first-child,
+toolbar.primary-toolbar button.raised.linked:focus:active:first-child,
+toolbar.primary-toolbar button.raised.linked:disabled:first-child,
+toolbar.primary-toolbar .raised.linked button:first-child,
+toolbar.primary-toolbar .raised.linked button:active:first-child,
+toolbar.primary-toolbar .raised.linked button:focus:first-child,
+toolbar.primary-toolbar .raised.linked button:focus:active:first-child,
+toolbar.primary-toolbar .raised.linked button:disabled:first-child,
+toolbar.inline-toolbar button:first-child,
+toolbar.inline-toolbar button:active:first-child,
+toolbar.inline-toolbar button:focus:first-child,
+toolbar.inline-toolbar button:focus:active:first-child,
+toolbar.inline-toolbar button:disabled:first-child,
+toolbar.inline-toolbar toolbutton button :first-child,
+toolbar.inline-toolbar toolbutton button :first-child:active,
+toolbar.inline-toolbar toolbutton button :first-child:focus,
+toolbar.inline-toolbar toolbutton button :first-child:focus:active,
+toolbar.inline-toolbar toolbutton button :first-child:disabled,
 /* Rightmost button */
-.primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .button.raised.linked:active:last-child,
-.primary-toolbar .button.raised.linked:focus:last-child,
-.primary-toolbar .button.raised.linked:focus:active:last-child,
-.primary-toolbar .button.raised.linked:insensitive:last-child,
-.primary-toolbar .raised.linked .button:last-child,
-.primary-toolbar .raised.linked .button:active:last-child,
-.primary-toolbar .raised.linked .button:focus:last-child,
-.primary-toolbar .raised.linked .button:focus:active:last-child,
-.primary-toolbar .raised.linked .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar .button:active:last-child,
-.inline-toolbar.toolbar .button:focus:last-child,
-.inline-toolbar.toolbar .button:focus:active:last-child,
-.inline-toolbar.toolbar .button:insensitive:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child .button,
-.inline-toolbar.toolbar GtkToolButton:last-child .button:active,
-.inline-toolbar.toolbar GtkToolButton:last-child .button:focus,
-.inline-toolbar.toolbar GtkToolButton:last-child .button:focus:active,
-.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive,
+toolbar.primary-toolbar button.raised.linked:last-child,
+toolbar.primary-toolbar button.raised.linked:active:last-child,
+toolbar.primary-toolbar button.raised.linked:focus:last-child,
+toolbar.primary-toolbar button.raised.linked:focus:active:last-child,
+toolbar.primary-toolbar button.raised.linked:disabled:last-child,
+toolbar.primary-toolbar .raised.linked button:last-child,
+toolbar.primary-toolbar .raised.linked button:active:last-child,
+toolbar.primary-toolbar .raised.linked button:focus:last-child,
+toolbar.primary-toolbar .raised.linked button:focus:active:last-child,
+toolbar.primary-toolbar .raised.linked button:disabled:last-child,
+toolbar.inline-toolbar button:last-child,
+toolbar.inline-toolbar button:active:last-child,
+toolbar.inline-toolbar button:focus:last-child,
+toolbar.inline-toolbar button:focus:active:last-child,
+toolbar.inline-toolbar button:disabled:last-child,
+toolbar.inline-toolbar toolbutton button :last-child,
+toolbar.inline-toolbar toolbutton button :last-child:active,
+toolbar.inline-toolbar toolbutton button :last-child:focus,
+toolbar.inline-toolbar toolbutton button :last-child:focus:active,
+toolbar.inline-toolbar toolbutton button :last-child:disabled,
 /* Single button */
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar .button:active:only-child,
-.inline-toolbar.toolbar .button:focus:only-child,
-.inline-toolbar.toolbar .button:focus:active:only-child,
-.inline-toolbar.toolbar .button:insensitive:only-child,
-.inline-toolbar.toolbar GtkToolButton:only-child .button,
-.inline-toolbar.toolbar GtkToolButton:only-child .button:active,
-.inline-toolbar.toolbar GtkToolButton:only-child .button:focus,
-.inline-toolbar.toolbar GtkToolButton:only-child .button:focus:active,
-.inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive {
+toolbar.inline-toolbar button:only-child,
+toolbar.inline-toolbar button:active:only-child,
+toolbar.inline-toolbar button:focus:only-child,
+toolbar.inline-toolbar button:focus:active:only-child,
+toolbar.inline-toolbar button:disabled:only-child,
+toolbar.inline-toolbar toolbutton button :only-child,
+toolbar.inline-toolbar toolbutton button :only-child:active,
+toolbar.inline-toolbar toolbutton button :only-child:focus,
+toolbar.inline-toolbar toolbutton button :only-child:focus:active,
+toolbar.inline-toolbar toolbutton button :only-child:disabled {
 	border-image: url("img/border-inline-button.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
 	border-radius: 3px;
 	border-width: 1px 1px 2px 1px;
@@ -558,12 +633,12 @@ GtkSwitch.trough,
 }
 
 /* generic insensitive element borders */
-GtkSwitch.trough:insensitive,
-.combobox-entry .entry:insensitive,
-.combobox-entry .button:insensitive,
-.entry:insensitive,
-.button:insensitive,
-.trough row {
+switch:disabled,
+combobox entry:disabled,
+combobox button:disabled,
+entry:disabled,
+button:disabled,
+trough row {
 	border-image: url("img/border-insensitive.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
 	border-radius: 3px;
 	border-width: 1px 1px 2px 1px;
@@ -571,39 +646,39 @@ GtkSwitch.trough:insensitive,
 	border-color: transparent;
 }
 
-.menuitem.button.flat,
-.button.flat,
-.button.flat:insensitive,
-GtkListBoxRow.button.list-row,
-GtkListBoxRow.button.list-row:hover {
+menuitem button.flat,
+button.flat,
+button.flat:disabled,
+list row button,
+list row button:hover {
     border-image: none;
     background-image: none;
 }
 
 /* focused element borders */
-.entry:focus,
-.combobox-entry .entry:focus,
-.button.flat:focus:active,
-.button:focus:active,
-.button.default:active,
+entry:focus,
+combobox entry:focus,
+button.flat:focus:active,
+button:focus:active,
+button.default:active,
 /* focused button borders */
-.button.flat:focus,
-.button.default,
-.primary-toolbar .entry:focus,
-.primary-toolbar .button:active:focus,
-.primary-toolbar .button:focus:hover,
-.primary-toolbar .combobox-entry .entry:focus,
-.primary-toolbar .combobox-entry .button:focus,
-.primary-toolbar .button.raised:focus:active,
-.primary-toolbar .raised .button:focus:active,
-.primary-toolbar .button.raised.default:active,
-.primary-toolbar .raised .button.default:active,
-.primary-toolbar GtkComboBox .button:active:focus,
-.primary-toolbar .button.raised:focus,
-.primary-toolbar .button.raised.default,
-.primary-toolbar .raised .button:focus,
-.primary-toolbar .raised .button.default,
-.primary-toolbar GtkComboBox .button:focus {
+button.flat:focus,
+button.default,
+toolbar.primary-toolbar entry:focus,
+toolbar.primary-toolbar button:active:focus,
+toolbar.primary-toolbar button:focus:hover,
+toolbar.primary-toolbar combobox entry:focus,
+toolbar.primary-toolbar combobox button:focus,
+toolbar.primary-toolbar button.raised:focus:active,
+toolbar.primary-toolbar .raised button:focus:active,
+toolbar.primary-toolbar button.raised.default:active,
+toolbar.primary-toolbar .raised button.default:active,
+toolbar.primary-toolbar combobox button:active:focus,
+toolbar.primary-toolbar button.raised:focus,
+toolbar.primary-toolbar button.raised.default,
+toolbar.primary-toolbar .raised button:focus,
+toolbar.primary-toolbar .raised button.default,
+toolbar.primary-toolbar combobox button:focus {
 	border-image: url("img/border-focused.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
 	border-radius: 3px;
 	border-width: 1px 1px 2px 1px;
@@ -612,7 +687,7 @@ GtkListBoxRow.button.list-row:hover {
 }
 
 /* focused primary toolbar button borders */
-.primary-toolbar .button:focus {
+toolbar.primary-toolbar button:focus {
 	border-image: url("img/border-focused-ptb.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
 	border-radius: 3px;
 	border-width: 1px 1px 2px 1px;
@@ -621,7 +696,7 @@ GtkListBoxRow.button.list-row:hover {
 }
 
 /* focused switch trough borders */
-GtkSwitch.trough:active {
+switch:active {
 	border-image: url("img/border-focused-switch.svg") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 3px;
 	border-width: 1px 1px 2px 1px;
@@ -629,121 +704,3 @@ GtkSwitch.trough:active {
 	border-color: transparent;
 }
 
-/* column-headers borders */
-column-header.button,
-column-header .button,
-column-header.button:focus,
-column-header .button:focus,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover
-column-header.button:active:focus,
-column-header .button:active:focus {
-	border-image: none;
-	border-width: 1px;
-	border-radius: 0;
-	border-style: solid;
-	border-color: @column_header_border_top_color @column_header_border_right_color
-	              @column_header_border_bottom_color @column_header_border_left_color;
-
-}
-
-column-header.button:last-child,
-column-header:last-child .button,
-column-header.button:last-child:focus,
-column-header:last-child .button:focus,
-column-header.button:last-child:active,
-column-header:last-child .button:active,
-column-header.button:last-child:active:hover,
-column-header:last-child .button:active:hover,
-column-header.button:last-child:active:focus,
-column-header:last-child .button:active:focus {
-	border-right: none;
-}
-
-/* Leftmost button */
-.linked .entry:first-child,
-.linked > GtkComboBox:first-child > .button:last-child,
-.linked > GtkComboBox:first-child > .button:active:last-child,
-.linked > GtkComboBox:first-child > .button:active:hover:last-child,
-.linked > GtkComboBox:first-child > .button:focus:last-child,
-.linked > GtkComboBox:first-child > .button:focus:active:last-child,
-.linked > GtkComboBox:first-child > .button:insensitive:last-child,
-.linked .button:first-child,
-.linked .button:active:first-child,
-.linked .button:active:hover:first-child,
-.linked .button:focus:first-child,
-.linked .button:focus:active:first-child,
-.linked .button:insensitive:first-child {
-    border-image: none;
-    border-radius: 3px 0 0 3px;
-    border-color: @border_color;
-    border-width: 1px;
-    padding: 1px 2px;
-}
-
-/* Middle button */
-.linked .entry,
-.linked > GtkComboBox > .button:last-child,
-.linked > GtkComboBox > .button:active:last-child,
-.linked > GtkComboBox > .button:active:hover:last-child,
-.linked > GtkComboBox > .button:focus:last-child,
-.linked > GtkComboBox > .button:focus:active:last-child,
-.linked > GtkComboBox > .button:insensitive:last-child,
-.linked .button,
-.linked .button:active,
-.linked .button:active:hover,
-.linked .button:focus,
-.linked .button:focus:active,
-.linked .button:insensitive {
-    border-image: none;
-	border-radius: 0;
-    border-color: @border_color;
-    border-width: 1px 0;
-    padding: 1px 2px;
-}
-
-/* Rightmost button */
-.linked .entry:last-child,
-.linked > GtkComboBox:last-child > .button,
-.linked > GtkComboBox:last-child > .button:last-child,
-.linked .button:last-child,
-.linked .button:active:last-child,
-.linked .button:active:hover:last-child,
-.linked .button:focus:last-child,
-.linked .button:focus:active:last-child,
-.linked .button:insensitive:last-child {
-    border-image: none;
-	border-radius: 0 3px 3px 0;
-    border-color: @border_color;
-    border-width: 1px;
-    padding: 1px 2px;
-}
-
-/* Dialog Action Area */
-
-/* Leftmost button */
-.dialog-action-area.linked .button:first-child,
-.dialog-action-area.linked .button:active:first-child,
-.dialog-action-area.linked .button:active:hover:first-child,
-.dialog-action-area.linked .button:focus:first-child,
-.dialog-action-area.linked .button:focus:active:first-child,
-.dialog-action-area.linked .button:insensitive:first-child,
-/* Middle button */
-.dialog-action-area.linked .button,
-.dialog-action-area.linked .button:active,
-.dialog-action-area.linked .button:active:hover,
-.dialog-action-area.linked .button:focus,
-.dialog-action-area.linked .button:focus:active,
-.dialog-action-area.linked .button:insensitive,
-/* Rightmost button */
-.dialog-action-area.linked .button:last-child,
-.dialog-action-area.linked .button:active:last-child,
-.dialog-action-area.linked .button:active:hover:last-child,
-.dialog-action-area.linked .button:focus:last-child,
-.dialog-action-area.linked .button:focus:active:last-child,
-.dialog-action-area.linked .button:insensitive:last-child {
-	border-radius: 3px;
-	border-width: 1px;
-}
diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index 1069703..4a107b0 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -1,5 +1,4 @@
 * {
-	engine: none;
 	padding: 0;
 
 	background-clip: padding-box;
@@ -8,34 +7,22 @@
 
 	-GtkTextView-error-underline-color: @error_color;
 
-	-GtkPaned-handle-size: 5;
-
-	-GtkCheckButton-indicator-size: 16;
-	-GtkCheckMenuItem-indicator-size: 10;
-
 	-GtkScrolledWindow-scrollbar-spacing: 3;
-	-GtkScrolledWindow-scrollbars-within-bevel: 0;
 
 	-GtkToolItemGroup-expander-size: 11;
-	-GtkExpander-expander-size: 14;
 
-	-GtkMenu-horizontal-padding: 0;
-	-GtkMenu-vertical-padding: 0;
-
-	-GtkWidget-link-color: @link_color;
-	-GtkWidget-visited-link-color: @visited_link_color;
 	-GtkIMHtml-hyperlink-color: @link_color;
 	-GtkHTML-link-color: @link_color;
 
 	-WnckTasklist-fade-overlay-rect: 0;
 
-	-GtkWidget-focus-padding: 2;
-	-GtkWidget-focus-line-width: 1;
 	outline-color: @focus_border_color;
 	outline-style: dashed;
 	outline-offset: -2px;
 	outline-width: 1px;
-	outline-radius: 2px;
+
+	-gtk-outline-radius: 2px;
+	-gtk-icon-style: regular; /* disable symbolic icons */
 	
 	-GtkWindow-resize-grip-width: 11;
 	-GtkWindow-resize-grip-height: 11;
@@ -45,8 +32,9 @@
  * Base States *
  ***************/
 
-GtkWindow {
+window {
 	color: @theme_fg_color;
+	margin: 0px;
 }
 
 .background {
@@ -60,28 +48,30 @@ GtkWindow {
 	color: @theme_selected_fg_color;
 }
 
-*:insensitive {
+*:disabled {
 	background-color: @insensitive_bg_color;
 	color: @insensitive_fg_color;
 	text-shadow: 1px 1px @insensitive_text_shadow_color;
-	border-color: @insensitive_border_color;
 }
 
-GtkImage,
-GtkImage:insensitive,
-GtkLabel,
-GtkLabel:insensitive,
-GtkBox,
-GtkBox:insensitive,
+image,
+image:disabled,
+label,
+label:disabled,
+box,
+box:disabled,
 GtkGrid,
-GtkGrid:insensitive {
+GtkGrid:disabled {
 	background-color: transparent;
 }
 
 /************
  * Tooltips *
  ************/
-.tooltip {
+tooltip,
+tooltip.background,
+.tooltip,
+.tooltip.background {
 	padding: 4px;
 	border-style: solid;
 	border-width: 1px;
@@ -91,8 +81,9 @@ GtkGrid:insensitive {
 	color: @theme_tooltip_fg_color;
 }
 
+tooltip *,
 .tooltip * {
-	background-color: transparent;
+	text-shadow: none;
 }
 
 /*****************
@@ -104,17 +95,17 @@ GtkGrid:insensitive {
 	    -gtk-icon-transform: rotate(1turn);
 	}
 }
-.spinner {
+spinner {
 	background-image: none;
 	background-color: blue;
 	opacity: 0;
 	-gtk-icon-source: -gtk-icontheme("process-working-symbolic");
 }
-.spinner:active {
+spinner:active {
 	opacity: 1;
 	animation: spin 1s linear infinite;
 }
-.spinner:active:insensitive {
+spinner:active:disabled {
 	opacity: 0.5;
 }
 
@@ -163,8 +154,9 @@ GtkGrid:insensitive {
 	-GtkButton-inner-border: 0;
 }
 
-.view.rubberband,
-.rubberband {
+.rubberband,
+view rubberband,
+rubberband {
 	background-color: alpha (@theme_selected_bg_color, 0.35);
 	border-color: @theme_selected_bg_color;
 	border-style: solid;
@@ -172,10 +164,18 @@ GtkGrid:insensitive {
 	border-radius: 2px;
 }
 
-GtkStatusbar {
-	padding: 5px;
+statusbar {
+	margin: -7px -10px -6px -10px;
+}
+
+statusbar label,
+statusbar frame {
 	color: @theme_fg_color;
-	-GtkStatusbar-shadow-type: none;
+	border-width: 0px;
+}
+
+statusbar frame {
+	border-width: 0;
 }
 
 .dnd {
@@ -185,49 +185,33 @@ GtkStatusbar {
 	border-radius: 0;
 }
 
-GtkTreeView.view.separator,
-GtkTreeView.separator,
-.separator,
-.separator:hover {
-	color: shade(@border_color, 1.30);
-}
-
-.pane-separator,
-.pane-separator:hover,
-.pane-separator:selected {
-	color: @theme_bg_color;
-	background-color: @theme_bg_color;
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
 /****************
  * Text Entries *
  ****************/
 
-.entry {
+entry {
 	border-style: solid;
 	padding: 4px;
 	color: @entry_text_color;
 	background-color: @theme_base_color;
 }
 
-.entry.progressbar {
+entry progressbar {
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
 }
 
-.entry:selected {
+entry selection {
 	color: @theme_selected_fg_color;
 	background-color: @theme_selected_bg_color;
 }
 
-.entry:insensitive {
+entry:disabled {
 	color: @insensitive_fg_color;
 }
 
 /* Entry background */
-.entry {
+entry {
 	background-color: @entry_bg_color;
 	background-image: linear-gradient(to bottom,
 	                  @entry_inner_border_color 1px,
@@ -235,12 +219,12 @@ GtkTreeView.separator,
 }
 
 /* Focused entry background */
-.entry:focus {
+entry:focus {
 	background-image: none;
 }
 
 /* Insensitive entry background */
-.entry:insensitive {
+entry:disabled {
 	background-image: linear-gradient(to bottom,
 	                  @entry_insensitive_inner_border_color 2px,
 	                  @entry_insensitive_bg_color 3px);
@@ -250,15 +234,15 @@ GtkTreeView.separator,
  * Symbolic images *
  *******************/
 
-.image {
+image {
 	color: @internal_element_color;
 }
 
-.image:hover {
+image:hover {
 	color: @internal_element_hover_color;
 }
 
-.image:selected {
+image:selected {
 	color: @theme_selected_fg_color;
 }
 
@@ -266,8 +250,8 @@ GtkTreeView.separator,
  * Color Chooser *
  *****************/
 
-GtkColorSwatch,
-GtkColorSwatch:selected {
+colorswatch,
+colorswatch:selected {
 	border-width: 1px;
 	border-style: solid;
 	border-radius: 3px;
@@ -276,13 +260,13 @@ GtkColorSwatch:selected {
 	background-clip: border-box;
 }
 
-GtkColorSwatch:hover,
-GtkColorSwatch:selected:hover {
+colorswatch:hover,
+colorswatch:selected:hover {
 	border-color: @color_swatch_hover_border_color;
 }
 
-GtkColorChooserWidget #add-color-button:hover,
-GtkColorChooserWidget #add-color-button:selected:hover {
+colorchooser #add-color-button:hover,
+colorchooser #add-color-button:selected:hover {
 }
 
 .color-active-badge,
@@ -304,8 +288,8 @@ GtkColorChooserWidget #add-color-button:selected:hover {
 	color: @color_active_badge_dark_color;
 }
 
-GtkColorEditor GtkColorSwatch.color-light:hover,
-GtkColorEditor GtkColorSwatch.color-dark:hover {
+GtkColorEditor colorswatch.color-light:hover,
+GtkColorEditor colorswatch.color-dark:hover {
 	background-image: none;
 }
 
@@ -313,16 +297,35 @@ GtkColorEditor GtkColorSwatch.color-dark:hover {
  * Progress bar *
  ****************/
 
-GtkProgressBar {
+progressbar {
+	border-radius: 3px;
 	padding: 0 0 1px 0;
 }
 
+progressbar.horizontal trough,
+progressbar.horizontal progress {
+	min-height: 16px;
+	border-radius: 3px;
+}
+
+progressbar.vertical trough,
+progressbar.vertical progress {
+	min-width: 16px;
+	border-radius: 3px;
+}
+
+progressbar.vertical trough {
+	background-image: linear-gradient(to right,
+	                  @trough_gradient_a,
+	                  @trough_gradient_b 4px);
+}
+
 /* progress component */
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
+progressbar.horizontal progress,
+row progressbar progress,
+row:hover progressbar progress,
+row:selected progressbar progress,
+row:selected:focus progressbar progress {
 	background-color: @progressbar_bg_color;
 	background-image: linear-gradient(to bottom,
 	                      alpha (@progressbar_gradient_a, 0.7),
@@ -338,14 +341,16 @@ GtkProgressBar {
 	border-width: 1px;
 	border-style: solid;
 	border-color: @progressbar_border_color;
+	min-height: 16px;
+	margin: 0 -1px 0 -1px;
 }
 
-.progressbar row:selected,
-.progressbar row:selected:focus {
+row:selected progressbar progress,
+row:selected:focus progressbar progress {
 	border-color: shade(@progressbar_border_color, 0.85);
 }
 
-.progressbar.vertical {
+progressbar.vertical progress {
 	background-image: linear-gradient(to right,
 	                      alpha (@progressbar_gradient_a, 0.7),
 	                      alpha (@progressbar_gradient_b, 0.7) 50%,
@@ -356,97 +361,141 @@ GtkProgressBar {
 	                      alpha (@progressbar_pattern_color, 0.0) 12px,
 	                      alpha (@progressbar_pattern_color, 0.5) 12px,
 	                      alpha (@progressbar_pattern_color, 0.5) 24px);
+	border-radius: 3px;
+	border-width: 1px;
+	border-style: solid;
+	border-color: @progressbar_border_color;
+	min-width: 16px;
+	margin: -1px 0 -1px 0;
 }
 
 /* for progressbars in cell renderers */
-.trough row {
+row trough {
 	padding: 0;
 }
-
-.trough row:selected,
-.trough row:selected:focus {
+/*
+row:selected progressbar trough,
+row:selected:focus progressbar trough {
 	background-image: -gtk-gradient (linear,
 	                  left top, left bottom,
 	                  from (mix (@trough_gradient_a, @theme_selected_bg_color, 0.25)),
 	                  to (mix (@trough_gradient_b, @theme_selected_bg_color, 0.25)));
-}
+}*/
 
 /************
  * GtkScale *
  ************/
 
-GtkScale {
+scale.vertical {
+    min-width: 10px;
+    padding: 3px 5px;
+}
+
+scale.horizontal {
+    min-height: 10px;
+    padding: 5px 2px;
+}
+
+/*scale {
 	-GtkScale-slider-length: 21;
 	-GtkRange-slider-width: 13;
 	-GtkRange-trough-border: 4;
+}*/
+
+scale.horizontal slider,
+scale.horizontal slider:hover,
+scale.horizontal slider:disabled {
+	border-radius: 0;
+	border-style: none;
+	background-color: transparent;
+	min-width: 21px;
+	min-height: 13px;
+	margin: -5px 0 -5px 0;
 }
 
-GtkScale.slider,
-GtkScale.slider:hover,
-GtkScale.slider:insensitive {
+scale.vertical slider,
+scale.vertical slider:hover,
+scale.vertical slider:disabled {
 	border-radius: 0;
 	border-style: none;
 	background-color: transparent;
+	min-width: 13px;
+	min-height: 21px;
+	margin: 0 -5px 0 -5px;
 }
 
-GtkScale.trough,
-GtkScale.trough.highlight,
-GtkScale.trough.vertical,
-GtkScale.trough:insensitive {
+scale.horizontal trough,
+scale.vertical trough,
+scale trough highlight,
+scale trough:disabled {
+	min-width: 3px;
+	min-height: 3px;
 	border-image: none;
 	border-style: solid;
 	border-width: 1px;
 	border-radius: 1px;
-	background-image: none;
 }
 
-GtkScale.trough {
+scale.horizontal trough {
+	margin: 5px 0 5px 0;
+}
+
+scale trough {
 	margin: 8px 0;
 	border-color: @scale_trough_border_color;
 	background-color: @scale_trough_bg_color;
+	background-image: none;
 }
 
-GtkScale.trough.vertical {
+scale.vertical trough {
 	margin: 0 8px;
+	background-image: none;
 }
 
-GtkScale.trough.highlight {
+scale trough highlight {
 	border-color: @scale_trough_highlight_border_color;
 	background-color: @scale_trough_highlight_bg_color;
+	margin: -1px;
 }
 
-GtkScale.trough:insensitive {
+scale trough:disabled {
 	border-color: @scale_trough_insensitive_border_color;
 	background-color: @scale_trough_insensitive_highlight_bg_color;
 }
 
-GtkScale.trough.highlight:insensitive {
+scale trough highlight:disabled {
 	border-color: @scale_trough_highlight_insensitive_border_color;
 	background-color: @scale_trough_highlight_insensitive_bg_color;
 }
 
-GtkScale.progressbar {
-	background-color: @scale_progressbar_bg_color;
+scale marks indicator {
+	color: @scale_mark_color;
 }
 
-GtkScale.mark {
-	color: @scale_mark_color;
+scale:focus {
+}
+
+scale:focus trough {
 }
 
 /**********
  * Frames *
  **********/
 
+ frame > border,
 .frame {
-	border-width: 1px;
-	border-color: @border_color;
-	border-style: solid;
-	border-radius: 3px;
-	background-color: @theme_bg_color;
+	box-shadow: none;
+	margin: 0;
 	padding: 0;
+	border-radius: 3px;
+	border: 1px solid @border_color;
 }
 
-GtkScrolledWindow.frame {
+frame > label {
+	padding: 0px 4px 0px 4px;
+}
+
+scrolledwindow frame {
 	border-style: solid;
 	border-color: @border_color;
 	border-width: 1px;
@@ -454,152 +503,256 @@ GtkScrolledWindow.frame {
 	padding: 0;
 }
 
-GtkScrolledWindow GtkViewport {
+scrolledwindow viewport {
 	background-color: @theme_bg_color;
 }
 
 /* avoid double borders when a viewport is
  * packed into a GtkScrolledWindow */
-GtkScrolledWindow GtkViewport.frame {
+scrolledwindow viewport.frame {
 	border-style: none;
 }
 
 /***********
  * Buttons *
  ***********/
-
-.button,
-.button.menuitem.menubar,
-.combobox-entry .button,
-.inline-toolbar.toolbar .button,
-.primary-toolbar.toolbar.horizontal .button,
-.primary-toolbar.toolbar.horizontal .button:active,
-.toolbar.horizontal .button,
-.toolbar.horizontal .button:active,
-.titlebar .linked.raised .button,
-.titlebar .linked.raised .button:active {
+button {
+	min-height: 16px;
+}
+
+button,
+button.menuitem.menubar,
+toolbar.inline-toolbar button,
+toolbar.primary-toolbar button,
+toolbar.primary-toolbar button:active,
+toolbar.horizontal button,
+toolbar.horizontal button:active,
+.titlebar .linked.raised button,
+.titlebar .linked.raised button:active {
 	padding: 5px 8px 6px;
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (@button_gradient_a),
+	                  color-stop (0.50, @button_gradient_b),
+	                  color-stop (0.50, @button_gradient_c),
+	                  to (@button_gradient_d));
+	background-color: transparent;
 }
 
-GtkComboBox GtkToggleButton.button,
-GtkComboBoxText GtkToggleButton.button,
-.toolbar.horizontal GtkComboBox GtkToggleButton.button,
-.toolbar.horizontal GtkComboBoxText GtkToggleButton.button {
-	padding: 2px;
+toolbar button,
+toolbar.primary-toolbar button,
+toolbar.horizontal button:hover,
+toolbar.horizontal button:active {
+	padding: 4px 6px;
 }
 
-.path-bar .button,
-.path-bar .button GtkImage,
-.path-bar .button GtkLabel {
+.path-bar button,
+.linked.path-bar > button,
+.path-bar button image,
+.path-bar button label {
 	padding: 2px;
 }
 
-.path-bar .button {
+.path-bar button {
 	border-width: 1px 0px 1px 1px;
 }
 
-.path-bar .button:hover:active {
-	border-left-width: 1px;
-}
-
-.path-bar .button:first-child,
-.path-bar .button:first-child:hover:active {
+.path-bar button:first-child,
+.path-bar button:first-child:hover:active {
 	border-right-width: 0px;
 }
 
-.path-bar .button:only-child,
-.path-bar .button:only-child:hover:active {
+.path-bar button:only-child,
+.path-bar button:only-child:hover:active {
 	border-radius: 3px;
 	border-right-width: 1px;
 }
 
-.linked.raised .button:first-child,
-.linked.raised .button:first-child:hover:active {
+.linked.raised button:first-child,
+.linked.raised button:first-child:hover:active {
 	border-right-width: 0px;
 }
 
-.button {
-	-GtkButton-image-spacing: 4;
+button {
+	-GtkButton-image-spacing: 4px;
 	-GtkButton-interior-focus: true;
 	-GtkButton-default-border: 0;
-	-GtkButton-inner-border: 3;
+	-GtkButton-inner-border: 3px;
 	color: @theme_text_color;
 	border-style: solid;
 	border-color: transparent;
 }
 
-/* We want anything inside the buttons to use their background */
-.button * {
-	background-color: transparent;
-}
-
 /* We may want a background for focused buttons, but in the meantime let's remove it too */
 GtkMenuToolButton *,
-.primary-toolbar .button,
-.primary-toolbar .button:insensitive {
+toolbar.horizontal button,
+toolbar.horizontal button.combo,
+toolbar.primary-toolbar button,
+toolbar.inline-toolbar button,
+toolbar.primary-toolbar button:disabled {
 	background-image: none;
 	background-color: transparent;
 }
 
-.primary-toolbar .button {
+toolbar.primary-toolbar button {
 	border-image: none;
 	border-style: solid;
 	border-width: 1px 1px 2px 1px;
 	border-color: transparent;
 }
 
-.primary-toolbar .button *:active,
-.inline-toolbar .button *:active,
-.button *:active,
-.button *:active:focus,
-.button *:focus {
+toolbar.primary-toolbar button:checked,
+toolbar.inline-toolbar button:checked,
+button:active,
+button:active:focus,
+button:focus,
+button:hover {
+	background-color: @theme_selected_bg_color;
 	color: @button_active_text_color;
+	border-color: @theme_selected_bg_color;
 }
 
-.button *:insensitive,
-.button *:active:insensitive {
+button:disabled,
+button:active:disabled {
 	color: @insensitive_fg_color;
 }
 
-.button .separator {
-	color: shade(@internal_element_color, 1.30);
+/* Focused primary toolbar button background */
+button:focus,
+toolbar.primary-toolbar button:focus {
+	background-image: linear-gradient(to bottom,
+	                  @pt_button_focus_gradient_a,
+	                  @pt_button_focus_gradient_b 50%,
+	                  @pt_button_focus_gradient_c 50%,
+	                  @pt_button_focus_gradient_d);
+}
+
+/* Focused + prelit primary toolbar button background */
+toolbar.primary-toolbar button:focus:hover {
+	background-image: linear-gradient(to bottom,
+	                  @pt_button_focus_hover_gradient_a,
+	                  @pt_button_focus_hover_gradient_b 50%,
+	                  @pt_button_focus_hover_gradient_c 50%,
+	                  @pt_button_focus_hover_gradient_d);
 }
 
 /*****************
  * GtkSpinButton *
  *****************/
 
-.spinbutton .button,
-.spinbutton .button:focus {
+spinbutton,
+spinbutton:focus {
 	color: @internal_element_color;
-	padding: 2px 6px;
-	border-width: 0 0 0 1px;
-	border-radius: 0;
+	padding: 0px;
+	border-width: 1px;
+	border-radius: 3px;
 	border-style: solid;
 	border-color: @spinbutton_border_color;
 	border-image: none;
 }
 
-.spinbutton .button {
-	background-color: transparent;
+spinbutton.horizontal > entry,
+spinbutton.horizontal > entry:focus {
+    padding: 0px 10px 0px 3px;
+    box-shadow: none;
+    border-radius: 3px 0px 0px 3px;
+    border-style: none;
+    border-image: none;
 }
 
-.spinbutton .button:insensitive {
-	color: @internal_element_insensitive_color;
+spinbutton > button,
+spinbutton > button:focus,
+spinbutton > button:focus:active {
+    background-color: transparent;
+    color: @internal_element_color;
+    padding: 6px;
+    border-radius: 0;
+    border-width: 0 0 0 1px;
+    border-style: solid;
+    border-color: @spinbutton_border_color;
+    border-image: none;
 }
 
-.spinbutton .button:active,
-.spinbutton .button:active:focus,
-.spinbutton .button:hover {
-	color: @internal_element_hover_color;
+spinbutton > button:disabled {
+    color: @internal_element_insensitive_color;
+    border-color: @insensitive_border_color;
+    border-image: none;
+    border-radius: 0;
+}
+
+spinbutton > button:checked,
+spinbutton > button:focus:checked,
+spinbutton > button:hover {
+    color: @internal_element_hover_color;
+}
+
+spinbutton.horizontal > button {
+    border-width: 0 0 0 1px;
+}
+
+spinbutton.horizontal > button:last-child {
+    border-radius: 0 3px 3px 0;
+}
+
+/*vertical */
+spinbutton.vertical > entry,
+spinbutton.vertical > entry:focus {
+    border-image: none;
+    border-color: @spinbutton_border_color;
+    border-radius: 0px;
+    border-width: 1px 0px 1px 0px;
+    padding: 6px 2px;
+}
+
+spinbutton.vertical > button,
+spinbutton.vertical > button:focus,
+spinbutton.vertical > button:focus:active,
+spinbutton.vertical > button:last-child,
+spinbutton.vertical > button:focus:last-child,
+spinbutton.vertical > button:focus:active:last-child {
+    padding: 6px 2px;
+    border-width: 0px;
 }
 
-.spinbutton .button:first-child {
-	border-radius: 2px 0 0 2px;
+spinbutton.vertical > button,
+spinbutton.vertical > button:focus,
+spinbutton.vertical > button:focus:active {
+    border-radius: 3px 3px 0px 0px;
 }
 
-.spinbutton .button:last-child {
-	border-radius: 0 2px 2px 0;
+spinbutton.vertical > button:last-child,
+spinbutton.vertical > button:focus:last-child,
+spinbutton.vertical > button:focus:active:last-child {
+    border-radius: 0px 0px 3px 3px;
+}
+
+/* linked */
+.linked.vertical > spinbutton.horizontal {
+    padding: 0px;
+    border-radius: 0px ;
+    border-width: 0px 1px 1px 1px;
+}
+
+.linked.vertical > spinbutton.horizontal > entry,
+.linked.vertical > spinbutton.horizontal > entry:focus {
+    padding: 0px 10px 0px 3px;
+    border-radius: 0px ;
+    border-style: none;
+    border-image: none;
+    box-shadow: none;
+}
+
+.linked.vertical > spinbutton.horizontal > button,
+.linked.vertical > spinbutton.horizontal > button:focus,
+.linked.vertical > spinbutton.horizontal > button:hover,
+.linked.vertical > spinbutton.horizontal > button:focus:active,
+.linked.vertical > spinbutton.horizontal > button:focus:hover {
+    border-radius: 0px;
+    border-width: 0 0 0 1px;
+    border-image: none;
+    border-color: @spinbutton_border_color;
+    padding: 6px;
 }
 
 /*********************
@@ -607,18 +760,11 @@ GtkMenuToolButton *,
  *********************/
 
 /* Button background */
-.button,
-.spinbutton .button,
-.toolbar .button.raised,
-.toolbar .raised .button,
-.toolbar .button.raised:focus,
-.toolbar .raised .button:focus,
-.toolbar GtkComboBox .button,
-.toolbar GtkComboBox .button:focus,
-.combobox-entry .button,
-.primary-toolbar .combobox-entry .button,
+button,
+spinbutton button,
+combobox button.combo,
 .titlebar .titlebutton:hover,
-GtkColorChooserWidget #add-color-button {
+colorchooser #add-color-button {
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  left bottom,
@@ -630,27 +776,29 @@ GtkColorChooserWidget #add-color-button {
 }
 
 /* Pushed button background */
-.button:checked,
-.button:checked:hover,
-.button:active,
-.button:active:hover,
-.menuitem.button:hover,
-.spinbutton .button:active,
-.spinbutton .button:active:hover,
-.toolbar .button:active,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active,
-.toolbar .raised .button:active,
-.toolbar .button.raised:active:hover,
-.toolbar .raised .button:active:hover,
-.primary-toolbar .combobox-entry .button:active,
-.combobox-entry .button:active,
-.primary-toolbar .button:active,
-.primary-toolbar .button:active:hover,
-.primary-toolbar .button:focus:active,
-.primary-toolbar .button:focus:active:hover,
-.inline-toolbar .button:active,
-.inline-toolbar .button:active:hover {
+button:checked,
+button:checked:hover,
+button:hover:active,
+menuitem button:hover,
+spinbutton button:active,
+spinbutton button:active:hover,
+combobox button.combo:checked,
+toolbar button:checked,
+toolbar button:checked:hover,
+toolbar button:hover:active,
+toolbar button.raised:checked,
+toolbar .raised button:checked,
+toolbar button.raised:hover:active,
+toolbar button.raised:checked:hover,
+toolbar .raised button:hover:active,
+toolbar .raised button:checked:hover,
+toolbar.primary-toolbar combobox button.combo:checked,
+toolbar.primary-toolbar button:checked,
+toolbar.primary-toolbar button:hover:active,
+toolbar.primary-toolbar button:focus:active,
+toolbar.primary-toolbar button:focus:hover:active,
+toolbar.inline-toolbar button:checked,
+toolbar.inline-toolbar button:hover:active {
 	background-image: linear-gradient(to bottom,
 	                  @button_active_gradient_a,
 	                  @button_active_gradient_b 3px,
@@ -661,65 +809,34 @@ GtkColorChooserWidget #add-color-button {
 	background-color: transparent;
 }
 
-GtkListBoxRow.button.list-row:hover {
-	background-image: linear-gradient(to bottom,
-	                  shade(@button_active_gradient_a, 1.20),
-	                  shade(@button_active_gradient_b, 1.20) 3px,
-	                  shade(@button_active_gradient_c, 1.20) 4px,
-	                  shade(@button_active_gradient_d, 1.20) 50%,
-	                  shade(@button_active_gradient_e, 1.20) 50%,
-	                  shade(@button_active_gradient_f, 1.20));
-	background-color: transparent;
-}
-
-GtkListBoxRow.button.list-row {
-	color: @theme_text_color;
-	background-color: @theme_base_color;
-	border-radius: 0px;
-	border: none;
-}
-
-GtkListBoxRow.button.list-row:selected {
-	color: @theme_selected_fg_color;
-	border-style: solid;
-	border-width: 1px;
-	border-color: @menubar_menuitem_hover_border_color;
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@menubar_menuitem_hover_gradient_a),
-	                  color-stop (0.50, @menubar_menuitem_hover_gradient_b),
-	                  color-stop (0.50, @menubar_menuitem_hover_gradient_c),
-	                  to (@menubar_menuitem_hover_gradient_d));
-}
-
-.trough,
-.trough.highlight,
-.trough row,
-.trough row:hover {
+trough,
+trough.highlight,
+trough row,
+trough row:hover {
 	background-image: linear-gradient(to bottom,
 	                  @trough_gradient_a,
 	                  @trough_gradient_b 4px);
 }
 
 /* Flipped pushed button background for vertical progressbar through and the like */
-.trough.vertical {
+trough.vertical {
 	background-image: linear-gradient(to right,
 	                  @trough_gradient_a,
 	                  @trough_gradient_b 4px);
 }
 
 /* Prelit button background */
-.button:hover,
-.spinbutton .button:hover,
-.toolbar .button:hover,
-.toolbar .button.raised:hover,
-.toolbar .raised .button:hover,
-.toolbar GtkComboBox .button:hover,
-.primary-toolbar .button:hover,
-.combobox-entry .button:hover,
-.primary-toolbar .combobox-entry .button:hover,
-GtkColorChooserWidget #add-color-button:hover {
+button:active,
+button:hover,
+spinbutton button:hover,
+combobox button.combo:hover,
+toolbar button:hover,
+toolbar button.raised:hover,
+toolbar .raised button:hover,
+toolbar combobox button.combo:hover,
+toolbar.primary-toolbar button:hover,
+toolbar.primary-toolbar combobox button.combo:hover,
+colorchooser #add-color-button:hover {
 	background-color: transparent;
 	background-image: linear-gradient(to bottom,
 	                  @button_hover_gradient_a 50%,
@@ -728,9 +845,9 @@ GtkColorChooserWidget #add-color-button:hover {
 }
 
 /* Insensitive button background */
-.button:insensitive,
-.toolbar GtkComboBox .button:insensitive,
-.combobox-entry .button:insensitive {
+button:disabled,
+combobox button.combo:disabled,
+toolbar combobox button.combo:disabled {
 	background-image: linear-gradient(to bottom,
 	                  @button_insensitive_inner_border_color 1px,
 	                  @button_insensitive_gradient_a 2px,
@@ -741,9 +858,9 @@ GtkColorChooserWidget #add-color-button:hover {
 }
 
 /* Pushed + Insensitive button background */
-.button:active:insensitive,
-.toolbar .button:active:insensitive,
-.toolbar GtkComboBox .button:active:insensitive {
+button:checked:disabled,
+toolbar button:checked:disabled,
+toolbar combobox button.combo:checked:disabled {
 	background-image: linear-gradient(to bottom,
 	                  @button_active_insensitive_gradient_a,
 	                  @button_active_insensitive_gradient_b 3px,
@@ -755,7 +872,7 @@ GtkColorChooserWidget #add-color-button:hover {
 }
 
 /* Focused primary toolbar button background */
-.primary-toolbar .button:focus {
+toolbar.primary-toolbar button:focus {
 	background-image: linear-gradient(to bottom,
 	                  @pt_button_focus_gradient_a,
 	                  @pt_button_focus_gradient_b 50%,
@@ -764,7 +881,7 @@ GtkColorChooserWidget #add-color-button:hover {
 }
 
 /* Focused + prelit primary toolbar button background */
-.primary-toolbar .button:focus:hover {
+toolbar.primary-toolbar button:focus:hover {
 	background-image: linear-gradient(to bottom,
 	                  @pt_button_focus_hover_gradient_a,
 	                  @pt_button_focus_hover_gradient_b 50%,
@@ -772,40 +889,60 @@ GtkColorChooserWidget #add-color-button:hover {
 	                  @pt_button_focus_hover_gradient_d);
 }
 
+button separator {
+    border-left: solid 1px @theme_fg_color;
+    padding-left: 2px;
+    padding-right: 2px;
+}
+
 /*****************
  * Notebooks and *
  * tabs          *
  *****************/
 
-.notebook {
+notebook {
 	padding: 0;
 	background-clip: border-box;
 	background-color: @notebook_bg_color;
-	-GtkNotebook-tab-overlap: 2;
+	/*border-radius: 3px 3px 0px 0px;*/
+	/*-GtkNotebook-tab-overlap: 2;
 	-GtkNotebook-tab-curvature: 3;
-	-GtkNotebook-initial-gap: 0;
-}
-
-.notebook.header.frame {
-	border-width: 0;
+	-GtkNotebook-initial-gap: 0;*/
 }
 
-.notebook GtkViewport {
-	background-color: @theme_bg_color;
+notebook viewport {
+	background-color: @theme_base_color;
 }
 
-.notebook tab {
+notebook tab {
 	padding: 3px;
-	border-radius: 3px;
-	border-color: @border_color;
 	border-style: solid;
 	border-width: 1px;
-	background-color: transparent;
+	border-color: @menu_border_color;
+}
+
+notebook header.top {
+	box-shadow: inset  0px -1px 0 0 @border_color;
+}
+
+notebook header.bottom {
+	box-shadow: inset  0px  1px 0 0 @border_color;
 }
 
-.notebook tab.top {
-	padding: 4px 2px 0 2px;
-	border-width: 1px 1px 0px;
+notebook header.left {
+	box-shadow: inset -1px  0px 0 0 @border_color;
+}
+
+notebook header.right {
+	box-shadow: inset  1px  0px 0 0 @border_color;
+}
+
+notebook header.top tab {
+	padding: 4px 6px 3px 6px;
+	border-width: 1px;
+	border-radius: 3px 3px 0px 0px;
+	margin-top: 3px;
+	margin-left: -1px;
 	background-image: linear-gradient(to bottom,
 	                  @notebook_tab_inner_border_color 1px,
 	                  @notebook_tab_gradient_a 2px,
@@ -814,9 +951,12 @@ GtkColorChooserWidget #add-color-button:hover {
 	                  @notebook_tab_gradient_d);
 }
 
-.notebook tab.right {
-	padding: 2px 4px 2px 0;
-	border-width: 1px 1px 1px 0;
+notebook header.right tab {
+	padding: 6px 6px 6px 6px;
+	border-width: 1px;
+	border-radius: 0px 3px 3px 0px;
+	margin-right: 3px;
+	margin-top: -1px;
 	background-image: linear-gradient(to left,
 	                  @notebook_tab_inner_border_color 1px,
 	                  @notebook_tab_gradient_a 2px,
@@ -825,9 +965,12 @@ GtkColorChooserWidget #add-color-button:hover {
 	                  @notebook_tab_gradient_d);
 }
 
-.notebook tab.bottom {
-	padding: 0 2px 4px;
-	border-width: 0px 1px 1px;
+notebook header.bottom tab {
+	padding: 3px 6px 4px 6px;
+	border-width: 1px;
+	border-radius: 0px 0px 3px 3px;
+	margin-bottom: 3px;
+	margin-left: -1px;
 	background-image: linear-gradient(to top,
 	                  @notebook_tab_inner_border_color 1px,
 	                  @notebook_tab_gradient_a 2px,
@@ -836,9 +979,12 @@ GtkColorChooserWidget #add-color-button:hover {
 	                  @notebook_tab_gradient_d);
 }
 
-.notebook tab.left {
-	padding: 2px 0 2px 4px;
-	border-width: 1px 0 1px 1px;
+notebook header.left tab {
+	padding: 6px 6px 6px 6px;
+	border-width: 1px;
+	border-radius: 3px 0px 0px 3px;
+	margin-left: 3px;
+	margin-top: -1px;
 	background-image: linear-gradient(to right,
 	                  @notebook_tab_inner_border_color 1px,
 	                  @notebook_tab_gradient_a 2px,
@@ -847,8 +993,10 @@ GtkColorChooserWidget #add-color-button:hover {
 	                  @notebook_tab_gradient_d);
 }
 
-.notebook tab.top:active {
+notebook header.top tab:checked {
 	padding-top: 7px;
+	margin-top: 0px;
+	border-bottom: 0px;
 	border-top-color: @notebook_active_tab_border;
 	background-image: linear-gradient(to bottom,
 	                  @notebook_active_tab_strip_gradient_a,
@@ -858,8 +1006,10 @@ GtkColorChooserWidget #add-color-button:hover {
 	                  @notebook_active_tab_gradient_b);
 }
 
-.notebook tab.right:active {
+notebook header.right tab:checked {
 	padding-right: 7px;
+	margin-right: 0px;
+	border-left: 0px;
 	border-right-color: @notebook_active_tab_border;
 	background-image: linear-gradient(to left,
 	                  @notebook_active_tab_strip_gradient_a,
@@ -869,8 +1019,10 @@ GtkColorChooserWidget #add-color-button:hover {
 	                  @notebook_active_tab_gradient_b);
 }
 
-.notebook tab.bottom:active {
-	padding-bottom: 7px;
+notebook header.bottom tab:checked {
+	padding-bottom: 6px;
+	margin-bottom: 0px;
+	border-top: 0px;
 	border-bottom-color: @notebook_active_tab_border;
 	background-image: linear-gradient(to top,
 	                  @notebook_active_tab_strip_gradient_a,
@@ -880,8 +1032,10 @@ GtkColorChooserWidget #add-color-button:hover {
 	                  @notebook_active_tab_gradient_b);
 }
 
-.notebook tab.left:active {
-	padding-left: 7px;
+notebook header.left tab:checked {
+	padding-left: 8px;
+	margin-left: 0px;
+	border-right: 0px;
 	border-left-color: @notebook_active_tab_border;
 	background-image: linear-gradient(to right,
 	                  @notebook_active_tab_strip_gradient_a,
@@ -891,21 +1045,32 @@ GtkColorChooserWidget #add-color-button:hover {
 	                  @notebook_active_tab_gradient_b);
 }
 
-.notebook tab * {
-	background-color: transparent;
+notebook header tab:focus {
+	padding: 2px;
 }
 
 /* close button styling */
-.notebook tab .button,
-.notebook tab .button:active,
-.notebook tab .button:hover {
+notebook button.flat.small-button {
+    border-image: none;
+    border-radius: 3px;
+    border-style: solid;
+    border-color: transparent;
+    border-width: 1px;
+    background-image: none;
+    background-color: transparent;
+    padding: 0;
+}
+
+notebook header.* tab button,
+notebook header.* tab button:active,
+notebook header.* tab button:hover {
 	border-image: none;
-	border-style: none;
 	background-image: none;
 	background-color: transparent;
+	border-color: alpha(black, 0.1);
 }
 
-.notebook tab .button GtkImage {
+notebook button image {
 	border-radius: 3px;
 	color: mix(@theme_fg_color, @theme_base_color, 0.6);
 	border-style: solid;
@@ -914,13 +1079,13 @@ GtkColorChooserWidget #add-color-button:hover {
 	padding: 0;
 }
 
-.notebook tab .button GtkImage:hover {
+notebook button image:hover {
 	color: @theme_fg_color;
 	border-color: alpha(black, 0.1);
 }
 
-.notebook tab .button GtkImage:active,
-.notebook tab .button GtkImage:active:hover {
+notebook button image:active,
+notebook button image:active:hover {
 	background-color: alpha(black, 0.08);
 	color:  @theme_base_color;
 	border-color: alpha(black, 0.27)
@@ -929,104 +1094,276 @@ GtkColorChooserWidget #add-color-button:hover {
 	              alpha(black, 0.13);
 }
 
+notebook header.top tabs arrow.up,
+notebook header.bottom tabs arrow.up {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+    color: @theme_fg_color;
+}
+
+notebook header.top tabs arrow.down,
+notebook header.bottom tabs arrow.down {
+    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+    color: @theme_fg_color;
+}
+
+notebook header.left tabs arrow.up,
+notebook header.right tabs arrow.up {
+    -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
+    color: @theme_fg_color;
+}
+
+notebook header.left tabs arrow.down,
+notebook header.right tabs arrow.down {
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+    color: @theme_fg_color;
+}
+
+notebook header tabs arrow {
+    color: @theme_fg_color;
+}
+
+notebook header tabs arrow:hover,
+notebook header tabs arrow:active {
+    color: @theme_selected_bg_color;
+}
+
+notebook header tabs arrow:disabled {
+    color: rgba(141, 144, 145, 0.3);
+}
+
+notebook header tabs arrow:backdrop {
+    color: rgba(84, 89, 90, 0.4);
+}
+
+notebook header tabs arrow:backdrop:disabled {
+    color: #c7c7c7;
+}
+
 /**************
  * ComboBoxes *
  **************/
 
-GtkComboBox {
+combobox {
 	padding: 0;
-	-GtkComboBox-arrow-scaling: 0.5;
-	-GtkComboBox-shadow-type: none;
+	/*-GtkComboBox-arrow-scaling: 0.5;*/
+	/*-GtkComboBox-shadow-type: none;*/
+}
+combobox arrow {
+	-gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+	color: @theme_fg_color;
+	min-height: 16px;
+	min-width: 16px;
+}
+combobox entry.combo,
+combobox button.combo {
+	padding: 5px 5px 5px 5px;
+ 	border-image-width: 3px 0 4px 3px;
+	border-radius: 3px 0 0 3px;
+	border-right-width: 0;
 }
 
-GtkComboBox *:insensitive {
+combobox entry.combo:disabled,
+combobox button.combo:disabled {
 	color: @insensitive_fg_color;
 }
 
-GtkComboBox .separator {
-	/* always disable separators */
-	-GtkWidget-wide-separators: true;
-	-GtkWidget-horizontal-separator: 0;
-	-GtkWidget-vertical-separator: 0;
+combobox separator {
+	/*-GtkWidget-wide-separators: true;*/
+	-GtkWidget-horizontal-separator: 1;
+	-GtkWidget-vertical-separator: 1;
+}
+
+combobox > .linked > entry.combo,
+combobox > .linked > button.combo,
+combobox > .linked > button.combo:focus,
+combobox > .linked > button.combo:hover,
+combobox > .linked > button.combo:checked,
+combobox > .linked > button.combo:focus:hover,
+combobox > .linked > button.combo:disabled {
+	border-image-width: 3px 3px 4px 3px;
+	border-radius: 0px;
+	border-width: 1px 0px 1px 0px;
 }
 
-.combobox-entry .entry:first-child,
-.combobox-entry .button:first-child {
+combobox > .linked > entry.combo:first-child,
+combobox > .linked > button.combo:first-child,
+combobox > .linked > button.combo:focus:first-child,
+combobox > .linked > button.combo:hover:first-child,
+combobox > .linked > button.combo:checked:first-child,
+combobox > .linked > button.combo:focus:hover:first-child,
+combobox > .linked > button.combo:disabled:first-child {
 	border-image-width: 3px 0 4px 3px;
 	border-radius: 3px 0 0 3px;
 	border-right-width: 0;
 }
 
-.combobox-entry .entry:last-child,
-.combobox-entry .button:last-child {
+combobox > .linked > entry.combo:last-child,
+combobox > .linked > button.combo:last-child,
+combobox > .linked > button.combo:focus:last-child,
+combobox > .linked > button.combo:hover:last-child,
+combobox > .linked > button.combo:checked:last-child,
+combobox > .linked > button.combo:focus:hover:last-child,
+combobox > .linked > button.combo:disabled:last-child {
 	border-image-width: 3px 3px 4px 0;
 	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
+	border-width: 0;
 }
-
-.combobox-entry .button:last-child {
-	border-image-width: 3px 3px 4px 2px;
+combobox > .linked > entry.combo:only-child,
+combobox > .linked > button.combo:only-child,
+combobox > .linked > button.combo:focus:only-child,
+combobox > .linked > button.combo:hover:only-child,
+combobox > .linked > button.combo:checked:only-child,
+combobox > .linked > button.combo:focus:hover:only-child,
+combobox > .linked > button.combo:disabled:only-child {
+	border-image-width: 3px 3px 4px 3px;
+	border-radius: 3px;
+	border-width: 1px;
+}
+/*
+toolbar.primary-toolbar combobox > .linked > entry.combo,
+toolbar.primary-toolbar combobox > .linked > button.combo {
+	border-image-width: 4px 4px 4px 0;
+	border-radius: 0 3px 3px 0;
+	border-left-width: 0;
 }
 
-.primary-toolbar .combobox-entry .entry:first-child,
-.primary-toolbar .combobox-entry .button:first-child {
+toolbar.primary-toolbar combobox > .linked > entry.combo:first-child,
+toolbar.primary-toolbar combobox > .linked > button.combo:first-child {
 	border-image-width: 4px 0 4px 4px;
 	border-radius: 3px 0 0 3px;
 	border-right-width: 0;
 }
 
-.primary-toolbar .combobox-entry .entry:last-child,
-.primary-toolbar .combobox-entry .button:last-child {
+toolbar.primary-toolbar combobox > .linked > entry.combo:last-child,
+toolbar.primary-toolbar combobox > .linked > button.combo:last-child {
 	border-image-width: 4px 4px 4px 0;
 	border-radius: 0 3px 3px 0;
 	border-left-width: 0;
 }
-
-.combobox-entry .button *:active,
-.combobox-entry .button *:active:hover {
-	color: @theme_text_color;
-}
-
-GtkComboBox .button {
-	color: @internal_element_color;
-}
-
-GtkComboBox .button *:hover {
-	color: @theme_text_color;
+*/
+/* linked combobox */
+
+/* Middle button */
+.linked > combobox > .linked > button.combo,
+.linked > combobox > .linked > button.combo:hover,
+.linked > combobox > .linked > button.combo:focus,
+.linked > combobox > .linked > button.combo:focus:hover,
+.linked > combobox > .linked > button.combo:checked,
+.linked > combobox > .linked > button.combo:disabled {
+    border-image: none;
+    border-radius: 0;
+    border-color: @border_color;
+    border-width: 1px;
+    border-width: 1px;
+    padding: 4px 2px;
+}
+
+/* Leftmost button */
+.linked > combobox:first-child > .linked > button.combo:first-child,
+.linked > combobox:first-child > .linked > button.combo:hover:first-child,
+.linked > combobox:first-child > .linked > button.combo:focus:first-child,
+.linked > combobox:first-child > .linked > button.combo:focus:hover:first-child,
+.linked > combobox:first-child > .linked > button.combo:checked:first-child,
+.linked > combobox:first-child > .linked > button.combo:disabled:first-child {
+    border-radius: 3px 0 0 3px;
+    border-width: 1px 0px 1px 1px;
+}
+
+/* Rightmost button */
+.linked > combobox:last-child > .linked > button.combo:last-child,
+.linked > combobox:last-child > .linked > button.combo:hover:last-child,
+.linked > combobox:last-child > .linked > button.combo:focus:last-child,
+.linked > combobox:last-child > .linked > button.combo:focus:hover:last-child,
+.linked > combobox:last-child > .linked > button.combo:checked:last-child,
+.linked > combobox:last-child > .linked > button.combo:disabled:last-child {
+    border-radius: 0 3px 3px 0;
+    border-width: 1px 1px 1px 0px;
+}
+
+/* vertical */
+
+/* Middle button */
+.linked.vertical > combobox > .linked > button.combo,
+.linked.vertical > combobox > .linked > button.combo:hover,
+.linked.vertical > combobox > .linked > button.combo:focus,
+.linked.vertical > combobox > .linked > button.combo:focus:hover,
+.linked.vertical > combobox > .linked > button.combo:checked,
+.linked.vertical > combobox > .linked > button.combo:disabled {
+    border-image: none;
+    border-radius: 0;
+    border-color: @border_color;
+    border-width: 0px 1px 0px 1px;
+    padding: 5px 5px;
+}
+
+/* top button */
+.linked.vertical > combobox:first-child > .linked > button.combo:first-child,
+.linked.vertical > combobox:first-child > .linked > button.combo:hover:first-child,
+.linked.vertical > combobox:first-child > .linked > button.combo:focus:first-child,
+.linked.vertical > combobox:first-child > .linked > button.combo:focus:hover:first-child,
+.linked.vertical > combobox:first-child > .linked > button.combo:checked:first-child,
+.linked.vertical > combobox:first-child > .linked > button.combo:disabled:first-child {
+    border-radius: 3px 3px 0px 0px;
+    border-width: 1px 1px 1px 1px;
+}
+
+/* bottom button */
+.linked.vertical > combobox:last-child > .linked > button.combo:last-child,
+.linked.vertical > combobox:last-child > .linked > button.combo:hover:last-child,
+.linked.vertical > combobox:last-child > .linked > button.combo:focus:last-child,
+.linked.vertical > combobox:last-child > .linked > button.combo:focus:hover:last-child,
+.linked.vertical > combobox:last-child > .linked > button.combo:checked:last-child,
+.linked.vertical > combobox:last-child > .linked > button.combo:disabled:last-child {
+    border-radius: 0px 0px 3px 3px;
+    border-width: 0px 1px 1px 1px;
 }
 
 /**************
  * Scrollbars *
  **************/
 
-.scrollbar {
+scrollbar {
 	background-image: none;
 	border-style: solid;
-	-GtkRange-trough-border: 0;
+	/*-GtkRange-trough-border: 0;*/
+	border-color: @scrollbar_trough_border_color;
 	-GtkScrollbar-has-backward-stepper: true;
 	-GtkScrollbar-has-forward-stepper: true;
-	-GtkRange-arrow-scaling: 0.4;
+	/*-GtkRange-arrow-scaling: 0.4;*/
 	-GtkRange-slider-width: 15;
 	-GtkRange-stepper-size: 15px;
 	-GtkScrollbar-min-slider-length: 30;
 	-GtkRange-stepper-spacing: 0;
 	-GtkRange-trough-under-steppers: 0;
+	box-shadow: none;
+	border-image: none;
+}
+
+scrollbar.vertical {
+    border-width: 0px 0px 0px 0px;
+    min-width: 14px;
+}
+
+scrollbar.horizontal {
+    border-width: 1px 0px 0px 0px;
+    min-height: 14px;
 }
 
-.scrollbars-junction {
+scrolledwindow junction {
 	background-image: none;
 	background-color: @scrollbars_junction_bg_color;
 }
 
-.scrollbars-junction,
-.scrollbar.trough {
+scrollbar trough {
 	border-color: @scrollbar_trough_border_color;
 	border-radius: 0;
 	border-image: none;
 }
 
-.scrollbar.trough.horizontal {
-	border-width: 1px 0px;
+scrollbar.horizontal trough {
+	min-height: 14px;
+	border-width: 0px 1px 0px 1px;
+	border-image: none;
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  left bottom,
@@ -1034,8 +1371,10 @@ GtkComboBox .button *:hover {
 	                  color-stop (0.5, @scrollbar_trough_gradient_b));
 }
 
-.scrollbar.trough.vertical {
+scrollbar.vertical trough {
+	min-width: 14px;
 	border-width: 0px 1px;
+	border-image: none;
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  right top,
@@ -1043,7 +1382,57 @@ GtkComboBox .button *:hover {
 	                  color-stop (0.5, @scrollbar_trough_gradient_b));
 }
 
-.scrollbar.button {
+/* Buttons */
+scrollbar button,
+scrollbar .button {
+	border-width: 1px;
+	border-image: none;
+	border-color: @scrollbar_button_border_color;
+	background-image: none;
+	background-color: transparent;
+	color: @scrollbar_button_color;
+}
+
+scrollbar.vertical button,
+scrollbar.vertical .button {
+    min-width: 14px;
+    min-height: 13px;
+    padding: 0;
+}
+
+scrollbar.horizontal button,
+scrollbar.horizontal .button {
+    min-width: 13px;
+    min-height: 14px;
+    padding: 0;
+}
+
+scrollbar.vertical button.up,
+scrollbar.vertical .button.up {
+	border-radius: 3px 3px 0px 0px;
+	-gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
+}
+
+scrollbar.vertical button.down,
+scrollbar.vertical .button.down {
+	border-radius: 0px 0px 3px 3px;
+	-gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+}
+
+scrollbar.horizontal button.up,
+scrollbar.horizontal .button.up {
+	border-radius: 3px 0px 0px 3px;
+	-gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+}
+
+scrollbar.horizontal button.down,
+scrollbar.horizontal .button.down {
+	border-radius: 0px 3px 3px 0px;
+	-gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+}
+
+scrollbar button,
+scrollbar .button {
 	border-width: 1px;
 	border-image: none;
 	border-color: @scrollbar_button_border_color;
@@ -1052,23 +1441,44 @@ GtkComboBox .button *:hover {
 	color: @scrollbar_button_color;
 }
 
-.scrollbar.button.top {
+scrollbar button:hover,
+scrollbar .button:hover {
+    border-image: none;
+    border-width: 1px;
+    border-radius: 0px;
+}
+
+scrollbar button:disabled,
+scrollbar .button:disabled {
+    color: @scrollbar_button_insensitive_color;
+    border-image: none;
+    border-width: 1px;
+    border-color: @scrollbar_button_insensitive_color;
+    border-radius: 0px;
+}
+
+scrollbar.top button,
+scrollbar.top .button {
 	border-radius: 3px 3px 0px 0px;
 }
 
-.scrollbar.button.bottom {
+scrollbar.bottom button,
+scrollbar.bottom .button {
 	border-radius: 0px 0px 3px 3px;
 }
 
-.scrollbar.button.left {
+scrollbar.left button,
+scrollbar.left .button {
 	border-radius: 3px 0px 0px 3px;
 }
 
-.scrollbar.button.right {
+scrollbar.right button,
+scrollbar.right .button {
 	border-radius: 0px 3px 3px 0px;
 }
 
-.scrollbar.button.horizontal {
+scrollbar.horizontal button,
+scrollbar.horizontal .button {
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  left bottom,
@@ -1078,7 +1488,8 @@ GtkComboBox .button *:hover {
 	                  to (@scrollbar_button_gradient_d));
 }
 
-.scrollbar.button.vertical {
+scrollbar.vertical button,
+scrollbar.vertical .button {
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  right top,
@@ -1088,7 +1499,8 @@ GtkComboBox .button *:hover {
 	                  to (@scrollbar_button_gradient_d));
 }
 
-.scrollbar.button.horizontal:hover {
+scrollbar.horizontal button:hover,
+scrollbar.horizontal .button:hover {
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  left bottom,
@@ -1098,7 +1510,8 @@ GtkComboBox .button *:hover {
 	                  to (@scrollbar_button_hover_gradient_d));
 }
 
-.scrollbar.button.vertical:hover {
+scrollbar.vertical button:hover,
+scrollbar.vertical .button:hover {
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  right top,
@@ -1108,7 +1521,8 @@ GtkComboBox .button *:hover {
 	                  to (@scrollbar_button_hover_gradient_d));
 }
 
-.scrollbar.button.horizontal:active {
+scrollbar.horizontal button:active,
+scrollbar.horizontal .button:active {
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  left bottom,
@@ -1118,7 +1532,8 @@ GtkComboBox .button *:hover {
 	                  to (@scrollbar_button_active_gradient_d));
 }
 
-.scrollbar.button.vertical:active {
+scrollbar.vertical button:active,
+scrollbar.vertical .button:active {
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  right top,
@@ -1128,21 +1543,36 @@ GtkComboBox .button *:hover {
 	                  to (@scrollbar_button_active_gradient_d));
 }
 
-.scrollbar.button:insensitive {
+scrollbar button:disabled,
+scrollbar .button:disabled {
 	color: @scrollbar_button_insensitive_color;
 }
 
-.scrollbar.slider {
+scrollbar.vertical slider,
+scrollbar.vertical .slider {
+	min-width: 14px;
+	min-height: 42px;
+	margin: 0px -1px 0px -1px;
+}
+
+scrollbar.horizontal slider,
+scrollbar.horizontal .slider {
+	min-width: 42px;
+	min-height: 14px;
+	margin: -1px 0px -1px 0px;
+}
+
+scrollbar slider,
+scrollbar .slider {
 	background-color: @scrollbar_slider_bg_color;
-	background-image: none;
 	border-radius: 0;
 	border-style: solid;
-	border-image: none;
 	border-color: @scrollbar_slider_border_color;
 	border-width: 1px;
 }
 
-.scrollbar.slider:hover {
+scrollbar slider:hover,
+scrollbar .slider:hover {
 	background-color: @scrollbar_slider_hover_bg_color;
 }
 
@@ -1151,15 +1581,15 @@ GtkComboBox .button *:hover {
  *********/
 
 /* combobox menus */
-GtkTreeMenu.menu,
-GtkTreeMenu.menu * {
+treemenu menu {
 	background-color: @menu_bg_color;
 }
 
-GtkTreeMenu .menuitem {
+treemenu menuitem {
 	padding: 2px;
 }
 
+menu,
 .menu {
 	font: normal;
 	background-color: @menu_bg_color;
@@ -1170,38 +1600,38 @@ GtkTreeMenu .menuitem {
 	border-color: @menu_border_color;
 }
 
-.menu.button {
+menu button,
+.menu button{
 	background-image: none;
 	background-color: @menu_bg_color;
 	color: @internal_element_color;
-
 	border-image: none;
 	border-style: none;
 }
 
-.menu.button:hover {
+menu button:hover,
+.menu button:hover {
 	background-image: none;
 	background-color: @theme_base_color;
 	color: @theme_text_color;
-
 	border-image: none;
 	border-style: none;
 }
 
-.menu.button:insensitive {
+menu button:disabled,
+.menu button:disabled {
 	background-color: @theme_base_color;
 	color: lighter(@internal_element_color);
-
 	border-image: none;
 	border-style: none;
 }
 
 /* this controls the general appearance of the menubar */
+menubar,
 .menubar {
 	border-style: none;
-	padding: 1px;
+	padding: 4px;
 	-GtkWidget-window-dragging: true;
-	-GtkMenuBar-internal-padding: 1;
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  left bottom,
@@ -1210,18 +1640,22 @@ GtkTreeMenu .menuitem {
 	                  to (@menubar_gradient_c));
 }
 
-.menubar .menuitem {
-	border-style: none;
+menubar menuitem,
+.menubar menuitem {
+	border-style: solid;
+	border-width: 1px;
+	border-color: transparent;
 	padding: 3px 5px;
 	background-color: transparent;
 }
 
-.menubar .menuitem:hover,
-.menuitem.button.flat:hover,
-.menuitem.button.flat:active {
+menubar menuitem:hover,
+.menubar menuitem:hover,
+menuitem button.flat:hover,
+menuitem button.flat:active {
 	background-color: @menu_bg_color;
 	border-style: solid;
-	border-width: 1px 1px 0px;
+	border-width: 1px;
 	border-color: @menubar_menuitem_hover_border_color;
 	border-radius: 3px 3px 0 0;
 	color: @menubar_menuitem_hover_color;
@@ -1234,48 +1668,46 @@ GtkTreeMenu .menuitem {
 	                  to (@menubar_menuitem_hover_gradient_d));
 }
 
-.menuitem.button.flat:hover {
+menuitem button.flat:hover {
 	border-width: 1px;
-	border-radius: 3px;
+	border-radius: 0px;
 }
 
-.menuitem.button.flat:focus {
+menuitem button.flat:focus {
 	color: @theme_text_color;
 }
 
-.menubar .menuitem *:hover {
+menubar menuitem:hover,
+.menubar menuitem:hover {
 	border-width: 1px;
 	color: @menubar_menuitem_hover_color;
 }
 
-.menu .menuitem {
-	-GtkMenuItem-arrow-scaling: 0.5;
+menu menuitem,
+.menu menuitem {
+	/*-GtkMenuItem-arrow-scaling: 0.5;*/
+	border-width: 1px;
+	border-style: solid;
+	border-color: transparent;
 	padding: 4px;
 	background-color: @menu_bg_color;
 }
 
-.menu .menuitem > * {
-	background-color: transparent;
-}
-
-.menu .menuitem:hover {
+menu menuitem:hover,
+.menu menuitem:hover {
 	border-radius: 0;
-}
-
-GtkTreeMenu .menuitem:hover,
-.menu .menuitem:active,
-.menu .menuitem:hover {
 	border-style: solid;
 	border-width: 1px;
 	border-color: @menubar_menuitem_hover_border_color;
 }
 
-GtkTreeMenu .menuitem *:hover,
-GtkComboBox .menuitem:hover *,
-.menu .menuitem:active,
-.menu .menuitem *:active,
-.menu .menuitem:hover,
-.menu .menuitem *:hover {
+treemenu menuitem:hover,
+combobox menuitem:hover,
+menu menuitem:hover,
+.menu menuitem:hover {
+	border-style: solid;
+	border-width: 1px;
+	border-color: @menubar_menuitem_hover_border_color;
 	color: @theme_selected_fg_color;
 	background-image: -gtk-gradient (linear,
 	                  left top,
@@ -1286,56 +1718,93 @@ GtkComboBox .menuitem:hover *,
 	                  to (@menubar_menuitem_hover_gradient_d));
 }
 
-.menu .menuitem:insensitive,
-.menu .menuitem *:insensitive {
+menuitem:disabled,
+menuitem:disabled * {
 	color: mix (@menu_fg_color, @menu_bg_color, 0.6);
+	background-color: transparent;
 }
 
-.menu .menuitem .accelerator:insensitive {
+menuitem accelerator:disabled {
 	color: mix (@menu_fg_color, @menu_bg_color, 0.7);
 }
 
-.menuitem .accelerator {
+menuitem accelerator {
 	color: alpha (@menu_fg_color, 0.4);
 }
 
-.menuitem .accelerator:hover,
-.menuitem .accelerator:active {
+menuitem accelerator:hover,
+menuitem accelerator:active {
 	color: alpha (@menu_fg_color, 0.3);
 }
 
-.menuitem.arrow {
+menuitem arrow {
+	min-height: 16px;
+	min-width: 16px;
+	margin-left: 10px;
 	color: @menu_controls_color;
 }
 
-.menuitem.separator {
-	color: @menu_separator_color;
-	padding: 3px 1px 3px 1px;
+menu menuitem arrow:dir(ltr),
+.menu menuitem arrow:dir(ltr) {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+}
 
-	-GtkMenuItem-horizontal-padding: 0;
+menu menuitem arrow:dir(rtl),
+.menu menuitem arrow:dir(rtl) {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
 }
 
-.menuitem.check,
-.menuitem.radio,
-.menuitem.check:hover,
-.menuitem.radio:hover,
-.menuitem.check:insensitive,
-.menuitem.radio:insensitive {
-	background-image: none;
-	background-color: transparent;
+menu arrow.top,
+.menu arrow.top {
+    -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
+}
+
+menu arrow.bottom,
+.menu arrow.bottom {
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+}
+
+menu arrow:hover,
+.menu arrow:hover {
+    border-color: @theme_selected_fg_color;
+    color: shade (@theme_selected_bg_color, 1.6);
 }
 
-.menuitem.check:active,
-.menuitem.radio:active {
+menu separator,
+.menu separator,
+menuitem separator {
+	color: @menu_separator_color;
+	margin: 3px 1px 3px 1px;
+	border-bottom: solid 1px @menu_separator_color;
+}
+
+menuitem check,
+menuitem radio,
+menuitem check:hover,
+menuitem radio:hover,
+menuitem check:disabled,
+menuitem radio:disabled
+menu menuitem .check,
+menu menuitem .radio,
+menu menuitem .check:hover,
+menu menuitem .radio:hover,
+menu menuitem .check:checked,
+menu menuitem .radio:checked,
+menu menuitem .check:disabled,
+menu menuitem .radio:disabled {
+	background-image: none;
 	background-color: transparent;
+	min-height: 12px;
+	min-width: 12px;
+	padding-left: 2px;
+	padding-right: 2px;
 }
 
 /***************
  * Menu Button *
  ***************/
 
-.button.menuitem.menubar:active,
-.button.menuitem.menubar *:active {
+menuitem button.flat:active {
 	color: @theme_text_color;
 	background-image: none;
 	background-color: @menu_bg_color;
@@ -1350,23 +1819,27 @@ GtkComboBox .menuitem:hover *,
  * Radiobuttons *
  ****************/
 
+check,
 .check,
+radio,
 .radio,
-.check:insensitive,
-.radio:insensitive {
+check:disabled,
+.check:disabled,
+radio:disabled,
+.radio:disabled {
 	background-color: transparent;
 	border-style: none;
 }
 
-.check row:selected:insensitive,
-.check row:selected:focus:insensitive {
+check row:selected:disabled,
+check row:selected:focus:disabled {
 	background-color: transparent;
 }
 
-GtkCheckButton:hover,
-GtkCheckButton:active:hover,
-GtkCheckButton:selected,
-GtkCheckButton:selected:focus {
+checkbutton:hover,
+checkbutton:active:hover,
+checkbutton:selected,
+checkbutton:selected:focus {
 	background-color: transparent;
 }
 
@@ -1374,17 +1847,17 @@ GtkCheckButton:selected:focus {
  * Toolbars *
  ************/
 
-.toolbar {
+toolbar {
 	border-style: none;
 	border-color: darker (@theme_bg_color);
 	padding: 4px;
 }
 
-.toolbar .button {
+toolbar button {
 	padding: 1px;
 }
 
-.toolbar:insensitive {
+toolbar:disabled {
 	color: alpha (@theme_fg_color, 0.6);
 }
 
@@ -1392,7 +1865,7 @@ GtkCheckButton:selected:focus {
  * Menubar Toolbars *
  ********************/
 
-.toolbar.menubar {
+toolbar menubar {
 	border-style: none;
 	-GtkToolbar-button-relief: normal;
 	padding-left: 4px;
@@ -1406,8 +1879,7 @@ GtkCheckButton:selected:focus {
 /* applications using EggEditableToolbar usually set the primary-toolbar
  * hint on the containing vbox, so we need to handle both these cases here.
  */
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar {
+toolbar.primary-toolbar {
 	border-width: 1px 0 1px 0;
 	border-radius: 0;
 	border-style: solid;
@@ -1417,16 +1889,14 @@ GtkCheckButton:selected:focus {
 	-GtkToolbar-button-relief: normal;
 }
 
-.primary-toolbar .toolbar:insensitive,
-.primary-toolbar.toolbar:insensitive {
+toolbar.primary-toolbar:disabled {
 	background-image: none;
-	background-color: shade (@theme_bg_color, 0.97);
+	background-color: transparent;
 	border-color: shade (@theme_bg_color, 0.91);
 }
 
 /* progressbars on primary toolbar entries are special */
-.primary-toolbar .toolbar .entry.progressbar,
-.primary-toolbar.toolbar .entry.progressbar {
+toolbar.primary-toolbar entry progress {
 	background-image: -gtk-gradient (linear,
 	                  left top, left bottom,
 	                  from (@trough_gradient_a),
@@ -1443,7 +1913,7 @@ GtkCheckButton:selected:focus {
  * Inline toolbars *
  *******************/
 
-.inline-toolbar.toolbar {
+toolbar.inline-toolbar {
 	border-width: 1px;
 	border-radius: 0;
 	border-style: solid;
@@ -1451,15 +1921,14 @@ GtkCheckButton:selected:focus {
 	padding: 4px;
 }
 
-.inline-toolbar.toolbar:last-child {
+toolbar.inline-toolbar:last-child {
 	border-width: 0 1px 1px 1px;
 	border-radius: 0 0 3px 3px;
 }
 
 /* Primary and inline toolbars background */
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar,
-.inline-toolbar.toolbar  {
+toolbar.primary-toolbar,
+toolbar.inline-toolbar  {
 	background-color: transparent;
 	background-image: linear-gradient(to bottom,
 	                  @toolbar_inner_border_color 1px,
@@ -1475,13 +1944,13 @@ GtkCheckButton:selected:focus {
 
 .sidebar,
 .sidebar .view,
-.sidebar GtkScrolledWindow {
+placessidebar .view {
 	background-color: @sidebar_bg_color;
 }
 
-.sidebar .radio,
-.sidebar .radio:focus,
-.sidebar .radio:selected {
+.sidebar radio,
+.sidebar radio:focus,
+.sidebar radio:selected {
 	background-image: none;
 	background-color: transparent;
 }
@@ -1502,12 +1971,12 @@ GtkCheckButton:selected:focus {
  * GtkAssistant *
  ****************/
 
-GtkAssistant .sidebar .highlight {
+assistant .sidebar highlight {
 	color: @theme_fg_color;
 	font: bold;
 }
 
-GtkAssistant .sidebar {
+assistant .sidebar {
 	padding: 12px;
 	border-width: 1px;
 	border-radius: 2px;
@@ -1522,112 +1991,148 @@ GtkAssistant .sidebar {
  * GtkSwitch *
  *************/
 
-GtkSwitch {
+switch {
 	color: @switch_color;
 }
 
-GtkScale.progressbar,
-GtkSwitch.trough:active {
+scale progressbar,
+switch:checked {
 	color: @switch_trough_active_color;
 }
 
-GtkSwitch.trough:active {
+switch:checked,
+switch:backdrop:checked {
 	background-image: -gtk-gradient (linear,
 	                  left top, left bottom,
 	                  from (@switch_trough_active_gradient_a),
 	                  to (@switch_trough_active_gradient_b));
 }
 
-GtkSwitch.trough:insensitive {
+switch:disabled,
+switch:backdrop:disabled {
 	background-image: none;
 	background-color: @insensitive_bg_color;
 	color: mix(@insensitive_bg_color, @insensitive_fg_color, 0.5);
 }
 
-GtkSwitch.slider {
+switch slider {
 	background-color: @switch_slider_bg_color;
 	border-width: 1px;
 	border-radius: 2px;
 	border-style: solid;
 	border-color: @switch_slider_border_color;
-	padding: 0px 0px 1px 0px;
+	padding: 0px;
 }
 
-GtkSwitch.slider:insensitive {
-	background-color: @switch_slider_insensitive_bg_color;
+switch:disabled slider {
 	border-color: @insensitive_border_color;
 }
 
-GtkTreeView {
-	-GtkTreeView-vertical-separator: 0;
-	-GtkTreeView-expander-size: 13;
-	-GtkWidget-focus-line-width: 1;
-	-GtkWidget-focus-padding: 1;
-}
+/**************************
+ * GtkIconview GtkViewport*
+ **************************/
 
-GtkTreeView.dnd {
-	border-color: @internal_element_color;
-	border-radius: 2px;
-	border-width: 1px;
-	border-style: solid;
-}
-
-GtkViewport,
-GtkIconView {
+iconview,
+viewport {
 	border-radius: 3px;
-	padding: 0;
+	padding: 3px;
 	background-color: @theme_base_color;
 }
 
-GtkIconView.view.cell:selected,
-GtkIconView.view.cell:selected:focus {
+iconview.view.cell:selected,
+iconview.view.cell:selected:focus {
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
 	border-radius: 4px;
 }
 
+list,
+view,
 .view,
-GtkTreeView {
+view text,
+.view text,
+iconview text,
+textview text
+treeview {
 	background-color: @theme_base_color;
 	color: @theme_text_color;
 }
 
+view,
+view:selected,
+view:selected:focus, 
 .view:selected,
-GtkTreeView:selected {
+.view:selected:focus, 
+view text selection,
+.view text selection,
+view text selection:focus,
+.view text selection:focus
+treeview:selected {
 	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
+	color: @theme_selected_fg_color
 }
 
-.view:insensitive,
-GtkTreeView:insensitive {
+view:disabled,
+.view:disabled,
+treeview:disabled {
 	background-color: @insensitive_bg_color;
 	color: @insensitive_fg_color;
 }
 
-GtkTreeView:hover {
-	background-image: linear-gradient(to bottom,
-	                  shade(@button_active_gradient_a, 1.20),
-	                  shade(@button_active_gradient_b, 1.20) 3px,
-	                  shade(@button_active_gradient_c, 1.20) 4px,
-	                  shade(@button_active_gradient_d, 1.20) 50%,
-	                  shade(@button_active_gradient_e, 1.20) 50%,
-	                  shade(@button_active_gradient_f, 1.20));
-	background-color: transparent;
+/* for firefox and probably other apps */
+label:selected,
+label selection,
+label selection:focus,
+label selection:hover {
+	background-color: @theme_selected_bg_color;
+	color: @theme_selected_fg_color;
+}
+
+label:disabled:selected,
+label selection:disabled {
+	color: @insensitive_fg_color;
+}
+
+label:backdrop:selected,
+label selection:backdrop {
+	color: @theme_fg_color;
+}
+
+label:backdrop:disabled:selected,
+label selection:backdrop:disabled {
+	color: @insensitive_fg_color;
+}
+
+/***************
+ * GtkTreeview *
+ ***************/
+
+treeview {
+	-GtkTreeView-vertical-separator: 0;
+	-GtkTreeView-expander-size: 13;
+	-GtkTreeView-grid-line-width: 0;
+	-GtkTreeView-grid-line-pattern: '';
+	-GtkTreeView-tree-line-width: 0;
+	-GtkTreeView-tree-line-pattern: '';
 }
 
-column-header.button,
-column-header .button {
+treeview.dnd {
+	border-color: @internal_element_color;
+	border-radius: 2px;
+	border-width: 1px;
+	border-style: solid;
+}
+
+/* column-headers */
+treeview header button {
+	min-height: 22px;
 	color: @internal_element_color;
 }
 
-column-header.button,
-column-header .button,
-column-header.button:insensitive,
-column-header .button:insensitive,
-column-header.button:hover,
-column-header .button:hover,
-column-header.button:focus:hover,
-column-header .button:focus:hover {
+treeview header button,
+treeview header button:disabled,
+treeview header button:hover,
+treeview header button:focus:hover {
 	background-color: @theme_base_color;
 	background-image: -gtk-gradient (linear,
 	                  left top,
@@ -1640,64 +2145,83 @@ column-header .button:focus:hover {
 	font-weight: normal;
 }
 
-column-header.button:insensitive,
-column-header .button:insensitive {
+treeview header button:disabled {
 	background-color: @insensitive_bg_color;
 }
 
-column-header.button:hover,
-column-header .button:hover,
-column-header.button:focus:hover,
-column-header .button:focus:hover,
-column-header.button:active:focus:hover,
-column-header .button:active:focus:hover,
-column-header.button:active:focus,
-column-header .button:active:focus,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button *:active,
-column-header .button *:active,
-column-header.button *:active:hover,
-column-header .button *:active:hover {
+treeview header button:hover,
+treeview header button:focus:hover,
+treeview header button:focus:hover:active,
+treeview header button:hover:active,
+treeview header button:checked,
+treeview header button:checked:hover {
 	color: @internal_element_hover_color;
 }
 
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:active:hover:focus,
-column-header .button:active:hover:focus,
-column-header.button:active:focus,
-column-header .button:active:focus {
+treeview header button:checked,
+treeview header button:checked:hover,
+treeview header button:checked:hover:focus {
 	background-color: @entry_bg_color;
 	background-image: none;
 }
 
-row:hover {
-	border-width: 0;
+treeview header button,
+treeview header button:focus,
+treeview header button:checked,
+treeview header button:checked:hover,
+treeview header button:focus:checked,
+treeview header button:focus:hover:active {
+	border-image: none;
+	border-width: 1px;
+	border-radius: 0;
+	border-style: solid;
+	border-color: @column_header_border_top_color @column_header_border_right_color
+	              @column_header_border_bottom_color @column_header_border_left_color;
 }
 
-row:insensitive {
-	border-width: 0;
+treeview header button:last-child,
+treeview header button:last-child:focus,
+treeview header button:last-child:checked,
+treeview header button:last-child:hover:active,
+treeview header button:last-child:active:focus {
+	border-right: none;
+}
+
+row,
+row:focus {
+	min-height: 22px;
 }
 
+row:hover,
+row:disabled,
 row:selected,
 row:selected:focus {
 	border-width: 0;
 }
 
+row:selected,
 row:selected:focus,
-.cell:selected {
+.cell:selected,
+row:selected:hover,
+row:selected:focus:hover,
+.cell:selected:hover {
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  left bottom,
 	                  from (@menubar_menuitem_hover_gradient_a),
-	                  color-stop (0.50, @menubar_menuitem_hover_gradient_b),
-	                  color-stop (0.50, @menubar_menuitem_hover_gradient_c),
 	                  to (@menubar_menuitem_hover_gradient_d));
 }
 
+row:hover,
+row:hover:focus,
+.cell:hover {
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (shade(@menubar_menuitem_hover_gradient_a, 1.2)),
+	                  to (shade(@menubar_menuitem_hover_gradient_d, 1.3)));
+}
+
 .cell {
 	color: @theme_text_color;
 	padding: 2px;
@@ -1708,36 +2232,110 @@ row:selected:focus,
 	color: @theme_selected_fg_color;
 }
 
-.expander {
-	border-style: solid;
-	border-width: 1px;
-	border-radius: 2px;
-	border-color: shade (@internal_element_color, 1.40);
-	color: @theme_base_color;
-	background-color: @theme_base_color;
+/*********
+ * Paned *
+ *********/
+
+paned.horizontal separator {
+	min-width: 7px;
+	background-size: 5px 5px;
+	margin: -1px 0 -1px 0;
+	border-style: none;
+	border-width: 0 1px 0 1px;
+	border-color: @border_color;
+	background-color: @theme_bg_color;
+	-gtk-icon-source: none;
 }
 
-.expander:active {
-	border-style: solid;
-	border-width: 1px;
-	border-color: shade (@internal_element_color, 1.40);
-	background-color: @theme_base_color;
+paned.vertical > separator {
+	min-height: 7px;
+	background-size: 5px 5px;
+	border-style: none;
+	margin: 0 -1px 0 -1px;
+	border-width: 1px 0 1px 0;
+	border-color: @border_color;
+	background-color: @theme_bg_color;
+	-gtk-icon-source: none;
 }
 
-.expander:hover {
-	border-style: solid;
-	border-width: 1px;
+paned > separator:hover,
+paned > separator:selected {
+	background-color: @theme_bg_color;
+}
+
+paned > separator:backdrop {
+}
+
+paned > separator.wide {
+	margin: 0;
+	padding: 0;
+	min-width: 5px;
+	min-height: 5px;
+	background-size: 1px 1px, 1px 1px;
+}
+
+paned > separator.wide:backdrop {
+}
+
+/* expander */
+expander,
+expander:active,
+expander:focus {
+	border-style: none;
+	color: @theme_fg_color;
+}
+
+treeview.view.expander {
+	-gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+	color: @theme_fg_color;
+}
+
+treeview.view.expander:dir(rtl) {
+	-gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
+}
+
+treeview.view.expander:checked {
+	-gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+}
+
+treeview.view.expander:hover {
+	color: @theme_selected_bg_color;
+}
+
+treeview.view.expander:selected,
+treeview.view.expander:selected:hover {
+	color: @theme_selected_fg_color;
+}
+
+expander arrow {
+	-gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+}
+
+expander arrow:dir(rtl) {
+	-gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
+}
+
+expander arrow:hover {
 	color: @internal_element_color;
-	border-color: shade (@internal_element_color, 1.40);
-	background-color: shade (@theme_bg_color, 1.02);
 }
 
-.expander row {
+expander arrow:checked {
+	-gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+}
+
+/* why this weird padding, possible issue with gtk+-3.18 ? */
+expander arrow {
+	min-width: 16px;
+	min-height: 16px;
+	padding: 0px 4px 0px 0px;
+}
+
+expander row {
 	border-radius: 2px;
 }
 
-.expander row:selected,
-.expander row:selected:focus {
+expander row:selected,
+expander row:selected:focus {
 	border-style: solid;
 	border-width: 1px;
 	border-color: @expander_row_selected_border_color;
@@ -1745,19 +2343,30 @@ row:selected:focus,
 	background-color: @theme_selected_bg_color;
 }
 
+expander scrolledwindow.frame {
+	border-radius: 0px;
+	border-width: 1px 0px;
+}
+
+expander toolbar.inline-toolbar {
+	border-width: 0px;
+	border-style: none;
+}
+
 /* Calendars */
-GtkCalendar {
+calendar {
 	padding: 2px;
+	border-style:none;
 }
 
-GtkCalendar.view {
+calendar.view {
 	border-radius: 3px;
 	border-style: solid;
 	border-width: 1px;
 	padding: 2px;
 }
 
-GtkCalendar.header {
+calendar.header {
 	border-radius: 0;
 	background-image: -gtk-gradient (linear,
 	                  left top,
@@ -1767,14 +2376,14 @@ GtkCalendar.header {
 	border-width: 0;
 }
 
-GtkCalendar.button,
-GtkCalendar.button:insensitive {
+calendar button,
+calendar button:disabled {
 	background-image: none;
 	background-color: transparent;
 }
 
-.highlight,
-GtkCalendar.highlight {
+highlight,
+calendar.highlight {
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
 	border-radius: 0;
@@ -1783,48 +2392,52 @@ GtkCalendar.highlight {
 }
 
 /* Use different button and entry borders on infobars */
-GtkInfoBar .entry,
-GtkInfoBar .entry:focus,
-GtkInfoBar .button,
-GtkInfoBar .button:insensitive,
-GtkInfoBar .button:active,
-GtkInfoBar .button:focus,
-GtkInfoBar .button:active:focus,
-.info .entry,
-.info .entry:focus,
-.info .button,
-.info .button:insensitive,
-.info .button:active,
-.info .button:focus,
-.info .button:active:focus,
-.warning .entry,
-.warning .entry:focus,
-.warning .button,
-.warning .button:insensitive,
-.warning .button:active,
-.warning .button:focus,
-.warning .button:active:focus,
-.question .entry,
-.question .entry:focus,
-.question .button,
-.question .button:insensitive,
-.question .button:active,
-.question .button:focus,
-.question .button:active:focus,
-.error .entry,
-.error .entry:focus,
-.error .button,
-.error .button:insensitive,
-.error .button:active,
-.error .button:focus,
-.error .button:active:focus {
+infobar entry,
+infobar entry:focus,
+infobar button,
+infobar button:disabled,
+infobar button:checked,
+infobar button:focus,
+infobar button:focus:checked,
+.info,
+.warning,
+.question,
+.error,
+entry.info,
+entry.info:focus,
+.info button,
+.info button:disabled,
+.info button:checked,
+.info button:focus,
+.info button:focus:checked,
+entry.warning,
+entry.warning:focus,
+.warning button,
+.warning button:disabled,
+.warning button:checked,
+.warning button:focus,
+.warning button:focus:checked,
+entry.question,
+entry.question:focus,
+.question button,
+.question button:disabled,
+.question button:checked,
+.question button:focus,
+.question button:focus:checked,
+entry.error,
+entry.error:focus,
+.error button,
+.error button:disabled,
+.error button:checked,
+.error button:focus,
+.error button:focus:checked {
 	border-image: none;
 	border-color: shade(@border_color, 0.9);
 	border-style: solid;
 	border-width: 1px;
 }
 
-GtkInfoBar:last-child,
+infobar:last-child,
 .info:last-child,
 .warning:last-child,
 .question:last-child,
@@ -1835,30 +2448,41 @@ GtkInfoBar:last-child,
 	border-style: solid;
 }
 
+.info,
 .info > * {
 	background-color: @info_bg_color;
 	color: @info_fg_color;
 	border-color: darker(@info_bg_color);
 }
 
+.warning,
 .warning > * {
 	background-color: @warning_bg_color;
 	color: @warning_fg_color;
 	border-color: darker(@warning_bg_color);
 }
 
+.question,
 .question > * {
 	background-color: @question_bg_color;
 	color: @question_fg_color;
 	border-color: darker(@question_bg_color);
 }
 
+.error,
 .error > * {
 	background-color: @error_bg_color;
 	color: @error_fg_color;
 	border-color: darker(@error_bg_color);
 }
 
+.info button:hover,
+.warning button:hover,
+.question button:hover,
+.error button:hover {
+	padding-bottom: 5px;
+}
+
 .view.dim-label,
 .dim-label,
 .dim-label:hover,
@@ -1871,14 +2495,6 @@ GtkInfoBar:last-child,
 	color: mix (@theme_selected_fg_color, @theme_base_color, 0.50);
 }
 
-/***************
- * Resize grip *
- ***************/
-
-.grip {
-	background-color: transparent;
-}
-
 /************
  * Titlebar *
  ************/
@@ -1914,23 +2530,34 @@ GtkInfoBar:last-child,
 /*	padding: 5px 5px 6px 5px;*/
 /*}*/
 
-.titlebar .titlebutton {
+.titlebar button.titlebutton {
 	background: none;
 	border-image: none;
 }
 
-.window-frame {
-	border-width: 1px;
-	border-radius: 7px 7px 0 0;
-	border-style: solid;
-	margin: 10px;
+decoration {
+	box-shadow: none;
+}
+
+window decoration {
+	border: solid 2px @insensitive_border_color;
+}
+
+tooltip.csd decoration {
+	border-radius: 5px;
+	box-shadow: 0 1px 5px @wm_shadow;
+}
+
+messagedialog.csd decoration {
+	border-radius: 7px;
+	box-shadow: 0 1px 5px @wm_shadow;
 }
 
 /**************
  * Action bar *
  **************/
 
-.action-bar {
+actionbar {
 	border: none;
 	padding: 7px 7px 3px 7px;
 }
@@ -1939,15 +2566,31 @@ GtkInfoBar:last-child,
  * Header bar *
  **************/
 
-GtkHeaderBar .header-bar {
+headerbar {
 	padding: 5px 4px 4px 4px;
 }
 
+headerbar.titlebar > stackswitcher.linked.stack-switcher > button,
+headerbar.titlebar > stackswitcher.linked.stack-switcher > button:checked:hover {
+	padding: 6px 12px;
+	border-width: 1px 1px 1px 0px;
+}
+
+headerbar.titlebar > stackswitcher.linked.stack-switcher > button:first-child,
+headerbar.titlebar > stackswitcher.linked.stack-switcher > button:checked:hover:first-child {
+	border-width: 1px;
+}
+
+headerbar.titlebar > stackswitcher.linked.stack-switcher > button:last-child,
+headerbar.titlebar > stackswitcher.linked.stack-switcher > button:checked:hover:last-child {
+	border-width: 1px 1px 1px 0px;
+}
+
 /************
  * Popovers *
  ************/
 
-GtkPopover {
+popover {
 	border: 1px solid;
 	border-radius: 0px;
 	border-color: @border_color;
@@ -1955,7 +2598,106 @@ GtkPopover {
 	background-clip: border-box;
 }
 
-GtkPopover > .toolbar,
-GtkPopover.osd > .toolbar .button {
+popover > list,
+popover > .view,
+popover > toolbar popover.osd > toolbar,
+popover > .inline-toolbar popover.osd > toolbar,
+popover > searchbar popover.osd > toolbar,
+popover > .location-bar popover.osd > toolbar,
+popover > toolbar popover.osd > .inline-toolbar,
+popover > .inline-toolbar .popover.osd > .inline-toolbar,
+popover > searchbar popover.osd > .inline-toolbar,
+popover > .location-bar popover.osd > .inline-toolbar,
+popover > toolbar popover.osd > searchbar,
+popover > .inline-toolbar popover.osd > searchbar,
+popover > searchbar popover.osd > searchbar,
+popover > .location-bar popover.osd > searchbar
+popover > .inline-toolbar popover.osd > .location-bar,
+popover > searchbar popover.osd > .location-bar,
+popover > .location-bar popover.osd > .location-bar {
 	background-color: transparent;
 }
+
+/***********
+ * Sidebar *
+ ***********/
+
+.sidebar,
+.sidebar .view,
+placessidebar .view {
+	background-color: @theme_bg_color;
+}
+
+.sidebar .frame {
+	border-style: none;
+}
+
+/******************
+ * Dialog Windows *
+ ******************/
+
+dialog filechooser placessidebar.sidebar.frame viewport.frame list,
+dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row {
+	background-color: @theme_base_color;
+}
+
+dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row revealer.sidebar-revealer image.sidebar-icon {
+	padding: 4px 8px 4px 6px;
+}
+
+dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row revealer.sidebar-revealer label.sidebar-label {
+	padding: 4px 0px 4px 1px;
+}
+
+dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row revealer.sidebar-revealer button.image-button.sidebar-button {
+	background-color: transparent;
+	background-image: none;
+	border-image:none;
+	box-shadow: none;
+	border-width: 0px;
+	padding: 4px 12px 4px 0px;
+}
+
+dialog filechooser placessidebar > viewport.frame {
+	border-style: none;
+}
+
+dialog filechooser #pathbarbox {
+	border-style: none;
+	background-color: transparent;
+}
+
+/* ie. mate-keyboard-properties option window */
+dialog scrolledwindow.frame,
+dialog scrolledwindow {
+	border-color: @border_color;
+	border-style: solid;
+	border-width: 1px;
+	border-radius: 2px;
+}
+
+/* credits in GtkAbout windows */
+dialog .dialog-vbox scrolledwindow.frame > viewport.view.frame {
+	background-color: shade (@theme_bg_color, 1.04);
+}
+
+dialog scrolledwindow.frame viewport .vertical expander .vertical {
+	background-color: @theme_base_color;
+	border-radius: 3px;
+	border-color: @border_color;
+	border-style: solid;
+	border-width: 1px;
+}
+
+/* print dialog */
+printdialog.background > box.view.vertical.dialog-vbox {
+	background-color: shade (@theme_bg_color, 1.0);
+}
+
+/******************
+ * GtkAboutDialog *
+ ******************/
+
+dialog.background dialog-vbox.vertical .vertical {
+	background: transparent;
+}
diff --git a/gtk-3.0/img/checkbox-checked-hover.png b/gtk-3.0/img/checkbox-checked-hover.png
index 07767a3..d332ffe 100644
--- a/gtk-3.0/img/checkbox-checked-hover.png
+++ b/gtk-3.0/img/checkbox-checked-hover.png
diff --git a/gtk-3.0/img/checkbox-checked-hover@2.png b/gtk-3.0/img/checkbox-checked-hover@2.png
new file mode 100644
index 0000000..9ae9176
--- /dev/null
+++ b/gtk-3.0/img/checkbox-checked-hover@2.png
diff --git a/gtk-3.0/img/checkbox-checked-insensitive.png b/gtk-3.0/img/checkbox-checked-insensitive.png
index ca4ad90..de9cc7d 100644
--- a/gtk-3.0/img/checkbox-checked-insensitive.png
+++ b/gtk-3.0/img/checkbox-checked-insensitive.png
diff --git a/gtk-3.0/img/checkbox-checked-insensitive@2.png b/gtk-3.0/img/checkbox-checked-insensitive@2.png
new file mode 100644
index 0000000..a011387
--- /dev/null
+++ b/gtk-3.0/img/checkbox-checked-insensitive@2.png
diff --git a/gtk-3.0/img/checkbox-checked.png b/gtk-3.0/img/checkbox-checked.png
index 25370da..9be7a13 100644
--- a/gtk-3.0/img/checkbox-checked.png
+++ b/gtk-3.0/img/checkbox-checked.png
diff --git a/gtk-3.0/img/checkbox-checked@2.png b/gtk-3.0/img/checkbox-checked@2.png
new file mode 100644
index 0000000..8ea176a
--- /dev/null
+++ b/gtk-3.0/img/checkbox-checked@2.png
diff --git a/gtk-3.0/img/checkbox-mixed-hover.png b/gtk-3.0/img/checkbox-mixed-hover.png
index 22a3a5e..52f452c 100644
--- a/gtk-3.0/img/checkbox-mixed-hover.png
+++ b/gtk-3.0/img/checkbox-mixed-hover.png
diff --git a/gtk-3.0/img/checkbox-mixed-hover@2.png b/gtk-3.0/img/checkbox-mixed-hover@2.png
new file mode 100644
index 0000000..c88120e
--- /dev/null
+++ b/gtk-3.0/img/checkbox-mixed-hover@2.png
diff --git a/gtk-3.0/img/checkbox-mixed-insensitive.png b/gtk-3.0/img/checkbox-mixed-insensitive.png
index 8b84e38..43a7603 100644
--- a/gtk-3.0/img/checkbox-mixed-insensitive.png
+++ b/gtk-3.0/img/checkbox-mixed-insensitive.png
diff --git a/gtk-3.0/img/checkbox-mixed-insensitive@2.png b/gtk-3.0/img/checkbox-mixed-insensitive@2.png
new file mode 100644
index 0000000..945c81e
--- /dev/null
+++ b/gtk-3.0/img/checkbox-mixed-insensitive@2.png
diff --git a/gtk-3.0/img/checkbox-mixed.png b/gtk-3.0/img/checkbox-mixed.png
index f68af34..0e8b29b 100644
--- a/gtk-3.0/img/checkbox-mixed.png
+++ b/gtk-3.0/img/checkbox-mixed.png
diff --git a/gtk-3.0/img/checkbox-mixed@2.png b/gtk-3.0/img/checkbox-mixed@2.png
new file mode 100644
index 0000000..88e5dda
--- /dev/null
+++ b/gtk-3.0/img/checkbox-mixed@2.png
diff --git a/gtk-3.0/img/checkbox-unchecked-hover.png b/gtk-3.0/img/checkbox-unchecked-hover.png
index da5fcc7..eb4bfbc 100644
--- a/gtk-3.0/img/checkbox-unchecked-hover.png
+++ b/gtk-3.0/img/checkbox-unchecked-hover.png
diff --git a/gtk-3.0/img/checkbox-unchecked-hover@2.png b/gtk-3.0/img/checkbox-unchecked-hover@2.png
new file mode 100644
index 0000000..92d98b3
--- /dev/null
+++ b/gtk-3.0/img/checkbox-unchecked-hover@2.png
diff --git a/gtk-3.0/img/checkbox-unchecked-insensitive.png b/gtk-3.0/img/checkbox-unchecked-insensitive.png
index 56d6a6c..6973edc 100644
--- a/gtk-3.0/img/checkbox-unchecked-insensitive.png
+++ b/gtk-3.0/img/checkbox-unchecked-insensitive.png
diff --git a/gtk-3.0/img/checkbox-unchecked-insensitive@2.png b/gtk-3.0/img/checkbox-unchecked-insensitive@2.png
new file mode 100644
index 0000000..9fc52f9
--- /dev/null
+++ b/gtk-3.0/img/checkbox-unchecked-insensitive@2.png
diff --git a/gtk-3.0/img/checkbox-unchecked.png b/gtk-3.0/img/checkbox-unchecked.png
index 5c315ff..fc8e438 100644
--- a/gtk-3.0/img/checkbox-unchecked.png
+++ b/gtk-3.0/img/checkbox-unchecked.png
diff --git a/gtk-3.0/img/checkbox-unchecked@2.png b/gtk-3.0/img/checkbox-unchecked@2.png
new file mode 100644
index 0000000..1a8b1a9
--- /dev/null
+++ b/gtk-3.0/img/checkbox-unchecked@2.png
diff --git a/gtk-3.0/img/menuitem-checkbox-checked-hover.png b/gtk-3.0/img/menuitem-checkbox-checked-hover.png
index 783f872..9310ed3 100644
--- a/gtk-3.0/img/menuitem-checkbox-checked-hover.png
+++ b/gtk-3.0/img/menuitem-checkbox-checked-hover.png
diff --git a/gtk-3.0/img/menuitem-checkbox-checked-hover@2.png b/gtk-3.0/img/menuitem-checkbox-checked-hover@2.png
new file mode 100644
index 0000000..a5fc350
--- /dev/null
+++ b/gtk-3.0/img/menuitem-checkbox-checked-hover@2.png
diff --git a/gtk-3.0/img/menuitem-checkbox-checked-insensitive.png b/gtk-3.0/img/menuitem-checkbox-checked-insensitive.png
index 70c0200..8fac342 100644
--- a/gtk-3.0/img/menuitem-checkbox-checked-insensitive.png
+++ b/gtk-3.0/img/menuitem-checkbox-checked-insensitive.png
diff --git a/gtk-3.0/img/menuitem-checkbox-checked-insensitive@2.png b/gtk-3.0/img/menuitem-checkbox-checked-insensitive@2.png
new file mode 100644
index 0000000..4a382cc
--- /dev/null
+++ b/gtk-3.0/img/menuitem-checkbox-checked-insensitive@2.png
diff --git a/gtk-3.0/img/menuitem-checkbox-checked.png b/gtk-3.0/img/menuitem-checkbox-checked.png
index 2191b1d..c317c6b 100644
--- a/gtk-3.0/img/menuitem-checkbox-checked.png
+++ b/gtk-3.0/img/menuitem-checkbox-checked.png
diff --git a/gtk-3.0/img/menuitem-checkbox-checked@2.png b/gtk-3.0/img/menuitem-checkbox-checked@2.png
new file mode 100644
index 0000000..e2daf17
--- /dev/null
+++ b/gtk-3.0/img/menuitem-checkbox-checked@2.png
diff --git a/gtk-3.0/img/menuitem-checkbox-hover.png b/gtk-3.0/img/menuitem-checkbox-hover.png
index 4d8125b..7880047 100644
--- a/gtk-3.0/img/menuitem-checkbox-hover.png
+++ b/gtk-3.0/img/menuitem-checkbox-hover.png
diff --git a/gtk-3.0/img/menuitem-checkbox-hover@2.png b/gtk-3.0/img/menuitem-checkbox-hover@2.png
new file mode 100644
index 0000000..4c25a35
--- /dev/null
+++ b/gtk-3.0/img/menuitem-checkbox-hover@2.png
diff --git a/gtk-3.0/img/menuitem-checkbox-insensitive.png b/gtk-3.0/img/menuitem-checkbox-insensitive.png
index 7129b2d..f28fdb9 100644
--- a/gtk-3.0/img/menuitem-checkbox-insensitive.png
+++ b/gtk-3.0/img/menuitem-checkbox-insensitive.png
diff --git a/gtk-3.0/img/menuitem-checkbox-insensitive@2.png b/gtk-3.0/img/menuitem-checkbox-insensitive@2.png
new file mode 100644
index 0000000..6442dc8
--- /dev/null
+++ b/gtk-3.0/img/menuitem-checkbox-insensitive@2.png
diff --git a/gtk-3.0/img/menuitem-checkbox-mixed-hover.png b/gtk-3.0/img/menuitem-checkbox-mixed-hover.png
index 48726ee..1c695dc 100644
--- a/gtk-3.0/img/menuitem-checkbox-mixed-hover.png
+++ b/gtk-3.0/img/menuitem-checkbox-mixed-hover.png
diff --git a/gtk-3.0/img/menuitem-checkbox-mixed-hover@2.png b/gtk-3.0/img/menuitem-checkbox-mixed-hover@2.png
new file mode 100644
index 0000000..fe8f361
--- /dev/null
+++ b/gtk-3.0/img/menuitem-checkbox-mixed-hover@2.png
diff --git a/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png b/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png
index ec51e4e..3baf12c 100644
--- a/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png
+++ b/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png
diff --git a/gtk-3.0/img/menuitem-checkbox-mixed-insensitive@2.png b/gtk-3.0/img/menuitem-checkbox-mixed-insensitive@2.png
new file mode 100644
index 0000000..ef1a6cd
--- /dev/null
+++ b/gtk-3.0/img/menuitem-checkbox-mixed-insensitive@2.png
diff --git a/gtk-3.0/img/menuitem-checkbox-mixed.png b/gtk-3.0/img/menuitem-checkbox-mixed.png
index a7b45a4..d81ecd1 100644
--- a/gtk-3.0/img/menuitem-checkbox-mixed.png
+++ b/gtk-3.0/img/menuitem-checkbox-mixed.png
diff --git a/gtk-3.0/img/menuitem-checkbox-mixed@2.png b/gtk-3.0/img/menuitem-checkbox-mixed@2.png
new file mode 100644
index 0000000..d8c01e8
--- /dev/null
+++ b/gtk-3.0/img/menuitem-checkbox-mixed@2.png
diff --git a/gtk-3.0/img/menuitem-checkbox.png b/gtk-3.0/img/menuitem-checkbox.png
index f7acdd5..822ad56 100644
--- a/gtk-3.0/img/menuitem-checkbox.png
+++ b/gtk-3.0/img/menuitem-checkbox.png
diff --git a/gtk-3.0/img/menuitem-checkbox@2.png b/gtk-3.0/img/menuitem-checkbox@2.png
new file mode 100644
index 0000000..cc72740
--- /dev/null
+++ b/gtk-3.0/img/menuitem-checkbox@2.png
diff --git a/gtk-3.0/img/menuitem-radio-checked-hover.png b/gtk-3.0/img/menuitem-radio-checked-hover.png
index 59b61ee..a9b0ce3 100644
--- a/gtk-3.0/img/menuitem-radio-checked-hover.png
+++ b/gtk-3.0/img/menuitem-radio-checked-hover.png
diff --git a/gtk-3.0/img/menuitem-radio-checked-hover@2.png b/gtk-3.0/img/menuitem-radio-checked-hover@2.png
new file mode 100644
index 0000000..2d57b18
--- /dev/null
+++ b/gtk-3.0/img/menuitem-radio-checked-hover@2.png
diff --git a/gtk-3.0/img/menuitem-radio-checked-insensitive.png b/gtk-3.0/img/menuitem-radio-checked-insensitive.png
index d8bd994..b5581ac 100644
--- a/gtk-3.0/img/menuitem-radio-checked-insensitive.png
+++ b/gtk-3.0/img/menuitem-radio-checked-insensitive.png
diff --git a/gtk-3.0/img/menuitem-radio-checked-insensitive@2.png b/gtk-3.0/img/menuitem-radio-checked-insensitive@2.png
new file mode 100644
index 0000000..08abcc4
--- /dev/null
+++ b/gtk-3.0/img/menuitem-radio-checked-insensitive@2.png
diff --git a/gtk-3.0/img/menuitem-radio-checked.png b/gtk-3.0/img/menuitem-radio-checked.png
index 717f089..12356d8 100644
--- a/gtk-3.0/img/menuitem-radio-checked.png
+++ b/gtk-3.0/img/menuitem-radio-checked.png
diff --git a/gtk-3.0/img/menuitem-radio-checked@2.png b/gtk-3.0/img/menuitem-radio-checked@2.png
new file mode 100644
index 0000000..93aca7a
--- /dev/null
+++ b/gtk-3.0/img/menuitem-radio-checked@2.png
diff --git a/gtk-3.0/img/menuitem-radio-hover.png b/gtk-3.0/img/menuitem-radio-hover.png
index af5a5ca..e5e71ad 100644
--- a/gtk-3.0/img/menuitem-radio-hover.png
+++ b/gtk-3.0/img/menuitem-radio-hover.png
diff --git a/gtk-3.0/img/menuitem-radio-hover@2.png b/gtk-3.0/img/menuitem-radio-hover@2.png
new file mode 100644
index 0000000..2acf9e2
--- /dev/null
+++ b/gtk-3.0/img/menuitem-radio-hover@2.png
diff --git a/gtk-3.0/img/menuitem-radio-insensitive.png b/gtk-3.0/img/menuitem-radio-insensitive.png
index 0615692..0bf4886 100644
--- a/gtk-3.0/img/menuitem-radio-insensitive.png
+++ b/gtk-3.0/img/menuitem-radio-insensitive.png
diff --git a/gtk-3.0/img/menuitem-radio-insensitive@2.png b/gtk-3.0/img/menuitem-radio-insensitive@2.png
new file mode 100644
index 0000000..47c3f73
--- /dev/null
+++ b/gtk-3.0/img/menuitem-radio-insensitive@2.png
diff --git a/gtk-3.0/img/menuitem-radio.png b/gtk-3.0/img/menuitem-radio.png
index 1f588e9..5611f9c 100644
--- a/gtk-3.0/img/menuitem-radio.png
+++ b/gtk-3.0/img/menuitem-radio.png
diff --git a/gtk-3.0/img/menuitem-radio@2.png b/gtk-3.0/img/menuitem-radio@2.png
new file mode 100644
index 0000000..2227b76
--- /dev/null
+++ b/gtk-3.0/img/menuitem-radio@2.png
diff --git a/gtk-3.0/img/pane-separator-grip-horz.png b/gtk-3.0/img/pane-separator-grip-horz.png
index 2670deb..ddedbe6 100644
--- a/gtk-3.0/img/pane-separator-grip-horz.png
+++ b/gtk-3.0/img/pane-separator-grip-horz.png
diff --git a/gtk-3.0/img/pane-separator-grip-horz@2.png b/gtk-3.0/img/pane-separator-grip-horz@2.png
new file mode 100644
index 0000000..5934a6c
--- /dev/null
+++ b/gtk-3.0/img/pane-separator-grip-horz@2.png
diff --git a/gtk-3.0/img/pane-separator-grip-vert.png b/gtk-3.0/img/pane-separator-grip-vert.png
index 6358b06..2b3c14b 100644
--- a/gtk-3.0/img/pane-separator-grip-vert.png
+++ b/gtk-3.0/img/pane-separator-grip-vert.png
diff --git a/gtk-3.0/img/pane-separator-grip-vert@2.png b/gtk-3.0/img/pane-separator-grip-vert@2.png
new file mode 100644
index 0000000..2468c96
--- /dev/null
+++ b/gtk-3.0/img/pane-separator-grip-vert@2.png
diff --git a/gtk-3.0/img/radio-checked-hover.png b/gtk-3.0/img/radio-checked-hover.png
index fe240e9..431a2b8 100644
--- a/gtk-3.0/img/radio-checked-hover.png
+++ b/gtk-3.0/img/radio-checked-hover.png
diff --git a/gtk-3.0/img/radio-checked-hover@2.png b/gtk-3.0/img/radio-checked-hover@2.png
new file mode 100644
index 0000000..469b43f
--- /dev/null
+++ b/gtk-3.0/img/radio-checked-hover@2.png
diff --git a/gtk-3.0/img/radio-checked-insensitive.png b/gtk-3.0/img/radio-checked-insensitive.png
index 46e46c2..aab0852 100644
--- a/gtk-3.0/img/radio-checked-insensitive.png
+++ b/gtk-3.0/img/radio-checked-insensitive.png
diff --git a/gtk-3.0/img/radio-checked-insensitive@2.png b/gtk-3.0/img/radio-checked-insensitive@2.png
new file mode 100644
index 0000000..ba9f564
--- /dev/null
+++ b/gtk-3.0/img/radio-checked-insensitive@2.png
diff --git a/gtk-3.0/img/radio-checked.png b/gtk-3.0/img/radio-checked.png
index 6250c17..a087644 100644
--- a/gtk-3.0/img/radio-checked.png
+++ b/gtk-3.0/img/radio-checked.png
diff --git a/gtk-3.0/img/radio-checked@2.png b/gtk-3.0/img/radio-checked@2.png
new file mode 100644
index 0000000..a7b3261
--- /dev/null
+++ b/gtk-3.0/img/radio-checked@2.png
diff --git a/gtk-3.0/img/radio-mixed-hover.png b/gtk-3.0/img/radio-mixed-hover.png
index 075ab04..da7b630 100644
--- a/gtk-3.0/img/radio-mixed-hover.png
+++ b/gtk-3.0/img/radio-mixed-hover.png
diff --git a/gtk-3.0/img/radio-mixed-hover@2.png b/gtk-3.0/img/radio-mixed-hover@2.png
new file mode 100644
index 0000000..e186c55
--- /dev/null
+++ b/gtk-3.0/img/radio-mixed-hover@2.png
diff --git a/gtk-3.0/img/radio-mixed-insensitive.png b/gtk-3.0/img/radio-mixed-insensitive.png
index bf64ef2..f4fc958 100644
--- a/gtk-3.0/img/radio-mixed-insensitive.png
+++ b/gtk-3.0/img/radio-mixed-insensitive.png
diff --git a/gtk-3.0/img/radio-mixed-insensitive@2.png b/gtk-3.0/img/radio-mixed-insensitive@2.png
new file mode 100644
index 0000000..1a8ad96
--- /dev/null
+++ b/gtk-3.0/img/radio-mixed-insensitive@2.png
diff --git a/gtk-3.0/img/radio-mixed.png b/gtk-3.0/img/radio-mixed.png
index 556083f..b77bd96 100644
--- a/gtk-3.0/img/radio-mixed.png
+++ b/gtk-3.0/img/radio-mixed.png
diff --git a/gtk-3.0/img/radio-mixed@2.png b/gtk-3.0/img/radio-mixed@2.png
new file mode 100644
index 0000000..a9526be
--- /dev/null
+++ b/gtk-3.0/img/radio-mixed@2.png
diff --git a/gtk-3.0/img/radio-unchecked-hover.png b/gtk-3.0/img/radio-unchecked-hover.png
index 1c39e13..13e153d 100644
--- a/gtk-3.0/img/radio-unchecked-hover.png
+++ b/gtk-3.0/img/radio-unchecked-hover.png
diff --git a/gtk-3.0/img/radio-unchecked-hover@2.png b/gtk-3.0/img/radio-unchecked-hover@2.png
new file mode 100644
index 0000000..23def64
--- /dev/null
+++ b/gtk-3.0/img/radio-unchecked-hover@2.png
diff --git a/gtk-3.0/img/radio-unchecked-insensitive.png b/gtk-3.0/img/radio-unchecked-insensitive.png
index e9d18a2..d8a0e42 100644
--- a/gtk-3.0/img/radio-unchecked-insensitive.png
+++ b/gtk-3.0/img/radio-unchecked-insensitive.png
diff --git a/gtk-3.0/img/radio-unchecked-insensitive@2.png b/gtk-3.0/img/radio-unchecked-insensitive@2.png
new file mode 100644
index 0000000..3a50d44
--- /dev/null
+++ b/gtk-3.0/img/radio-unchecked-insensitive@2.png
diff --git a/gtk-3.0/img/radio-unchecked.png b/gtk-3.0/img/radio-unchecked.png
index e903a42..8e170ed 100644
--- a/gtk-3.0/img/radio-unchecked.png
+++ b/gtk-3.0/img/radio-unchecked.png
diff --git a/gtk-3.0/img/radio-unchecked@2.png b/gtk-3.0/img/radio-unchecked@2.png
new file mode 100644
index 0000000..932f018
--- /dev/null
+++ b/gtk-3.0/img/radio-unchecked@2.png
diff --git a/gtk-3.0/img/resize-grip.png b/gtk-3.0/img/resize-grip.png
index 3bd6e60..d2ee816 100644
--- a/gtk-3.0/img/resize-grip.png
+++ b/gtk-3.0/img/resize-grip.png
diff --git a/gtk-3.0/img/resize-grip@2.png b/gtk-3.0/img/resize-grip@2.png
new file mode 100644
index 0000000..3742d91
--- /dev/null
+++ b/gtk-3.0/img/resize-grip@2.png
diff --git a/gtk-3.0/img/scale-slider-horz-hover.png b/gtk-3.0/img/scale-slider-horz-hover.png
index a2a1cfd..b0f1293 100644
--- a/gtk-3.0/img/scale-slider-horz-hover.png
+++ b/gtk-3.0/img/scale-slider-horz-hover.png
diff --git a/gtk-3.0/img/scale-slider-horz-hover@2.png b/gtk-3.0/img/scale-slider-horz-hover@2.png
new file mode 100644
index 0000000..133ba89
--- /dev/null
+++ b/gtk-3.0/img/scale-slider-horz-hover@2.png
diff --git a/gtk-3.0/img/scale-slider-horz-insensitive.png b/gtk-3.0/img/scale-slider-horz-insensitive.png
index 9319b7b..0dd71e0 100644
--- a/gtk-3.0/img/scale-slider-horz-insensitive.png
+++ b/gtk-3.0/img/scale-slider-horz-insensitive.png
diff --git a/gtk-3.0/img/scale-slider-horz-insensitive@2.png b/gtk-3.0/img/scale-slider-horz-insensitive@2.png
new file mode 100644
index 0000000..cd270ee
--- /dev/null
+++ b/gtk-3.0/img/scale-slider-horz-insensitive@2.png
diff --git a/gtk-3.0/img/scale-slider-horz.png b/gtk-3.0/img/scale-slider-horz.png
index 355b9d6..d2dca86 100644
--- a/gtk-3.0/img/scale-slider-horz.png
+++ b/gtk-3.0/img/scale-slider-horz.png
diff --git a/gtk-3.0/img/scale-slider-horz@2.png b/gtk-3.0/img/scale-slider-horz@2.png
new file mode 100644
index 0000000..35d2353
--- /dev/null
+++ b/gtk-3.0/img/scale-slider-horz@2.png
diff --git a/gtk-3.0/img/scale-slider-vert-hover.png b/gtk-3.0/img/scale-slider-vert-hover.png
index acfee6b..35b2458 100644
--- a/gtk-3.0/img/scale-slider-vert-hover.png
+++ b/gtk-3.0/img/scale-slider-vert-hover.png
diff --git a/gtk-3.0/img/scale-slider-vert-hover@2.png b/gtk-3.0/img/scale-slider-vert-hover@2.png
new file mode 100644
index 0000000..494a48f
--- /dev/null
+++ b/gtk-3.0/img/scale-slider-vert-hover@2.png
diff --git a/gtk-3.0/img/scale-slider-vert-insensitive.png b/gtk-3.0/img/scale-slider-vert-insensitive.png
index 2340233..719c73c 100644
--- a/gtk-3.0/img/scale-slider-vert-insensitive.png
+++ b/gtk-3.0/img/scale-slider-vert-insensitive.png
diff --git a/gtk-3.0/img/scale-slider-vert-insensitive@2.png b/gtk-3.0/img/scale-slider-vert-insensitive@2.png
new file mode 100644
index 0000000..ffe9964
--- /dev/null
+++ b/gtk-3.0/img/scale-slider-vert-insensitive@2.png
diff --git a/gtk-3.0/img/scale-slider-vert.png b/gtk-3.0/img/scale-slider-vert.png
index acc0435..b91649f 100644
--- a/gtk-3.0/img/scale-slider-vert.png
+++ b/gtk-3.0/img/scale-slider-vert.png
diff --git a/gtk-3.0/img/scale-slider-vert@2.png b/gtk-3.0/img/scale-slider-vert@2.png
new file mode 100644
index 0000000..59da4d8
--- /dev/null
+++ b/gtk-3.0/img/scale-slider-vert@2.png
diff --git a/gtk-3.0/img/slider-horz-grip.png b/gtk-3.0/img/slider-horz-grip.png
index 313c11d..05d937b 100644
--- a/gtk-3.0/img/slider-horz-grip.png
+++ b/gtk-3.0/img/slider-horz-grip.png
diff --git a/gtk-3.0/img/slider-horz-grip@2.png b/gtk-3.0/img/slider-horz-grip@2.png
new file mode 100644
index 0000000..d6cb220
--- /dev/null
+++ b/gtk-3.0/img/slider-horz-grip@2.png
diff --git a/gtk-3.0/img/slider-vert-grip.png b/gtk-3.0/img/slider-vert-grip.png
index 4b5a55a..ff74d5c 100644
--- a/gtk-3.0/img/slider-vert-grip.png
+++ b/gtk-3.0/img/slider-vert-grip.png
diff --git a/gtk-3.0/img/slider-vert-grip@2.png b/gtk-3.0/img/slider-vert-grip@2.png
new file mode 100644
index 0000000..9e4786b
--- /dev/null
+++ b/gtk-3.0/img/slider-vert-grip@2.png