updated
updated colors
updated all
..
fixed conflicts