cleanup

2 files changed, 144 insertions, 70 deletions

diff --git a/icons/cuisenaire-off.svg b/icons/cuisenaire-off.svg
index 29eaafd..b699382 100644
--- a/icons/cuisenaire-off.svg
+++ b/icons/cuisenaire-off.svg
@@ -2,12 +2,27 @@
 <!-- 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"
    version="1.1"
    width="45"
    height="45"
    id="svg2">
+  <metadata
+     id="metadata18">
+    <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>
   <defs
      id="defs41" />
   <rect
@@ -23,52 +38,74 @@
      y2="5.5"
      x1="22.5"
      x2="22.5"
-     style="fill:#aaaaaa;stroke:#000000;stroke-width:2;stroke-miterlimit:0;stroke-dasharray:none"
+     style="fill:#aaaaaa;stroke:#000000;stroke-width:2;stroke-linecap:square;stroke-miterlimit:0;stroke-dasharray:none"
      id="line10-68" />
-  <g
-     transform="translate(0,0.39652096)"
-     id="g2952">
-    <path
-       d="m 26.5,13.979188 a 4,7.6728847 0 1 1 -7.999999,0 4,7.6728847 0 1 1 7.999999,0 z"
-       id="path3633-7-6"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       d="m 26.5,30.202213 a 4,7.698429 0 1 1 -7.999999,0 4,7.698429 0 1 1 7.999999,0 z"
-       id="path3633-5-6"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-  </g>
   <line
      y1="39.500004"
      y2="5.4999976"
      x1="9.724575"
      x2="9.724575"
-     style="fill:#aaaaaa;stroke:#000000;stroke-width:2;stroke-miterlimit:0;stroke-dasharray:none"
+     style="fill:#aaaaaa;stroke:#000000;stroke-width:2;stroke-linecap:square;stroke-miterlimit:0;stroke-dasharray:none"
      id="line10-68-3" />
-  <path
-     d="m 13.724576,22.5 a 4,15.916808 0 1 1 -7.9999992,0 4,15.916808 0 1 1 7.9999992,0 z"
-     id="path3633-5-6-4"
-     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
   <line
      y1="39.500004"
      y2="5.4999976"
      x1="35.084743"
      x2="35.084743"
-     style="fill:#aaaaaa;stroke:#000000;stroke-width:2;stroke-miterlimit:0;stroke-dasharray:none"
+     style="fill:#aaaaaa;stroke:#000000;stroke-width:2;stroke-linecap:square;stroke-miterlimit:0;stroke-dasharray:none"
      id="line10-68-3-8" />
-  <g
-     transform="translate(0,0.1912236)"
-     id="g2947">
-    <path
-       d="m 39.084746,22.240958 a 4,5.1638796 0 1 1 -7.999999,0 4,5.1638796 0 1 1 7.999999,0 z"
-       id="path3633-2-2-3"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       d="m 39.084746,32.839251 a 4,5.1275249 0 1 1 -7.999999,0 4,5.1275249 0 1 1 7.999999,0 z"
-       id="path3633-7-6-5-1"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       d="m 39.084746,11.710483 a 4,5.05974 0 1 1 -7.999999,0 4,5.05974 0 1 1 7.999999,0 z"
-       id="path3633-4-5-4-2"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-  </g>
+  <rect
+     width="6.9443316"
+     height="30.944332"
+     rx="1.4985782"
+     ry="1.6732401"
+     x="6.252409"
+     y="7.0278349"
+     id="rect2995"
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.05566847;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <rect
+     width="7.2432909"
+     height="15.243291"
+     rx="1.5630932"
+     ry="0.82424414"
+     x="18.878355"
+     y="6.8783555"
+     id="rect2995-6"
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75670934;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <rect
+     width="7.2432909"
+     height="15.243291"
+     rx="1.5630932"
+     ry="0.82424414"
+     x="18.878355"
+     y="22.878355"
+     id="rect2995-6-0"
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75670934;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <rect
+     width="7.3798122"
+     height="10.049812"
+     rx="1.5925543"
+     ry="0.5434193"
+     x="31.394836"
+     y="6.8100948"
+     id="rect2995-6-7"
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.62018806;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <rect
+     width="7.3798122"
+     height="10.049812"
+     rx="1.5925543"
+     ry="0.5434193"
+     x="31.394836"
+     y="17.783117"
+     id="rect2995-6-7-1"
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.62018806;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <rect
+     width="7.3798122"
+     height="10.049812"
+     rx="1.5925543"
+     ry="0.5434193"
+     x="31.394836"
+     y="28.756142"
+     id="rect2995-6-7-5"
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.62018806;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
 </svg>
