[Magic-HD-Night/Noire]Some last template tweaks.