Theme updates to upgrade to 0.16 - #310

Can someone peer review this please. It should (hopefully) fix #310