[gnome-shell-design] rough mockup of the DnD behaviour for window rearranging across workspaces. See http://live.gnome.or

[Jakub Steiner <jimmac src gnome org>]

commit 99466430d3fc0d669c949f90265e0e862640ef95
Author: Jakub Steiner <jimmac gmail com>
Date:   Thu Aug 12 19:00:31 2010 +0200

    rough mockup of the DnD behaviour for window rearranging across workspaces. See http://live.gnome.org/GnomeShell/Design/Whiteboards/OverviewWindowDND

 mockups/motion/rough/1-start-drag.png              |  Bin 0 -> 350683 bytes
 mockups/motion/rough/2-hold.png                    |  Bin 0 -> 344210 bytes
 mockups/motion/rough/3-to-tiled-workspaces.png     |  Bin 0 -> 332077 bytes
 mockups/motion/rough/4-ready-to-drop.png           |  Bin 0 -> 560587 bytes
 .../rough/5-taken-to-the-target-workspace.png      |  Bin 0 -> 407756 bytes
 mockups/motion/rough/6-final.png                   |  Bin 0 -> 357751 bytes
 mockups/shell-mockups.svg                          |  356 ++++++++++++++++----
 7 files changed, 283 insertions(+), 73 deletions(-)
---
diff --git a/mockups/motion/rough/1-start-drag.png b/mockups/motion/rough/1-start-drag.png
new file mode 100644
index 0000000..c7e15fc
Binary files /dev/null and b/mockups/motion/rough/1-start-drag.png differ
diff --git a/mockups/motion/rough/2-hold.png b/mockups/motion/rough/2-hold.png
new file mode 100644
index 0000000..658e841
Binary files /dev/null and b/mockups/motion/rough/2-hold.png differ
diff --git a/mockups/motion/rough/3-to-tiled-workspaces.png b/mockups/motion/rough/3-to-tiled-workspaces.png
new file mode 100644
index 0000000..160265c
Binary files /dev/null and b/mockups/motion/rough/3-to-tiled-workspaces.png differ
diff --git a/mockups/motion/rough/4-ready-to-drop.png b/mockups/motion/rough/4-ready-to-drop.png
new file mode 100644
index 0000000..4f1cc54
Binary files /dev/null and b/mockups/motion/rough/4-ready-to-drop.png differ
diff --git a/mockups/motion/rough/5-taken-to-the-target-workspace.png b/mockups/motion/rough/5-taken-to-the-target-workspace.png
new file mode 100644
index 0000000..9c0d6f6
Binary files /dev/null and b/mockups/motion/rough/5-taken-to-the-target-workspace.png differ
diff --git a/mockups/motion/rough/6-final.png b/mockups/motion/rough/6-final.png
new file mode 100644
index 0000000..c6ccc24
Binary files /dev/null and b/mockups/motion/rough/6-final.png differ
diff --git a/mockups/shell-mockups.svg b/mockups/shell-mockups.svg
index 3c9e862..62a4577 100644
--- a/mockups/shell-mockups.svg
+++ b/mockups/shell-mockups.svg
@@ -29,9 +29,9 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="509.32054"
-     inkscape:cy="382.09145"
-     inkscape:current-layer="layer29"
+     inkscape:cx="521.8941"
+     inkscape:cy="389.99621"
+     inkscape:current-layer="layer48"
      inkscape:document-units="px"
      showgrid="false"
      inkscape:window-width="1680"
@@ -8406,10 +8406,11 @@
     <filter
        inkscape:collect="always"
        id="filter15696"
-       x="-0.047613981"
+       x="-0.047613982"
        width="1.095228"
-       y="-0.41166868"
-       height="1.8233374">
+       y="-0.41166869"
+       height="1.8233374"
+       color-interpolation-filters="sRGB">
       <feGaussianBlur
          inkscape:collect="always"
          stdDeviation="3.9451585"
@@ -10523,7 +10524,8 @@
     </clipPath>
     <filter
        inkscape:collect="always"
-       id="filter18645">
+       id="filter18645"
+       color-interpolation-filters="sRGB">
       <feGaussianBlur
          inkscape:collect="always"
          stdDeviation="2.9811715"
@@ -12714,7 +12716,7 @@
     <radialGradient
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.7481488,0,0,1.7805361,-23.042966,-23.568319)"
-       r="6.9985772"
+       r="6.9985771"
        fy="29.839787"
        fx="30.127851"
        cy="29.839787"
@@ -12744,10 +12746,11 @@
     <filter
        id="filter5733"
        height="1.7145865"
-       y="-0.35729324"
+       y="-0.35729325"
        width="1.1525522"
-       x="-0.076276083"
-       inkscape:collect="always">
+       x="-0.076276086"
+       inkscape:collect="always"
+       color-interpolation-filters="sRGB">
       <feGaussianBlur
          id="feGaussianBlur5735"
          stdDeviation="0.60003059"
@@ -12794,10 +12797,11 @@
     <filter
        id="filter6876"
        height="1.1596224"
-       y="-0.079811202"
+       y="-0.0798112"
        width="1.24818"
        x="-0.12409002"
-       inkscape:collect="always">
+       inkscape:collect="always"
+       color-interpolation-filters="sRGB">
       <feGaussianBlur
          id="feGaussianBlur6878"
          stdDeviation="0.28308036"
@@ -13492,6 +13496,74 @@
        id="radialGradient23875"
        xlink:href="#linearGradient34508-4-9"
        inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-4-75"
