(Bug 4755) Property name clean-up, theme organization