diff --git a/app/app.iml b/app/app.iml
index 1c81077..947c09c 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -57,6 +57,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/tests/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/tests/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/tests/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/art" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
diff --git a/app/build.gradle b/app/build.gradle
index 9fdd221..0fa412f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,6 +30,20 @@ task createVersionXML {
 }
 preBuild.dependsOn createVersionXML
 
+//
+//	Convert SVG images from art directory into PNG files.
+//
+task generateDrawablesFromArt {
+	doLast {
+        def p = 'make -C app/src/main/art RES=../res TMP=../../../build/art'.execute()
+		p.consumeProcessOutput()
+		p.waitFor()
+		if ( p.exitValue() )
+			throw new GradleException("Generation of art failed.")
+	}
+}
+preBuild.dependsOn generateDrawablesFromArt
+
 android {
     compileSdkVersion 10
     buildToolsVersion "21.1.1"
diff --git a/app/src/main/art/Makefile b/app/src/main/art/Makefile
new file mode 100644
index 0000000..cb3e2ef
--- /dev/null
+++ b/app/src/main/art/Makefile
@@ -0,0 +1,100 @@
+XMLS = xmlstarlet ed -P -N svg=http://www.w3.org/2000/svg
+LAYER_ON = -u //*/svg:g[@inkscape:label=\"$(1)\"]/@style -v display:inline
+LAYER_OFF = -u //*/svg:g[@inkscape:label=\"$(1)\"]/@style -v display:none
+S2P = inkscape --without-gui
+SIZE = --export-width=$(1) --export-height=$(2)
+#S2P = imagemagick -background none
+#SIZE = -resize $(1)x$(2)
+
+TMP = tmp
+RES = res
+
+DIR = $(TMP) $(RES) $(RES)/drawable $(RES)/drawable-ldpi \
+    	$(RES)/drawable-mdpi $(RES)/drawable-hdpi $(RES)/drawable-xhdpi
+
+png = bingo.png  box.png  floor.png  goal.png   splash.png  \
+	    wall.png  worker.png  worker_select.png
+
+pngx = icon.png  icon_debug.png  next.png  prev.png  reset.png  undo.png \
+	   lock.png unlock.png unlocking.png
+
+all:  $(DIR)\
+	$(addprefix $(RES)/drawable/,$(png)) \
+	$(addprefix $(RES)/drawable-ldpi/,$(pngx)) \
+	$(addprefix $(RES)/drawable-mdpi/,$(pngx)) \
+	$(addprefix $(RES)/drawable-hdpi/,$(pngx)) \
+	$(addprefix $(RES)/drawable-xhdpi/,$(pngx))
+
+$(DIR) :
+	mkdir $@
+
+$(RES)/drawable/%.png : $(TMP)/%.svg
+	$(S2P) --export-png=$@ --file=$<
+
+$(RES)/drawable-ldpi/%.png : $(TMP)/%.svg
+	$(S2P) $(call SIZE,36,36) --export-png=$@ --file=$< 
+
+$(RES)/drawable-mdpi/%.png : $(TMP)/%.svg
+	$(S2P) $(call SIZE,48,48) --export-png=$@ --file=$<
+
+$(RES)/drawable-hdpi/%.png : $(TMP)/%.svg
+	$(S2P) $(call SIZE,72,72) --export-png=$@ --file=$<
+
+$(RES)/drawable-xhdpi/%.png : $(TMP)/%.svg
+	$(S2P) $(call SIZE,96,96) --export-png=$@ --file=$<
+
+$(TMP)/%.svg : %.svg
+	cp $< $@
+
+$(TMP)/icon.svg : icon.svg
+	$(XMLS) $(call LAYER_OFF,"Debug") $< > $@
+
+$(TMP)/icon_debug.svg : icon.svg
+	$(XMLS) $(call LAYER_ON,"Debug") $< > $@
+
+$(TMP)/worker.svg : worker.svg
+	$(XMLS) $(call LAYER_OFF,"Hands") $< > $@
+
+$(TMP)/worker_select.svg : worker.svg
+	$(XMLS) $(call LAYER_ON,"Hands") $< > $@
+
+$(TMP)/floor.svg : floor.svg
+	$(XMLS) $(call LAYER_OFF,"Goal") $< > $@
+
+$(TMP)/goal.svg : floor.svg
+	$(XMLS) $(call LAYER_ON,"Goal") $< > $@
+
+$(TMP)/lock.svg : lock.svg
+	$(XMLS) $(call LAYER_ON,"lock") $< > $@
+
+$(TMP)/unlock.svg : lock.svg
+	$(XMLS) $(call LAYER_ON,"unlock") $< > $@
+
+$(TMP)/unlocking.svg : lock.svg
+	$(XMLS) $(call LAYER_ON,"unlocking") $< > $@
+
+$(TMP)/prev.svg : buttons.svg
+	$(XMLS) $(call LAYER_ON,"Prev Smooth") $< > $@
+
+$(TMP)/next.svg : buttons.svg
+	$(XMLS) $(call LAYER_ON,"Next Smooth") $< > $@
+
+$(TMP)/reset.svg : buttons.svg
+	$(XMLS) $(call LAYER_ON,"Reset Smooth") $< > $@
+
+$(TMP)/undo.svg : buttons.svg
+	$(XMLS) $(call LAYER_ON,"Undo Smooth") $< > $@
+
+
+
+#		def cfg = 'imagemagick -background none -resize '+w+'x'+h+' - ' + png
+#		def sizes = [ 'ldpi':[36,36],
+#					  'mdpi':[48,48],
+#					  'hdpi':[72,72],
+#					 'xhdpi':[96,96] ]
+
+#		def sizes2= [ 'ldpi':[22,36],
+#					  'mdpi':[29,48],
+#					  'hdpi':[43,72],
+#					 'xhdpi':[58,96] ]
+		
diff --git a/app/src/main/art/bingo.svg b/app/src/main/art/bingo.svg
index c9719a3..ad79ad4 100644
--- a/app/src/main/art/bingo.svg
+++ b/app/src/main/art/bingo.svg
@@ -9,11 +9,11 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
+   width="500"
+   height="500"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="bingo.svg"
    inkscape:export-filename="C:\Users\vahagnk\devel\_private\org.dyndns.vahagn.sokoban\art\bingo.png"
    inkscape:export-xdpi="89.873062"
@@ -27,21 +27,25 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4283557"
-     inkscape:cx="534.28726"
-     inkscape:cy="478.14229"
+     inkscape:zoom="0.71417785"
+     inkscape:cx="153.09914"
+     inkscape:cy="72.742182"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:snap-global="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1018"
-     inkscape:window-x="-8"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1672"
      inkscape:window-y="-8"
      inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
-       id="grid3079" />
+       id="grid3079"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -51,115 +55,116 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(0,-552.36217)">
     <rect
-       style="opacity:0.94999999999999996;fill:#008000"
+       style="opacity:0.95;fill:#008000"
        id="rect2985"
        width="500"
        height="500"
-       x="155.03543"
-       y="312.52313" />
+       x="-0.22199483"
+       y="552.52313" />
     <rect
        style="opacity:0.95;fill:#d3bc5f"
        id="rect2987"
        width="36.633663"
        height="29.702971"
-       x="172.27722"
-       y="315.72852" />
+       x="17.019796"
+       y="555.72852" />
     <rect
-       style="opacity:0.94999999999999996;fill:#005800"
+       style="opacity:0.95;fill:#005800"
        id="rect2989"
        width="500"
        height="60"
-       x="154.8604"
-       y="312.4631" />
+       x="-0.39702842"
+       y="552.46313" />
     <rect
-       style="opacity:0.94999999999999996;fill:#74e400"
+       style="opacity:0.95;fill:#74e400"
        id="rect2989-1"
        width="500"
        height="60"
-       x="154.83038"
-       y="374.60233" />
+       x="-0.42704245"
+       y="614.60229" />
     <rect
-       style="opacity:0.94999999999999996;fill:#00b800"
+       style="opacity:0.95;fill:#00b800"
        id="rect2989-7"
        width="500"
        height="60"
-       x="154.83038"
-       y="437.21365" />
+       x="-0.42704245"
+       y="677.21362" />
     <rect
-       style="opacity:0.94999999999999996;fill:#8cec00"
+       style="opacity:0.95;fill:#8cec00"
        id="rect2989-4"
        width="500"
        height="60"
-       x="154.89044"
-       y="501.00992" />
+       x="-0.36698386"
+       y="741.00989" />
     <rect
-       style="opacity:0.94999999999999996;fill:#0cc800"
+       style="opacity:0.95;fill:#0cc800"
        id="rect2989-0"
        width="500"
        height="60"
-       x="154.7352"
-       y="563.52155" />
+       x="-0.52222675"
+       y="803.52155" />
     <rect
-       style="opacity:0.94999999999999996;fill:#00b800"
+       style="opacity:0.95;fill:#00b800"
        id="rect2989-9"
        width="500"
        height="60"
-       x="154.90704"
-       y="626.67078" />
+       x="-0.3503823"
+       y="866.67078" />
     <rect
-       style="opacity:0.94999999999999996;fill:#b8f800"
+       style="opacity:0.95;fill:#b8f800"
        id="rect2989-48"
        width="500"
        height="60"
-       x="155.0099"
-       y="690.15588" />
+       x="-0.24752279"
+       y="930.15588" />
     <rect
-       style="opacity:0.94999999999999996;fill:#085a02;fill-opacity:0.99607843"
+       style="opacity:0.95;fill:#085a02;fill-opacity:0.99607843"
        id="rect2989-8"
        width="500"
        height="60"
-       x="154.81058"
-       y="752.48291" />
+       x="-0.44684836"
+       y="992.48291" />
     <rect
-       style="opacity:0.94999999999999996;fill:#006000"
+       style="opacity:0.95;fill:#006000"
        id="rect2989-2"
        width="624.62427"
        height="75.683846"
-       x="-354.92532"
-       y="650.10168"
+       x="-628.29071"
+       y="712.52856"
        transform="matrix(0.71278139,-0.70138626,0.63422998,0.77314444,0,0)" />
     <rect
-       style="opacity:0.94999999999999996;fill:#007400"
+       style="opacity:0.95;fill:#007400"
        id="rect2989-45"
        width="622.96442"
        height="75.746498"
-       x="363.81247"
-       y="83.598946"
+       x="391.40414"
+       y="365.3205"
        transform="matrix(0.7165534,0.69753224,-0.62128484,0.7835848,0,0)" />
     <rect
-       style="opacity:0.94999999999999996;fill:#078300;fill-opacity:1"
+       style="opacity:0.95;fill:#078300;fill-opacity:1"
        id="rect2989-5"
        width="499.99573"
        height="59.964287"
-       x="-812.56342"
-       y="594.79266"
+       x="-1052.5729"
+       y="439.54987"
        transform="matrix(7.1424932e-5,-1,1,7.1508806e-5,0,0)" />
     <rect
-       style="opacity:0.94999999999999996;fill:#008400"
+       style="opacity:0.95;fill:#008400"
        id="rect2989-17"
        width="499.84061"
        height="58.686657"
-       x="-811.9231"
-       y="157.13138"
+       x="-1052.3495"
+       y="2.5042763"
        transform="matrix(0.00262797,-0.99999655,0.99999623,0.00274515,0,0)" />
   </g>
 </svg>
diff --git a/app/src/main/art/box.svg b/app/src/main/art/box.svg
index 66aa659..f707e02 100644
--- a/app/src/main/art/box.svg
+++ b/app/src/main/art/box.svg
@@ -9,11 +9,11 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
+   width="500"
+   height="500"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="box.svg"
    inkscape:export-filename="C:\Users\vahagnk\devel\_private\org.dyndns.vahagn.sokoban\art\box.png"
    inkscape:export-xdpi="89.873062"
@@ -27,21 +27,25 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4283557"
-     inkscape:cx="313.36866"
-     inkscape:cy="490.25008"
+     inkscape:zoom="1.1301775"
+     inkscape:cx="56.319409"
+     inkscape:cy="241.66791"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:snap-global="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1018"
-     inkscape:window-x="-8"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1672"
      inkscape:window-y="-8"
      inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
-       id="grid3079" />
+       id="grid3079"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -58,108 +62,109 @@
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(0,-552.36217)">
     <rect
-       style="opacity:0.94999999999999996;fill:#a0892c"
+       style="opacity:0.95;fill:#a0892c"
        id="rect2985"
        width="500"
        height="500"
-       x="155.03543"
-       y="312.52313" />
+       x="-0.12822925"
+       y="552.77655" />
     <rect
        style="opacity:0.95;fill:#d3bc5f"
        id="rect2987"
        width="36.633663"
        height="29.702971"
-       x="172.27722"
-       y="315.72852" />
+       x="17.113562"
+       y="555.98193" />
     <rect
        style="opacity:0.95;fill:#aa8800"
        id="rect2989"
        width="500"
        height="60"
-       x="154.8604"
-       y="312.4631" />
+       x="-0.3032628"
+       y="552.71649" />
     <rect
        style="opacity:0.95;fill:#ffcc00"
        id="rect2989-1"
        width="500"
        height="60"
-       x="154.83038"
-       y="374.60233" />
+       x="-0.33327684"
+       y="614.85571" />
     <rect
-       style="opacity:0.94999999999999996;fill:#ffdd55"
+       style="opacity:0.95;fill:#ffdd55"
        id="rect2989-7"
        width="500"
        height="60"
-       x="154.83038"
-       y="437.21365" />
+       x="-0.33327684"
+       y="677.46704" />
     <rect
-       style="opacity:0.94999999999999996;fill:#d3bc5f;stroke:none"
+       style="opacity:0.95;fill:#d3bc5f;stroke:none"
        id="rect2989-4"
        width="500"
        height="60"
-       x="154.89044"
-       y="501.00992" />
+       x="-0.27321824"
+       y="741.26331" />
     <rect
-       style="opacity:0.94999999999999996;fill:#ffd42a"
+       style="opacity:0.95;fill:#ffd42a"
        id="rect2989-0"
        width="500"
        height="60"
-       x="154.7352"
-       y="563.52155" />
+       x="-0.42846116"
+       y="803.77496" />
     <rect
-       style="opacity:0.94999999999999996;fill:#d3bc5f"
+       style="opacity:0.95;fill:#d3bc5f"
        id="rect2989-9"
        width="500"
        height="60"
-       x="154.90704"
-       y="626.67078" />
+       x="-0.25661668"
+       y="866.92419" />
     <rect
        style="opacity:0.95;fill:#ffd42a"
        id="rect2989-48"
        width="500"
        height="60"
-       x="155.0099"
-       y="690.15588" />
+       x="-0.1537572"
+       y="930.4093" />
     <rect
        style="opacity:0.95;fill:#aa8800"
        id="rect2989-8"
        width="500"
        height="60"
-       x="154.81058"
-       y="752.48291" />
+       x="-0.35308275"
+       y="992.73633" />
     <rect
-       style="opacity:0.94999999999999996;fill:#a0892c"
+       style="opacity:0.95;fill:#a0892c"
        id="rect2989-2"
        width="624.62427"
        height="75.683846"
-       x="-354.92532"
-       y="650.10168"
+       x="-628.38"
+       y="712.7757"
        transform="matrix(0.71278139,-0.70138626,0.63422998,0.77314444,0,0)" />
     <rect
        style="opacity:0.95;fill:#aa8800"
        id="rect2989-45"
        width="622.96442"
        height="75.746498"
-       x="363.81247"
-       y="83.598946"
+       x="391.63779"
+       y="365.43744"
        transform="matrix(0.7165534,0.69753224,-0.62128484,0.7835848,0,0)" />
     <rect
        style="opacity:0.95;fill:#d4aa00"
        id="rect2989-5"
        width="499.99573"
        height="59.964287"
-       x="-812.56342"
-       y="594.79266"
+       x="-1052.8279"
+       y="439.64618"
        transform="matrix(7.1424932e-5,-1,1,7.1508806e-5,0,0)" />
     <rect
        style="opacity:0.95;fill:#d4aa00"
        id="rect2989-17"
        width="499.84061"
        height="58.686657"
-       x="-811.9231"
-       y="157.13138"
+       x="-1052.6016"
+       y="2.5996311"
        transform="matrix(0.00262797,-0.99999655,0.99999623,0.00274515,0,0)" />
   </g>
 </svg>
diff --git a/app/src/main/art/buttons.svg b/app/src/main/art/buttons.svg
index 5fea6d0..268ae20 100644
--- a/app/src/main/art/buttons.svg
+++ b/app/src/main/art/buttons.svg
@@ -27,15 +27,15 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.29"
-     inkscape:cx="217.24802"
+     inkscape:cx="128.10073"
      inkscape:cy="230.02585"
      inkscape:document-units="px"
-     inkscape:current-layer="layer4"
+     inkscape:current-layer="g4047"
      showgrid="true"
      inkscape:snap-global="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1018"
-     inkscape:window-x="-8"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1672"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
      showguides="true"
@@ -322,7 +322,7 @@
      sodipodi:insensitive="true"
      inkscape:groupmode="layer"
      id="g4047"
-     inkscape:label="Undo Smoth"
+     inkscape:label="Undo Smooth"
      transform="translate(0,-552.36217)"
      style="display:none">
     <path
diff --git a/app/src/main/art/floor.svg b/app/src/main/art/floor.svg
index df0f639..2b09d00 100644
--- a/app/src/main/art/floor.svg
+++ b/app/src/main/art/floor.svg
@@ -14,7 +14,7 @@
    height="500"
    id="svg3081"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="floor.svg"
    inkscape:export-filename="C:\Users\vahagnk\devel\_private\org.dyndns.vahagn.sokoban\res\drawable\goal.png"
    inkscape:export-xdpi="90"
@@ -22,10 +22,9 @@
   <defs
      id="defs3083">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4035">
       <stop
-         style="stop-color:#44aa00;stop-opacity:1;"
+         style="stop-color:#44aa00;stop-opacity:0.45535713;"
          offset="0"
          id="stop4037" />
       <stop
@@ -111,8 +110,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.3"
-     inkscape:cx="210.43303"
+     inkscape:zoom="0.83972969"
+     inkscape:cx="-95.341037"
      inkscape:cy="280.19905"
      inkscape:document-units="px"
      inkscape:current-layer="layer5"
@@ -122,7 +121,10 @@
      inkscape:window-height="1018"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
-     inkscape:window-maximized="1">
+     inkscape:window-maximized="1"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     showborder="true">
     <inkscape:grid
        type="xygrid"
        id="grid3093"
@@ -139,7 +141,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -253,9 +255,9 @@
      inkscape:groupmode="layer"
      id="layer5"
      inkscape:label="Goal"
-     style="opacity:0.33628319;display:inline">
+     style="opacity:1;display:inline">
     <rect
-       style="fill:url(#radialGradient4041);fill-opacity:1;stroke:none"
+       style="fill:url(#radialGradient4041);fill-opacity:1;stroke:none;opacity:0.59292035"
        id="rect3827"
        width="676.15387"
        height="617.69232"
@@ -266,7 +268,7 @@
        inkscape:export-ydpi="90" />
     <path
        sodipodi:type="arc"
-       style="fill:#008000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       style="fill:#008000;fill-opacity:0.28042328000000000;fill-rule:nonzero;stroke:none;opacity:0.6460177"
        id="path4025"
        sodipodi:cx="241.15384"
        sodipodi:cy="251.92308"
diff --git a/app/src/main/art/lock.svg b/app/src/main/art/lock.svg
index 18ccc5d..dacabe4 100644
--- a/app/src/main/art/lock.svg
+++ b/app/src/main/art/lock.svg
@@ -173,7 +173,7 @@
      id="namedview2987"
      showgrid="false"
      inkscape:zoom="0.69044441"
-     inkscape:cx="-581.59004"
+     inkscape:cx="-748.14943"
      inkscape:cy="232.66929"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
@@ -282,7 +282,7 @@
   </g>
   <g
      style="display:none"
-     inkscape:label="locking"
+     inkscape:label="unlocking"
      id="g3013"
      inkscape:groupmode="layer"
      sodipodi:insensitive="true">
diff --git a/app/src/main/art/splash.svg b/app/src/main/art/splash.svg
index 8702ba2..532940a 100644
--- a/app/src/main/art/splash.svg
+++ b/app/src/main/art/splash.svg
@@ -12,15 +12,15 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="500"
-   height="500"
+   height="800"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="icon.svg"
-   enable-background="new"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="splash.svg"
    inkscape:export-filename="C:\Users\vahagnk\devel\_private\org.dyndns.vahagn.sokoban\art\icon3_36.png"
    inkscape:export-xdpi="6.48"
-   inkscape:export-ydpi="6.48">
+   inkscape:export-ydpi="6.48"
+   style="enable-background:new">
   <defs
      id="defs4">
     <linearGradient
@@ -153,7 +153,7 @@
        x2="356.59912"
        y2="109.88838"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.437626,0,0,1.2124367,-213.79316,-77.945365)" />
