Common: Update config & macros