Clean up theme functions