+       id="radialGradient36603-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0338554,-0.0055072,0.03125008,0.38257694,-2.6641297,18.80356)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
+    <linearGradient
+       id="linearGradient34508-4-75"
+       inkscape:collect="always">
+      <stop
+         id="stop34510-7-54"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop34512-7-8"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="42"
+       fy="30"
+       fx="51"
+       cy="30"
+       cx="51"
+       gradientTransform="matrix(1.0338554,-0.0055072,0.03125008,0.38257694,-2.6641297,18.80356)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient23916"
+       xlink:href="#linearGradient34508-4-75"
+       inkscape:collect="always" />
+    <mask
+       id="mask12112-0-6-5-3-8-3-4-3-4-9"
+       maskUnits="userSpaceOnUse">
+      <rect
+         y="434"
+         x="16.5"
+         height="16"
+         width="221"
+         id="rect12114-2-9-0-8-2-6-0-7-5-9"
+         style="fill:url(#radialGradient12116-6-2-9-3-0-75-1-5-5-7);fill-opacity:1;stroke:none" />
+    </mask>
+    <radialGradient
+       r="110.5"
+       fy="442"
+       fx="128.5"
+       cy="442"
+       cx="128.5"
+       gradientTransform="matrix(1,0,0,0.07239819,-1.5,410)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12116-6-2-9-3-0-75-1-5-5-7"
+       xlink:href="#linearGradient12104-5-1-5-6-8-7-3-4-8-5"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient12104-5-1-5-6-8-7-3-4-8-5"
+       inkscape:collect="always">
+      <stop
+         id="stop12106-3-0-0-5-2-8-7-7-2-9"
+         offset="0"
+         style="stop-color:#cccccc;stop-opacity:1;" />
+      <stop
+         id="stop12108-4-0-4-9-5-04-5-9-0-7"
+         offset="1"
+         style="stop-color:#cccccc;stop-opacity:0;" />
+    </linearGradient>
   </defs>
   <metadata
      id="metadata2945">
@@ -13943,7 +14015,7 @@
          id="g7325">
         <path
            transform="matrix(0.78932957,0,0,0.78932789,-285.14046,-37.271259)"
-           d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
+           d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
            sodipodi:ry="1.9003495"
            sodipodi:rx="1.9003495"
            sodipodi:cy="617.14966"
@@ -13959,7 +14031,7 @@
            sodipodi:cy="617.14966"
            sodipodi:rx="1.9003495"
            sodipodi:ry="1.9003495"
-           d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
+           d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
            transform="matrix(0.78932957,0,0,0.78932789,-289.14046,-37.271259)" />
         <path
            sodipodi:type="arc"
@@ -13969,11 +14041,11 @@
            sodipodi:cy="617.14966"
            sodipodi:rx="1.9003495"
            sodipodi:ry="1.9003495"
-           d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
+           d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
            transform="matrix(0.78932957,0,0,0.78932789,-285.14046,-41.271259)" />
         <path
            transform="matrix(0.78932957,0,0,0.78932789,-285.14046,-45.271259)"
-           d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
+           d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
            sodipodi:ry="1.9003495"
            sodipodi:rx="1.9003495"
            sodipodi:cy="617.14966"
@@ -13983,7 +14055,7 @@
            sodipodi:type="arc" />
         <path
            transform="matrix(0.78932957,0,0,0.78932789,-293.14046,-37.271259)"
-           d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
+           d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
            sodipodi:ry="1.9003495"
            sodipodi:rx="1.9003495"
            sodipodi:cy="617.14966"
@@ -13993,7 +14065,7 @@
            sodipodi:type="arc" />
         <path
            transform="matrix(0.78932957,0,0,0.78932789,-289.14046,-41.271259)"
-           d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
+           d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
            sodipodi:ry="1.9003495"
            sodipodi:rx="1.9003495"
            sodipodi:cy="617.14966"
@@ -15003,11 +15075,11 @@
            sodipodi:cy="617.14966"
            sodipodi:rx="1.9003495"
            sodipodi:ry="1.9003495"
-           d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
+           d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
            transform="matrix(0.78932957,0,0,0.78932789,-285.14046,-37.271259)" />
         <path
            transform="matrix(0.78932957,0,0,0.78932789,-289.14046,-37.271259)"
-           d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
+           d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
            sodipodi:ry="1.9003495"
            sodipodi:rx="1.9003495"
            sodipodi:cy="617.14966"
@@ -15017,7 +15089,7 @@
            sodipodi:type="arc" />
         <path
            transform="matrix(0.78932957,0,0,0.78932789,-285.14046,-41.271259)"
-           d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
+           d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
            sodipodi:ry="1.9003495"
            sodipodi:rx="1.9003495"
            sodipodi:cy="617.14966"
@@ -15033,7 +15105,7 @@
            sodipodi:cy="617.14966"
            sodipodi:rx="1.9003495"
            sodipodi:ry="1.9003495"
-           d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
+           d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
            transform="matrix(0.78932957,0,0,0.78932789,-285.14046,-45.271259)" />
         <path
            sodipodi:type="arc"
@@ -15043,7 +15115,7 @@
            sodipodi:cy="617.14966"
            sodipodi:rx="1.9003495"
            sodipodi:ry="1.9003495"
-           d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
+           d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
            transform="matrix(0.78932957,0,0,0.78932789,-293.14046,-37.271259)" />
         <path
            sodipodi:type="arc"
@@ -15053,7 +15125,7 @@
            sodipodi:cy="617.14966"
            sodipodi:rx="1.9003495"
            sodipodi:ry="1.9003495"
-           d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
+           d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
            transform="matrix(0.78932957,0,0,0.78932789,-289.14046,-41.271259)" />
       </g>
       <g
@@ -15834,7 +15906,7 @@
         </g>
         <path
            transform="matrix(0.897436,0,0,0.981132,1.333333,1.688679)"
