Clean up theme vs structure css