Fix a couple settings modules not showing up properly.
Combined C screen lock/brightness module with existing screensaver module