The update that resolved all configs

Succeeded in abiding within the universal configs with IDs. This
*should* be relatively conflict ID free. If you find one, please report
it :) Enjoy your tinkering!