-           d="M 52,33.1875 C 52,35.016943 45.452164,36.5 37.375,36.5 29.297836,36.5 22.75,35.016943 22.75,33.1875 c 0,-1.829443 6.547836,-3.3125 14.625,-3.3125 8.077164,0 14.625,1.483057 14.625,3.3125 z"
+           d="m 52,33.1875 a 14.625,3.3125 0 1 1 -29.25,0 14.625,3.3125 0 1 1 29.25,0 z"
            sodipodi:ry="3.3125"
            sodipodi:rx="14.625"
            sodipodi:cy="33.1875"
@@ -15853,7 +15925,7 @@
              sodipodi:cy="15.109375"
              sodipodi:rx="1.7421875"
              sodipodi:ry="1.578125"
-             d="m 13.999999,15.109375 c 0,0.871574 -0.780004,1.578125 -1.742187,1.578125 -0.962184,0 -1.742188,-0.706551 -1.742188,-1.578125 0,-0.871574 0.780004,-1.578125 1.742188,-1.578125 0.962183,0 1.742187,0.706551 1.742187,1.578125 z"
+             d="m 13.999999,15.109375 a 1.7421875,1.578125 0 1 1 -3.484375,0 1.7421875,1.578125 0 1 1 3.484375,0 z"
              transform="matrix(1.143498,0,0,1.268986,-1.524595,-5.176204)" />
           <path
              sodipodi:type="arc"
@@ -15863,7 +15935,7 @@
              sodipodi:cy="15.109375"
              sodipodi:rx="1.7421875"
              sodipodi:ry="1.578125"
-             d="m 13.999999,15.109375 c 0,0.871574 -0.780004,1.578125 -1.742187,1.578125 -0.962184,0 -1.742188,-0.706551 -1.742188,-1.578125 0,-0.871574 0.780004,-1.578125 1.742188,-1.578125 0.962183,0 1.742187,0.706551 1.742187,1.578125 z"
+             d="m 13.999999,15.109375 a 1.7421875,1.578125 0 1 1 -3.484375,0 1.7421875,1.578125 0 1 1 3.484375,0 z"
              transform="matrix(1.143498,0,0,1.268986,2.475405,-5.176204)" />
           <path
              sodipodi:type="arc"
@@ -15873,7 +15945,7 @@
              sodipodi:cy="15.109375"
              sodipodi:rx="1.7421875"
              sodipodi:ry="1.578125"
-             d="m 13.999999,15.109375 c 0,0.871574 -0.780004,1.578125 -1.742187,1.578125 -0.962184,0 -1.742188,-0.706551 -1.742188,-1.578125 0,-0.871574 0.780004,-1.578125 1.742188,-1.578125 0.962183,0 1.742187,0.706551 1.742187,1.578125 z"
+             d="m 13.999999,15.109375 a 1.7421875,1.578125 0 1 1 -3.484375,0 1.7421875,1.578125 0 1 1 3.484375,0 z"
              transform="matrix(1.143498,0,0,1.268986,6.475405,-5.176204)" />
           <path
              sodipodi:type="arc"
@@ -15883,7 +15955,7 @@
              sodipodi:cy="15.109375"
              sodipodi:rx="1.7421875"
              sodipodi:ry="1.578125"
-             d="m 13.999999,15.109375 c 0,0.871574 -0.780004,1.578125 -1.742187,1.578125 -0.962184,0 -1.742188,-0.706551 -1.742188,-1.578125 0,-0.871574 0.780004,-1.578125 1.742188,-1.578125 0.962183,0 1.742187,0.706551 1.742187,1.578125 z"
+             d="m 13.999999,15.109375 a 1.7421875,1.578125 0 1 1 -3.484375,0 1.7421875,1.578125 0 1 1 3.484375,0 z"
              transform="matrix(1.143498,0,0,1.268986,10.47541,-5.176204)" />
           <path
              sodipodi:type="arc"
@@ -15893,7 +15965,7 @@
              sodipodi:cy="15.109375"
              sodipodi:rx="1.7421875"
              sodipodi:ry="1.578125"
-             d="m 13.999999,15.109375 c 0,0.871574 -0.780004,1.578125 -1.742187,1.578125 -0.962184,0 -1.742188,-0.706551 -1.742188,-1.578125 0,-0.871574 0.780004,-1.578125 1.742188,-1.578125 0.962183,0 1.742187,0.706551 1.742187,1.578125 z"
+             d="m 13.999999,15.109375 a 1.7421875,1.578125 0 1 1 -3.484375,0 1.7421875,1.578125 0 1 1 3.484375,0 z"
              transform="matrix(1.143498,0,0,1.268986,14.47541,-5.176204)" />
           <path
              sodipodi:type="arc"
@@ -15903,7 +15975,7 @@
              sodipodi:cy="15.109375"
              sodipodi:rx="1.7421875"
              sodipodi:ry="1.578125"
-             d="m 13.999999,15.109375 c 0,0.871574 -0.780004,1.578125 -1.742187,1.578125 -0.962184,0 -1.742188,-0.706551 -1.742188,-1.578125 0,-0.871574 0.780004,-1.578125 1.742188,-1.578125 0.962183,0 1.742187,0.706551 1.742187,1.578125 z"
+             d="m 13.999999,15.109375 a 1.7421875,1.578125 0 1 1 -3.484375,0 1.7421875,1.578125 0 1 1 3.484375,0 z"
              transform="matrix(1.143498,0,0,1.268986,18.47541,-5.176204)" />
           <path
              sodipodi:type="arc"
@@ -15913,7 +15985,7 @@
              sodipodi:cy="15.109375"
              sodipodi:rx="1.7421875"
              sodipodi:ry="1.578125"
