got colors working
a few changes