Switch to Remy Sharps simpler version
Make available as packages