diff --git a/art/floor.svg b/art/floor.svg
index 39c9f78..df0f639 100644
--- a/art/floor.svg
+++ b/art/floor.svg
@@ -7,19 +7,103 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
+   width="500"
+   height="500"
    id="svg3081"
    version="1.1"
    inkscape:version="0.48.4 r9939"
    sodipodi:docname="floor.svg"
-   inkscape:export-filename="C:\Users\vahagnk\devel\_private\org.dyndns.vahagn.sokoban\art\floor.png"
+   inkscape:export-filename="C:\Users\vahagnk\devel\_private\org.dyndns.vahagn.sokoban\res\drawable\goal.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
-     id="defs3083" />
+     id="defs3083">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4035">
+      <stop
+         style="stop-color:#44aa00;stop-opacity:1;"
+         offset="0"
+         id="stop4037" />
+      <stop
+         style="stop-color:#44aa00;stop-opacity:0;"
+         offset="1"
+         id="stop4039" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3977">
+      <stop
+         style="stop-color:#2aff2a;stop-opacity:1;"
+         offset="0"
+         id="stop3979" />
+      <stop
+         style="stop-color:#2aff2a;stop-opacity:0;"
+         offset="1"
+         id="stop3981" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3956">
+      <stop
+         style="stop-color:#d7d7f4;stop-opacity:1;"
+         offset="0"
+         id="stop3958" />
+      <stop
+         style="stop-color:#d7d7f4;stop-opacity:0;"
+         offset="1"
+         id="stop3960" />
+    </linearGradient>
+    <filter
+       id="filter3918"
+       inkscape:label="Glow"
+       inkscape:menu="Shadows and Glows"
+       inkscape:menu-tooltip="Glow of object's own color at the edges"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur3920"
+         stdDeviation="5"
+         result="result91" />
+      <feComposite
+         id="feComposite3922"
+         in2="result91"
+         in="SourceGraphic"
+         operator="over" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3956"
+       id="radialGradient3962"
+       cx="250.38462"
+       cy="251.15385"
+       fx="250.38462"
+       fy="251.15385"
+       r="287.53846"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3977"
+       id="linearGradient3975"
+       x1="427.69232"
+       y1="394.61539"
+       x2="119.23077"
+       y2="87.692307"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4035"
+       id="radialGradient4041"
+       cx="241.92309"
+       cy="248.84616"
+       fx="241.92309"
+       fy="248.84616"
+       r="338.07693"
+       gradientTransform="matrix(1,0,0,0.9135381,0,21.515712)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -27,11 +111,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.64"
-     inkscape:cx="441.31396"
-     inkscape:cy="172.29403"
+     inkscape:zoom="1.3"
+     inkscape:cx="210.43303"
+     inkscape:cy="280.19905"
      inkscape:document-units="px"
-     inkscape:current-layer="layer3"
+     inkscape:current-layer="layer5"
      showgrid="true"
      inkscape:snap-global="false"
      inkscape:window-width="1920"
@@ -41,7 +125,11 @@
      inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
-       id="grid3093" />
+       id="grid3093"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
   <metadata
      id="metadata3086">
@@ -51,115 +139,154 @@
         <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">
-    <rect
-       style="fill:#9eabb0;stroke:#00003e;stroke-width:0.796;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+     id="layer4"
+     inkscape:label="Back"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#ffffff;stroke:none;display:inline"
+       d="m -82.674928,577.29025 c 227.680718,1.4e-4 455.361438,0 683.042168,0 0,-215.62937 0,-431.25882 0,-646.888256 -227.68073,0 -455.36145,0 -683.042168,0 0,215.629436 0,431.258886 0,646.888256 z"
        id="rect3089"
-       width="498.16245"
-       height="498.30487"
-       x="144.93642"
-       y="304.28625" />
-    <rect
-       style="fill:#364e59;stroke:#00003e;stroke-width:0.796;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
-       id="rect3091"
-       width="99.632492"
-       height="249.15244"
-       x="144.95837"
-       y="304.03802" />
-    <rect
-       style="fill:#bdcdd4;stroke:#00003e;stroke-width:0.796;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:label="Tiles"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:none"
+     transform="translate(0,-552.36217)"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#2ad4ff;stroke:none"
+       d="m 1.8125,924.25 c 40.3125,0 80.625,0 120.9375,0 0,-81.70833 0,-163.41667 0,-245.125 -40.3125,0 -80.625,0 -120.9375,0 0,81.70833 0,163.41667 0,245.125 z"
        id="rect3091-1"
