Updated custom tooltips to new format