Documented themes, and improved consistency