I put all of the uncommented defines from the rcbugfix configuration.h and the 'colin' old configuration.h in an excel file and did some comparing (I do SQL stuff all day, I am using a saw to pound nails here.) The new file merges some items ( HOMING_FEEDRATE_XY vs HOMING_FEEDRATE), breaks out some others and drops some defines entirely.. and of course add a whole crop of entirely new defines for nozzle cleaning, etc.

I may use the excel as a guide as I can filter out a lot of the 'noise', but having looked at the Pegasus files, it it definitely closer to the bugfix and may be a better place to start, so, excellent suggestion, thank you.