diff --git a/Logo.hs b/Logo.hs
--- a/Logo.hs
+++ b/Logo.hs
@@ -2,7 +2,7 @@
 module Main where
 
 import Diagrams.Prelude
-import Diagrams.Backend.Cairo.CmdLine
+import Diagrams.Backend.SVG.CmdLine
 import Diagrams.TwoD.Path.Turtle
 
 import Logo.Types
@@ -24,9 +24,9 @@
 
 logoOpts :: String -> LogoOpts
 logoOpts prog = LogoOpts
-  { output =  "logo.png"
+  { output =  "logo.svg"
            &= typFile
-           &= help "Output image file (default=logo.png)"
+           &= help "Output image file (default=logo.svg)"
   , src = def
         &= typFile
         &= args
@@ -50,7 +50,7 @@
 
 readSource :: FilePath -> IO [LogoToken]
 readSource f = do
-  tokens <- tokenize <$> readFile f
+  tokens <- tokenize f <$> readFile f
   case tokens of
     Left x -> error $ show x
     Right t -> return t
@@ -62,4 +62,3 @@
   case res of
     Left  err -> error $ show err
     Right _ -> return ()
-
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -6,18 +6,14 @@
 
 ## Quickstart
 
-For those who like to live dangerously, here is a quickstart:
-
-* Install [diagrams](http://projects.haskell.org/diagrams/) and related dependencies. Here is a [gist of instructions](https://gist.github.com/1683922) if you are on OS X.
-* Clone the Git repo for hs-logo
-* Run `cabal configure && cabal build`
+Follow the [installation instructions](http://deepakjois.github.com/hs-logo/installation.html)
 
 You can now try out some logo programs in the [examples](https://github.com/deepakjois/hs-logo/tree/master/site/examples) folder
 
-    % dist/build/hs-logo/hs-logo site/examples/sources/snowflake.logo -o ~/tmp/snowflake.png
+    % dist/build/hs-logo/hs-logo site/examples/sources/snowflake.logo -o ~/tmp/snowflake.svg
 
-![Snowflake](http://deepakjois.github.com/hs-logo/examples/images/snowflake.png)
+![Snowflake](http://deepakjois.github.com/hs-logo/examples/svgs/snowflake.svg)
 
-    % dist/build/hs-logo/hs-logo site/examples/sources/design1.logo -o ~/tmp/design1.png
+    % dist/build/hs-logo/hs-logo site/examples/sources/design1.logo -o ~/tmp/design1.svg
 
-![Design](http://deepakjois.github.com/hs-logo/examples/images/design1.png)
+![Design](http://deepakjois.github.com/hs-logo/examples/svgs/design1.svg)
diff --git a/hs-logo.cabal b/hs-logo.cabal
--- a/hs-logo.cabal
+++ b/hs-logo.cabal
@@ -1,5 +1,5 @@
 Name:                hs-logo
-Version:             0.1
+Version:             0.2
 Synopsis:            Logo turtle graphics interpreter
 Description:         Interpreter for the Logo programming language,
                      specialised for turtle graphics.
@@ -32,4 +32,4 @@
                      parsec-numbers,
                      diagrams-core >= 0.5 && < 0.6,
                      diagrams-lib >= 0.5 && < 0.6,
-                     diagrams-cairo >= 0.5 && < 0.6
+                     diagrams-svg >= 0.3 && < 0.4