more upgrades and fixes to theme