-       width="99.632492"
-       height="249.15244"
-       x="244.90024"
-       y="428.66904" />
-    <rect
-       style="fill:#0e352e;fill-opacity:1;stroke:#00003e;stroke-width:0.796;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#5555ff;fill-opacity:1;stroke:none"
+       d="m 376.28125,554.75 c 40.32292,0 80.64583,0 120.96875,0 0,81.69792 0,163.39583 0,245.09375 -40.32292,0 -80.64583,0 -120.96875,0 0,-81.69792 0,-163.39583 0,-245.09375 z"
        id="rect3091-7"
-       width="99.632492"
-       height="249.15244"
-       x="543.52289"
-       y="-553.41901"
-       transform="scale(1,-1)" />
-    <rect
-       style="fill:#0e232e;stroke:#00003e;stroke-width:0.796;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#d5f6ff;stroke:none"
+       d="m 1.2360534,1211.7159 c 40.1551306,0 80.3102626,0 120.4653966,0 0,-94.3788 0,-188.7574 0,-283.1361 -40.155134,0 -80.310266,0 -120.4653966,0 0,94.3787 0,188.7573 0,283.1361 z"
        id="rect3091-14"
-       width="99.632492"
-       height="124.57624"
-       x="244.25737"
-       y="677.91895" />
-    <rect
-       style="fill:#0e232e;stroke:#00003e;stroke-width:0.796;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#d5f6ff;stroke:none"
+       d="m 2.0501228,675.58209 c 40.1460722,0 80.2921442,0 120.4382172,0 0,-98.2262 0,-196.4524 0,-294.6786 -40.146073,0 -80.292145,0 -120.4382172,0 0,98.2262 0,196.4524 0,294.6786 z"
        id="rect3091-14-2"
-       width="99.632492"
-       height="124.57624"
-       x="244.29326"
-       y="304.02863" />
-    <rect
-       style="fill:#253953;fill-opacity:0.99607842999999996;stroke:#00003e;stroke-width:0.796;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#5f5fd3;fill-opacity:0.99607843;stroke:none"
+       d="m 251.15625,924.03125 c 40.3125,0 80.625,0 120.9375,0 0,-81.70833 0,-163.41667 0,-245.125 -40.3125,0 -80.625,0 -120.9375,0 0,81.70833 0,163.41667 0,245.125 z"
        id="rect3091-15-21"
-       width="99.632492"
-       height="249.15244"
-       x="443.72964"
-       y="428.45319" />
-    <rect
-       style="fill:#364e59;stroke:#00003e;stroke-width:0.796;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#5fbcd3;stroke:none"
+       d="m 126.5,1049.4375 c 40.3125,0 80.625,0 120.9375,0 0,-81.70833 0,-163.41667 0,-245.125 -40.3125,0 -80.625,0 -120.9375,0 0,81.70833 0,163.41667 0,245.125 z"
        id="rect3091-15-7"
-       width="99.632492"
-       height="249.15244"
-       x="344.33099"
-       y="553.8797" />
-    <rect
-       style="fill:#bdcdd4;stroke:#00003e;stroke-width:0.796;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#87aade;fill-opacity:1;stroke:none"
+       d="m 251.91728,675.20772 c 40.20098,0 80.40196,0 120.60294,0 0,-76.22983 0,-152.45965 0,-228.68948 -40.20098,0 -80.40196,0 -120.60294,0 0,76.22983 0,152.45965 0,228.68948 z"
        id="rect3091-2-8"
-       width="99.632492"
-       height="124.57624"
-       x="444.2063"
-       y="304.33783" />
-    <rect
-       style="fill:#466673;fill-opacity:1;stroke:#00003e;stroke-width:0.796;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#aaaaff;fill-opacity:1;stroke:none"
+       d="m 376.875,1049.0312 c 40.3125,0 80.625,1e-4 120.9375,0 0,-81.69787 0,-163.39578 0,-245.0937 -40.3125,0 -80.625,0 -120.9375,0 0,81.69792 0,163.39583 0,245.0937 z"
        id="rect3091-15-2-1"
