--- a/src/upmpdcli.conf
+++ b/src/upmpdcli.conf
@@ -110,152 +110,154 @@
 # Initial / default List of radios stolen from radiotray. Edit to taste
 #
 # Maybe this should be XML, but it's not. The section markers are the radio
-# names, and then there is only an url attribute. THere is not much more
-# which we can send through UPnP anyway.
+# names, and then there are two possible entries:
+#  url (mandatory) points to the radio playlist or stream
+#  artUrl (optional) points to the radio icon
 
 [radio Smooth Jazz]
-url=http://smoothjazz.com/streams/smoothjazz_128.pls
+url = http://smoothjazz.com/streams/smoothjazz_128.pls
+artUrl =
 
 [radio SKY.fm Piano Jazz]
-url=http://listen.sky.fm/public1/pianojazz.pls
+url = http://listen.sky.fm/public1/pianojazz.pls
 
 [radio SKY.fm Smooth Jazz]
-url=http://listen.sky.fm/public1/smoothjazz.pls
+url = http://listen.sky.fm/public1/smoothjazz.pls
 
 [radio Sonic Universe]
-url=http://somafm.com/sonicuniverse.pls
+url = http://somafm.com/sonicuniverse.pls
 
 [radio Blue FM]
-url=http://bluefm.net/listen.pls
+url = http://bluefm.net/listen.pls
 
 [radio Onda Tropical]
-url=http://yp.shoutcast.com/sbin/tunein-station.pls?id=506392
+url = http://yp.shoutcast.com/sbin/tunein-station.pls?id=506392
 
 [radio Top Latino Radio]
-url=http://online.radiodifusion.net:8020/listen.pls
+url = http://online.radiodifusion.net:8020/listen.pls
 
 [radio Salsa Stream]
-url=http://listen.sky.fm/public3/salsa.pls
+url = http://listen.sky.fm/public3/salsa.pls
 
 [radio Reggaeton 24/7]
-url=http://cc.net2streams.com/tunein.php/reggaeton/playlist.pls
+url = http://cc.net2streams.com/tunein.php/reggaeton/playlist.pls
 
 [radio Suave 107]
-url=http://grupomedrano.com.do/suave107/suave107.m3u
+url = http://grupomedrano.com.do/suave107/suave107.m3u
 
 [radio 181.FM Classic Hits]
-url=http://sc-rly.181.fm:80/stream/1094
+url = http://sc-rly.181.fm:80/stream/1094
 
 [radio .977 Classic Rock]
-url=http://www.977music.com/tunein/web/classicrock.asx
+url = http://www.977music.com/tunein/web/classicrock.asx
 
 [radio 80s Sky.FM]
-url=http://listen.sky.fm/public3/the80s.pls
+url = http://listen.sky.fm/public3/the80s.pls
 
 [radio Covers]
-url=http://somafm.com/covers.pls
+url = http://somafm.com/covers.pls
 
 [radio KDFC]
-url=http://provisioning.streamtheworld.com/pls/KDFCFM.pls
+url = http://provisioning.streamtheworld.com/pls/KDFCFM.pls
 
 [radio Classic FM]
-url=http://media-ice.musicradio.com/ClassicFMMP3.m3u
+url = http://media-ice.musicradio.com/ClassicFMMP3.m3u
 
 [radio WCPE]
-url=http://www.ibiblio.org/wcpe/wcpe.pls
+url = http://www.ibiblio.org/wcpe/wcpe.pls
 
 [radio CINEMIX]
-url=http://cinemix.us/cine.asx
+url = http://cinemix.us/cine.asx
 
 [radio SKY.fm Soundtracks]
-url=http://listen.sky.fm/public1/soundtracks.pls
+url = http://listen.sky.fm/public1/soundtracks.pls
 
 [radio SKY.fm Mostly Classical]
-url=http://listen.sky.fm/public1/classical.pls
+url = http://listen.sky.fm/public1/classical.pls
 
 [radio Radio Paradise]
-url=http://www.radioparadise.com/musiclinks/rp_128aac.m3u
+url = http://www.radioparadise.com/musiclinks/rp_128aac.m3u
 
 [radio .977 The Hitz Channel]
-url=http://yp.shoutcast.com/sbin/tunein-station.pls?id=1280356
+url = http://yp.shoutcast.com/sbin/tunein-station.pls?id=1280356
 
 [radio Enjoy Station]
