29.9.2015

2 files changed, 453 insertions, 164 deletions

diff --git a/Super Flat Remix/devices/scalable/audio-speakers.svg b/Super Flat Remix/devices/scalable/audio-speakers.svg
index 7f7fcb974..c3a8d57fe 100755
--- a/Super Flat Remix/devices/scalable/audio-speakers.svg
+++ b/Super Flat Remix/devices/scalable/audio-speakers.svg
@@ -14,7 +14,7 @@
    height="512"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.91+devel r14355 custom"
    sodipodi:docname="audio-speakers.svg"
    inkscape:export-filename="/home/afel/Pictures/evos-mockups/personal-app-icons/rhythmbox.png"
    inkscape:export-xdpi="360"
@@ -558,6 +558,314 @@
        id="radialGradient3105-0"
        xlink:href="#linearGradient4156"
        inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="10"
+       fy="30"
+       fx="-14"
+       cy="30"
+       cx="-14"
+       id="radialGradient3786-0-3"
+       xlink:href="#linearGradient3780"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2"
+       fy="21.5"
+       fx="3"
+       cy="21.5"
+       cx="3"
+       gradientTransform="matrix(1,0,0,1.25,0,-5.375)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3932-4-5"
+       xlink:href="#linearGradient3792-6"
+       inkscape:collect="always" />
+    <radialGradient
+       r="10"
+       fy="30"
+       fx="-14"
+       cy="30"
+       cx="-14"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4445-2"
+       xlink:href="#linearGradient4156"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="18.166666"
+       x2="3"
+       y1="24.833334"
+       x1="3"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4376"
+       xlink:href="#linearGradient4156"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1039.3622"
+       x2="26"
+       y1="1044.3622"
+       x1="29"
+       gradientTransform="translate(0,-0.6603)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4378"
+       xlink:href="#linearGradient3841"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2"
+       fy="-4"
+       fx="-18"
+       cy="-4"
+       cx="-18"
+       gradientTransform="matrix(1,0,0,2,0,4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4453-21"
+       xlink:href="#linearGradient4082"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1039.3622"
+       x2="26"
+       y1="1044.3622"
+       x1="29"
+       gradientTransform="translate(0,-0.6603)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4381"
+       xlink:href="#linearGradient3841"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1039.3622"
+       x2="26"
+       y1="1044.3622"
+       x1="29"
+       gradientTransform="matrix(1.0895478,0.38334512,-0.38334512,1.0895478,395.0537,-104.62724)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4383"
+       xlink:href="#linearGradient3841"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1072.3622"
+       x2="100"
+       y1="1028.4492"
+       x1="56.087017"
+       gradientTransform="translate(-55.066291,-21.977904)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4385"
+       xlink:href="#linearGradient4402"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2"
+       fy="21.5"
+       fx="3"
+       cy="21.5"
+       cx="3"
+       gradientTransform="matrix(1,0,0,1.25,0,-5.375)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4449-3-2"
+       xlink:href="#linearGradient4082"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4082"
+       id="radialGradient4596-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.25,0,-5.375)"
+       cx="3"
+       cy="21.5"
+       fx="3"
+       fy="21.5"
+       r="2" />
+    <radialGradient
+       r="2"
+       fy="-4"
+       fx="-18"
+       cy="-4"
+       cx="-18"
+       gradientTransform="matrix(1,0,0,2,0,4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4678-4"
+       xlink:href="#linearGradient4082"
+       inkscape:collect="always" />
+    <radialGradient
+       r="10"
+       fy="30"
+       fx="-14"
+       cy="30"
+       cx="-14"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4445-4-9"
+       xlink:href="#linearGradient3982-8"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1072.3622"
+       x2="100"
+       y1="1028.4492"
+       x1="56.087017"
+       gradientTransform="translate(-55.066291,-21.977869)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4391"
+       xlink:href="#linearGradient4402"
+       inkscape:collect="always" />
+    <radialGradient
+       r="10"
+       fy="30"
+       fx="-14"
+       cy="30"
+       cx="-14"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3105-6"
+       xlink:href="#linearGradient4156"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3780"
+       id="radialGradient3786-0-2-8"
+       cx="-14"
+       cy="30"
+       fx="-14"
+       fy="30"
+       r="10"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3792-6"
+       id="radialGradient3932-4-1-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.25,0,-5.375)"
+       cx="3"
+       cy="21.5"
+       fx="3"
+       fy="21.5"
+       r="2" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4156"
+       id="radialGradient4445-6-4"
+       gradientUnits="userSpaceOnUse"
+       cx="-14"
+       cy="30"
+       fx="-14"
+       fy="30"
+       r="10" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4156"
+       id="linearGradient4397"
+       gradientUnits="userSpaceOnUse"
+       x1="3"
+       y1="24.833334"
+       x2="3"
+       y2="18.166666" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3841"
+       id="linearGradient4399"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-0.6603)"
+       x1="29"
+       y1="1044.3622"
+       x2="26"
+       y2="1039.3622" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4082"
+       id="radialGradient4453-2-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,2,0,4)"
+       cx="-18"
+       cy="-4"
+       fx="-18"
+       fy="-4"
+       r="2" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3841"
+       id="linearGradient4403"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-0.6603)"
+       x1="29"
+       y1="1044.3622"
+       x2="26"
+       y2="1039.3622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3841"
+       id="linearGradient4405"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0895478,0.38334512,-0.38334512,1.0895478,395.0537,-104.62724)"
+       x1="29"
+       y1="1044.3622"
+       x2="26"
+       y2="1039.3622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4402"
+       id="linearGradient4407"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-55.066291,-21.977904)"
+       x1="56.087017"
+       y1="1028.4492"
+       x2="100"
+       y2="1072.3622" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4082"
+       id="radialGradient4449-3-5-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.25,0,-5.375)"
+       cx="3"
+       cy="21.5"
+       fx="3"
+       fy="21.5"
+       r="2" />
+    <radialGradient
+       r="2"
+       fy="21.5"
+       fx="3"
+       cy="21.5"
+       cx="3"
+       gradientTransform="matrix(1,0,0,1.25,0,-5.375)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4596-5-5"
+       xlink:href="#linearGradient4082"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4082"
+       id="radialGradient4678-0-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,2,0,4)"
+       cx="-18"
+       cy="-4"
+       fx="-18"
+       fy="-4"
+       r="2" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3982-8"
+       id="radialGradient4445-4-6-4"
+       gradientUnits="userSpaceOnUse"
+       cx="-14"
+       cy="30"
+       fx="-14"
+       fy="30"
+       r="10" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4402"
+       id="linearGradient4413"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-55.066291,-21.977869)"
+       x1="56.087017"
+       y1="1028.4492"
+       x2="100"
+       y2="1072.3622" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4156"
+       id="radialGradient3105-0-8"
+       gradientUnits="userSpaceOnUse"
+       cx="-14"
+       cy="30"
+       fx="-14"
+       fy="30"
+       r="10" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -566,19 +874,19 @@
      borderopacity="1"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.125"
