Upgrade to Lib-Noir