Moved the various macros from the visual constant file to the relevant classes