9/23 commit: More theme updates