more color fixes
officially bug fixed. Need testing.