General upgrades to theme layer.