diff --git a/hydrogen-syntax.cabal b/hydrogen-syntax.cabal
--- a/hydrogen-syntax.cabal
+++ b/hydrogen-syntax.cabal
@@ -1,5 +1,5 @@
 name:                 hydrogen-syntax
-version:              0.6
+version:              0.7
 homepage:             https://github.com/scravy/hydrogen-syntax
 synopsis:             Hydrogen Syntax
 license:              BSD3
@@ -20,8 +20,8 @@
                       , Hydrogen.Syntax.Types
   build-depends:      base ==4.7.*
                       , containers ==0.5.* 
-                      , hydrogen-prelude ==0.6.0.1
-                      , hydrogen-util ==0.6
+                      , hydrogen-prelude ==0.7
+                      , hydrogen-util ==0.7
                       , nicify ==1.1.*
                       , parsec ==3.1.*
                       , uuid ==1.3.*
diff --git a/src/Hydrogen/Syntax/Parser.hs b/src/Hydrogen/Syntax/Parser.hs
--- a/src/Hydrogen/Syntax/Parser.hs
+++ b/src/Hydrogen/Syntax/Parser.hs
@@ -3,9 +3,9 @@
 import Hydrogen.Prelude hiding ((<|>), many)
 import Hydrogen.Syntax.Types
 
-import Hydrogen.Util.Parsec hiding (token, tokens)
-import Text.Parsec.Char (char, hexDigit, noneOf, oneOf, string)
+import Hydrogen.Util.Parsec.Char hiding (token, tokens, space)
 
+
 tokenize :: String -> Parser String (Tokens Token)
 tokenize srcName = either mkError sanitize . runIdentity . runParserT tokens () srcName
   where
@@ -106,10 +106,8 @@
     sanitize [] = Right []
 
 layout :: Parser (Tokens Token) POPs
-layout = either mkError Right . runIdentity . runParserT document () "-"
+layout = runTokenParser (many (liftA2 (,) getPosition (someToken 0)) <* eof)
   where
-    document = many (liftA2 (,) getPosition (someToken 0)) <* eof
-
     someToken :: Monad m => Int -> ParsecT [(SourcePos, Token)] u m POP
     someToken i = choice [
         sourceToken $ \case