Theme cleanup