v3.1.1

* Many internal fixes to address 3.1.0 issues
* Theme updates