Use hiccup for templating.
Clean up templates and design
Generate site, now using hiccup.