Update to latest ZPX themes code