artwork cleanup

10 files changed, 304 insertions, 517 deletions

diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 52de41a..94a7226 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -784,6 +784,11 @@ class TurtleArtActivity(activity.Activity):
             toolbar_box.toolbar.insert(palette_toolbar_button, -1)
             palette_toolbar_button.show()
 
+            separator = gtk.SeparatorToolItem()
+            separator.set_draw(True)
+            toolbar_box.toolbar.insert(separator, -1)
+            separator.show()
+
             # eraser button
             self.eraser_button = ToolButton( "eraseron" )
             self.eraser_button.set_tooltip(_('Clean'))
diff --git a/icons/eraseroff.svg b/icons/eraseroff.svg
index dcb3ae3..9f466ce 100644
--- a/icons/eraseroff.svg
+++ b/icons/eraseroff.svg
@@ -1,91 +1,33 @@
 <?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"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
+   version="1.0"
    width="50"
    height="43"
-   version="1.0"
-   sodipodi:docname="eraseron.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg2">
   <defs
-     id="defs5">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective9" />
-    <inkscape:perspective
-       id="perspective3267"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-height="1000"
-     inkscape:window-width="1679"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="10"
-     inkscape:cx="25"
-     inkscape:cy="30.833333"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:current-layer="svg2" />
+     id="defs5" />
   <path
-     style="fill:#c44000;stroke:#a00000;stroke-width:1.5;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 37.612208,24.238779 L 36,17.5 L 48.5,4 L 47,14.5 L 37.612208,24.238779 z"
+     d="m 36.61535,26.125 0,-8.375 12.5,-13.5 -1.5,10.5 -11,11.375 z"
      id="path2394"
-     sodipodi:nodetypes="ccccc" />
+     style="fill:#c44000;fill-opacity:1;stroke:#a00000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none" />
   <path
-     style="fill:#c44000;stroke:#a00000;stroke-width:1.5;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 15,17.5 L 28.5,4 L 48.5,4 L 36,17.5 L 15,17.5 z"
+     d="m 15.61535,17.75 13.5,-13.5 20,0 -12.5,13.5 -21,0 z"
      id="path2390"
-     sodipodi:nodetypes="ccccc" />
+     style="fill:#c44000;fill-opacity:1;stroke:#a00000;stroke-width:1.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
   <path
-     style="fill:#a09400;stroke:#a00000;stroke-width:1.50000000000000000;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 22.800718,38.5 L 25.493716,28.5 L 36,17.5 L 37.432675,24.418312 L 22.800718,38.5 z"
+     d="m 23.416068,38.75 2.692998,-10 10.506284,-11 0,8.375 -13.199282,12.625 z"
      id="path2392"
-     sodipodi:nodetypes="ccccc" />
+     style="fill:#c4a000;fill-opacity:1;stroke:#a00000;stroke-width:1.5;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none" />
   <path
-     style="fill:#c4a000;stroke:#a00000;stroke-width:1.50000000000000000;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 3.9497307,28.5 L 15,17.5 L 36,17.5 L 25.13465,28.5 L 3.9497307,28.5 z"
+     d="m 4.5650808,28.75 11.0502692,-11 21,0 -10.86535,11 -21.1849192,0 z"
      id="path2388"
-     sodipodi:nodetypes="ccccc" />
+     style="fill:#c4a000;fill-opacity:1;stroke:#a00000;stroke-width:1.5;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none" />
   <path
-     style="fill:#e0d000;stroke:#a00000;stroke-width:1.50000000000000000;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 0.26929982,38.5 L 3.8599641,28.5 L 25.044883,28.5 L 22.441652,38.5 L 0.26929982,38.5 z"
+     d="m 0.88464991,38.75 3.59066429,-10 21.1849188,0 -2.603231,10 -22.17235209,0 z"
      id="path2384"
-     sodipodi:nodetypes="ccccc" />
+     style="fill:#e0d000;fill-opacity:1;stroke:#a00000;stroke-width:1.5;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none" />
 </svg>
diff --git a/icons/eraseron.svg b/icons/eraseron.svg
index 9ffbb5e..ca884df 100644
--- a/icons/eraseron.svg
+++ b/icons/eraseron.svg
@@ -1,91 +1,38 @@
 <?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"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
+   version="1.0"
    width="50"
    height="43"
-   version="1.0"
-   sodipodi:docname="eraseroff.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg2">
   <defs
