Clean up theme-related code