added properties and colors from christian
changed color presedence
Fixed presedence and changed colors: