Fixed even more color bugs