[Magic-HD] Screentweaks & code cleanup