Fixed header and added necessary NSColor category