follow-up to r8022 (Manga Mode)