+       gradientTransform="matrix(1.437626,0,0,1.2124367,-213.79316,-215.94536)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3820"
@@ -163,7 +163,7 @@
        x2="239.30128"
        y2="169.15221"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.161917,0,0,1.2124367,-24.542962,-80.37753)" />
+       gradientTransform="matrix(1.161917,0,0,1.2124367,-24.542962,-218.37753)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3873"
@@ -173,7 +173,7 @@
        x2="159.09091"
        y2="979.63489"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.161917,0,0,1.2124367,-24.087456,-178.707)" />
+       gradientTransform="matrix(1.161917,0,0,1.2124367,-24.087456,-316.707)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3889"
@@ -183,7 +183,7 @@
        x2="330.11365"
        y2="814.86218"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.161917,0,0,1.2124367,-24.087456,-178.707)" />
+       gradientTransform="matrix(1.161917,0,0,1.2124367,-24.087456,-316.707)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3907"
@@ -193,7 +193,7 @@
        x2="206.80421"
        y2="230.84761"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.161917,0,0,1.2124367,-24.087456,-61.365035)" />
+       gradientTransform="matrix(1.161917,0,0,1.2124367,-24.087456,-199.36504)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -203,19 +203,19 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.17"
-     inkscape:cx="181.6373"
-     inkscape:cy="169.00407"
+     inkscape:cx="210.243"
+     inkscape:cy="455.05609"
      inkscape:document-units="px"
