diff --git a/cmd/testX11draw.go b/cmd/testX11draw.go
index 71f56fa..be9645b 100644
--- a/cmd/testX11draw.go
+++ b/cmd/testX11draw.go
@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
-	"exp/draw"
-	"exp/draw/x11"
+	"image/draw"
+	"image/draw/x11"
 	"image"
 	"math"
 	"draw2d.googlecode.com/hg/draw2d"
diff --git a/cmd/testandroid.go b/cmd/testandroid.go
index 6ebf6ed..6120fa4 100644
--- a/cmd/testandroid.go
+++ b/cmd/testandroid.go
@@ -91,7 +91,7 @@ func android(gc draw2d.GraphicContext, x, y float64) {
 
 func main() {
 	i, gc := initGc(width, height)
-	gc.SetFillColor(image.RGBAColor{0xff, 0x44, 0x44, 0xff})
+	gc.SetFillColor(image.RGBAColor{0x44, 0xff, 0x44, 0xff})
 	gc.SetStrokeColor(image.RGBAColor{0x44, 0x44, 0x44, 0xff})
 	android(gc, 10, 10)
 	saveToPngFile("TestAndroid", i)
diff --git a/cmd/testimage.go b/cmd/testimage.go
index c4bfcf9..e4cef6a 100644
--- a/cmd/testimage.go
+++ b/cmd/testimage.go
@@ -9,7 +9,7 @@ import (
 	"image"
 	"time"
 	"image/png"
-	"exp/draw"
+	"image/draw"
 	"draw2d.googlecode.com/hg/draw2d"
 )
 
diff --git a/draw2d/curve/curve_test.go b/draw2d/curve/curve_test.go
index b3ae18a..7c3ff5e 100644
--- a/draw2d/curve/curve_test.go
+++ b/draw2d/curve/curve_test.go
@@ -8,7 +8,7 @@ import (
 	"bufio"
 	"image"
 	"image/png"
-	"exp/draw"
+	"image/draw"
 	"draw2d.googlecode.com/hg/draw2d/raster"
 )
 
diff --git a/draw2d/image.go b/draw2d/image.go
index cbc80ce..48dc79f 100644
--- a/draw2d/image.go
+++ b/draw2d/image.go
@@ -3,7 +3,7 @@
 package draw2d
 
 import (
-	"exp/draw"
+	"image/draw"
 	"image"
 	"log"
 	"freetype-go.googlecode.com/hg/freetype"
diff --git a/draw2d/paint.go b/draw2d/paint.go
index be3bbd1..c05fe7e 100644
--- a/draw2d/paint.go
+++ b/draw2d/paint.go
@@ -3,7 +3,7 @@
 package draw2d
 
 import (
-	"exp/draw"
+	"image/draw"
 	"image"
 	"freetype-go.googlecode.com/hg/freetype/raster"
 )
@@ -40,7 +40,7 @@ func (r *NRGBAPainter) Paint(ss []raster.Span, done bool) {
 		}
 		base := s.Y * r.Image.Stride
 		p := r.Image.Pix[base+s.X0 : base+s.X1]
-		// This code is duplicated from drawGlyphOver in $GOROOT/src/pkg/exp/draw/draw.go.
+		// This code is duplicated from drawGlyphOver in $GOROOT/src/pkg/image/draw/draw.go.
 		// TODO(nigeltao): Factor out common code into a utility function, once the compiler
 		// can inline such function calls.
 		ma := s.A >> 16
diff --git a/draw2d/raster/line.go b/draw2d/raster/line.go
index 8a9d33a..92fed7a 100644
--- a/draw2d/raster/line.go
+++ b/draw2d/raster/line.go
@@ -3,7 +3,7 @@
 package raster
 
 import (
-	"exp/draw"
+	"image/draw"
 	"image"
 )
 
diff --git a/draw2d/rgba_interpolation.go b/draw2d/rgba_interpolation.go
index 88663b2..c70ae5a 100644
--- a/draw2d/rgba_interpolation.go
+++ b/draw2d/rgba_interpolation.go
@@ -2,7 +2,7 @@
 package draw2d
 
 import (
-	"exp/draw"
+	"image/draw"
 	"image"
 	"math"
 )
diff --git a/draw2dgl/gc.go b/draw2dgl/gc.go
index de8a043..e87807d 100644
--- a/draw2dgl/gc.go
+++ b/draw2dgl/gc.go
@@ -2,7 +2,7 @@ package draw2dgl
 
 import (
 	"image"
-	"exp/draw"
+	"image/draw"
 	"gl"
 	"freetype-go.googlecode.com/hg/freetype/raster"
 	"draw2d.googlecode.com/hg/draw2d"
diff --git a/resource/result/TestAndroid.png b/resource/result/TestAndroid.png
index b0294d0..817429b 100644
Binary files a/resource/result/TestAndroid.png and b/resource/result/TestAndroid.png differ