d7 2.x - major theming updates