-     inkscape:current-layer="layer7"
+     inkscape:current-layer="layer6"
      showgrid="false"
      inkscape:snap-smooth-nodes="false"
      inkscape:object-paths="true"
      inkscape:snap-global="false"
      inkscape:object-nodes="false"
      inkscape:snap-intersection-paths="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1018"
-     inkscape:window-x="-8"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1672"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
      inkscape:snap-nodes="true"
@@ -237,17 +237,18 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
      inkscape:groupmode="layer"
      id="layer7"
-     inkscape:label="BigBox"
-     style="opacity:0.2964602;display:none">
+     inkscape:label="big_box"
+     style="opacity:0.2964602;display:none"
+     transform="translate(0,300)">
     <rect
-       y="2.2209995"
+       y="-145.77899"
        x="4.2691622"
        height="499.0787"
        width="496.88708"
@@ -255,7 +256,7 @@
        style="fill:#ffd42a;fill-opacity:1;stroke:none;display:inline" />
     <path
        style="fill:#ffb82a;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642198px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-       d="m 2.5088277,2.2210102 83.5230193,0 -1.726158,497.1399998 -81.5044619,0 z"
+       d="m 2.5088277,-145.77899 83.5230193,0 -1.726158,497.14 -81.5044619,0 z"
        id="path4184-5"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
