fixed colors finally