Feature/rewrite fountain grammar