-       width="99.632492"
-       height="249.15244"
-       x="543.98761"
-       y="553.48468" />
-    <rect
-       style="fill:#005c65;fill-opacity:1;stroke:#00003e;stroke-width:0.796;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#afdde9;fill-opacity:1;stroke:none"
+       d="m 126.5625,800.0625 c 40.32292,0 80.64583,0 120.96875,0 0,-81.69792 0,-163.39583 0,-245.09375 -40.32292,0 -80.64583,0 -120.96875,0 0,81.69792 0,163.39583 0,245.09375 z"
        id="rect3091-15-5-1-3"
-       width="99.632492"
-       height="249.15244"
-       x="344.39288"
-       y="304.48703" />
-    <rect
-       style="fill:#bdcdd4;stroke:#00003e;stroke-width:0.796;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#87aade;stroke:none"
+       d="m 252.23353,1236.1463 c 40.13598,-2e-4 80.27196,0 120.40794,0 0,-102.5753 0,-205.1502 0,-307.72527 -40.13598,0 -80.27196,0 -120.40794,0 0,102.57507 0,205.15027 0,307.72527 z"
        id="rect3091-2-8-3"
-       width="99.632492"
-       height="124.57624"
-       x="444.38818"
-       y="677.74054" />
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer7"
+     inkscape:label="Tiles2"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="rect3836"
+       width="500"
+       height="501.53845"
+       x="0.76923078"
+       y="0.76923078" />
+    <rect
+       style="fill:url(#radialGradient3962);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3918)"
+       id="rect3838"
+       width="479.23077"
+       height="479.23077"
+       x="10.769231"
+       y="11.538462" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="Layer"
-     style="display:inline">
+     style="opacity:0.4424779;display:none"
+     transform="translate(0,-552.36217)"
+     sodipodi:insensitive="true">
     <rect
-       style="opacity:0.63274381;fill:#ffffff;fill-opacity:0.99967316;fill-rule:nonzero;stroke:none"
+       style="opacity:0.63274387;fill:#ffffff;fill-opacity:0.99967316;fill-rule:nonzero;stroke:none"
        id="rect2997"
-       width="499.01733"
-       height="499.0173"
-       x="144.61633"
-       y="304.01834" />
+       width="629.78662"
+       height="591.32501"
+       x="-63.845207"
+       y="506.32602" />
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Red" />
+     id="layer5"
+     inkscape:label="Goal"
+     style="opacity:0.33628319;display:inline">
+    <rect
+       style="fill:url(#radialGradient4041);fill-opacity:1;stroke:none"
+       id="rect3827"
+       width="676.15387"
+       height="617.69232"
+       x="-96.153847"
+       y="-60"
+       inkscape:export-filename="C:\Users\vahagnk\devel\_private\org.dyndns.vahagn.sokoban\res\drawable\goal.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#008000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="path4025"
+       sodipodi:cx="241.15384"
+       sodipodi:cy="251.92308"
+       sodipodi:rx="41.153847"
+       sodipodi:ry="43.46154"
+       d="m 282.30769,251.92308 a 41.153847,43.46154 0 1 1 -82.3077,0 41.153847,43.46154 0 1 1 82.3077,0 z"
+       inkscape:export-filename="C:\Users\vahagnk\devel\_private\org.dyndns.vahagn.sokoban\res\drawable\path4025.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="GoalSign"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:url(#linearGradient3975);fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="M 250,50 C 139.54305,50 50,139.70563 50,250.375 c 0,110.66937 89.54305,200.40625 200,200.40625 110.45695,0 200,-89.73688 200,-200.40625 C 450,139.70563 360.45695,50 250,50 z m -0.375,50 C 332.68013,100 400,167.31987 400,250.375 400,333.43013 332.68013,400.78125 249.625,400.78125 166.56987,400.78125 99.21875,333.43013 99.21875,250.375 99.21875,167.31987 166.56987,100 249.625,100 z"
+       id="path3964"
+       inkscape:connector-curvature="0" />
+  </g>
 </svg>