-url=http://yp.shoutcast.com/sbin/tunein-station.pls?id=1377285
+url = http://yp.shoutcast.com/sbin/tunein-station.pls?id=1377285
 
 [radio SKY.fm Top Hits]
-url=http://listen.sky.fm/public1/tophits.pls
+url = http://listen.sky.fm/public1/tophits.pls
 
 [radio Indie Pop Rocks!]
-url=http://somafm.com/indiepop.pls
+url = http://somafm.com/indiepop.pls
 
 [radio PopTron]
-url=http://somafm.com/poptron.pls
+url = http://somafm.com/poptron.pls
 
 [radio AM 1710]
-url=http://lin2.ash.fast-serv.com:9022/listen.pls
+url = http://lin2.ash.fast-serv.com:9022/listen.pls
 
 [radio WNAR]
-url=http://live.wnar-am.com:8500/listen.pls
+url = http://live.wnar-am.com:8500/listen.pls
 
 [radio SKY.fm Oldies]
-url=http://listen.sky.fm/public1/oldies.pls
+url = http://listen.sky.fm/public1/oldies.pls
 
 [radio 181.FM]
-url=http://yp.shoutcast.com/sbin/tunein-station.pls?id=1275050
+url = http://yp.shoutcast.com/sbin/tunein-station.pls?id=1275050
 
 [radio Lounge Radio]
-url=http://yp.shoutcast.com/sbin/tunein-station.pls?id=1288934
+url = http://yp.shoutcast.com/sbin/tunein-station.pls?id=1288934
 
 [radio Beat Blender]
-url=http://somafm.com/beatblender.pls
+url = http://somafm.com/beatblender.pls
 
 [radio Secret Agent]
-url=http://somafm.com/secretagent.pls
+url = http://somafm.com/secretagent.pls
 
 [radio Groove Salad]
-url=http://somafm.com/groovesalad.pls
+url = http://somafm.com/groovesalad.pls
 
 [radio Illinois Street Lounge]
-url=http://somafm.com/illstreet.pls
+url = http://somafm.com/illstreet.pls
 
 [radio SKY.fm Country]
-url=http://listen.sky.fm/public1/country.pls
+url = http://listen.sky.fm/public1/country.pls
 
 [radio Boot Liquor]
-url=http://somafm.com/bootliquor.pls
+url = http://somafm.com/bootliquor.pls
 
 [radio US 181]
-url=mmsh://wms-rly.181.fm/181-us181?MSWMExt=.asf
+url = mmsh://wms-rly.181.fm/181-us181?MSWMExt=.asf
 
 [radio Real Country]
-url=mmsh://wms-rly.181.fm/181-realcountry?MSWMExt=.asf
+url = mmsh://wms-rly.181.fm/181-realcountry?MSWMExt=.asf
 
 [radio Highway 181]
-url=mmsh://wms-rly.181.fm/181-highway?MSWMExt=.asf
+url = mmsh://wms-rly.181.fm/181-highway?MSWMExt=.asf
 
 [radio Country 108]
-url=http://www.country108.com/listen.pls
+url = http://www.country108.com/listen.pls
 
 [radio Drone Zone]
-url=http://somafm.com/dronezone.pls
+url = http://somafm.com/dronezone.pls
 
 [radio Space Station Soma]
-url=http://somafm.com/spacestation.pls
+url = http://somafm.com/spacestation.pls
 
 [radio cliqhop idm]
-url=http://somafm.com/cliqhop.pls
+url = http://somafm.com/cliqhop.pls
 
 [radio Black Rock FM]
-url=http://somafm.com/brfm.pls
+url = http://somafm.com/brfm.pls
 
 [radio New Dance Radio]
-url=http://jbstream.net/tunein.php/blackoutworm/playlist.asx
+url = http://jbstream.net/tunein.php/blackoutworm/playlist.asx
 
 [radio Jupiter Broadcast]
-url=http://jblive.fm/
+url = http://jblive.fm/
 
 [radio WCRS LPFM Columbus]
-url=http://sh4.audio-stream.com/tunein.php/pleonard/playlist.pls
+url = http://sh4.audio-stream.com/tunein.php/pleonard/playlist.pls
 
 [radio WBEZ]
-url=http://wbez.ic.llnwd.net/stream/wbez_91_5_fm.pls
+url = http://wbez.ic.llnwd.net/stream/wbez_91_5_fm.pls