Hot Fix and some color updates