[Magic-HD-Night/Noire] Several tweaks
Merge remote-tracking branch 'origin/master'