Some more updates to make the theme page work better

Man, we need a serious redesign of how areas and blocks work.