allow disabling help and mail; upgrade 2010 and 2011 themes