@@ -263,11 +264,11 @@
        sodipodi:nodetypes="ccccc"
        inkscape:connector-curvature="0"
        id="path4186-8"
-       d="m 417.63317,2.2210102 83.52302,0 -0.0777,497.1399998 -82.62207,0 z"
+       d="m 417.63317,-145.77899 83.52302,0 -0.0777,497.14 -82.62207,0 z"
        style="fill:#ffb82a;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642198px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;display:inline" />
     <path
        style="fill:#ffc52a;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642198;stroke-linejoin:round;stroke-opacity:1;display:inline"
-       d="m 2.8012271,3.2936415 498.2771329,0 0,81.2589055 -498.2771329,0 z"
+       d="m 2.8012271,-144.70636 498.2771329,0 0,81.258907 -498.2771329,0 z"
        id="rect4190-8"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
@@ -275,7 +276,7 @@
        sodipodi:nodetypes="ccccc"
        inkscape:connector-curvature="0"
        id="path4193-1"
-       d="m 2.8012271,418.10211 498.2771329,0 0,81.2589 -498.2771329,0 z"
+       d="m 2.8012271,270.10211 498.2771329,0 0,81.2589 -498.2771329,0 z"
        style="fill:#ffc52a;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642198;stroke-linejoin:round;stroke-opacity:1;display:inline" />
     <rect
        style="fill:#ffdd55;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642198;stroke-linejoin:round;stroke-opacity:1;display:inline"
