fixed colors
committing all changes