Re-factor Settings (incomplete)
Merge branch 'master' into settings
Re-factor Settings (requires changes in main.cpp)