@@ -283,56 +284,74 @@
        width="82.565849"
        height="333.54956"
        x="168.31187"
-       y="84.552574" />
+       y="-63.447426" />
     <rect
        style="fill:#ffcc00;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642198;stroke-linejoin:round;stroke-opacity:1;display:inline"
        id="rect4195-1"
        width="82.565849"
        height="333.54956"
        x="85.745911"
-       y="84.552666" />
+       y="-63.447334" />
     <rect
        style="fill:#ffcc00;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642198;stroke-linejoin:round;stroke-opacity:1;display:inline"
        id="rect4195-9-4"
        width="82.565849"
        height="333.54956"
        x="335.20364"
-       y="84.552574" />
+       y="-63.447426" />
     <path
        style="fill:#ffba08;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642198;stroke-opacity:1;display:inline"
-       d="m 21.923338,84.586749 352.411182,333.541901 114.19532,0 L 136.11865,84.586749 z"
+       d="m 21.923338,-63.413251 352.411182,333.541901 114.19532,0 -352.41119,-333.541901 z"
        id="rect4222-6-9"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
        style="fill:#fab826;fill-opacity:1;stroke:#ffaf00;stroke-width:3.07642198;stroke-opacity:1;display:inline"
-       d="M 368.49499,84.586749 21.737955,418.12865 l 113.175725,0 346.75703,-333.541901 z"
+       d="M 368.49499,-63.413251 21.737955,270.12865 l 113.175725,0 346.75703,-333.541901 z"
        id="rect4222-8"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
        style="fill:none;stroke:none;display:inline"
-       d="M 369.20984,2.296704 416.70485,89.400231 333.23091,88.837671 317.31962,2.3628486 z"
+       d="m 369.20984,-145.7033 47.49501,87.103531 -83.47394,-0.56256 -15.91129,-86.474821 z"
        id="path5801-2-9"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
   </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="title">
+    <text
+       xml:space="preserve"
+       style="font-size:74.00489044px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff9600;fill-opacity:1;stroke:none;font-family:Sans"
+       x="0.66347247"
+       y="120.67854"
+       id="text3062"
+       sodipodi:linespacing="125%"
+       transform="scale(0.93246631,1.0724248)"><tspan
+         sodipodi:role="line"
+         id="tspan3064"
+         x="0.66347247"
+         y="120.67854"
+         style="font-size:133.20880127px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;fill:#ff9600;fill-opacity:1;font-family:FreeSans;-inkscape-font-specification:FreeSans Semi-Bold">Բանվոր</tspan></text>
+  </g>
   <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="second_plane"
      style="display:inline"
-     transform="translate(0,-552.36218)"
+     transform="translate(0,-252.36218)"
      sodipodi:insensitive="true">
     <path
        style="fill:url(#linearGradient3879);fill-opacity:1;stroke:none"