diff --git a/icons/cuisenaire-on.svg b/icons/cuisenaire-on.svg
index 6daa324..fe7a9be 100644
--- a/icons/cuisenaire-on.svg
+++ b/icons/cuisenaire-on.svg
@@ -2,12 +2,27 @@
 <!-- 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"
    version="1.1"
    width="45"
    height="45"
    id="svg2">
+  <metadata
+     id="metadata18">
+    <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>
   <defs
      id="defs41" />
   <rect
@@ -23,52 +38,74 @@
      y2="5.5"
      x1="22.5"
      x2="22.5"
-     style="fill:#aaaaaa;stroke:#000000;stroke-width:2;stroke-miterlimit:0;stroke-dasharray:none"
+     style="fill:#aaaaaa;stroke:#000000;stroke-width:2;stroke-linecap:square;stroke-miterlimit:0;stroke-dasharray:none"
      id="line10-68" />
-  <g
-     transform="translate(0,0.39652096)"
-     id="g2952">
-    <path
-       d="m 26.5,13.979188 a 4,7.6728847 0 1 1 -7.999999,0 4,7.6728847 0 1 1 7.999999,0 z"
-       id="path3633-7-6"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       d="m 26.5,30.202213 a 4,7.698429 0 1 1 -7.999999,0 4,7.698429 0 1 1 7.999999,0 z"
-       id="path3633-5-6"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-  </g>
   <line
      y1="39.500004"
      y2="5.4999976"
      x1="9.724575"
      x2="9.724575"
-     style="fill:#aaaaaa;stroke:#000000;stroke-width:2;stroke-miterlimit:0;stroke-dasharray:none"
+     style="fill:#aaaaaa;stroke:#000000;stroke-width:2;stroke-linecap:square;stroke-miterlimit:0;stroke-dasharray:none"
      id="line10-68-3" />
-  <path
-     d="m 13.724576,22.5 a 4,15.916808 0 1 1 -7.9999992,0 4,15.916808 0 1 1 7.9999992,0 z"
-     id="path3633-5-6-4"
-     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
   <line
      y1="39.500004"
      y2="5.4999976"
      x1="35.084743"
      x2="35.084743"
-     style="fill:#aaaaaa;stroke:#000000;stroke-width:2;stroke-miterlimit:0;stroke-dasharray:none"
+     style="fill:#aaaaaa;stroke:#000000;stroke-width:2;stroke-linecap:square;stroke-miterlimit:0;stroke-dasharray:none"
      id="line10-68-3-8" />
-  <g
-     transform="translate(0,0.1912236)"
-     id="g2947">
-    <path
-       d="m 39.084746,22.240958 a 4,5.1638796 0 1 1 -7.999999,0 4,5.1638796 0 1 1 7.999999,0 z"
-       id="path3633-2-2-3"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       d="m 39.084746,32.839251 a 4,5.1275249 0 1 1 -7.999999,0 4,5.1275249 0 1 1 7.999999,0 z"
-       id="path3633-7-6-5-1"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       d="m 39.084746,11.710483 a 4,5.05974 0 1 1 -7.999999,0 4,5.05974 0 1 1 7.999999,0 z"
-       id="path3633-4-5-4-2"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-  </g>
+  <rect
+     width="6.9443316"
+     height="30.944332"
+     rx="1.4985782"
+     ry="1.6732401"
+     x="6.252409"
+     y="7.0278349"
+     id="rect2995"
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.05566847;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <rect
+     width="7.2432909"
+     height="15.243291"
+     rx="1.5630932"
+     ry="0.82424414"
+     x="18.878355"
+     y="6.8783555"
+     id="rect2995-6"
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75670934;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <rect
+     width="7.2432909"
+     height="15.243291"
+     rx="1.5630932"
+     ry="0.82424414"
+     x="18.878355"
+     y="22.878355"
+     id="rect2995-6-0"
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75670934;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <rect
+     width="7.3798122"
+     height="10.049812"
+     rx="1.5925543"
+     ry="0.5434193"
+     x="31.394836"
+     y="6.8100948"
+     id="rect2995-6-7"
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.62018806;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <rect
+     width="7.3798122"
+     height="10.049812"
+     rx="1.5925543"
+     ry="0.5434193"
+     x="31.394836"
+     y="17.783117"
+     id="rect2995-6-7-1"
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.62018806;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <rect
+     width="7.3798122"
+     height="10.049812"
+     rx="1.5925543"
+     ry="0.5434193"
+     x="31.394836"
+     y="28.756142"
+     id="rect2995-6-7-5"
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.62018806;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
 </svg>