Moved some external-apps to single variant and modified support contacts format.