-       d="m 85.698199,797.77074 c 0,0 37.665621,58.70316 45.507341,92.33064 8.69161,37.27203 0.26059,115.07862 0.26059,115.07862 9.64081,25.3101 37.13051,18.0683 40.08464,-0.048 0,0 7.6977,-77.30978 -0.25948,-114.59484 -8.5677,-40.14589 -49.92401,-111.85138 -49.92401,-111.85138 z"
+       d="m 85.698199,659.77074 c 0,0 37.665621,58.70316 45.507341,92.33064 8.69161,37.27203 0.26059,115.07862 0.26059,115.07862 9.64081,25.3101 37.13051,18.0683 40.08464,-0.048 0,0 7.6977,-77.30978 -0.25948,-114.59484 -8.5677,-40.14589 -49.92401,-111.85138 -49.92401,-111.85138 z"
        id="path4015"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="csccscc" />
     <path
        style="fill:url(#linearGradient3895);fill-opacity:1;stroke:none"
-       d="m 183.53876,703.07558 30.90388,-26.63904 c 0,0 29.3937,65.77281 57.9456,87.14893 27.16621,20.33869 77.40935,20.44538 77.40935,20.44538 16.64517,9.49353 16.61054,38.884 -14.37674,34.19491 -11.80483,-1.78633 -60.98194,-1.75168 -92.5934,-26.30905 -28.75005,-22.33442 -59.28869,-88.84113 -59.28869,-88.84113 z"
+       d="m 183.53876,565.07558 30.90388,-26.63904 c 0,0 29.3937,65.77281 57.9456,87.14893 27.16621,20.33869 77.40935,20.44538 77.40935,20.44538 16.64517,9.49353 16.61054,38.884 -14.37674,34.19491 -11.80483,-1.78633 -60.98194,-1.75168 -92.5934,-26.30905 -28.75005,-22.33442 -59.28869,-88.84113 -59.28869,-88.84113 z"
        id="path4017"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccscssc" />
@@ -340,11 +359,12 @@
   <g
      inkscape:groupmode="layer"
      id="layer3"
-     inkscape:label="Box"
+     inkscape:label="box"
      style="display:inline"
+     transform="translate(0,300)"
      sodipodi:insensitive="true">
     <rect
-       y="279.78345"
+       y="141.78345"
        x="303.048"
        height="189.63731"
        width="194.64587"
@@ -354,11 +374,11 @@
        sodipodi:nodetypes="ccccc"
        inkscape:connector-curvature="0"
        id="path4121"
-       d="m 342.65518,239.83473 -39.6072,39.94872 194.64588,-1e-5 -39.93747,-39.89529 z"
+       d="m 342.65518,101.83473 -39.6072,39.94872 194.64588,-10e-6 -39.93747,-39.89529 z"
        style="fill:#ff9600;fill-opacity:1;stroke:none;display:inline" />
     <path
        style="fill:#ffb82a;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 302.35841,279.78344 32.71853,0 -0.67621,188.90069 -31.92777,0 z"
+       d="m 302.35841,141.78344 32.71853,0 -0.67621,188.90069 -31.92777,0 z"
        id="path4184"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
@@ -366,11 +386,11 @@
        sodipodi:nodetypes="ccccc"
        inkscape:connector-curvature="0"
        id="path4186"
-       d="m 464.97533,279.78344 32.71853,0 -0.0305,188.90069 -32.36559,0 z"
+       d="m 464.97533,141.78344 32.71853,0 -0.0305,188.90069 -32.36559,0 z"
        style="fill:#ffb82a;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
     <path
        style="fill:#ffc52a;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1"
-       d="m 302.47296,280.191 195.19042,0 0,30.87636 -195.19042,0 z"
+       d="m 302.47296,142.191 195.19042,0 0,30.87636 -195.19042,0 z"
        id="rect4190"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
@@ -378,7 +398,7 @@
        sodipodi:nodetypes="ccccc"
        inkscape:connector-curvature="0"
        id="path4193"
-       d="m 302.47296,437.80778 195.19042,0 0,30.87635 -195.19042,0 z"
+       d="m 302.47296,299.80778 195.19042,0 0,30.87635 -195.19042,0 z"
        style="fill:#ffc52a;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1" />
     <rect
        style="fill:#ffdd55;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1;display:inline"
@@ -386,90 +406,90 @@
        width="32.343575"
        height="126.74043"
        x="367.3085"
-       y="311.06735" />
+       y="173.06735" />
     <rect
        style="fill:#ffcc00;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1;display:inline"
        id="rect4195"
        width="32.343575"
        height="126.74043"
        x="334.965"
-       y="311.06738" />
+       y="173.06738" />
     <rect
        style="fill:#ffcc00;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1;display:inline"
        id="rect4195-9"
        width="32.343575"
        height="126.74043"
        x="432.68518"
-       y="311.06735" />
+       y="173.06735" />
     <path
        style="fill:#ffba08;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-opacity:1;display:inline"
-       d="m 309.96367,311.08035 138.05026,126.73752 44.73381,0 -138.05027,-126.73752 z"
+       d="m 309.96367,173.08035 138.05026,126.73752 44.73381,0 -138.05027,-126.73752 z"
        id="rect4222-6"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
        style="fill:#fab826;fill-opacity:1;stroke:#ffaf00;stroke-width:1.18690801;stroke-opacity:1"
-       d="m 445.72641,311.08035 -135.83535,126.73752 44.33437,0 135.83538,-126.73752 z"
+       d="m 445.72641,173.08035 -135.83535,126.73752 44.33437,0 135.83538,-126.73752 z"
        id="rect4222"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
        style="fill:#aa4400;stroke:none"
