clean up theme logic