diff --git a/art/goal.svg b/art/goal.svg
deleted file mode 100644
index c1ab773..0000000
--- a/art/goal.svg
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
-   id="svg3081"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="hole.svg"
-   inkscape:export-filename="C:\Users\vahagnk\devel\_private\org.dyndns.vahagn.sokoban\art\hole.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3083" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.799999"
-     inkscape:cx="386.47409"
-     inkscape:cy="738.06391"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:snap-global="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1018"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3093" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3086">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#88aa00;stroke:#000000;stroke-width:0.99646747;stroke-opacity:1"
-       id="rect3089"
-       width="498.16238"
-       height="498.30511"
-       x="144.93629"
-       y="303.66132" />
-    <rect
-       style="fill:#445500;stroke:#000000;stroke-width:0.9969328;stroke-opacity:1"
-       id="rect3091"
-       width="99.632011"
-       height="249.38647"
-       x="144.92924"
-       y="303.80396" />
-    <rect
-       style="fill:#88aa00;stroke:#000000;stroke-width:0.99646747;stroke-opacity:1"
-       id="rect3091-1"
-       width="99.632477"
-       height="249.15256"
-       x="244.90022"
-       y="428.66904" />
-    <rect
-       style="fill:#0e352e;fill-opacity:1;stroke:#000000;stroke-width:0.99646747;stroke-opacity:1"
-       id="rect3091-7"
-       width="99.632477"
-       height="249.15256"
-       x="543.52283"
-       y="-553.41895"
-       transform="scale(1,-1)" />
-    <rect
-       style="fill:#222b00;stroke:#000000;stroke-width:0.99646747;stroke-opacity:1"
-       id="rect3091-14"
-       width="99.632477"
-       height="124.57628"
-       x="244.25735"
-       y="677.3725" />
-    <rect
-       style="fill:#222b00;stroke:#000000;stroke-width:0.99646747;stroke-opacity:1"
-       id="rect3091-14-2"
-       width="99.632477"
-       height="124.57628"
-       x="244.29324"
-       y="304.02869" />
-    <rect
-       style="fill:#668000;fill-opacity:0.99607843;stroke:#000000;stroke-width:0.99646747;stroke-opacity:1"
-       id="rect3091-15-21"
-       width="99.632477"
-       height="249.15256"
-       x="443.72955"
-       y="428.45319" />
-    <rect
-       style="fill:#445500;stroke:#000000;stroke-width:0.99646747;stroke-opacity:1"
-       id="rect3091-15-7"
-       width="99.632477"
-       height="249.15256"
-       x="344.33096"
-       y="552.78589" />
-    <rect
-       style="fill:#a0892c;stroke:#000000;stroke-width:0.99646747;stroke-opacity:1"
-       id="rect3091-2-8"
-       width="99.632477"
-       height="124.57628"
-       x="444.20621"
-       y="304.33789" />
-    <rect
-       style="fill:#222b00;fill-opacity:1;stroke:#000000;stroke-width:0.99646747;stroke-opacity:1"
-       id="rect3091-15-2-1"
-       width="99.632477"
-       height="249.15256"
-       x="543.5188"
-       y="552.62524" />
-    <rect
-       style="fill:#d3bc5f;fill-opacity:1;stroke:#000000;stroke-width:0.99646747;stroke-opacity:1"
-       id="rect3091-15-5-1-3"
-       width="99.632477"
-       height="249.15256"
-       x="344.39285"
-       y="304.48709" />
-    <rect
-       style="fill:#a0892c;stroke:#000000;stroke-width:0.99646747;stroke-opacity:1"
-       id="rect3091-2-8-3"
-       width="99.632477"
-       height="124.57628"
-       x="444.23193"
-       y="677.19409" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Layer"
-     style="display:inline">
-    <rect
-       style="opacity:0.59734509;fill:#ffffff;fill-opacity:0.99967316;fill-rule:nonzero;stroke:none"
-       id="rect3809"
-       width="499.19794"
-       height="499.51044"
-       x="144.43756"
-       y="303.12943"
-       inkscape:export-xdpi="90.1446"
-       inkscape:export-ydpi="90.1446" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Red" />
-</svg>
diff --git a/res/drawable/floor.png b/res/drawable/floor.png
index ec357be..8eab04f 100644
Binary files a/res/drawable/floor.png and b/res/drawable/floor.png differ
diff --git a/res/drawable/goal.png b/res/drawable/goal.png
index beb7c84..0bbaa09 100644
Binary files a/res/drawable/goal.png and b/res/drawable/goal.png differ