cleaned a bit up ...

… to be more compatible with built in Espresso zones and therefore
easier syntax highlighting.