Rework theme mechanism