-     id="defs5">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective9" />
-    <inkscape:perspective
-       id="perspective3267"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-height="1000"
-     inkscape:window-width="1679"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="10"
-     inkscape:cx="25"
-     inkscape:cy="30.833333"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:current-layer="svg2" />
-  <path
-     style="fill:#808080;stroke:#a0a0a0;stroke-width:1.50000000000000000;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 37.612208,24.238779 L 36,17.5 L 48.5,4 L 47,14.5 L 37.612208,24.238779 z"
-     id="path2394"
-     sodipodi:nodetypes="ccccc" />
-  <path
-     style="fill:#808080;stroke:#a0a0a0;stroke-width:1.50000000000000000;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 15,17.5 L 28.5,4 L 48.5,4 L 36,17.5 L 15,17.5 z"
-     id="path2390"
-     sodipodi:nodetypes="ccccc" />
-  <path
-     style="fill:#a0a0a0;stroke:#a0a0a0;stroke-width:1.50000000000000000;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 22.800718,38.5 L 25.493716,28.5 L 36,17.5 L 37.432675,24.418312 L 22.800718,38.5 z"
-     id="path2392"
-     sodipodi:nodetypes="ccccc" />
-  <path
-     style="fill:#c4c4c4;stroke:#a0a0a0;stroke-width:1.50000000000000000;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 3.9497307,28.5 L 15,17.5 L 36,17.5 L 25.13465,28.5 L 3.9497307,28.5 z"
-     id="path2388"
-     sodipodi:nodetypes="ccccc" />
-  <path
-     style="fill:#e0e0e0;stroke:#a0a0a0;stroke-width:1.50000000000000000;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 0.26929982,38.5 L 3.8599641,28.5 L 25.044883,28.5 L 22.441652,38.5 L 0.26929982,38.5 z"
-     id="path2384"
-     sodipodi:nodetypes="ccccc" />
+     id="defs5" />
+  <g
+     transform="translate(0.61535009,0.25)"
+     id="g3589"
+     style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+    <path
+       d="M 36,25.875 36,17.5 48.5,4 47,14.5 36,25.875 z"
+       id="path2394"
+       style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 15,17.5 28.5,4 48.5,4 36,17.5 l -21,0 z"
+       id="path2390"
+       style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 22.800718,38.5 25.493716,28.5 36,17.5 36,25.875 22.800718,38.5 z"
+       id="path2392"
+       style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 3.9497307,28.5 15,17.5 l 21,0 -10.86535,11 -21.1849193,0 z"
+       id="path2388"
+       style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 0.26929982,38.5 3.59066428,-10 21.1849189,0 -2.603231,10 -22.17235218,0 z"
+       id="path2384"
+       style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
 </svg>
diff --git a/icons/help-toolbar.svg b/icons/help-toolbar.svg
index d997562..40d6369 100644
--- a/icons/help-toolbar.svg
+++ b/icons/help-toolbar.svg
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -11,10 +13,11 @@
   <defs
      id="defs11" />
   <path
-     d="M 50,27.625 C 50,39.9681 39.8431,50.125 27.5,50.125 C 15.1569,50.125 5,39.9681 5,27.625 C 5,15.2819 15.1569,5.125 27.5,5.125 C 39.8431,5.125 50,15.2819 50,27.625 z"
-     id="path6" />
+     d="m 50,27.625 c 0,12.3431 -10.1569,22.5 -22.5,22.5 C 15.1569,50.125 5,39.9681 5,27.625 5,15.2819 15.1569,5.125 27.5,5.125 c 12.3431,0 22.5,10.1569 22.5,22.5 z"
+     id="path6"
+     style="fill:#404040;fill-opacity:1" />
   <path
-     d="M 23.956,27.167 C 23.956,25.546 25.756,25.277 27.601,24.781 C 29.401,24.286 31.201,23.566 31.201,20.956 C 31.201,18.976 29.356,17.536 27.467,17.536 C 23.687,17.536 23.102,21.991 20.221,21.991 C 18.601,21.991 17.476,20.731 17.476,18.751 C 17.476,14.025 23.416,11.326 27.467,11.326 C 33.273,11.326 38.223,14.926 38.223,20.957 C 38.223,25.952 35.073,28.878 30.438,30.048 L 30.438,31.667 C 30.438,33.468 29.087,34.772 27.197,34.772 C 25.172,34.772 23.957,33.467 23.957,31.667 L 23.957,27.167 L 23.956,27.167 z M 23.686,40.937 C 23.686,39.002 25.261,37.427 27.196,37.427 C 29.132,37.427 30.706,39.002 30.706,40.937 C 30.706,42.873 29.132,44.449 27.196,44.449 C 25.261,44.448 23.686,42.872 23.686,40.937 z"
+     d="m 23.956,27.167 c 0,-1.621 1.8,-1.89 3.645,-2.386 1.8,-0.495 3.6,-1.215 3.6,-3.825 0,-1.98 -1.845,-3.42 -3.734,-3.42 -3.78,0 -4.365,4.455 -7.246,4.455 -1.62,0 -2.745,-1.26 -2.745,-3.24 0,-4.726 5.94,-7.425 9.991,-7.425 5.806,0 10.756,3.6 10.756,9.631 0,4.995 -3.15,7.921 -7.785,9.091 l 0,1.619 c 0,1.801 -1.351,3.105 -3.241,3.105 -2.025,0 -3.24,-1.305 -3.24,-3.105 l 0,-4.5 -0.001,0 z m -0.27,13.77 c 0,-1.935 1.575,-3.51 3.51,-3.51 1.936,0 3.51,1.575 3.51,3.51 0,1.936 -1.574,3.512 -3.51,3.512 -1.935,-10e-4 -3.51,-1.577 -3.51,-3.512 z"
      id="path8"
