Finished consolidating INI imports and macros