-     inkscape:cx="301.03827"
-     inkscape:cy="226.94361"
+     inkscape:zoom="1.1048543"
+     inkscape:cx="-95.893591"
+     inkscape:cy="270.69277"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:showpageshadow="false"
      borderlayer="true"
-     inkscape:window-width="3840"
-     inkscape:window-height="2016"
+     inkscape:window-width="960"
+     inkscape:window-height="1017"
      inkscape:window-x="0"
-     inkscape:window-y="64"
-     inkscape:window-maximized="1"
+     inkscape:window-y="32"
+     inkscape:window-maximized="0"
      inkscape:snap-global="true"
      inkscape:snap-bbox="true"
      inkscape:snap-nodes="true"
@@ -615,120 +923,125 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-540.3622)">
-    <rect
-       style="fill:#333333;fill-opacity:1;stroke:none;stroke-width:10.2221384"
-       id="rect2983-4"
-       width="347.55273"
-       height="449.77429"
-       x="81.884811"
-       y="571.58789"
-       rx="30.666416"
-       ry="30.666416" />
-    <path
-       style="fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:10.2221384"
-       d="m 129.18224,596.29706 c -5.98799,-5.9871 -15.69663,-5.9871 -21.68442,0 -5.9878,5.98814 -5.988,15.69713 0,21.68525 5.98798,5.98711 15.69663,5.98711 21.68442,0 5.9878,-5.98812 5.988,-15.69711 0,-21.68525 z m -5.42111,1.80728 3.61407,3.61455 -5.4211,5.4208 5.4211,5.4208 -3.61407,3.61455 -5.4211,-5.4208 -5.42111,5.4208 -3.61407,-3.61455 5.42111,-5.4208 -5.42111,-5.4208 3.61407,-3.61455 5.42111,5.4208 5.4211,-5.4208 z"
-       id="path4290-16"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:10.2221384"
-       d="m 405.17999,596.29706 c -5.98798,-5.9871 -15.69664,-5.9871 -21.68443,0 -5.98778,5.98814 -5.98798,15.69713 0,21.68525 5.98799,5.98711 15.69664,5.98711 21.68443,0 5.98779,-5.98812 5.988,-15.69711 0,-21.68525 z m -5.42111,1.80728 3.61407,3.61455 -5.4211,5.4208 5.4211,5.4208 -3.61407,3.61455 -5.4211,-5.4208 -5.42111,5.4208 -3.61407,-3.61455 5.4211,-5.4208 -5.4211,-5.4208 3.61407,-3.61455 5.42111,5.4208 5.4211,-5.4208 z"
-       id="path4290-4-7"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:10.2221384"
-       d="m 405.17999,974.51621 c -5.98798,-5.9871 -15.69664,-5.9871 -21.68443,0 -5.98778,5.98813 -5.98798,15.69711 0,21.68524 5.98799,5.98715 15.69664,5.98715 21.68443,0 5.98779,-5.98813 5.988,-15.69711 0,-21.68524 z m -5.42111,1.80727 3.61407,3.61455 -5.4211,5.4208 5.4211,5.42081 -3.61407,3.61454 -5.4211,-5.4208 -5.42111,5.4208 -3.61407,-3.61454 5.4211,-5.42081 -5.4211,-5.4208 3.61407,-3.61455 5.42111,5.4208 5.4211,-5.4208 z"
-       id="path4290-1-2"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:10.2221384"
-       d="m 129.18209,974.51621 c -5.98799,-5.9871 -15.69664,-5.9871 -21.68442,0 -5.9878,5.98813 -5.98799,15.69711 0,21.68524 5.98798,5.98715 15.69663,5.98715 21.68442,0 5.98778,-5.98813 5.988,-15.69711 0,-21.68524 z m -5.42111,1.80727 3.61407,3.61455 -5.4211,5.4208 5.4211,5.42081 -3.61407,3.61454 -5.4211,-5.4208 -5.42111,5.4208 -3.61407,-3.61454 5.4211,-5.42081 -5.4211,-5.4208 3.61407,-3.61455 5.42111,5.4208 5.4211,-5.4208 z"
-       id="path4290-43-8"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.2;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:10.2221384"
-       d="m 113.22889,571.3622 286.21989,0 c 16.98919,0 30.66641,13.56478 30.66641,30.66642 0,-15.5305 -20.44428,-20.44427 -30.66641,-20.44427 -10.22214,0 -275.99776,0 -286.21989,0 -10.22214,0 -30.666423,5.67022 -30.666423,20.44427 0,-17.24986 13.84664,-30.66642 30.666423,-30.66642 z"
-       id="rect2983-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssczzcs" />
-    <path
-       style="opacity:0.2;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.2221384"
-       d="m 113.22889,1021.1363 286.21989,0 c 16.98919,0 30.66641,-13.5648 30.66641,-30.66639 0,15.53049 -20.44428,20.44429 -30.66641,20.44429 -10.22214,0 -275.99776,0 -286.21989,0 -10.22214,0 -30.666423,-5.6702 -30.666423,-20.44429 0,17.24989 13.84664,30.66639 30.666423,30.66639 z"
-       id="rect2983-1-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssczzcs" />
-    <circle
-       style="fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:20.57165718"
-       id="path3790-5-75"
-       cx="256.33884"
-       cy="648.02814"
-       r="45.999626" />
-    <circle
-       cy="648.0282"
-       cx="256.33884"
-       style="fill:#333333;fill-opacity:1;stroke:none;stroke-width:9.03518009"
-       id="path3755-4"
-       r="25.555347" />
-    <path
-       style="opacity:0.2;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:10.22213936"
-       d="m 281.89418,648.02817 c 0,-10.57173 -11.44152,-21.90502 -25.55535,-21.90502 -14.11383,0 -25.55534,10.52676 -25.55534,21.90502 0,-14.1137 11.44151,-25.55534 25.55534,-25.55534 14.11383,0 25.55535,11.44164 25.55535,25.55534 z"
-       id="path3790-6-46"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscsc" />
-    <path
-       style="opacity:0.2;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.22213936"
-       d="m 281.89418,648.02817 c 0,10.57174 -11.44152,21.90503 -25.55535,21.90503 -14.11383,0 -25.55534,-10.52676 -25.55534,-21.90503 0,14.11371 11.44151,25.55535 25.55534,25.55535 14.11383,0 25.55535,-11.44164 25.55535,-25.55535 z"
-       id="path3790-6-4-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscsc" />
-    <ellipse
-       cy="857.58167"
-       cx="256.33881"
-       style="fill:#ffc82d;fill-opacity:1;stroke:none;stroke-width:12.77767372"
-       id="path3753-7"
-       r="127.77673" />
-    <path
-       style="opacity:0.3;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.2221384"
-       d="m 379.0045,857.58209 c 0,-59.36916 -55.16474,-112.44353 -122.66567,-112.44353 -67.50093,0 -122.66567,53.73881 -122.66567,112.44353 0,-71.55496 55.16474,-122.66566 122.66567,-122.66566 67.50093,0 122.66567,51.1107 122.66567,122.66566 z"
-       id="path3753-4-8-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscsc" />
-    <path
-       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:10.2221384"
-       d="m 379.0045,857.58209 c 0,59.36916 -55.16474,112.44353 -122.66567,112.44353 -67.50093,0 -122.66567,-53.73881 -122.66567,-112.44353 0,71.55498 55.16474,122.66567 122.66567,122.66567 67.50093,0 122.66567,-51.11069 122.66567,-122.66567 z"
-       id="path3753-4-8-0-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscsc" />
-    <ellipse
-       cy="857.58167"
-       cx="256.33881"
-       style="fill:none;stroke:#1a1a1a;stroke-width:10.2221384;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3757-9"
-       r="127.77673" />
-    <ellipse
-       style="fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:18.28591728"
-       id="path3790-5-7-4"
-       cx="256.33881"
-       cy="857.58167"
-       rx="40.888557"
-       ry="40.888554" />
-    <ellipse
-       style="fill:#333333;fill-opacity:1;stroke:none;stroke-width:16.00017929"
-       id="path3790-62"
-       cx="256.33881"
-       cy="857.58167"
-       rx="35.777485"
-       ry="35.777489" />
-    <path
-       style="opacity:0.2;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:10.22213936"
-       d="m 292.1163,857.58168 c 0,-14.80063 -16.01812,-30.66641 -35.77749,-30.66641 -19.75936,0 -35.77748,14.73726 -35.77748,30.66641 0,-19.75939 16.01812,-35.77748 35.77748,-35.77748 19.75937,0 35.77749,16.01809 35.77749,35.77748 z"
-       id="path3790-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscsc" />
-    <path
-       style="opacity:0.2;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.22213936"
-       d="m 292.1163,857.58168 c 0,14.80064 -16.01812,30.66642 -35.77749,30.66642 -19.75936,0 -35.77748,-14.73726 -35.77748,-30.66642 0,19.7594 16.01812,35.77749 35.77748,35.77749 19.75937,0 35.77749,-16.01809 35.77749,-35.77749 z"
-       id="path3790-6-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscsc" />
+    <g
+       id="layer1-2"
+       inkscape:label="Layer 1"
+       transform="translate(-7.0068359e-7,8.6914063e-6)">
+      <rect
+         ry="30.666416"
+         rx="30.666416"
+         y="571.58789"
+         x="81.884811"
+         height="449.77429"
+         width="347.55273"
+         id="rect2983-4"
+         style="fill:#333333;fill-opacity:1;stroke:none;stroke-width:10.2221384" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4290-16"
+         d="m 129.18224,596.29706 c -5.98799,-5.9871 -15.69663,-5.9871 -21.68442,0 -5.9878,5.98814 -5.988,15.69713 0,21.68525 5.98798,5.98711 15.69663,5.98711 21.68442,0 5.9878,-5.98812 5.988,-15.69711 0,-21.68525 z m -5.42111,1.80728 3.61407,3.61455 -5.4211,5.4208 5.4211,5.4208 -3.61407,3.61455 -5.4211,-5.4208 -5.42111,5.4208 -3.61407,-3.61455 5.42111,-5.4208 -5.42111,-5.4208 3.61407,-3.61455 5.42111,5.4208 z"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:10.2221384" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4290-4-7"
+         d="m 405.17999,596.29706 c -5.98798,-5.9871 -15.69664,-5.9871 -21.68443,0 -5.98778,5.98814 -5.98798,15.69713 0,21.68525 5.98799,5.98711 15.69664,5.98711 21.68443,0 5.98779,-5.98812 5.988,-15.69711 0,-21.68525 z m -5.42111,1.80728 3.61407,3.61455 -5.4211,5.4208 5.4211,5.4208 -3.61407,3.61455 -5.4211,-5.4208 -5.42111,5.4208 -3.61407,-3.61455 5.4211,-5.4208 -5.4211,-5.4208 3.61407,-3.61455 5.42111,5.4208 z"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:10.2221384" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4290-1-2"
+         d="m 405.17999,974.51621 c -5.98798,-5.9871 -15.69664,-5.9871 -21.68443,0 -5.98778,5.98813 -5.98798,15.69711 0,21.68524 5.98799,5.98715 15.69664,5.98715 21.68443,0 5.98779,-5.98813 5.988,-15.69711 0,-21.68524 z m -5.42111,1.80727 3.61407,3.61455 -5.4211,5.4208 5.4211,5.42081 -3.61407,3.61454 -5.4211,-5.4208 -5.42111,5.4208 -3.61407,-3.61454 5.4211,-5.42081 -5.4211,-5.4208 3.61407,-3.61455 5.42111,5.4208 z"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:10.2221384" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4290-43-8"
+         d="m 129.18209,974.51621 c -5.98799,-5.9871 -15.69664,-5.9871 -21.68442,0 -5.9878,5.98813 -5.98799,15.69711 0,21.68524 5.98798,5.98715 15.69663,5.98715 21.68442,0 5.98778,-5.98813 5.988,-15.69711 0,-21.68524 z m -5.42111,1.80727 3.61407,3.61455 -5.4211,5.4208 5.4211,5.42081 -3.61407,3.61454 -5.4211,-5.4208 -5.42111,5.4208 -3.61407,-3.61454 5.4211,-5.42081 -5.4211,-5.4208 3.61407,-3.61455 5.42111,5.4208 z"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:10.2221384" />
+      <path
+         sodipodi:nodetypes="ssczzcs"
+         inkscape:connector-curvature="0"
+         id="rect2983-1"
+         d="m 113.22889,571.3622 h 286.21989 c 16.98919,0 30.66641,13.56478 30.66641,30.66642 0,-15.5305 -20.44428,-20.44427 -30.66641,-20.44427 -10.22214,0 -275.99776,0 -286.21989,0 -10.22214,0 -30.666423,5.67022 -30.666423,20.44427 0,-17.24986 13.84664,-30.66642 30.666423,-30.66642 z"
+         style="opacity:0.2;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:10.2221384" />
+      <path
+         sodipodi:nodetypes="ssczzcs"
+         inkscape:connector-curvature="0"
+         id="rect2983-1-1"
+         d="m 113.22889,1021.1363 h 286.21989 c 16.98919,0 30.66641,-13.5648 30.66641,-30.66639 0,15.53049 -20.44428,20.44429 -30.66641,20.44429 -10.22214,0 -275.99776,0 -286.21989,0 -10.22214,0 -30.666423,-5.6702 -30.666423,-20.44429 0,17.24989 13.84664,30.66639 30.666423,30.66639 z"
+         style="opacity:0.2;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.2221384" />
+      <circle
+         r="45.999626"
+         cy="648.02814"
+         cx="256.33884"
+         id="path3790-5-75"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:20.57165718" />
+      <circle
+         r="25.555347"
+         id="path3755-4"
+         style="fill:#333333;fill-opacity:1;stroke:none;stroke-width:9.03518009"
+         cx="256.33884"
+         cy="648.0282" />
+      <path
+         sodipodi:nodetypes="cscsc"
+         inkscape:connector-curvature="0"
+         id="path3790-6-46"
+         d="m 281.89418,648.02817 c 0,-10.57173 -11.44152,-21.90502 -25.55535,-21.90502 -14.11383,0 -25.55534,10.52676 -25.55534,21.90502 0,-14.1137 11.44151,-25.55534 25.55534,-25.55534 14.11383,0 25.55535,11.44164 25.55535,25.55534 z"
+         style="opacity:0.2;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:10.22213936" />
+      <path
+         sodipodi:nodetypes="cscsc"
+         inkscape:connector-curvature="0"
+         id="path3790-6-4-8"
+         d="m 281.89418,648.02817 c 0,10.57174 -11.44152,21.90503 -25.55535,21.90503 -14.11383,0 -25.55534,-10.52676 -25.55534,-21.90503 0,14.11371 11.44151,25.55535 25.55534,25.55535 14.11383,0 25.55535,-11.44164 25.55535,-25.55535 z"
+         style="opacity:0.2;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.22213936" />
+      <circle
+         id="path3753-7"
+         style="fill:#ffc82d;fill-opacity:1;stroke:none;stroke-width:12.77767372"
+         cx="256.33881"
+         cy="857.58167"
+         r="127.77673" />
+      <path
+         sodipodi:nodetypes="cscsc"
+         inkscape:connector-curvature="0"
+         id="path3753-4-8-0"
+         d="m 379.0045,857.58209 c 0,-59.36916 -55.16474,-112.44353 -122.66567,-112.44353 -67.50093,0 -122.66567,53.73881 -122.66567,112.44353 0,-71.55496 55.16474,-122.66566 122.66567,-122.66566 67.50093,0 122.66567,51.1107 122.66567,122.66566 z"
+         style="opacity:0.3;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.2221384" />
+      <path
+         sodipodi:nodetypes="cscsc"
+         inkscape:connector-curvature="0"
+         id="path3753-4-8-0-0"
+         d="m 379.0045,857.58209 c 0,59.36916 -55.16474,112.44353 -122.66567,112.44353 -67.50093,0 -122.66567,-53.73881 -122.66567,-112.44353 0,71.55498 55.16474,122.66567 122.66567,122.66567 67.50093,0 122.66567,-51.11069 122.66567,-122.66567 z"
+         style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:10.2221384" />
+      <circle
+         r="127.77673"
+         id="path3757-9"
+         style="fill:none;stroke:#1a1a1a;stroke-width:10.2221384;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         cx="256.33881"
+         cy="857.58167" />
+      <ellipse
+         ry="40.888554"
+         rx="40.888557"
+         cy="857.58167"
+         cx="256.33881"
+         id="path3790-5-7-4"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:18.28591728" />
+      <ellipse
+         ry="35.777489"
+         rx="35.777485"
+         cy="857.58167"
+         cx="256.33881"
+         id="path3790-62"
+         style="fill:#333333;fill-opacity:1;stroke:none;stroke-width:16.00017929" />
+      <path
+         sodipodi:nodetypes="cscsc"
+         inkscape:connector-curvature="0"
+         id="path3790-6"
+         d="m 292.1163,857.58168 c 0,-14.80063 -16.01812,-30.66641 -35.77749,-30.66641 -19.75936,0 -35.77748,14.73726 -35.77748,30.66641 0,-19.75939 16.01812,-35.77748 35.77748,-35.77748 19.75937,0 35.77749,16.01809 35.77749,35.77748 z"
+         style="opacity:0.2;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:10.22213936" />
+      <path
+         sodipodi:nodetypes="cscsc"
+         inkscape:connector-curvature="0"
+         id="path3790-6-4"
+         d="m 292.1163,857.58168 c 0,14.80064 -16.01812,30.66642 -35.77749,30.66642 -19.75936,0 -35.77748,-14.73726 -35.77748,-30.66642 0,19.7594 16.01812,35.77749 35.77748,35.77749 19.75937,0 35.77749,-16.01809 35.77749,-35.77749 z"
+         style="opacity:0.2;fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.22213936" />
+    </g>
   </g>
 </svg>