-     style="fill:#ffffff;stroke:#ffffff;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+     style="fill:#ffffff;stroke:#ffffff;stroke-width:0.25;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
 </svg>
diff --git a/icons/hideshowoff.svg b/icons/hideshowoff.svg
index 19b49a3..3a475c5 100644
--- a/icons/hideshowoff.svg
+++ b/icons/hideshowoff.svg
@@ -1,134 +1,17 @@
 <?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: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="53"
-   height="43"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="hideshowoff.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0">
-  <metadata
-     id="metadata28">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="1000"
-     inkscape:window-width="1679"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="44.444505"
-     inkscape:cy="21.242368"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:current-layer="svg2" />
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
   <defs
-     id="defs5">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 22 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="87 : 22 : 1"
-       inkscape:persp3d-origin="43.5 : 14.666667 : 1"
-       id="perspective30" />
-    <linearGradient
-       id="linearGradient3166">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3168" />
-      <stop
-         style="stop-color:#ffff00;stop-opacity:1;"
-         offset="1"
-         id="stop3170" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient3166"
-       id="linearGradient3172"
-       x1="0"
-       y1="22"
-       x2="74"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-    <inkscape:perspective
-       id="perspective2472"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3166"
-       id="linearGradient2487"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="22"
-       x2="74"
-       y2="22" />
-    <inkscape:perspective
-       id="perspective2590"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
+     id="defs6" />
   <path
-     style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:1.59263432;stroke-opacity:1"
-     d="M 34.341481,1.8366553 C 45.747271,1.8366553 45.747271,1.8366553 45.747271,1.8366553 C 45.747271,1.8366553 48.692673,4.0485498 49.668012,5.3948257 C 50.664216,6.7699023 52.163028,10.732081 52.163028,10.732081 L 52.163028,27.633391 C 52.163028,27.633391 50.582578,30.919053 49.668012,32.081104 C 48.648933,33.375948 45.747271,35.639274 45.747271,35.639274 L 33.628619,35.639274 L 33.628619,35.639274 L 33.628619,39.197444 L 19.371381,39.197444 L 19.371381,35.639274 L 7.2527289,35.639274 C 7.2527289,35.639274 4.3510677,33.375948 3.3319885,32.081104 C 2.4174221,30.919053 0.8369718,27.633391 0.8369718,27.633391 L 0.8369718,10.732081 C 0.8369718,10.732081 2.3357841,6.7699023 3.3319885,5.3948257 C 4.3073276,4.0485498 7.2527289,1.8366553 7.2527289,1.8366553 L 18.658519,1.8366553 L 18.658519,6.2843683 L 34.341481,6.2843683 L 34.341481,1.8366553 z"
-     id="path9"
-     sodipodi:nodetypes="ccsccscccccccsccsccccc" />
-  <rect
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-opacity:1"
-     id="rect3375"
-     width="53"
-     height="3"
-     x="0"
-     y="7.9999986" />
-  <rect
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-opacity:1"
-     id="rect3377"
-     width="53"
-     height="3"
-     x="0"
-     y="30" />
-  <rect
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-opacity:1"
-     id="rect3379"
-     width="53"
-     height="3"
-     x="0"
-     y="22.666666" />
-  <rect
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-opacity:1"
-     id="rect3381"
-     width="53"
-     height="3"
-     x="0"
-     y="15.333332" />
+     d="m 1.5,25.5 0,-8 a 8,8 0 0 1 8,-8 l 8,0 0,4 20,0 0,-4 8,0 a 8,8 0 0 1 8,8 l 0,8 0,8 a 8,8 0 0 1 -8,8 l -8,0 -2,0 0,4 -16,0 0,-4 -2,0 -8,0 a 8,8 0 0 1 -8,-8 l 0,-8 z"
+     id="path2882"
+     style="fill:#404040;fill-opacity:1;stroke:#ffffff;stroke-width:2.5;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
 </svg>