-             d="m 13.999999,15.109375 c 0,0.871574 -0.780004,1.578125 -1.742187,1.578125 -0.962184,0 -1.742188,-0.706551 -1.742188,-1.578125 0,-0.871574 0.780004,-1.578125 1.742188,-1.578125 0.962183,0 1.742187,0.706551 1.742187,1.578125 z"
+             d="m 13.999999,15.109375 a 1.7421875,1.578125 0 1 1 -3.484375,0 1.7421875,1.578125 0 1 1 3.484375,0 z"
              transform="matrix(1.143498,0,0,1.268986,22.47541,-5.176204)" />
         </g>
         <rect
@@ -15956,7 +16028,7 @@
              sodipodi:cy="11.257812"
              sodipodi:rx="0.59375"
              sodipodi:ry="0.6484375"
-             d="m 12.71875,11.257812 c 0,0.358122 -0.265831,0.648437 -0.59375,0.648437 -0.327919,0 -0.59375,-0.290315 -0.59375,-0.648437 0,-0.358123 0.265831,-0.648438 0.59375,-0.648438 0.327919,0 0.59375,0.290315 0.59375,0.648438 z"
+             d="m 12.71875,11.257812 a 0.59375,0.6484375 0 1 1 -1.1875,0 0.59375,0.6484375 0 1 1 1.1875,0 z"
              transform="translate(-0.21875,-0.109374)" />
         </g>
         <g
@@ -17324,7 +17396,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(2.1248378,0,0,2.1249489,542.91022,375.7404)" />
                 <path
                    sodipodi:type="arc"
@@ -17334,7 +17406,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(0.94632584,0,0,0.9447551,561.91315,434.68492)" />
                 <path
                    sodipodi:type="arc"
@@ -17344,7 +17416,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(0.94632584,0,0,0.9447551,579.5406,434.68738)" />
                 <path
                    sodipodi:type="arc"
@@ -17354,7 +17426,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(0.23898032,0,0,0.23858367,587.38287,427.69097)" />
                 <path
                    sodipodi:type="arc"
@@ -17364,7 +17436,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(0.82637292,0,0,0.82637292,564.67108,437.94501)" />
                 <path
                    sodipodi:type="arc"
@@ -17374,7 +17446,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(0.11999306,0,0,0.11940445,581.29065,457.40401)" />
                 <path
                    sodipodi:type="arc"
@@ -17384,7 +17456,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 16.111254,28.201619 c -0.36606,-4.107376 2.666876,-7.733813 6.774253,-8.099873 0.438098,-0.03904 0.878789,-0.0393 1.316933,-7.69e-4"
+                   d="M 16.111254,28.201619 A 7.4665399,7.4665399 0 0 1 24.20244,20.100977"
                    transform="matrix(1.2941317,0,0,1.2867116,562.47065,398.82439)"
                    sodipodi:start="3.0527049"
                    sodipodi:end="4.8001087"
@@ -17397,7 +17469,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(0.11999306,0,0,0.11940445,598.91964,457.40401)" />
                 <path
                    sodipodi:type="arc"
@@ -17407,7 +17479,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(0.82637292,0,0,0.82637292,582.30007,437.94503)" />
                 <path
                    sodipodi:type="arc"
@@ -17417,7 +17489,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(0.71480963,0,0,0.71361967,584.87873,441.01055)" />
                 <path
                    sodipodi:type="arc"
@@ -17427,7 +17499,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(0.71480963,0,0,0.71361967,567.36502,441.05007)" />
                 <path
                    sodipodi:type="arc"
@@ -17437,7 +17509,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 16.111254,28.201619 c -0.36606,-4.107376 2.666876,-7.733813 6.774253,-8.099873 0.438098,-0.03904 0.878789,-0.0393 1.316933,-7.69e-4"
+                   d="M 16.111254,28.201619 A 7.4665399,7.4665399 0 0 1 24.20244,20.100977"
                    transform="matrix(-1.2941317,0,0,-1.2867116,623.38495,469.66478)"
                    sodipodi:start="3.0527049"
                    sodipodi:end="4.8001087"
@@ -17450,7 +17522,7 @@
                    sodipodi:cy="12.8681"
                    sodipodi:rx="10.638533"
                    sodipodi:ry="10.638533"
-                   d="M 15.290321,23.493506 C 9.4220711,23.785292 4.4283755,19.264675 4.1365895,13.396426 3.8448034,7.528176 8.3654203,2.5344804 14.23367,2.2426943 c 0.353301,-0.017567 0.707259,-0.017502 1.060554,1.949e-4"
+                   d="m 15.290321,23.493506 a 10.638533,10.638533 0 1 1 0.0039,-21.2506168"
                    transform="matrix(1.8949769,0,0,1.9073349,558.68134,408.85292)"
                    sodipodi:start="1.5211144"
                    sodipodi:end="4.7624383"
@@ -17463,7 +17535,7 @@
                    sodipodi:cy="12.8681"
                    sodipodi:rx="10.638533"
                    sodipodi:ry="10.638533"
-                   d="M 15.290321,23.493506 C 9.4220711,23.785292 4.4283755,19.264675 4.1365895,13.396426 3.8448034,7.528176 8.3654203,2.5344804 14.23367,2.2426943 c 0.353301,-0.017567 0.707259,-0.017502 1.060554,1.949e-4"
+                   d="m 15.290321,23.493506 a 10.638533,10.638533 0 1 1 0.0039,-21.2506168"
                    transform="matrix(3.0705466,0,0,2.9854145,543.26377,395.84946)"
                    sodipodi:start="1.5211144"
                    sodipodi:end="4.7624383"