-       d="m 364.06882,239.84466 -27.85671,40.34634 31.10207,0 17.00384,-40.33693 z"
+       d="m 364.06882,101.84466 -27.85671,40.34634 31.10207,0 17.00384,-40.33693 z"
        id="path5801"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
        style="fill:#ff6600;stroke:none"
-       d="m 367.84163,280.191 16.78684,-40.33679 21.10779,0.01 -5.90794,40.32709 z"
+       d="m 367.84163,142.191 16.78684,-40.33679 21.10779,0.01 -5.90794,40.32709 z"
        id="path5803"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
        style="fill:#ff7f2a;stroke:none;display:inline"
-       d="m 431.57529,280.191 -6.40565,-40.23712 -19.12278,-0.0898 -5.86864,40.33002 z"
+       d="m 431.57529,142.191 -6.40565,-40.23712 -19.12278,-0.0898 -5.86864,40.33002 z"
        id="path5803-6"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
        style="fill:none;stroke:none;display:inline"
-       d="m 445.9808,240.182 18.59488,40.02713 -32.68108,-0.25851 -6.22946,-39.73823 z"
+       d="m 445.9808,102.182 18.59488,40.02713 -32.68108,-0.25851 -6.22946,-39.73823 z"
        id="path5801-2"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
        style="fill:#d4aa00;stroke:none"
-       d="m 464.4348,280.191 0.0873,-4.67444 32.70213,0.25851 0.24774,4.65329 z"
+       d="m 464.4348,142.191 0.0873,-4.67444 32.70213,0.25851 0.24774,4.65329 z"
        id="path5855"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
        style="fill:#ffcc00;stroke:none"
-       d="m 464.52216,275.51656 -22.27583,-37.3704 0.0599,1.73482 22.25514,40.32804 z"
+       d="m 464.52216,137.51656 -22.27583,-37.3704 0.0599,1.73482 22.25514,40.32804 z"
        id="path5857"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
        style="fill:#ff9600;fill-opacity:1;stroke:none"
-       d="m 464.52216,275.51656 32.70215,0.25851 -39.05814,-37.66825 -15.94328,0 z"
+       d="m 464.52216,137.51656 32.70215,0.25851 -39.05814,-37.66825 -15.94328,0 z"
        id="path5859"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
        style="fill:#d4aa00;fill-opacity:1;stroke:none"
-       d="m 303.27493,279.82968 0,0 32.26901,0.40752 -0.20102,-3.20718 -32.03678,-0.46042 z"
+       d="m 303.27493,141.82968 0,0 32.26901,0.40752 -0.20102,-3.20718 -32.03678,-0.46042 z"
        id="path5891"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccc" />
     <path
        style="fill:#ff9600;fill-opacity:1;stroke:none"
-       d="m 335.64188,277.03326 -32.226,-0.34915 40.16321,-38.57729 19.74096,0 z"
+       d="m 335.64188,139.03326 -32.226,-0.34915 40.16321,-38.57729 19.74096,0 z"
        id="path5893"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
        style="fill:#aa8800;fill-opacity:1;stroke:none"
-       d="m 335.35265,277.18557 27.9674,-39.07875 0,1.95445 -27.77481,40.41628 z"
+       d="m 335.35265,139.18557 27.9674,-39.07875 0,1.95445 -27.77481,40.41628 z"
        id="path5897"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
@@ -479,11 +499,11 @@
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
-     transform="translate(0,-552.36218)"
+     transform="translate(0,-252.36218)"
      sodipodi:insensitive="true">
     <path
        style="fill:#ffcc00;fill-opacity:1;stroke:none;display:inline"
-       d="m 254.37902,590.82417 c -28.81097,4.95816 -35.62107,17.32969 -38.59418,42.98726 -0.84369,7.28135 -6.72484,12.94213 -10.94805,18.80498 -34.04568,47.26343 -82.69132,82.04844 -115.022188,130.60522 -1.640852,2.46434 -2.928048,5.20323 -3.916653,8.02112 -12.002443,34.21113 -8.880442,73.53413 -23.943021,106.40081 -16.992642,37.07811 -58.6448905,90.01657 -58.6448905,90.01657 -7.8761698,25.83267 13.8057235,36.09707 31.5990425,25.73567 0,0 46.419511,-53.94426 64.45365,-92.66343 17.21715,-36.96515 20.86431,-67.23006 39.59603,-103.38438 15.49462,-29.90624 63.56196,-70.62478 63.56196,-70.62478 0,0 18.918,39.34961 35.24386,60.45235 24.152,18.9697 55.39841,34.75724 72.87061,40.51414 21.55786,-0.69033 24.3167,-29.10645 11.68481,-33.65069 -26.56735,-9.55738 -33.37885,-13.88582 -59.71068,-38.31372 -21.84827,-20.26861 -40.54096,-81.15157 -40.54096,-81.15157 0,0 9.23873,-15.60517 14.46726,-18.63833 5.97992,-3.46914 8.93604,1.02613 18.0281,0.47777 30.36625,-3.12338 38.40952,-22.96684 38.40952,-42.60173 1.73462,-30.49483 -8.26611,-36.24423 -38.59422,-42.98726 z"
+       d="m 254.37902,452.82417 c -28.81097,4.95816 -35.62107,17.32969 -38.59418,42.98726 -0.84369,7.28135 -6.72484,12.94213 -10.94805,18.80498 -34.04568,47.26343 -82.69132,82.04844 -115.022188,130.60522 -1.640852,2.46434 -2.928048,5.20323 -3.916653,8.02112 C 73.895506,687.45388 77.017507,726.77688 61.954928,759.64356 44.962286,796.72167 3.3100375,849.66013 3.3100375,849.66013 -4.5661323,875.4928 17.115761,885.7572 34.90908,875.3958 c 0,0 46.419511,-53.94426 64.45365,-92.66343 17.21715,-36.96515 20.86431,-67.23006 39.59603,-103.38438 15.49462,-29.90624 63.56196,-70.62478 63.56196,-70.62478 0,0 18.918,39.34961 35.24386,60.45235 24.152,18.9697 55.39841,34.75724 72.87061,40.51414 21.55786,-0.69033 24.3167,-29.10645 11.68481,-33.65069 -26.56735,-9.55738 -33.37885,-13.88582 -59.71068,-38.31372 -21.84827,-20.26861 -40.54096,-81.15157 -40.54096,-81.15157 0,0 9.23873,-15.60517 14.46726,-18.63833 5.97992,-3.46914 8.93604,1.02613 18.0281,0.47777 30.36625,-3.12338 38.40952,-22.96684 38.40952,-42.60173 1.73462,-30.49483 -8.26611,-36.24423 -38.59422,-42.98726 z"
        id="path3933-1"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="csssssccssccccscsccc" />