diff --git a/Super Flat Remix/devices/scalable/printer.svg b/Super Flat Remix/devices/scalable/printer.svg
index ec7c8f3de..7398d08a9 100644
--- a/Super Flat Remix/devices/scalable/printer.svg
+++ b/Super Flat Remix/devices/scalable/printer.svg
@@ -11,7 +11,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.91+devel r14355 custom"
    width="512"
    height="512"
    sodipodi:docname="printer.svg"
@@ -39,26 +39,21 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1200"
-     inkscape:window-height="1024"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      id="namedview4"
      showgrid="false"
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:snap-global="false"
-     inkscape:zoom="0.60204079"
-     inkscape:cx="238.73158"
-     inkscape:cy="121.4447"
-     inkscape:window-x="960"
-     inkscape:window-y="64"
-     inkscape:window-maximized="0"
+     inkscape:zoom="1.1670024"
+     inkscape:cx="-26.181305"
+     inkscape:cy="234.54129"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
      inkscape:current-layer="g2987"
-     inkscape:document-units="px">
-    <sodipodi:guide
-       orientation="0,1"
-       position="413.59323,319.33052"
-       id="guide3806" />
-  </sodipodi:namedview>
+     inkscape:document-units="px" />
   <g
      id="g2987"
      transform="translate(-448.47458,73.491525)">
