Move Full Screen Mode to Manifest
Merge branch 'refactor'