Update for ade25.toolbar usage