@@ -84,11 +79,6 @@
        inkscape:connector-curvature="0" />
     <path
        style="fill:#b0b0af;stroke-width:0.94224596"
-       d="m 489.93537,311.6501 c -6.913,-1.65113 -14.59721,-8.2045 -17.62813,-15.03386 -2.58735,-5.82982 -2.68415,-10.63189 -2.31879,-115.02423 l 0.38127,-108.940398 3.38939,-4.929547 c 1.86417,-2.711236 5.70233,-6.46542 8.52928,-8.342642 4.83031,-3.207563 6.89508,-3.484687 34.28154,-4.601271 16.0279,-0.653463 112.62185,-0.979728 214.6532,-0.725054 204.73191,0.511061 190.72902,-0.147262 199.76177,9.391419 2.31696,2.446739 4.96747,6.522686 5.89003,9.057649 1.22942,3.37817 1.70623,33.190394 1.78551,111.636304 l 0.10816,107.0273 -3.1985,6.30296 c -1.86858,3.68226 -5.76013,8.07813 -9.35951,10.57245 l -6.16101,4.26957 -47.00779,0.44325 c -37.63372,0.35487 -47.24377,0.0723 -48.19127,-1.41686 -0.65093,-1.02305 -1.1933,-9.03664 -1.20526,-17.80795 l -0.0217,-15.94781 -119.05435,0.3623 -119.05433,0.36231 -0.71077,17.00239 -0.71078,17.00237 -44.77864,0.21908 c -24.62826,0.12056 -46.84893,-0.27538 -49.37928,-0.87973 z"
-       id="path3019"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#b0b0af;stroke-width:0.94224596"
        d="m 783.1741,116.84779 c 6.63562,-6.61378 3.28014,-17.767934 -6.04701,-20.101234 -7.51762,-1.88056 -16.00739,6.581264 -14.1206,14.074134 2.34097,9.29644 13.53199,12.64091 20.16761,6.0271 z"
        id="path3017"
        inkscape:connector-curvature="0" />