@@ -17476,7 +17548,7 @@
                    sodipodi:cy="12.8681"
                    sodipodi:rx="10.638533"
                    sodipodi:ry="10.638533"
-                   d="M 15.290321,23.493506 C 9.4220711,23.785292 4.4283755,19.264675 4.1365895,13.396426 3.8448034,7.528176 8.3654203,2.5344804 14.23367,2.2426943 c 0.353301,-0.017567 0.707259,-0.017502 1.060554,1.949e-4"
+                   d="m 15.290321,23.493506 a 10.638533,10.638533 0 1 1 0.0039,-21.2506168"
                    transform="matrix(-1.9101097,0,0,1.9073349,629.0275,409.70003)"
                    sodipodi:start="1.5211144"
                    sodipodi:end="4.7624383"
@@ -17489,7 +17561,7 @@
                    sodipodi:cy="12.8681"
                    sodipodi:rx="10.638533"
                    sodipodi:ry="10.638533"
-                   d="M 15.290321,23.493506 C 9.4220711,23.785292 4.4283755,19.264675 4.1365895,13.396426 3.8448034,7.528176 8.3654203,2.5344804 14.23367,2.2426943 c 0.353301,-0.017567 0.707259,-0.017502 1.060554,1.949e-4"
+                   d="m 15.290321,23.493506 a 10.638533,10.638533 0 1 1 0.0039,-21.2506168"
                    transform="matrix(-3.0705466,0,0,2.984295,642.55122,395.85147)"
                    sodipodi:start="1.5211144"
                    sodipodi:end="4.7624383"
@@ -17636,11 +17708,11 @@
                      sodipodi:cy="38.700001"
                      sodipodi:rx="13.75"
                      sodipodi:ry="3.8"
-                     d="m 26.5,38.700001 c 0,2.098682 -6.156085,3.8 -13.75,3.8 -7.5939153,0 -13.75,-1.701318 -13.75,-3.8 0,-2.098682 6.1560847,-3.8 13.75,-3.8 7.593915,0 13.75,1.701318 13.75,3.8 z"
+                     d="m 26.5,38.700001 a 13.75,3.8 0 1 1 -27.5,0 13.75,3.8 0 1 1 27.5,0 z"
                      transform="matrix(0.9,0,0,1,21.1,-2)" />
                   <path
                      transform="matrix(0.704562,0,0,0.704562,20.97029,15.85306)"
-                     d="m 31.160714,16.910715 c 0,8.23496 -6.675754,14.910714 -14.910714,14.910714 -8.23496,0 -14.9107141,-6.675754 -14.9107141,-14.910714 0,-8.2349599 6.6757541,-14.910714 14.9107141,-14.910714 8.23496,0 14.910714,6.6757541 14.910714,14.910714 z"
+                     d="m 31.160714,16.910715 a 14.910714,14.910714 0 1 1 -29.8214281,0 14.910714,14.910714 0 1 1 29.8214281,0 z"
                      sodipodi:ry="14.910714"
                      sodipodi:rx="14.910714"
                      sodipodi:cy="16.910715"
@@ -17650,7 +17722,7 @@
                      sodipodi:type="arc" />
                   <path
                      transform="matrix(0.521637,0,0,0.521637,23.89626,18.89987)"
-                     d="m 31.160714,16.910715 c 0,8.23496 -6.675754,14.910714 -14.910714,14.910714 -8.23496,0 -14.9107141,-6.675754 -14.9107141,-14.910714 0,-8.2349599 6.6757541,-14.910714 14.9107141,-14.910714 8.23496,0 14.910714,6.6757541 14.910714,14.910714 z"
+                     d="m 31.160714,16.910715 a 14.910714,14.910714 0 1 1 -29.8214281,0 14.910714,14.910714 0 1 1 29.8214281,0 z"
                      sodipodi:ry="14.910714"
                      sodipodi:rx="14.910714"
                      sodipodi:cy="16.910715"
@@ -17660,7 +17732,7 @@
                      sodipodi:type="arc" />
                   <path
                      transform="matrix(0.89268,0,0,0.89268,18.74719,12.22636)"
-                     d="m 16.40625,17.28125 c 0,0.673097 -0.545653,1.21875 -1.21875,1.21875 -0.673097,0 -1.21875,-0.545653 -1.21875,-1.21875 0,-0.673097 0.545653,-1.21875 1.21875,-1.21875 0.673097,0 1.21875,0.545653 1.21875,1.21875 z"
+                     d="m 16.40625,17.28125 a 1.21875,1.21875 0 1 1 -2.4375,0 1.21875,1.21875 0 1 1 2.4375,0 z"
                      sodipodi:ry="1.21875"
                      sodipodi:rx="1.21875"
                      sodipodi:cy="17.28125"
@@ -17681,7 +17753,7 @@
                      inkscape:connector-curvature="0" />
                   <path
                      transform="matrix(1.189172,0,0,1.189172,12.45482,12.63401)"
-                     d="m 17.324117,7.6932044 c 0,0.3417088 -0.27701,0.6187184 -0.618718,0.6187184 -0.341709,0 -0.618719,-0.2770096 -0.618719,-0.6187184 0,-0.3417088 0.27701,-0.6187184 0.618719,-0.6187184 0.341708,0 0.618718,0.2770096 0.618718,0.6187184 z"
+                     d="m 17.324117,7.6932044 a 0.61871845,0.61871845 0 1 1 -1.237437,0 0.61871845,0.61871845 0 1 1 1.237437,0 z"
                      sodipodi:ry="0.61871845"
                      sodipodi:rx="0.61871845"
                      sodipodi:cy="7.6932044"
