added clean up theme