2014-12-16 Color fixes