In general, I've changed hypens to colons (or en dashes) where appropriate.