Rework theme