Added stuff from fluidity
Updated colors