Updated colors and rearranged stuff