diff --git a/icons/hideshowon.svg b/icons/hideshowon.svg
index b6c328d..326b32c 100644
--- a/icons/hideshowon.svg
+++ b/icons/hideshowon.svg
@@ -1,54 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    version="1.0"
-   width="53"
-   height="43"
+   width="55"
+   height="55"
    id="svg2">
   <defs
      id="defs5">
     <linearGradient
-       id="linearGradient3166">
+       id="linearGradient3689">
       <stop
-         id="stop3168"
+         id="stop3691"
          style="stop-color:#ffffff;stop-opacity:1"
          offset="0" />
       <stop
-         id="stop3170"
+         id="stop3693"
          style="stop-color:#ffff00;stop-opacity:1"
          offset="1" />
     </linearGradient>
     <linearGradient
        x1="0"
-       y1="22"
-       x2="74"
-       y2="22"
-       id="linearGradient3172"
-       xlink:href="#linearGradient3166"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="0"
-       y1="22"
-       x2="74"
-       y2="22"
-       id="linearGradient2487"
-       xlink:href="#linearGradient3166"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="0"
-       y1="22"
-       x2="74"
-       y2="22"
-       id="linearGradient2399"
-       xlink:href="#linearGradient3166"
+       y1="19"
+       x2="54"
+       y2="19"
+       id="linearGradient3695"
+       xlink:href="#linearGradient3689"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7128619,0,0,0.8895426,-6.102877e-4,0.9471127)" />
+       gradientTransform="translate(0.5,8.5)" />
   </defs>
   <path
-     d="M 34.216761,1.8366553 C 45.622551,1.8366553 45.622551,1.8366553 45.622551,1.8366553 C 45.622551,1.8366553 48.567953,4.0485498 49.543292,5.3948257 C 50.539496,6.7699023 52.038308,10.732081 52.038308,10.732081 L 52.038308,27.633391 C 52.038308,27.633391 50.457858,30.919053 49.543292,32.081104 C 48.524213,33.375948 45.622551,35.639274 45.622551,35.639274 L 33.503899,35.639274 L 33.503899,35.639274 L 33.503899,39.197444 L 19.246661,39.197444 L 19.246661,35.639274 L 7.1280087,35.639274 C 7.1280087,35.639274 4.2263475,33.375948 3.2072683,32.081104 C 2.2927019,30.919053 0.71225161,27.633391 0.71225161,27.633391 L 0.71225161,10.732081 C 0.71225161,10.732081 2.2110639,6.7699023 3.2072683,5.3948257 C 4.1826074,4.0485498 7.1280087,1.8366553 7.1280087,1.8366553 L 18.533799,1.8366553 L 18.533799,6.2843683 L 34.216761,6.2843683 L 34.216761,1.8366553 z"
-     id="path9"
-     style="fill:url(#linearGradient2399);fill-opacity:1;stroke:#c0a000;stroke-width:1.59263432;stroke-opacity:1" />
+     d="m 1.5,25.5 0,-8 a 8,8 0 0 1 8,-8 l 8,0 0,4 20,0 0,-4 8,0 a 8,8 0 0 1 8,8 l 0,8 0,8 a 8,8 0 0 1 -8,8 l -8,0 -2,0 0,4 -16,0 0,-4 -2,0 -8,0 a 8,8 0 0 1 -8,-8 l 0,-8 z"
+     id="path2882"
+     style="fill:url(#linearGradient3695);fill-opacity:1;stroke:#a08000;stroke-width:2;stroke-linecap:square;stroke-opacity:1" />
 </svg>
diff --git a/po/TurtleArt.pot b/po/TurtleArt.pot
index 3980220..bc6923c 100644
--- a/po/TurtleArt.pot
+++ b/po/TurtleArt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-21 13:33+0000\n"
+"POT-Creation-Date: 2010-02-21 23:27+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,46 +17,56 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: activity/activity.info:2
-#: /home/walter/Desktop/ta-refactoring/tawindow.py:1229
-#: /home/walter/Desktop/ta-refactoring/tawindow.py:2432
+#: /home/walter/Desktop/ta-refactoring/tawindow.py:1290
+#: /home/walter/Desktop/ta-refactoring/tawindow.py:2494
 #: /home/walter/Desktop/ta-refactoring/turtleart.py:76
 #: /home/walter/Desktop/ta-refactoring/taexporthtml.py:286
 msgid "Turtle Art"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/tawindow.py:1483
+#: /home/walter/Desktop/ta-refactoring/tawindow.py:507
+#: /home/walter/Desktop/ta-refactoring/tawindow.py:508
+msgid "orientation"
+msgstr ""
+
+#: /home/walter/Desktop/ta-refactoring/tawindow.py:518
+#: /home/walter/Desktop/ta-refactoring/tawindow.py:786
+msgid "next"
+msgstr ""
+
+#: /home/walter/Desktop/ta-refactoring/tawindow.py:1544
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:315
 msgid "click to open"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/tawindow.py:2429
