Fixed pipe connection for colors

Also change the name of a few classes in the process