Continued work on config.addons.mk