-#: /home/walter/Desktop/ta-refactoring/tawindow.py:2433
+#: /home/walter/Desktop/ta-refactoring/tawindow.py:2491
+#: /home/walter/Desktop/ta-refactoring/tawindow.py:2495
 #: /home/walter/Desktop/ta-refactoring/talogo.py:742
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:687
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1142
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:709
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1200
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:356
 msgid "xcor"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/tawindow.py:2429
-#: /home/walter/Desktop/ta-refactoring/tawindow.py:2433
+#: /home/walter/Desktop/ta-refactoring/tawindow.py:2491
+#: /home/walter/Desktop/ta-refactoring/tawindow.py:2495
 #: /home/walter/Desktop/ta-refactoring/talogo.py:743
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:687
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1142
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:709
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1200
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:357
 msgid "ycor"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/tawindow.py:2429
-#: /home/walter/Desktop/ta-refactoring/tawindow.py:2433
+#: /home/walter/Desktop/ta-refactoring/tawindow.py:2491
+#: /home/walter/Desktop/ta-refactoring/tawindow.py:2495
 #: /home/walter/Desktop/ta-refactoring/talogo.py:743
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:688
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1143
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:710
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1201
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:263
 msgid "heading"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/tawindow.py:2492
+#: /home/walter/Desktop/ta-refactoring/tawindow.py:2554
 msgid "image"
 msgstr ""
 
@@ -108,234 +118,235 @@ msgstr ""
 msgid "as input"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:135
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:136
 msgid "presentation"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:188
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:849
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:189
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:894
 msgid "Project"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:273
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:274
 msgid "snapshot"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:291
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:301
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:319
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:328
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:292
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:317
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:334
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:343
 #: /home/walter/Desktop/ta-refactoring/turtleart.py:142
 msgid "Show palette"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:295
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:306
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:322
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:334
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:731
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1327
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:299
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:312
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:321
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:337
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:349
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:773
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1385
 #: /home/walter/Desktop/ta-refactoring/turtleart.py:146
 msgid "Hide palette"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:312
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:326
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:327
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:341
 msgid "Show blocks"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:315
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:332
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:740
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1340
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:330
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:347
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:677
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1151
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:662
 msgid "Hide blocks"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:417
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:430
 msgid "Rescale coordinates down"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:425
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:710
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1171
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:438
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:725
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1229
 msgid "Rescale coordinates up"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:607
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1430
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:620
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1475
 msgid "Save snapshot"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:614
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1265
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:627
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1323
 msgid "Save as HTML"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:621
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:634
 msgid "Save as Logo"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:628
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1283
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:641
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1341
 msgid "Save as image"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:635
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1297
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:648
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1355
 msgid "Load my block"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:643
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1307
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:656
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1365
 msgid "Import project from the Journal"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:663
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1106
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:680
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1156
+msgid "<Ctrl>b"
+msgstr ""
+
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:685
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1164
 msgid "Fullscreen"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:670
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1119
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:692
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1177
 #: /home/walter/Desktop/ta-refactoring/turtleart.py:96
 msgid "Cartesian coordinates"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:676
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1128
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:698
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1186
 #: /home/walter/Desktop/ta-refactoring/turtleart.py:100
 msgid "Polar coordinates"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:716
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1157
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:731
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1215
 #: /home/walter/Desktop/ta-refactoring/turtleart.py:108
 msgid "Grow blocks"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:723
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1164
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:738
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1222
 #: /home/walter/Desktop/ta-refactoring/turtleart.py:112
 msgid "Shrink blocks"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:734
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1332
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:776
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1390
 msgid "<Ctrl>p"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:743
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1345
-msgid "<Ctrl>b"
-msgstr ""
-
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:749
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1412
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:794
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1457
 #: /home/walter/Desktop/ta-refactoring/turtleart.py:161
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:647
 msgid "Clean"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:752
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1417
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:797
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1462
 msgid "<Ctrl>e"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:758
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1358
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:803
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1403
 #: /home/walter/Desktop/ta-refactoring/turtleart.py:165
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:707
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:708
 msgid "Run"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:761
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1362
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:806
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1407
 msgid "<Ctrl>r"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:767
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1370
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:812
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1415
 #: /home/walter/Desktop/ta-refactoring/turtleart.py:169
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:708
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:709
 msgid "Step"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:770
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1374
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:815
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1419
 msgid "<Ctrl>w"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:776
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1382
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:821
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1427
 #: /home/walter/Desktop/ta-refactoring/turtleart.py:173
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:643
 msgid "Debug"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:779
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:824
 msgid "<Alt>d"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:785
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1395
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:727
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:830
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1440
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:728
 msgid "Stop turtle"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:788
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1399
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:833
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1444
 msgid "<Ctrl>s"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:800
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1448
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:845
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1493
 msgid "Samples"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:811
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1246
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:856
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1304
 msgid "Move the cursor over the orange palette for help."
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:820
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:857
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:865
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:902
 msgid "Help"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:851
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:896
 #: /home/walter/Desktop/ta-refactoring/turtleart.py:121
 msgid "View"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:853
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:898
 #: /home/walter/Desktop/ta-refactoring/turtleart.py:136
 msgid "Edit"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:855
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:900
 msgid "Import/Export"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1187
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1245
 #: /home/walter/Desktop/ta-refactoring/turtleart.py:127
 msgid "Copy"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1199
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1257
 #: /home/walter/Desktop/ta-refactoring/turtleart.py:131
 msgid "Paste"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1274
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1332
 msgid "Save Logo"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1387
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1432
 msgid "<Ctrl>d"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1453