@@ -17691,7 +17763,7 @@
                      sodipodi:type="arc" />
                   <path
                      transform="matrix(1.189172,0,0,1.189172,12.45482,24.40622)"
-                     d="m 17.324117,7.6932044 c 0,0.3417088 -0.27701,0.6187184 -0.618718,0.6187184 -0.341709,0 -0.618719,-0.2770096 -0.618719,-0.6187184 0,-0.3417088 0.27701,-0.6187184 0.618719,-0.6187184 0.341708,0 0.618718,0.2770096 0.618718,0.6187184 z"
+                     d="m 17.324117,7.6932044 a 0.61871845,0.61871845 0 1 1 -1.237437,0 0.61871845,0.61871845 0 1 1 1.237437,0 z"
                      sodipodi:ry="0.61871845"
                      sodipodi:rx="0.61871845"
                      sodipodi:cy="7.6932044"
@@ -17701,7 +17773,7 @@
                      sodipodi:type="arc" />
                   <path
                      transform="matrix(1.189172,0,0,1.189172,6.568712,18.52011)"
-                     d="m 17.324117,7.6932044 c 0,0.3417088 -0.27701,0.6187184 -0.618718,0.6187184 -0.341709,0 -0.618719,-0.2770096 -0.618719,-0.6187184 0,-0.3417088 0.27701,-0.6187184 0.618719,-0.6187184 0.341708,0 0.618718,0.2770096 0.618718,0.6187184 z"
+                     d="m 17.324117,7.6932044 a 0.61871845,0.61871845 0 1 1 -1.237437,0 0.61871845,0.61871845 0 1 1 1.237437,0 z"
                      sodipodi:ry="0.61871845"
                      sodipodi:rx="0.61871845"
                      sodipodi:cy="7.6932044"
@@ -17711,7 +17783,7 @@
                      sodipodi:type="arc" />
                   <path
                      transform="matrix(1.189172,0,0,1.189172,18.34092,18.52011)"
-                     d="m 17.324117,7.6932044 c 0,0.3417088 -0.27701,0.6187184 -0.618718,0.6187184 -0.341709,0 -0.618719,-0.2770096 -0.618719,-0.6187184 0,-0.3417088 0.27701,-0.6187184 0.618719,-0.6187184 0.341708,0 0.618718,0.2770096 0.618718,0.6187184 z"
+                     d="m 17.324117,7.6932044 a 0.61871845,0.61871845 0 1 1 -1.237437,0 0.61871845,0.61871845 0 1 1 1.237437,0 z"
                      sodipodi:ry="0.61871845"
                      sodipodi:rx="0.61871845"
                      sodipodi:cy="7.6932044"
@@ -17727,7 +17799,7 @@
                      sodipodi:cy="16.910715"
                      sodipodi:rx="14.910714"
                      sodipodi:ry="14.910714"
-                     d="m 31.160714,16.910715 c 0,8.23496 -6.675754,14.910714 -14.910714,14.910714 -8.23496,0 -14.9107141,-6.675754 -14.9107141,-14.910714 0,-8.2349599 6.6757541,-14.910714 14.9107141,-14.910714 8.23496,0 14.910714,6.6757541 14.910714,14.910714 z"
+                     d="m 31.160714,16.910715 a 14.910714,14.910714 0 1 1 -29.8214281,0 14.910714,14.910714 0 1 1 29.8214281,0 z"
                      transform="matrix(0.659664,0,0,0.659664,21.69988,16.61232)" />
                 </g>
               </g>
@@ -17954,7 +18026,7 @@
         <polygon
            transform="matrix(0.51392102,0,0,0.5236022,454.14135,733.5436)"
            style="fill:#cccccc;fill-opacity:0.93333333;stroke:#cccccc;stroke-width:5;stroke-linejoin:round;stroke-opacity:0.93333333"
-           points="39.389,13.769 39.389,13.769 22.235,28.606 6,28.606 6,47.699 21.989,47.699 39.389,62.75 "
+           points="39.389,13.769 22.235,28.606 6,28.606 6,47.699 21.989,47.699 39.389,62.75 39.389,13.769 "
            id="polygon1" />
       </g>
     </g>
@@ -18085,7 +18157,7 @@
              sodipodi:cy="761.5"
              sodipodi:rx="6.5"
              sodipodi:ry="6.5"
-             d="m 1019.5,761.5 c 0,3.58985 -2.9101,6.5 -6.5,6.5 -3.5899,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.9101,-6.5 6.5,-6.5 3.5899,0 6.5,2.91015 6.5,6.5 z" />
+             d="m 1019.5,761.5 a 6.5,6.5 0 1 1 -13,0 6.5,6.5 0 1 1 13,0 z" />
           <text
              xml:space="preserve"
              style="font-size:16px;fill:#ffffff"
@@ -18389,7 +18461,7 @@
              sodipodi:cy="761.5"
              sodipodi:rx="6.5"
              sodipodi:ry="6.5"
-             d="m 1019.5,761.5 c 0,3.58985 -2.9101,6.5 -6.5,6.5 -3.5899,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.9101,-6.5 6.5,-6.5 3.5899,0 6.5,2.91015 6.5,6.5 z" />
+             d="m 1019.5,761.5 a 6.5,6.5 0 1 1 -13,0 6.5,6.5 0 1 1 13,0 z" />
           <text
              sodipodi:linespacing="125%"
              xml:space="preserve"
@@ -18492,7 +18564,7 @@
          transform="translate(104.4612,370.2747)">
         <path
            transform="translate(-33.721488,-4.2100825)"