@@ -103,12 +93,6 @@
        id="path3013"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:#13b4e5;stroke-width:0.94224596"
-       d="m 490.26855,312.27566 c -4.2769,-1.71935 -9.58785,-3.85191 -12.93527,-7.55939 -2.54857,-2.8227 -4.31129,-6.28311 -5.60457,-9.73973 -2.95592,-7.90035 -1.32233,-9.76985 -1.34053,-113.18692 l -0.22716,-109.364933 2.87231,-3.872176 c 3.14394,-4.238379 10.71199,-12.028149 18.72703,-12.725432 8.01138,-0.696972 417.79349,-2.482224 425.90676,-0.324429 11.15598,2.391655 15.55054,7.733038 18.24886,14.511155 l 3.49842,9.506781 -0.31307,103.067904 0,106.61583 -4.4142,7.88962 c -2.33979,4.182 -5.51486,8.2656 -9.13419,10.6616 l -5.76349,3.81545 -46.30605,0 -46.30604,0 -0.40444,-16.26123 c -0.22386,-8.99944 -1.0951,-17.09341 -1.95099,-18.12469 -1.25311,-1.50988 -23.96769,-1.85933 -119.71604,-1.84171 -64.99325,0.0124 -118.94766,0.51626 -119.89873,1.12057 -1.1606,0.73748 -1.86177,6.69029 -2.13231,18.10293 l -0.40312,17.00413 -45.48942,0.2755 c -27.49226,0.1665 -44.79158,1.2823 -46.91376,0.42917 z M 784.26507,117.80779 c 5.62742,-5.87376 5.38484,-14.34498 -0.55387,-19.342094 -6.11936,-5.1491 -13.03394,-4.97135 -18.48036,0.47506 -5.44642,5.446404 -5.62418,12.361004 -0.47506,18.480364 3.03996,3.61276 4.7249,4.3737 9.68484,4.3737 4.72325,0 6.81978,-0.85083 9.82445,-3.98703 z"
-       id="path2999"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sssscsscccccsscccssscscssssssss" />
-    <path
        style="fill:#000000;fill-opacity:0;stroke-width:0.94224596"
        d="m 488.3454,310.77112 c -6.7731,-2.73327 -12.00708,-7.6249 -14.71977,-13.75693 -1.53049,-3.45961 -2.47316,-6.59973 -2.09482,-6.97803 0.37834,-0.37831 1.41927,1.52814 2.3132,4.23651 2.14713,6.50546 5.36794,10.03705 12.20992,13.38829 4.94061,2.41991 7.88363,2.68296 23.76365,2.1238 l 18.12469,-0.63822 0,-32.64025 c 0,-19.78146 0.57973,-33.72337 1.47157,-35.38965 1.4425,-2.69519 4.88748,-2.74943 174.56564,-2.74943 132.73335,0 173.49185,0.39773 174.79994,1.70571 1.23079,1.2307 1.70586,11.08629 1.70586,35.38968 l 0,33.68394 18.12469,0.59188 c 13.56096,0.44287 19.14228,0.0954 22.16604,-1.38004 2.22274,-1.0846 4.39998,-1.6134 4.83829,-1.17511 0.43831,0.43826 -1.54147,1.77384 -4.39954,2.9679 -4.35551,1.81973 -12.38504,2.11029 -49.61693,1.79545 l -44.42047,-0.3756 -0.40444,-16.25996 c -0.22386,-8.99875 -1.0951,-17.09206 -1.95099,-18.12329 -1.25311,-1.50975 -23.96769,-1.85916 -119.71604,-1.84153 -64.99325,0.0124 -118.94766,0.5162 -119.89873,1.12048 -1.1606,0.73742 -1.86177,6.68978 -2.13231,18.1015 l -0.40312,17.0028 -45.48942,0.2755 c -26.15749,0.1584 -46.91202,-0.29863 -48.83691,-1.0754 z m 439.05085,-5.24844 c 0,-0.78181 1.05863,-2.29933 2.3525,-3.37231 6.90576,-5.72661 6.86012,-5.0099 7.29588,-114.59385 0.28446,-71.52653 -0.0574,-103.563194 -1.12622,-105.560254 -0.98961,-1.84896 -1.0592,-3.71674 -0.19599,-5.25914 2.70049,-4.825126 3.22502,16.80357 2.78219,114.722794 l -0.44678,98.7896 -3.2696,6.63678 c -3.23126,6.55895 -7.39198,11.42012 -7.39198,8.63638 z m -457.06608,-123.30209 0.0396,-105.186074 3.18536,-5.958738 c 3.83953,-7.18251 10.43011,-12.431105 18.20526,-14.498281 8.11571,-2.157733 416.75,-2.169019 424.86325,-0.0124 7.37685,1.961488 14.39685,7.258479 17.33431,13.079729 2.11334,4.188121 1.88635,4.077125 -2.88238,-1.409647 -2.84703,-3.275706 -7.23841,-7.031155 -9.75864,-8.345433 -4.28612,-2.23555 -26.61616,-4.795891 -26.61616,-3.052152 0,0.429077 2.19811,5.148687 4.88472,10.488022 7.47517,14.8562 9.71303,25.57143 9.0037,43.111544 -0.42715,10.56273 -1.54286,17.62555 -3.81716,24.16437 -8.79015,25.27242 -28.56081,45.07543 -54.13915,54.22785 -7.8737,2.81734 -11.97269,3.30625 -27.72011,3.30625 -15.7474,0 -19.84641,-0.48891 -27.72011,-3.30625 -12.64777,-4.5256 -23.84761,-11.5752 -33.12035,-20.84723 l -7.7954,-7.79479 -92.91029,-0.003 -92.91029,-0.003 -8.52928,-4.42598 c -12.30037,-6.38329 -18.57135,-13.04063 -25.28173,-26.83987 l -5.87539,-12.08216 -0.58807,-30.205474 -0.58807,-30.20545 -15.10732,0.0087 c -17.93254,0.01117 -24.14253,1.493914 -30.83753,7.371734 -5.4283,4.765737 -7.76912,8.404212 -8.96085,13.928376 -0.42322,1.96128 -1.1358,49.940724 -1.58347,106.620364 l -0.81397,103.05394 0.0396,-105.18609 z m 313.9349,-64.39762 c 5.62742,-5.87333 5.38484,-14.34388 -0.55387,-19.340594 -6.11936,-5.14871 -13.03394,-4.97099 -18.48036,0.47502 -5.44642,5.445984 -5.62418,12.360044 -0.47506,18.478914 3.03996,3.6125 4.7249,4.37334 9.68484,4.37334 4.72325,0 6.81978,-0.85074 9.82445,-3.98668 z"
        id="path2997"
