Fix Some Alignment Stuff
Move Colors to Own Module