-           d="m 663.16908,138.83571 c 0,6.57703 -5.33174,11.90876 -11.90877,11.90876 -6.57702,0 -11.90876,-5.33173 -11.90876,-11.90876 0,-6.57703 5.33174,-11.90876 11.90876,-11.90876 6.57703,0 11.90877,5.33173 11.90877,11.90876 z"
+           d="m 663.16908,138.83571 a 11.90876,11.90876 0 1 1 -23.81753,0 11.90876,11.90876 0 1 1 23.81753,0 z"
            sodipodi:ry="11.90876"
            sodipodi:rx="11.90876"
            sodipodi:cy="138.83571"
@@ -18885,7 +18957,7 @@
              sodipodi:role="line">Lucy</tspan></text>
         <path
            transform="translate(6,-2)"
-           d="m 844,561 c 0,3.31371 -2.46243,6 -5.5,6 -3.03757,0 -5.5,-2.68629 -5.5,-6 0,-3.31371 2.46243,-6 5.5,-6 3.03757,0 5.5,2.68629 5.5,6 z"
+           d="m 844,561 a 5.5,6 0 1 1 -11,0 5.5,6 0 1 1 11,0 z"
            sodipodi:ry="6"
            sodipodi:rx="5.5"
            sodipodi:cy="561"
@@ -19116,7 +19188,7 @@
          inkscape:flatsided="true"
          inkscape:rounded="0"
          inkscape:randomized="0"
-         d="m 864.75,716 -4.97965,-8.625 9.9593,0 L 864.75,716 z"
+         d="m 864.75,716 -4.97965,-8.625 9.9593,0 z"
          transform="translate(11.25003,3.4999665)" />
       <g
          style="display:inline"
@@ -19227,7 +19299,7 @@
              sodipodi:cy="761.5"
              sodipodi:rx="6.5"
              sodipodi:ry="6.5"
-             d="m 1019.5,761.5 c 0,3.58985 -2.9101,6.5 -6.5,6.5 -3.5899,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.9101,-6.5 6.5,-6.5 3.5899,0 6.5,2.91015 6.5,6.5 z" />
+             d="m 1019.5,761.5 a 6.5,6.5 0 1 1 -13,0 6.5,6.5 0 1 1 13,0 z" />
           <text
              xml:space="preserve"
              style="font-size:16px;fill:#ffffff"
@@ -34794,7 +34866,7 @@
            sodipodi:cy="457.36218"
            sodipodi:rx="15"
            sodipodi:ry="15"
-           d="m 354.11,447.04676 c 5.69705,-6.01438 15.19104,-6.27163 21.20542,-0.57458 0.23644,0.22396 0.46551,0.45556 0.68687,0.69444"
+           d="m 354.11,447.04676 a 15,15 0 0 1 21.89229,0.11986"
            sodipodi:start="3.8999016"
            sodipodi:end="5.5358258"
            transform="matrix(0.78855176,0,0,0.78855176,566.56366,-337.67406)"
@@ -34807,7 +34879,7 @@
            sodipodi:cy="441.36218"
            sodipodi:rx="7"
            sodipodi:ry="7"
-           d="m 362.76048,436.72027 c 2.56365,-2.89371 6.98773,-3.16127 9.88144,-0.59761 0.3042,0.2695 0.58435,0.56499 0.83728,0.88311"
+           d="m 362.76048,436.72027 a 7,7 0 0 1 10.71872,0.2855"
            transform="matrix(0.78855176,0,0,0.78855176,564.38322,-325.42766)"
            sodipodi:start="3.8665864"
            sodipodi:end="5.6114507"
@@ -34820,7 +34892,7 @@
            sodipodi:cy="437.86218"
            sodipodi:rx="0.5"
            sodipodi:ry="0.5"
-           d="m 371,437.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+           d="m 371,437.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
            transform="matrix(0.78855176,0,0,0.78855176,562.26452,-321.50875)" />
         <path
            sodipodi:type="arc"
@@ -34830,7 +34902,7 @@
            sodipodi:cy="438.39029"
            sodipodi:rx="23.644417"
            sodipodi:ry="23.644417"
-           d="m 354.31096,421.82857 c 9.14679,-9.31984 24.11695,-9.46013 33.43679,-0.31335 0.12213,0.11986 0.24295,0.24104 0.36245,0.36352"
+           d="m 354.31096,421.82857 a 23.644417,23.644417 0 0 1 33.79924,0.0502"
            transform="matrix(0.78855176,0,0,0.78855176,561.81831,-322.5204)"
            sodipodi:start="3.9176195"
            sodipodi:end="5.5101271"
@@ -34841,7 +34913,7 @@
          id="g11297">
         <polygon
            id="polygon11299"
-           points="6,28.606 6,47.699 21.989,47.699 39.389,62.75 39.389,13.769 39.389,13.769 22.235,28.606 "
+           points="6,47.699 21.989,47.699 39.389,62.75 39.389,13.769 39.389,13.769 22.235,28.606 6,28.606 "
            style="fill:#ffffff;fill-opacity:1;stroke:#cccccc;stroke-width:1.65897107;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.93333333;stroke-dasharray:none;display:inline"
            transform="matrix(0.29661886,0,0,0.3062412,786.19642,1.921749)" />
         <path
@@ -35342,7 +35414,7 @@
     <g
        inkscape:groupmode="layer"
        id="layer21"
-       inkscape:label="AppMenu"
+       inkscape:label="AppMenu FIXME"
        style="display:none">
       <path
          style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-opacity:0.25098039;display:inline"
@@ -35523,6 +35595,144 @@
     </g>
     <g
        inkscape:groupmode="layer"
