Merge old modes into new modes.
Remove those HTML spaces and switch to dashes.