diff --git a/wps/WPSLIST b/wps/WPSLIST
index 556fc8f33c..bac03dea51 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -104,14 +104,14 @@ Statusbar: on
 Name: marquee.wps
 RWPS: marquee.rwps
 Author: Mike Sobel
-Font: chicago12.fnt
+Font: nimbus-12.fnt
 Statusbar: on
 </wps>
 
 <rwps>
 Name: marquee.rwps
 Author: Mike Sobel
-Font: chicago12.fnt
+Font: nimbus-12.fnt
 Statusbar: on
 </rwps>
 
@@ -119,14 +119,14 @@ Statusbar: on
 Name: DancePuffDuo.wps
 RWPS: DancePuffDuo.rwps
 Author: Chris Oxtoby
-Font: chicago12.fnt
+Font: nimbus-12.fnt
 Statusbar: on
 </wps>
 
 <rwps>
 Name: DancePuffDuo.rwps
 Author: Chris Oxtoby
-Font: chicago12.fnt
+Font: nimbus-12.fnt
 Statusbar: on
 </rwps>
 
diff --git a/wps/marquee.128x64x1.wps b/wps/marquee.128x64x1.wps
index cd2fe50dbb..233ec889ea 100644
--- a/wps/marquee.128x64x1.wps
+++ b/wps/marquee.128x64x1.wps
@@ -1,8 +1,8 @@
 # Marquee full information remote WPS, with Rockbox status bar
-# for use with Chicago12 font
+# for use with Nimbus-12 font
 #
 %ac%?pn<%t10%s%pn|%s%?id<%id|%d1>%?iy< (%iy)|>>;%ac%?pn<%s%?id<%id|%d1>%?iy< (%iy)|>|%t0>
 %ac%s%?it<%it|%fn>
 %pb
 %x|b|pb.bmp|96|38|
-%t5%al%pc%ac%pp/%pe%ar%pt;%t2.5%al%pc%ac%fb %?fv<vbr|k>%ar%pt;%t2.5%al%pc%ac%fc%ar%pt;%t10%ac%s%?It<up: %It/|%?Fn<up: %Fn/|genre: %?ig<%ig|unknown>>>%?Id<%Id|%D1>
\ No newline at end of file
+%t5%al%pc%ac%pp/%pe%ar%pt;%t2.5%al%pc%ac%fb %?fv<vbr|k>%ar%pt;%t2.5%al%pc%ac%fc%ar%pt;%t10%ac%s%?It<up: %It/|%?Fn<up: %Fn/|genre: %?ig<%ig|unknown>>>%?Id<%Id|%D1>
diff --git a/wps/marquee.160x128x1.wps b/wps/marquee.160x128x1.wps
index c3bd0e96d9..8d3c2a02e8 100644
--- a/wps/marquee.160x128x1.wps
+++ b/wps/marquee.160x128x1.wps
@@ -1,5 +1,5 @@
 # Marquee full information WPS, with Rockbox status bar
-# for use with Chicago12 font
+# for use with Nimbus-12 font
 #
 %x|a|iriver-rockbox.bmp|0|0|