Incorporate Jordan's excellent theme updates