fix colors, rename a varable