Minor template / theme / html5 fixes