+       id="layer48"
+       inkscape:label="Calendar FIXME"
+       style="display:inline">
+      <path
+         sodipodi:open="true"
+         transform="matrix(0.91071429,0,0,0.7458835,466.28462,6.638651)"
+         sodipodi:end="6.2831853"
+         sodipodi:start="3.1415927"
+         d="M 9,29.999999 A 42,16 0 0 1 93,30"
+         sodipodi:ry="16"
+         sodipodi:rx="42"
+         sodipodi:cy="30"
+         sodipodi:cx="51"
+         id="path34506-1-89"
+         style="opacity:0.4625;color:#000000;fill:url(#radialGradient23916);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="sccssssssssccs"
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         id="rect41123-0-8-0"
+         d="m 516.44602,32.578116 c 0.48664,0 0.9657,0.163231 1.3386,0.479744 l 15.46821,13.129855 318.19011,0 c 4.78128,0 7.61512,3.320411 7.61512,7.588926 l 0,308.759429 c 0,4.76853 -2.83384,8.46393 -7.61512,8.46393 l -379.76976,0 c -4.78127,0 -7.61512,-4.1954 -7.61512,-8.46393 l 0,-308.759429 c 0,-4.37651 2.60085,-7.588926 7.61512,-7.588926 l 27.96603,0 15.46821,-13.129855 c 0.3729,-0.316513 0.85196,-0.479744 1.3386,-0.479744 z"
+         style="fill:#000000;fill-opacity:1;stroke:#a5a5a5;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path34366-5-3-6"
+         d="m 469.44595,29.053908 86.38438,0"
+         style="opacity:0.5;color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text23993"
+         y="21.542971"
+         x="512.23926"
+         style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Cantarell;-inkscape-font-specification:Cantarell Medium"
+         xml:space="preserve"
+         inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/rect2996.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90"><tspan
+           style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Cantarell;-inkscape-font-specification:Cantarell Medium"
+           y="21.542971"
+           x="512.23926"
+           id="tspan23995"
+           sodipodi:role="line">Wed <tspan
+   id="tspan23997"
+   style="font-weight:bold;fill:#000000;fill-opacity:1">3:34 <tspan
+   dy="-4"
+   dx="-4"
+   id="tspan23999"
+   style="font-size:8px;fill:#000000;fill-opacity:1">PM</tspan></tspan></tspan></text>
+      <text
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/rect2996.png"
+         xml:space="preserve"
+         style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Cantarell;-inkscape-font-specification:Cantarell Medium"
+         x="512.23926"
+         y="20.542971"
+         id="text3003-6"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3005-8"
+           x="512.23926"
+           y="20.542971"
+           style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;font-family:Cantarell;-inkscape-font-specification:Cantarell Medium">Wed <tspan
+   style="font-weight:bold"
+   id="tspan16456-7">3:34 <tspan
+   style="font-size:8px"
+   id="tspan16458-8"
+   dx="-4"
+   dy="-4">PM</tspan></tspan></tspan></text>
+      <text
+         id="text42177-6-7-6-5-3-8-1"
+         y="81.157898"
+         x="484.9509"
+         style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+         xml:space="preserve"
+         sodipodi:linespacing="125%"><tspan
+           y="81.157898"
+           x="484.9509"
+           id="tspan42179-3-1-2-7-0-1-3"
+           sodipodi:role="line">August 11th 2010</tspan></text>
+      <path
+         transform="matrix(1.3086791,0,0,0.5,494.20668,-117.48247)"
+         mask="url(#mask12112-0-6-5-3-8-3-4-3-4-9)"
+         id="path12157-8-0-7-7-1-4-6-1-0-6-7"
+         d="m 21,442 212,0"
+         style="fill:none;stroke:#ffffff;stroke-width:1.23622751;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50196078;stroke-dasharray:none;display:inline"
+         inkscape:connector-curvature="0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text42177-6-7-6-5-3-8-7-6-2"
+         y="351.03448"
+         x="487.04922"
+         style="font-size:14px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Cantarell;-inkscape-font-specification:Cantarell Medium"
+         xml:space="preserve"><tspan
+           y="351.03448"
+           x="487.04922"
+           id="tspan42179-3-1-2-7-0-1-8-4-7"
+           sodipodi:role="line">Date and Time Settings</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:14px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Cantarell;-inkscape-font-specification:Cantarell Medium"
+         x="487.04922"
+         y="321.03448"
+         id="text24049"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan24051"
+           x="487.04922"
+           y="321.03448">Locations</tspan></text>
+      <path
+         sodipodi:type="star"
+         style="fill:#5f5f5f;fill-opacity:1;stroke:#5f5f5f;stroke-width:0.59699649;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="path6578-6-8-7-4-3-9"
+         sodipodi:sides="3"
+         sodipodi:cx="84.5"
+         sodipodi:cy="337.5"
+         sodipodi:r1="5"
+         sodipodi:r2="2.5"
+         sodipodi:arg1="0.52359878"
+         sodipodi:arg2="1.5707963"
+         inkscape:flatsided="true"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="M 88.830127,340 80.169873,340 84.5,332.5 z"
+         transform="matrix(0,0.98149546,-0.71467429,0,1076.3092,233.06363)" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#ffffff;stroke-width:1.23622751;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50196078;stroke-dasharray:none;display:inline"
+         d="m 21,442 212,0"
+         id="path24071"
+         mask="url(#mask12112-0-6-5-3-8-3-4-3-4-9)"
+         transform="matrix(1.3086791,0,0,0.5,494.20668,73.51753)" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
        id="layer25"
        inkscape:label="InputLanguage"
        style="display:none">
@@ -37375,7 +37585,7 @@
          style="opacity:0.5;color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     </g>
     <g
-       style="display:inline"
+       style="display:none"
        inkscape:label="Network"
        id="layer28"
        inkscape:groupmode="layer">