Merged Nico's fullscreen patch