Changing colors, getting rid of the wrapper

not sure what the wrapper does