Use new style osd creation tools