New Options Panel and Refactor File Types