diff -upBr slim-old/Slim/Buttons/ScreenSaver.pm slim/server/Slim/Buttons/ScreenSaver.pm
--- slim-old/Slim/Buttons/ScreenSaver.pm	2004-09-29 20:53:00.000000000 -0700
+++ slim/server/Slim/Buttons/ScreenSaver.pm	2004-11-18 09:24:53.593750000 -0800
@@ -49,7 +49,7 @@ sub screenSaver {
 	assert($mode);
 	
 	# some variables, so save us calling the same functions multiple times.
-	my $saver = Slim::Utils::Prefs::clientGet($client,'screensaver');
+	my $saver = $client->playmode eq 'play' ? Slim::Utils::Prefs::clientGet($client,'screensaver') : Slim::Utils::Prefs::clientGet($client,'idlesaver');
 	my $dim = Slim::Utils::Prefs::clientGet($client,'idleBrightness');
 	my $timeout = Slim::Utils::Prefs::clientGet($client,"screensavertimeout");
 	my $irtime = Slim::Hardware::IR::lastIRTime($client);
diff -upBr slim-old/Slim/Player/Player.pm slim/server/Slim/Player/Player.pm
--- slim-old/Slim/Player/Player.pm	2004-10-20 03:09:00.000000000 -0700
+++ slim/server/Slim/Player/Player.pm	2004-11-18 09:48:55.546875000 -0800
@@ -47,6 +47,7 @@ my $defaultPrefs = {
 		,'powerOffBrightness'	=> 1
 		,'powerOnBrightness'	=> 4
 		,'screensaver'			=> 'playlist'
+		,'idlesaver'			=> 'playlist'
 		,'screensavertimeout'	=> 30
 		,'scrollPause'			=> 3.6
 		,'scrollPauseDouble'	=> 3.6
Only in slim/server/Slim/Utils: Scan.pm.old
diff -upBr slim-old/Slim/Web/Setup.pm slim/server/Slim/Web/Setup.pm
--- slim-old/Slim/Web/Setup.pm	2004-11-04 20:24:00.000000000 -0800
+++ slim/server/Slim/Web/Setup.pm	2004-11-18 10:07:57.203125000 -0800
@@ -121,6 +121,7 @@ sub initSetupConfig {
 						if (scalar(keys %{Slim::Buttons::Common::hash_of_savers()}) > 0) {
 							push @{$pageref->{'GroupOrder'}}, 'ScreenSaver';
 							$pageref->{'Prefs'}{'screensaver'}{'options'} = Slim::Buttons::Common::hash_of_savers();
+							$pageref->{'Prefs'}{'idlesaver'}{'options'} = Slim::Buttons::Common::hash_of_savers();
 						}
 					} else {
 						$pageref->{'GroupOrder'} = ['Default','TitleFormats'];
@@ -187,11 +188,12 @@ sub initSetupConfig {
 					,'GroupLine' => 1
 				}
 			,'ScreenSaver' => {
-				'PrefOrder' => ['screensaver','screensavertimeout']
+				'PrefOrder' => ['screensaver','idlesaver','screensavertimeout']
 				,'Suppress_PrefHead' => 1
 				,'Suppress_PrefDesc' => 1
 				,'Suppress_PrefLine' => 1
 				,'Suppress_PrefSub' => 1
+				,'PrefsInTable' => 1
 				,'GroupHead' => string('SETUP_SCREENSAVER')
 				,'GroupDesc' => string('SETUP_SCREENSAVER_DESC')
 				,'GroupLine' => 1
@@ -256,6 +258,11 @@ sub initSetupConfig {
 							,'validateArgs' => [\&Slim::Buttons::Common::hash_of_savers,1]
 							,'options' => undef #will be set by preEval  
 						}
+			,'idlesaver'	=> {
+							'validate' => \&validateInHash
+							,'validateArgs' => [\&Slim::Buttons::Common::hash_of_savers,1]
+							,'options' => undef #will be set by preEval  
+						}
 			,'screensavertimeout' => {
 							'validate' => \&validateNumber
 							,'validateArgs' => [0,undef,1]
diff -upBr slim-old/strings.txt slim/server/strings.txt
--- slim-old/strings.txt	2004-10-28 09:06:00.000000000 -0700
+++ slim/server/strings.txt	2004-11-18 09:59:42.828125000 -0800
@@ -2836,7 +2848,7 @@ SETUP_HISTORYLENGTH_DESC
 SETUP_SCREENSAVER
 	DE	Bildschirmschoner
 	DK	Pauseskærm
-	EN	Screensaver
+	EN	Screensaver during Playback
 	ES	Salvapantalla
 	FI	Näytönsäästäjä
 	FR	Ecran de veille
@@ -2845,16 +2857,22 @@ SETUP_SCREENSAVER
 	PT	Protecção de Ecrã
 	SE	Skärmsläckare
 
+SETUP_IDLESAVER
+	EN	Idle Screensaver
+
 SETUP_SCREENSAVER_CHOOSE
 	DE	Wählen Sie einen Bildschirmschoner
-	EN	Choose your custom screensaver:
+	EN	Choose your Playback screensaver:
 	FR	Choisissez un écran de veille
 	NO	Velg din skjermsparer
 	SE	Välj din anpassade skärmsläckare
 
+SETUP_IDLESAVER_CHOOSE
+	EN	Choose your Idle screensaver:
+
 SETUP_SCREENSAVER_DESC
 	FR	Vous pouvez modifier l'écran de veille courant ainsi que le délai avant son activation. Entrez 0 pour désactiver l'écran de veille courant.
-	EN	You can your current screensaver and the duration to wait before enabling the screensaver. Set this duration to zero to never show the current screensaver.
+	EN	You can choose your current screensaver and the duration to wait before enabling the screensaver. Set this duration to zero to never show the current screensaver. The Playback screensaver will activate while playing music, while the Idle screensaver will be used when the player is powered on and idle.
 
 SETUP_SCREENSAVERTIMEOUT
 	DE	Bildschirmschoner Verzögerung: