[Magic-HD-Night/Noire]tweak more screens to use templates