added dynamic changes of colors
fixed the conflicts