diff --git a/Gleam.cabal b/Gleam.cabal
--- a/Gleam.cabal
+++ b/Gleam.cabal
@@ -1,5 +1,5 @@
 name:                Gleam
-version:             0.1.0.2
+version:             0.1.1.0
 cabal-version:       >=1.10
 license:             BSD3
 license-file:        LICENSE
diff --git a/src/Color.hs b/src/Color.hs
--- a/src/Color.hs
+++ b/src/Color.hs
@@ -41,5 +41,5 @@
   Violet        -> "#EE82EE"
   Azure         -> "#007FFF"
   Chartreuse    -> "#7FFF00"
-  Orange        -> "ffa500"
+  Orange        -> "#FFA500"
   (RGBA string) -> string
diff --git a/src/Handler.hs b/src/Handler.hs
--- a/src/Handler.hs
+++ b/src/Handler.hs
@@ -133,7 +133,7 @@
 convertMouse pos state = (EventKey (Mouse pos) state)
 
 convertMouseMove :: Point -> Point -> InputEvent
-convertMouseMove (x, y) (nx, ny) = (EventMotion ((x - nx), (y - ny)) (nx, ny))
+convertMouseMove (x, y) (nx, ny) = (EventMouse ((x - nx), (y - ny)) (nx, ny))
 
 convertKeyCode :: UI.KeyCode -> KeyState -> InputEvent
 convertKeyCode code state
diff --git a/src/InputEvent.hs b/src/InputEvent.hs
--- a/src/InputEvent.hs
+++ b/src/InputEvent.hs
@@ -13,7 +13,7 @@
         -- | A key or mouse button event
         = EventKey Key KeyState
         -- | A mouse motion event
-        | EventMotion Point Point
+        | EventMouse Point Point
         deriving (Eq, Show)
 
 -- | A key.
diff --git a/src/Render.hs b/src/Render.hs
--- a/src/Render.hs
+++ b/src/Render.hs
@@ -45,7 +45,9 @@
   return ()
 
 drawPicture (Rectangle width height) canvas = do
-  canvas # UI.fillRect (0 - (width / 2), 0 - (height / 2)) width height
+  canvas # UI.beginPath
+  canvas # drawRectangle (0 - (width / 2), 0 - (height / 2)) width height
+  canvas # UI.fill
   return ()
 
 drawPicture (Stroke color size picture) canvas = do
@@ -54,6 +56,7 @@
   canvas # set' UI.lineWidth size
   canvas # drawPicture picture
   canvas # restoreDrawState
+  canvas # UI.stroke
   return ()
 
 drawPicture (Text string font fontSize) canvas = do
@@ -158,6 +161,15 @@
   "%1.getContext('2d').drawImage(%2,%3,%4,%5,%6)"
   canvas
   image
+  x
+  y
+  width
+  height
+
+drawRectangle :: Vector -> Double -> Double -> UI.Canvas -> UI ()
+drawRectangle (x, y) width height canvas = UI.runFunction $ ffi
+  "%1.getContext('2d').rect(%2,%3,%4,%5)"
+  canvas
   x
   y
   width