[Cabbiev2] If the 'Artist' tag is empty read the 'Album Artist' tag.

Change-Id: Ic8b90cd2c833a08b57ed0157f960c9471cc5a51b

25 files changed, 66 insertions, 66 deletions

diff --git a/wps/cabbiev2.112x64x1.wps b/wps/cabbiev2.112x64x1.wps
index 17cc269420..0655becce2 100644
--- a/wps/cabbiev2.112x64x1.wps
+++ b/wps/cabbiev2.112x64x1.wps
@@ -48,8 +48,8 @@
 # Track Info
 %V(0,8,-,35,-)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
-%t(5)%ac%s%?Fn<%Sx(Next:) %?It<%It|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>%;%t(5)%ac%s%?Fn<%Sx(Next:) %?Ia<%Ia|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>
+%t(5)%ac%s%?Fn<%Sx(Next:) %?It<%It|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>%;%t(5)%ac%s%?Fn<%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>>
 %V(0,48,-,8,-)
 %pc%ar%pr
diff --git a/wps/cabbiev2.128x128x16.wps b/wps/cabbiev2.128x128x16.wps
index ef0ca62409..c23a10e952 100644
--- a/wps/cabbiev2.128x128x16.wps
+++ b/wps/cabbiev2.128x128x16.wps
@@ -63,13 +63,13 @@
 # Track Info - Album Art
 %ax%Vl(a,70,12,-,50,1)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?iy<%iy>
 #
 # Track Info - No Album Art
 %Vl(b,0,12,-,50,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?iy<%iy>
diff --git a/wps/cabbiev2.128x128x2.wps b/wps/cabbiev2.128x128x2.wps
index fcb26d5d8b..6a70baca4b 100644
--- a/wps/cabbiev2.128x128x2.wps
+++ b/wps/cabbiev2.128x128x2.wps
@@ -63,13 +63,13 @@
 # Track Info - Album Art
 %ax%Vl(a,70,12,-,50,-)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?iy<%iy>
 #
 # Track Info - No Album Art
 %Vl(b,0,12,-,50,-)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?iy<%iy>
diff --git a/wps/cabbiev2.128x160x16.wps b/wps/cabbiev2.128x160x16.wps
index 2f62a2dddc..ebf28f9205 100644
--- a/wps/cabbiev2.128x160x16.wps
+++ b/wps/cabbiev2.128x160x16.wps
@@ -42,7 +42,7 @@
 #NowPlaying - AA
 %Vl(a,5,88,118,24,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 #Album Art
 %Vl(a,5,15,118,70,1)
 %Cl(0,0,118,70)
@@ -52,7 +52,7 @@
 %Vl(b,0,15,-,84,1)
 
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 %s%acNext Track:
diff --git a/wps/cabbiev2.128x64x1.wps b/wps/cabbiev2.128x64x1.wps
index a796da3147..5a473261b3 100644
--- a/wps/cabbiev2.128x64x1.wps
+++ b/wps/cabbiev2.128x64x1.wps
@@ -54,7 +54,7 @@
 # Current Track Info
 %V(0,16,128,24,1)
 %ac%s%?it<%it|%fn>
-%ac%s%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%ac%s%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %ac%s%?id<%id|%?d(1)<%d(1)|%(root%)>>
 #
 # Next Track Info
diff --git a/wps/cabbiev2.128x96x16.wps b/wps/cabbiev2.128x96x16.wps
index d245d91293..a107447192 100644
--- a/wps/cabbiev2.128x96x16.wps
+++ b/wps/cabbiev2.128x96x16.wps
@@ -63,13 +63,13 @@
 # Track Info - Album Art
 %ax%Vl(a,51,12,-,34,1)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?iy<%iy>
 #
 # Track Info - No Album Art
 %Vl(b,0,12,-,34,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?iy<%iy>
diff --git a/wps/cabbiev2.128x96x2.wps b/wps/cabbiev2.128x96x2.wps
index c7c65521cb..116de16a20 100644
--- a/wps/cabbiev2.128x96x2.wps
+++ b/wps/cabbiev2.128x96x2.wps
@@ -51,6 +51,6 @@
 # Track Info
 %V(0,10,128,48,1)%Vf(0)%Vb(3)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%Sx(Next:) %ac%It
diff --git a/wps/cabbiev2.132x80x16.wps b/wps/cabbiev2.132x80x16.wps
index 6fba9f143d..644b829cdc 100644
--- a/wps/cabbiev2.132x80x16.wps
+++ b/wps/cabbiev2.132x80x16.wps
@@ -55,13 +55,13 @@
 # Track Info - Album Art
 %ax%Vl(a,48,10,-,48,1)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%Sx(Next:) %?It<%It|%Fn>
 #
 # Track Info - No Album Art
 %Vl(b,0,10,-,48,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%Sx(Next:) %?It<%It|%Fn>
diff --git a/wps/cabbiev2.138x110x2.wps b/wps/cabbiev2.138x110x2.wps
index ab8614c866..8abf02f335 100644
--- a/wps/cabbiev2.138x110x2.wps
+++ b/wps/cabbiev2.138x110x2.wps
@@ -59,7 +59,7 @@
 # Track Info - Album Art
 %ax%Vl(a,65,10,-,60,-)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%Sx(Next Track:)
 %s%al%?It<%It|%Fn>
@@ -67,7 +67,7 @@
 # Track Info - No Album Art
 %Vl(b,0,10,-,60,-)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%Sx(Next Track:)
 %s%ac%?It<%It|%Fn>
diff --git a/wps/cabbiev2.160x128x1.wps b/wps/cabbiev2.160x128x1.wps
index ada6c2db13..e0d982585f 100644
--- a/wps/cabbiev2.160x128x1.wps
+++ b/wps/cabbiev2.160x128x1.wps
@@ -52,7 +52,7 @@
 # Track Info - No Album Art
 %V(0,12,-,75,-)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 %ac%Sx(Next Track:)
diff --git a/wps/cabbiev2.160x128x16.wps b/wps/cabbiev2.160x128x16.wps
index 305c02bde8..8abdcddd4d 100644
--- a/wps/cabbiev2.160x128x16.wps
+++ b/wps/cabbiev2.160x128x16.wps
@@ -59,7 +59,7 @@
 # Track Info - Album Art
 %ax%Vl(a,77,10,-,75,-)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 %Sx(Next Track:)
@@ -68,7 +68,7 @@
 # Track Info - No Album Art
 %Vl(b,0,10,-,75,-)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 %ac%Sx(Next Track:)
diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps
index a24fdf8702..9b46c7df84 100644
--- a/wps/cabbiev2.160x128x2.wps
+++ b/wps/cabbiev2.160x128x2.wps
@@ -59,7 +59,7 @@
 # Track Info - Album Art
 %ax%Vl(a,70,10,-,75,-)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 %s%al%Sx(Next Track:)
@@ -68,7 +68,7 @@
 # Track Info - No Album Art
 %Vl(b,0,10,-,75,-)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 %ac%Sx(Next Track:)
diff --git a/wps/cabbiev2.176x132x16.wps b/wps/cabbiev2.176x132x16.wps
index cc7f7d812d..03b4ced194 100644
--- a/wps/cabbiev2.176x132x16.wps
+++ b/wps/cabbiev2.176x132x16.wps
@@ -59,7 +59,7 @@
 # Track Info - Album Art
 %ax%Vl(a,81,12,-,74,1)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 %s%al%Sx(Next Track:)
@@ -68,7 +68,7 @@
 # Track Info - No Album Art
 %Vl(b,0,12,-,74,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 %ac%Sx(Next Track:)
diff --git a/wps/cabbiev2.176x220x16.wps b/wps/cabbiev2.176x220x16.wps
index 0201f44543..46d34d2a3e 100644
--- a/wps/cabbiev2.176x220x16.wps
+++ b/wps/cabbiev2.176x220x16.wps
@@ -59,16 +59,16 @@
 # Track Info - Album Art
 %ax%Vl(a,0,142,-,36,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 #
 # Track Info - No Album Art
 %Vl(b,0,50,-,96,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?iy<%iy|>
 
 %ac%Sx(Next Track:)
 %s%ac%?It<%It|%Fn>
-%s%ac%?Ia<%Ia|>
+%s%ac%?Ia<%Ia|%?IA<%IA>>
diff --git a/wps/cabbiev2.220x176x16.wps b/wps/cabbiev2.220x176x16.wps
index 00c8d2cc52..62e44aa713 100644
--- a/wps/cabbiev2.220x176x16.wps
+++ b/wps/cabbiev2.220x176x16.wps
@@ -59,7 +59,7 @@
 # Track Info - Album Art
 %ax%Vl(a,105,30,-,90,-)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 %s%al%Sx(Next Track:)
@@ -68,7 +68,7 @@
 # Track Info - No Album Art
 %Vl(b,0,30,-,90,-)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 %ac%Sx(Next Track:)
diff --git a/wps/cabbiev2.240x320x16.mini2440.wps b/wps/cabbiev2.240x320x16.mini2440.wps
index 1bb2fe5a8c..3f78b95a11 100644
--- a/wps/cabbiev2.240x320x16.mini2440.wps
+++ b/wps/cabbiev2.240x320x16.mini2440.wps
@@ -19,7 +19,7 @@
 %pb(22,254,199,13,pb-240x320x16.bmp)
 %?C<|>
 %?C<|%s%ac%?it<%it|%fn>>
-%?C<|%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>>
+%?C<|%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>>
 %?C<|%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>>
 %?C<|%ac%?iy<%iy|>>
 %?C<|>
@@ -27,10 +27,10 @@
 %?C<|%ac%?fv<%(vbr%) |>%fb kbit/s %fc>
 %?C<|>
 %?C<%s%ac%?it<%it|%fn>|>
-%?C<%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>|%ac%Sx(Next Track:)>
+%?C<%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>|%ac%Sx(Next Track:)>>
 %?C<%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>|%ac%s%?It<%It|%Fn>>
-%?C<|%s%ac%?Ia<%Ia|%?D(2)<%D(2)|%(root%)>>>
-%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
+%?C<|%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>>>
+%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
 
 
      %pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr     
diff --git a/wps/cabbiev2.240x320x16.wps b/wps/cabbiev2.240x320x16.wps
index 90ace9b8a5..9f35bc5d60 100644
--- a/wps/cabbiev2.240x320x16.wps
+++ b/wps/cabbiev2.240x320x16.wps
@@ -59,15 +59,15 @@
 # Track Info - Album Art
 %ax%Vl(a,0,165,-,78,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
-%s%ac%Sx(Next:) %?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>
+%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>
 #
 # Track Info - No Album Art
 %Vl(b,0,45,-,198,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %ac%?iy<%iy|>
 
@@ -77,5 +77,5 @@
 
 %ac%Sx(Next Track:)
 %ac%s%?It<%It|%Fn>
-%s%ac%?Ia<%Ia|%?D(2)<%D(2)|%(root%)>>
+%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>>
 %s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>
diff --git a/wps/cabbiev2.240x400x16.wps b/wps/cabbiev2.240x400x16.wps
index e6be0eb8a7..beffd4a8e0 100644
--- a/wps/cabbiev2.240x400x16.wps
+++ b/wps/cabbiev2.240x400x16.wps
@@ -14,7 +14,7 @@
 %?C<|>
 %?C<|>
 %?C<|%s%ac%?it<%it|%fn>>
-%?C<|%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>>
+%?C<|%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>>
 %?C<|%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>>
 %?C<|%ac%?iy<%iy|>>
 %?C<|>
@@ -22,10 +22,10 @@
 %?C<|%ac%?fv<%(vbr%) |>%fb kbit/s %fc>
 %?C<|>
 %?C<%s%ac%?it<%it|%fn>|>
-%?C<%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>|%ac%Sx(Next Track:)>
+%?C<%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>|%ac%Sx(Next Track:)>
 %?C<%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>|%ac%s%?It<%It|%Fn>>
-%?C<|%s%ac%?Ia<%Ia|%?D(2)<%D(2)|%(root%)>>>
-%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
+%?C<|%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>>>
+%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
 
 
      %pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr     
diff --git a/wps/cabbiev2.320x240x16.mrobe500.wps b/wps/cabbiev2.320x240x16.mrobe500.wps
index d9eb06f96d..58ba2e5bad 100644
--- a/wps/cabbiev2.320x240x16.mrobe500.wps
+++ b/wps/cabbiev2.320x240x16.mrobe500.wps
@@ -31,23 +31,23 @@
 
 %Vl(a,153,30,-,130,1)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 #%s%al%iy
 
 %s%al%Sx(Next Track:)
 %s%al%?It<%It|%Fn>
-%s%al%Ia
+%s%al%?Ia<%Ia|%IA>
 
 %Vl(b,0,30,-,130,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%iy
 
 %ac%Sx(Next Track:)
 %s%ac%?It<%It|%Fn>
-%s%ac%Ia
+%s%ac%?Ia<%Ia|%IA>
 
 %V(0,180,-,20,1)
 #touch the X of X regions to let the playlist viewer pop up
diff --git a/wps/cabbiev2.320x240x16.wps b/wps/cabbiev2.320x240x16.wps
index bfe67cae9b..fb0e4f5303 100644
--- a/wps/cabbiev2.320x240x16.wps
+++ b/wps/cabbiev2.320x240x16.wps
@@ -59,21 +59,21 @@
 # Track Info - Album Art
 %ax%Vl(a,153,30,-,130,1)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?iy<%iy>
 
 %s%al%Sx(Next Track:)
 %s%al%?It<%It|%Fn>
-%s%al%?Ia<%Ia>
+%s%al%?Ia<%Ia|%?IA<%IA>>
 #
 # Track Info - No Album Art
 %ax%Vl(b,0,30,-,130,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?iy<%iy>
 
 %ac%Sx(Next Track:)
 %s%ac%?It<%It|%Fn>
-%s%ac%?Ia<%Ia>
+%s%ac%?Ia<%Ia|%?IA<%IA>>
diff --git a/wps/cabbiev2.320x480x16.wps b/wps/cabbiev2.320x480x16.wps
index 297fe66cc3..88c9404f48 100644
--- a/wps/cabbiev2.320x480x16.wps
+++ b/wps/cabbiev2.320x480x16.wps
@@ -28,13 +28,13 @@
 # tap on current title info for playlist (ie. where albumart would normally be)
 %T(70,0,180,180,playlist)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %ac%?iy<%iy|>
 %Vl(b,0,200,-,140,-)
 %ac%?ig<%ig|>
 %ac%?fv<%(vbr%) |>%fb kbit/s %fc
-%s%ac%?Ia<%Ia|%?D(2)<%D(2)|%(root%)>>
+%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>>
 %ac%Sx(Next Track:)
 %ac%s%?It<%It|%Fn>
 #
@@ -48,12 +48,12 @@
 # current track info - AA
 %Vl(d,0,240,-,-120,-)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 # next track info - AA
 %Vl(d,0,338,-,-120,-)
-%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
+%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
 
 # playtime
 %V(15,398,290,30,-)
diff --git a/wps/cabbiev2.400x240x16.wps b/wps/cabbiev2.400x240x16.wps
index 54a2cb0370..3adb12ff04 100644
--- a/wps/cabbiev2.400x240x16.wps
+++ b/wps/cabbiev2.400x240x16.wps
@@ -59,21 +59,21 @@
 # Track Info - Album Art
 %ax%Vl(a,153,32,-,122,1)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?iy<%iy>
 
 %s%al%Sx(Next Track:)
 %s%al%?It<%It|%Fn>
-%s%al%?Ia<%Ia>
+%s%al%?Ia<%Ia|%?IA<%IA>>
 #
 # Track Info - No Album Art
 %ax%Vl(b,0,32,-,122,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?iy<%iy>
 
 %ac%Sx(Next Track:)
 %s%ac%?It<%It|%Fn>
-%s%ac%?Ia<%Ia>
+%s%ac%?Ia<%Ia|%?IA<%IA>>
diff --git a/wps/cabbiev2.480x800x16.wps b/wps/cabbiev2.480x800x16.wps
index 102cce20b4..05f24bc293 100644
--- a/wps/cabbiev2.480x800x16.wps
+++ b/wps/cabbiev2.480x800x16.wps
@@ -29,13 +29,13 @@
 %T(0,0,275,275,playlist)
 
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %ac%?iy<%iy|>
 %Vl(b,0,400,-,180,-)
 %ac%?ig<%ig|>
 %ac%?fv<%(vbr%) |>%fb kbit/s %fc
-%s%ac%?Ia<%Ia|%?D(2)<%D(2)|%(root%)>>
+%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>>
 %ac%Sx(Next Track:)
 %ac%s%?It<%It|%Fn>
 #
@@ -49,12 +49,12 @@
 # current track info - AA
 %Vl(d,0,370,-,-200,-)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 # next track info - AA
 %Vl(d,0,550,-,-200,-)
-%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
+%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
 
 # playtime
 %V(20,660,440,36,-)
diff --git a/wps/cabbiev2.800x480x16.wps b/wps/cabbiev2.800x480x16.wps
index 553dcc3f5f..2994ab4498 100644
--- a/wps/cabbiev2.800x480x16.wps
+++ b/wps/cabbiev2.800x480x16.wps
@@ -18,11 +18,11 @@
 %T(0,0,225,225,playlist)
 %Vl(b,0,79,-,225,-)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 %ac%Sx(Next Track:)
-%s%ac%?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>
+%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>
 
 #
 # album art viewport
@@ -35,11 +35,11 @@
 # track & next track info - AA
 %Vl(d,309,83,-,211,-)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 %s%al%Sx(Next Track:)
-%s%al%?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>
+%s%al%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>
 
 # playtime
 %V(30,360,740,36,-)
diff --git a/wps/cabbiev2.96x96x16.wps b/wps/cabbiev2.96x96x16.wps
index 19c7ef08e1..327a5aad1c 100644
--- a/wps/cabbiev2.96x96x16.wps
+++ b/wps/cabbiev2.96x96x16.wps
@@ -58,14 +58,14 @@
 # Track Info - Album Art
 %ax%Vl(a,51,12,-,34,1)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?iy<%iy>
 #
 # Track Info - No Album Art
 %Vl(b,0,12,-,34,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?iy<%iy>
 #