Overlay updates from Andromadus & AceEnablementProject