Add attributes to set prefix and suffix color
Minor refacto. Fix bugs