Move theme options to own folder
Add defautl to layout options