@@ -129,7 +113,7 @@
     <g
        id="g3858"
        transform="matrix(1.4215444,0,0,1.4215444,421.32645,-105.65228)"
-       style="fill:#f9f9f9">
+       style="fill:#ffffff;fill-opacity:1">
       <rect
          rx="1.3801507"
          y="269.91525"
@@ -137,7 +121,7 @@
          height="79.728813"
          width="168.43777"
          id="rect3800"
-         style="fill:#f9f9f9;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
       <rect
          rx="1.3801507"
          y="269.5"
@@ -145,7 +129,7 @@
          height="28.652542"
          width="168.43777"
          id="rect3800-2"
-         style="fill:#f9f9f9;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
     </g>
     <path
        style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:0.94224596;fill-opacity:1"
@@ -160,14 +144,11 @@
        x="530.87219"
        y="86.235062"
        rx="50.021095" />
-    <rect
-       style="fill:#f9f9f9;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94224596"
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#dcdcdc;stroke-width:21.71385956;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 585.59568,-25.507642 c -16.43483,0 -29.78565,14.15399 -29.78565,31.5781309 V 69.231387 h 29.46329 c 0.34665,0.655043 0.95616,1.090576 1.65647,1.090576 h 235.3587 c 0.70004,0 1.30781,-0.43596 1.65455,-1.090576 H 853.6782 V 6.0704889 c 0,-17.4241409 -13.32388,-31.5781309 -29.7876,-31.5781309 z"
        id="rect3800-1-0"
-       width="240.6571"
-       height="57.242302"
-       x="584.27942"
-       y="-2.7723041"
-       rx="1.9719034" />
+       inkscape:connector-curvature="0" />
     <rect
        style="fill:#383838;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94224596"
        id="rect3016-0"
@@ -182,10 +163,5 @@
        cy="96.469063"
        rx="15.652754"
        ry="15.026644" />
-    <path
-       style="fill:#b3b3b3;stroke-width:0.94224596"
-       id="path68"
-       inkscape:connector-curvature="0"
-       d="m 584.91084,0.27276919 239.66527,0 0,53.27621381 29.95817,0 0,-53.27621381 c 0,-14.69757519 -13.39972,-26.63810419 -29.95817,-26.63810419 l -239.66527,0 c -16.52939,0 -29.95814,11.940529 -29.95814,26.63810419 l 0,53.27621381 29.95814,0 0,-53.27621381" />
   </g>
 </svg>