added brand colors and updated todo
fixed grouping bug finally sheesh