Naming conventions for css changed to use - as seperator
Merge from fmob