Fix up colors and reorganize