adding missing span classes, and "." instead of ":"