Potentially fixed #1123
Uses whole new settings system.