diff --git a/draw2d/src/cmd/gettingStarted.go b/draw2d/src/cmd/gettingStarted.go
index b251763..3e98f2a 100644
--- a/draw2d/src/cmd/gettingStarted.go
+++ b/draw2d/src/cmd/gettingStarted.go
@@ -11,8 +11,8 @@ import (
 
 	"image"
 	"image/png"
-	"draw2d"
-	//"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
+	//"draw2d"
+	"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
 )
 
 
diff --git a/draw2d/src/cmd/testX11draw.go b/draw2d/src/cmd/testX11draw.go
index e0d627c..7f1229b 100644
--- a/draw2d/src/cmd/testX11draw.go
+++ b/draw2d/src/cmd/testX11draw.go
@@ -6,8 +6,8 @@ import (
 	"exp/draw/x11"
 	"image"
 	"math"
-	"draw2d"
-	//"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
+	//"draw2d"
+	"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
 )
 
 func main() {
diff --git a/draw2d/src/cmd/testandroid.go b/draw2d/src/cmd/testandroid.go
index c1b1ae4..b1fc0a1 100644
--- a/draw2d/src/cmd/testandroid.go
+++ b/draw2d/src/cmd/testandroid.go
@@ -11,12 +11,12 @@ import (
 	"math"
 	"image"
 	"image/png"
-	"draw2d"
-	//"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
+	//"draw2d"
+	"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
 )
 
 const (
-	width, height = 500, 500
+	width, height = 178, 224
 )
 
 var (
@@ -93,6 +93,8 @@ func android(gc *draw2d.GraphicContext, x, y float) {
 
 func main() {
 	i, gc := initGc(width, height)
-	android(gc, 100, 100)
+	gc.SetFillColor(image.RGBAColor{0xff, 0x44, 0x44, 0xff})
+	gc.SetStrokeColor(image.RGBAColor{0x44, 0x44, 0x44, 0xff})
+	android(gc, 10, 10)
 	saveToPngFile("TestAndroid", i)
 }
diff --git a/draw2d/src/cmd/testdraw2d.go b/draw2d/src/cmd/testdraw2d.go
index 534ecdb..1f394a3 100644
--- a/draw2d/src/cmd/testdraw2d.go
+++ b/draw2d/src/cmd/testdraw2d.go
@@ -13,8 +13,8 @@ import (
 	"math"
 	"image"
 	"image/png"
-	"draw2d"
-	//"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
+	//"draw2d"
+	"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
 )
 
 const (
diff --git a/draw2d/src/cmd/test_gopher.go b/draw2d/src/cmd/testgopher.go
similarity index 95%
rename from draw2d/src/cmd/test_gopher.go
rename to draw2d/src/cmd/testgopher.go
index efa551f..aa3674f 100644
--- a/draw2d/src/cmd/test_gopher.go
+++ b/draw2d/src/cmd/testgopher.go
@@ -11,12 +11,12 @@ import (
 
 	"image"
 	"image/png"
-	"draw2d"
-	//"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
+	//"draw2d"
+	"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
 )
 
 const (
-	width, height = 500, 300
+	width, height = 300, 200
 )
 
 var (
@@ -129,7 +129,7 @@ func gordon(gc *draw2d.GraphicContext, x, y, w, h float) {
 func main() {
 	i, gc := initGc(width, height)
 	gc.Clear()
-	gc.Translate(100, 100)
+	gc.Translate(-75, 58)
 	gc.Rotate(-30 * (math.Pi / 180.0))
 	gordon(gc, 48, 48, 240, 72)
 	saveToPngFile("TestGopher", i)