Rewrite; remove disliked themes, tidy up plugin file