Big rewrite, mostly complete theme