WH-30 - Theme cleanup