Max Kohl Colormaster changes

Didn't run into any trouble!