+#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1498
 msgid "<Ctrl>o"
 msgstr ""
 
@@ -761,12 +772,12 @@ msgstr ""
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:525
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:526
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:527
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:814
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:829
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:845
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:876
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:907
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:938
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:815
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:830
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:846
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:877
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:908
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:939
 msgid "Title"
 msgstr ""
 
@@ -880,7 +891,7 @@ msgid "moves turtle backward"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:632
-msgid "palette of variable blocks"
+msgid "Palette of variable blocks"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:633
@@ -916,7 +927,7 @@ msgid "holds current pen color (can be used in place of a number block)"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:641
-msgid "a palette of pen colors"
+msgid "Palette of pen colors"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:642
@@ -941,7 +952,7 @@ msgid "logical equal-to operator"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:649
-msgid "palette of extra options"
+msgid "Palette of extra options"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:650
@@ -949,7 +960,7 @@ msgid "fills the background with (color, shade)"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:651
-msgid "palette of flow operators"
+msgid "Palette of flow operators"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:652
@@ -1044,297 +1055,301 @@ msgid "a programmable block: used to add advanced math equations, e.g., sin(x)"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:676
-msgid "runs code found in the tamyblock.py module found in the Journal"
+msgid "displays next palette"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:677
-msgid "logical NOT operator"
+msgid "runs code found in the tamyblock.py module found in the Journal"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:678
-msgid "palette of numeric operators"
+msgid "logical NOT operator"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:679
-msgid "used as numeric input in mathematic operators"
+msgid "Palette of numeric operators"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:680
-msgid "logical OR operator"
+msgid "used as numeric input in mathematic operators"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:681
-msgid "changes the orientation of the palette of blocks"
+msgid "logical OR operator"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:682
-msgid "Turtle will draw when moved."
+msgid "changes the orientation of the palette of blocks"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:683
-msgid "palette of pen commands"
+msgid "Turtle will draw when moved."
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:684
-msgid "holds current pen size (can be used in place of a number block)"
+msgid "Palette of pen commands"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:685
-msgid "Turtle will not draw when moved."
+msgid "holds current pen size (can be used in place of a number block)"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:686
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:733
-msgid "presentation template: select Journal object (with description)"
+msgid "Turtle will not draw when moved."
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:687
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:734
-msgid "presentation template: select Journal object (no description)"
+msgid "presentation template: select Journal object (with description)"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:688
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:689
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:735
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:736
-msgid "presentation template: select two Journal objects"
+msgid "presentation template: select Journal object (no description)"
 msgstr ""
 
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:689
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:690
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:736
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:737
-msgid "presentation template: select four Journal objects"
+msgid "presentation template: select two Journal objects"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:691
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:738
-msgid "presentation template: list of bullets"
+msgid "presentation template: select four Journal objects"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:692
-msgid "adds two alphanumeric inputs"
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:739
+msgid "presentation template: list of bullets"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:693
-msgid "displays polar coordinates"
+msgid "adds two alphanumeric inputs"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:694
-msgid "pops value off FILO (first-in last-out heap)"
+msgid "displays polar coordinates"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:695
-msgid "palette of presentation templates"
+msgid "pops value off FILO (first-in last-out heap)"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:696
-msgid "prints value in status block at bottom of the screen"
+msgid "Palette of presentation templates"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:697
-msgid "shows values in FILO (first-in last-out heap)"
+msgid "prints value in status block at bottom of the screen"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:698
-msgid "multiplies two numeric inputs"
+msgid "shows values in FILO (first-in last-out heap)"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:699
-msgid "pushes value onto FILO (first-in last-out heap)"
+msgid "multiplies two numeric inputs"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:700
-msgid "returns random number between minimum (top) and maximum (bottom) values"
+msgid "pushes value onto FILO (first-in last-out heap)"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:701
-msgid "modular (remainder) operator"
+msgid "returns random number between minimum (top) and maximum (bottom) values"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:702
-msgid "loops specified number of times"
+msgid "modular (remainder) operator"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:703
-msgid "restores most recent blocks from trash"
+msgid "loops specified number of times"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:704
-msgid "restore all blocks from trash"
+msgid "restores most recent blocks from trash"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:705
-msgid "xcor of right of screen"
+msgid "restore all blocks from trash"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:706
+msgid "xcor of right of screen"
+msgstr ""
+
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:707
 msgid "turns turtle clockwise (angle in degrees)"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:709
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:710
 msgid "saves a picture to the Sugar Journal"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:710
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:711
 msgid "holds current scale value"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:711
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:712
 msgid "sets color of the line drawn by the turtle"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:712
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:713
 msgid "sets the heading of the turtle (0 is towards the top of the screen.)"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:713
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:714
 msgid "sets size of the line drawn by the turtle"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:714
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:715
 msgid "sets the scale of media"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:715
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:716
 msgid "sets shade of the line drawn by the turtle"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:716
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:717
 msgid "sets color of text drawn by the turtle"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:717
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:718
 msgid "sets size of text drawn by turtle"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:718
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:719
 msgid ""
 "moves turtle to position xcor, ycor; (0, 0) is in the center of the screen."
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:719
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:720
 msgid "holds current pen shade"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:720
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:721
 msgid "draws text or show media from the Journal"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:721
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:722
 msgid "restores hidden blocks"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:722
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:723
 msgid "calculates square root"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:723
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:724
 msgid "invokes Action 1 stack"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:724
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:725
 msgid "invokes Action 2 stack"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:725
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:726
 msgid "invokes named action stack"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:726
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:727
 msgid "connects action to toolbar run buttons"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:728
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:729
 msgid "stops current action"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:729
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:730
 msgid "stores numeric value in Variable 1"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:730
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:731
 msgid "stores numeric value in Variable 2"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:731
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:732
 msgid "stores numeric value in named variable"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:732
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:733
 msgid "string value"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:739
