Initial work on full theme rewrite.