lots of new goodies from Orangered / Circlet