Changed the Defines

all defines declared