Revert "Moved screensaver options to separate menu"

This reverts commit a9cd3425534da261e33c57409bb256065fd9bb18.
moved screensaver options to separate screensaver settings menu