-msgid "holds current text color (can be used in place of a number block)"
-msgstr ""
-
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:740
-msgid "holds current text size (can be used in place of a number block)"
+msgid "holds current text color (can be used in place of a number block)"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:741
-msgid "ycor of top of screen"
+msgid "holds current text size (can be used in place of a number block)"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:742
-msgid "a place to throw away blocks"
+msgid "ycor of top of screen"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:743
-msgid "palette of turtle commands"
+msgid "Trashcan"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:744
-msgid "do-until-True operator that uses boolean operators from Numbers palette"
+msgid "Palette of turtle commands"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:745
-msgid "jogs stack down"
+msgid "do-until-True operator that uses boolean operators from Numbers palette"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:746
-msgid "pauses program execution a specified number of seconds"
+msgid "jogs stack down"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:747
-msgid "do-while-True operator that uses boolean operators from Numbers palette"
+msgid "pauses program execution a specified number of seconds"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:748
-msgid "the canvas width"
+msgid "do-while-True operator that uses boolean operators from Numbers palette"
 msgstr ""
 
 #: /home/walter/Desktop/ta-refactoring/taconstants.py:749
+msgid "the canvas width"
+msgstr ""
+
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:750
 msgid ""
 "holds current x-coordinate value of the turtle (can be used in place of a "
 "number block)"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:750
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:751
 msgid ""
 "holds current y-coordinate value of the turtle (can be used in place of a "
 "number block)"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:809
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:810
 msgid "bulleted list"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:824
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:825
 msgid "picture"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:840
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:841
 msgid "2×2 pictures"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:871
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:872
 msgid "2×1 pictures"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:902
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:903
 msgid "1×2 pictures"
 msgstr ""
 
-#: /home/walter/Desktop/ta-refactoring/taconstants.py:933
+#: /home/walter/Desktop/ta-refactoring/taconstants.py:934
 msgid "1×1 picture"
 msgstr ""
