Reworked some of the definition names and values in preparation for
colour FAX