Further updates to Theme changes.