Fixed most of the issues with pulling in color classes will fix the rest before i send upstream. also updated todo.