Added few color changes