Fix up colors and add new colors file