_blank theme cleanup
More _blank cleanup