@@ -493,23 +513,24 @@
        width="25.747025"
        height="1.6119893e-006"
        x="362.77811"
-       y="824.87097" />
+       y="686.87097" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer5"
      inkscape:label="face"
      style="display:inline"
+     transform="translate(0,300)"
      sodipodi:insensitive="true">
     <path
        style="fill:url(#linearGradient3826);fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 291.71618,88.218239 c 2.12289,19.119621 -18.80171,35.817181 -35.27952,35.817181 -16.47782,0 -22.96478,-5.15605 -27.26471,-11.27249 -6.29753,-8.95796 10.76394,17.41252 40.22748,4.45232 11.6126,-5.10804 22.03985,-18.452092 22.31675,-28.997011 z"
+       d="m 291.71618,-49.781761 c 2.12289,19.119621 -18.80171,35.817181 -35.27952,35.817181 -16.47782,0 -22.96478,-5.15605 -27.26471,-11.27249 -6.29753,-8.95796 10.76394,17.41252 40.22748,4.45232 11.6126,-5.10804 22.03985,-18.452092 22.31675,-28.997011 z"
        id="path3033"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="csssc" />
     <path
        style="fill:url(#linearGradient3913);fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 206.85784,203.07824 c -7.50913,-13.91844 -6.72686,-12.25509 -8.48593,-16.15108 -0.5375,-1.19044 -2.81412,-7.4956 -4.5498,-17.18416 3.34901,10.02437 7.89294,19.9273 13.03573,33.33524 z"
+       d="m 206.85784,65.07824 c -7.50913,-13.91844 -6.72686,-12.25509 -8.48593,-16.15108 -0.5375,-1.19044 -2.81412,-7.4956 -4.5498,-17.18416 3.34901,10.02437 7.89294,19.9273 13.03573,33.33524 z"
        id="path3830"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cscc" />
@@ -517,24 +538,25 @@
   <g
      inkscape:groupmode="layer"
      id="layer4"
-     inkscape:label="Hat"
+     inkscape:label="hat"
      style="display:inline"
+     transform="translate(0,300)"
      sodipodi:insensitive="true">
     <path
        style="fill:#d45500;fill-opacity:1;stroke:none"
-       d="m 299.34257,60.914907 c 0,22.32034 -22.43256,6.217625 -44.37134,6.217625 -21.93876,0 -42.0475,16.102715 -42.0475,-6.217625 0,-22.320347 20.10874,-40.414559 42.0475,-40.414559 21.93878,0 44.37134,18.094212 44.37134,40.414559 z"
+       d="m 299.34257,-77.08509 c 0,22.320337 -22.43256,6.21762 -44.37134,6.21762 -21.93876,0 -42.0475,16.102717 -42.0475,-6.21762 0,-22.32035 20.10874,-40.41456 42.0475,-40.41456 21.93878,0 44.37134,18.09421 44.37134,40.41456 z"
        id="path4163"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="sssss" />
     <path
        style="fill:url(#linearGradient4180);fill-opacity:1;stroke:none"
-       d="m 293.5429,58.842357 c 0,17.1695 -16.99832,6.157176 -37.01744,6.157176 -20.01914,0 -40.12588,11.012324 -40.12588,-6.157176 0,-17.16949 18.55253,-35.937863 38.57166,-35.937863 20.01913,0 38.57166,18.768373 38.57166,35.937863 z"
+       d="m 293.5429,-79.15764 c 0,17.1695 -16.99832,6.15717 -37.01744,6.15717 -20.01914,0 -40.12588,11.01233 -40.12588,-6.15717 0,-17.16949 18.55253,-35.93787 38.57166,-35.93787 20.01913,0 38.57166,18.76838 38.57166,35.93787 z"
        id="path4167"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="sssss" />
     <path
        style="fill:#d45500;fill-opacity:1;stroke:none"
-       d="m 314.86087,71.692645 c 1.99925,3.795356 2.46806,4.249077 -10.42746,2.124092 -11.1239,-2.856519 -15.3929,1.101513 -15.3929,-8.341708 0,-9.44322 16.00482,-2.277054 20.35836,0.518143 2.93281,2.24407 4.33459,3.55921 5.462,5.699473 z"
+       d="m 314.86087,-66.30736 c 1.99925,3.79536 2.46806,4.24908 -10.42746,2.1241 -11.1239,-2.85652 -15.3929,1.10151 -15.3929,-8.34171 0,-9.44322 16.00482,-2.27706 20.35836,0.51814 2.93281,2.24407 4.33459,3.55921 5.462,5.69947 z"
        id="path4171"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="scscs" />