diff --git a/taconstants.py b/taconstants.py
index bda0079..cc0ef1a 100644
--- a/taconstants.py
+++ b/taconstants.py
@@ -673,6 +673,7 @@ HELP_STRINGS = {
     'minus2':_("subtracts bottom numeric input from top numeric input"),
     'myfunc':_("a programmable block: used to add advanced math equations, e.g., sin(x)"),
     'myfunc2':_("a programmable block: used to add advanced math equations, e.g., sin(x)"),
+    'next':_('displays next palette'),
     'nop':_("runs code found in the tamyblock.py module found in the Journal"),
     'not':_("logical NOT operator"),
     'numbers':_("Palette of numeric operators"),
diff --git a/tasprite_factory.py b/tasprite_factory.py
index f76f40d..bfb8711 100755
--- a/tasprite_factory.py
+++ b/tasprite_factory.py
@@ -929,12 +929,11 @@ def generator(datapath):
     """
 
     svg0 = SVG()
-    f = open_file(datapath, "flow_test2.svg")
+    f = open_file(datapath, "basic.svg")
     svg0.set_scale(2)
-    svg0.expand(10,0)
-    svg0.set_tab(False)
+    svg0.set_tab(True)
     svg0.set_slot(True)
-    svg_str = svg0.basic_flow()
+    svg_str = svg0.basic_block()
     f.write(svg_str)
     close_file(f)
 
diff --git a/tawindow.py b/tawindow.py
index ebbcbd1..b136aa2 100644
--- a/tawindow.py
+++ b/tawindow.py
@@ -504,8 +504,8 @@ class TurtleArtWindow():
             self.palette_button.append(Sprite(self.sprite_list, 0,
                            self.toolbar_offset, svg_str_to_pixbuf(svg_from_file(
                                "%s/images/palettevertical.svg" % (self.path)))))
-            self.palette_button[0].name = 'orientation'
-            self.palette_button[1].name = 'orientation'
+            self.palette_button[0].name = _('orientation')
+            self.palette_button[1].name = _('orientation')
             self.palette_button[0].type = 'palette'
             self.palette_button[1].type = 'palette'
             self.palette_button[self.orientation].set_layer(TAB_LAYER)
@@ -515,7 +515,7 @@ class TurtleArtWindow():
             self.palette_button.append(Sprite(self.sprite_list, 16,
                            self.toolbar_offset, svg_str_to_pixbuf(svg_from_file(
                               "%s/images/palettenext.svg" %(self.path)))))
-            self.palette_button[2].name = 'next'
+            self.palette_button[2].name = _('next')
             self.palette_button[2].type = 'palette'
             self.palette_button[2].set_layer(TAB_LAYER)
 
@@ -783,7 +783,7 @@ class TurtleArtWindow():
                 if self._hide_button_hit(spr, x, y):
                     self.hideshow_palette(False)
             elif spr.type == 'palette':
-               if spr.name == 'next':
+               if spr.name == _('next'):
                    i = self.selected_palette+1
                    if i == len(PALETTE_NAMES):
                        i = 0
@@ -826,7 +826,7 @@ class TurtleArtWindow():
         self.show_palette(i)
 
     """
-    Select a toolbar button (when not running Sugar)
+    Select a toolbar button (Used when not running Sugar).
     """
     def _select_toolbar_button(self, spr):
         if spr.name == 'run-fastoff':
@@ -879,7 +879,7 @@ class TurtleArtWindow():
         self.show_palette(PALETTE_NAMES.index('trash'))
 
     """
-    Restore all the blocks in the trash can
+    Restore all the blocks in the trash can.
     """
     def _restore_all_from_trash(self):
         for b in self.block_list.list:
@@ -887,7 +887,7 @@ class TurtleArtWindow():
                 self._restore_from_trash(b)
 
     """
-    Restore latest blocks from the trash can
+    Restore most recent blocks from the trash can.
     """
     def _restore_latest_from_trash(self):
         if len(self.trash_stack) == 0:
@@ -920,7 +920,7 @@ class TurtleArtWindow():
         self.trash_stack.remove(blk)
 
     """
-    Permanently remove blocks in the trash can
+    Permanently remove all blocks presently in the trash can.
     """
     def _empty_trash(self):
         for b in self.block_list.list:
@@ -933,9 +933,14 @@ class TurtleArtWindow():
     Is x,y over the trash can?
     """
     def _in_the_trash(self, x, y):
+        """
         if self.selected_palette == self.trash_index and \
            self.palette_sprs[self.trash_index][self.orientation].hit((x,y)):
             return True
+        """
+        if self.palette_sprs[self.selected_palette][self.orientation].hit(
+                                                                         (x,y)):
+            return True
         return False
 
     """
@@ -1196,6 +1201,7 @@ class TurtleArtWindow():
                 (bx, by) = b.spr.get_xy()
                 if bx+dx < 0:
                     dx += -(bx+dx)
+                """
                 # ...or under the palette.
                 if self.selected_palette is not None and\
                    self.selected_palette != self.trash_index:
@@ -1208,6 +1214,7 @@ class TurtleArtWindow():
                     else:
                         if by < h+self.toolbar_offset and bx+dx < PALETTE_WIDTH:
                             dx += -(bx+dx)+PALETTE_WIDTH
+                """
 
             # Move the stack.
             for b in self.drag_group: