Cabbie v2: Place album above title and track on the WPS. The idea is to have the album immediately beneath any album art.

Change-Id: I8c5fe85207bb3ecfde131710170ef7a5f801f312

26 files changed, 50 insertions, 50 deletions

diff --git a/wps/cabbiev2.112x64x1.wps b/wps/cabbiev2.112x64x1.wps
index 0655becce2..72a05d27b6 100644
--- a/wps/cabbiev2.112x64x1.wps
+++ b/wps/cabbiev2.112x64x1.wps
@@ -47,9 +47,9 @@
 #
 # Track Info
 %V(0,8,-,35,-)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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|%?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 c23a10e952..176b07db58 100644
--- a/wps/cabbiev2.128x128x16.wps
+++ b/wps/cabbiev2.128x128x16.wps
@@ -62,14 +62,14 @@
 #
 # Track Info - Album Art
 %ax%Vl(a,70,12,-,50,1)
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?it<%it|%fn>
 %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%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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 6a70baca4b..c96844f197 100644
--- a/wps/cabbiev2.128x128x2.wps
+++ b/wps/cabbiev2.128x128x2.wps
@@ -62,14 +62,14 @@
 #
 # Track Info - Album Art
 %ax%Vl(a,70,12,-,50,-)
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?it<%it|%fn>
 %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%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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 ebf28f9205..01df6229cd 100644
--- a/wps/cabbiev2.128x160x16.wps
+++ b/wps/cabbiev2.128x160x16.wps
@@ -51,9 +51,9 @@
 #Now Playing - NOAA
 %Vl(b,0,15,-,84,1)
 
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
-%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 %s%acNext Track:
 %s%ac%?It<%It|%Fn>
diff --git a/wps/cabbiev2.128x64x1.wps b/wps/cabbiev2.128x64x1.wps
index 5a473261b3..ddd94eb1fb 100644
--- a/wps/cabbiev2.128x64x1.wps
+++ b/wps/cabbiev2.128x64x1.wps
@@ -53,9 +53,9 @@
 #
 # Current Track Info
 %V(0,16,128,24,1)
+%ac%s%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %ac%s%?it<%it|%fn>
 %ac%s%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
-%ac%s%?id<%id|%?d(1)<%d(1)|%(root%)>>
 #
 # Next Track Info
 %V(0,42,128,8,1)
diff --git a/wps/cabbiev2.128x96x16.wps b/wps/cabbiev2.128x96x16.wps
index a107447192..4136fa6d8d 100644
--- a/wps/cabbiev2.128x96x16.wps
+++ b/wps/cabbiev2.128x96x16.wps
@@ -62,14 +62,14 @@
 #
 # Track Info - Album Art
 %ax%Vl(a,51,12,-,34,1)
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?it<%it|%fn>
 %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%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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 116de16a20..43d7adc197 100644
--- a/wps/cabbiev2.128x96x2.wps
+++ b/wps/cabbiev2.128x96x2.wps
@@ -50,7 +50,7 @@
 #
 # Track Info
 %V(0,10,128,48,1)%Vf(0)%Vb(3)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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 644b829cdc..39e35c2e2c 100644
--- a/wps/cabbiev2.132x80x16.wps
+++ b/wps/cabbiev2.132x80x16.wps
@@ -54,14 +54,14 @@
 #
 # Track Info - Album Art
 %ax%Vl(a,48,10,-,48,1)
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?it<%it|%fn>
 %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%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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 8abf02f335..b27b622004 100644
--- a/wps/cabbiev2.138x110x2.wps
+++ b/wps/cabbiev2.138x110x2.wps
@@ -58,16 +58,16 @@
 #
 # Track Info - Album Art
 %ax%Vl(a,65,10,-,60,-)
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?it<%it|%fn>
 %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>
 #
 # Track Info - No Album Art
 %Vl(b,0,10,-,60,-)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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 e0d982585f..3d7eb51735 100644
--- a/wps/cabbiev2.160x128x1.wps
+++ b/wps/cabbiev2.160x128x1.wps
@@ -51,9 +51,9 @@
 #
 # Track Info - No Album Art
 %V(0,12,-,75,-)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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%?It<%It|%Fn>
diff --git a/wps/cabbiev2.160x128x16.wps b/wps/cabbiev2.160x128x16.wps
index 8abdcddd4d..10f16077c0 100644
--- a/wps/cabbiev2.160x128x16.wps
+++ b/wps/cabbiev2.160x128x16.wps
@@ -58,18 +58,18 @@
 #
 # Track Info - Album Art
 %ax%Vl(a,77,10,-,75,-)
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?it<%it|%fn>
 %s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
-%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 %Sx(Next Track:)
 %s%?It<%It|%Fn>
 #
 # Track Info - No Album Art
 %Vl(b,0,10,-,75,-)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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%?It<%It|%Fn>
diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps
index 9b46c7df84..5c0a172a1e 100644
--- a/wps/cabbiev2.160x128x2.wps
+++ b/wps/cabbiev2.160x128x2.wps
@@ -58,18 +58,18 @@
 #
 # Track Info - Album Art
 %ax%Vl(a,70,10,-,75,-)
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?it<%it|%fn>
 %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>
 #
 # Track Info - No Album Art
 %Vl(b,0,10,-,75,-)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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%?It<%It|%Fn>
diff --git a/wps/cabbiev2.176x132x16.wps b/wps/cabbiev2.176x132x16.wps
index 03b4ced194..a8b599ea3e 100644
--- a/wps/cabbiev2.176x132x16.wps
+++ b/wps/cabbiev2.176x132x16.wps
@@ -58,18 +58,18 @@
 #
 # Track Info - Album Art
 %ax%Vl(a,81,12,-,74,1)
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?it<%it|%fn>
 %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>
 #
 # Track Info - No Album Art
 %Vl(b,0,12,-,74,1)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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%?It<%It|%Fn>
diff --git a/wps/cabbiev2.176x220x16.wps b/wps/cabbiev2.176x220x16.wps
index 46d34d2a3e..6281f6cc27 100644
--- a/wps/cabbiev2.176x220x16.wps
+++ b/wps/cabbiev2.176x220x16.wps
@@ -58,15 +58,15 @@
 #
 # Track Info - Album Art
 %ax%Vl(a,0,142,-,36,1)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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:)
diff --git a/wps/cabbiev2.220x176x16.wps b/wps/cabbiev2.220x176x16.wps
index 62e44aa713..3963aa364a 100644
--- a/wps/cabbiev2.220x176x16.wps
+++ b/wps/cabbiev2.220x176x16.wps
@@ -58,18 +58,18 @@
 #
 # Track Info - Album Art
 %ax%Vl(a,105,30,-,90,-)
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?it<%it|%fn>
 %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>
 #
 # Track Info - No Album Art
 %Vl(b,0,30,-,90,-)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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%?It<%It|%Fn>
diff --git a/wps/cabbiev2.240x320x16.mini2440.wps b/wps/cabbiev2.240x320x16.mini2440.wps
index 3f78b95a11..14d65325d2 100644
--- a/wps/cabbiev2.240x320x16.mini2440.wps
+++ b/wps/cabbiev2.240x320x16.mini2440.wps
@@ -18,17 +18,17 @@
 %Cl(55,30,130,130,c,c)
 %pb(22,254,199,13,pb-240x320x16.bmp)
 %?C<|>
+%?C<|%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>>
 %?C<|%s%ac%?it<%it|%fn>>
 %?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<|>
 %?C<|%ac%?ig<%ig|>>
 %?C<|%ac%?fv<%(vbr%) |>%fb kbit/s %fc>
 %?C<|>
+%?C<%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>|%ac%s%?It<%It|%Fn>>
 %?C<%s%ac%?it<%it|%fn>|>
 %?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|%?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%)>>>
 
diff --git a/wps/cabbiev2.240x320x16.wps b/wps/cabbiev2.240x320x16.wps
index 9f35bc5d60..ab6ca535fd 100644
--- a/wps/cabbiev2.240x320x16.wps
+++ b/wps/cabbiev2.240x320x16.wps
@@ -58,24 +58,24 @@
 #
 # Track Info - Album Art
 %ax%Vl(a,0,165,-,78,1)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>
 #
 # Track Info - No Album Art
 %Vl(b,0,45,-,198,1)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
-%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %ac%?iy<%iy|>
 
 %ac%?ig<%ig|>
 %ac%?fv<%(vbr%) |>%fb kbit/s %fc
 
 
-%ac%Sx(Next Track:)
+%ac%Sx(Next:)
+%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>
 %ac%s%?It<%It|%Fn>
 %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 beffd4a8e0..7bed444259 100644
--- a/wps/cabbiev2.240x400x16.wps
+++ b/wps/cabbiev2.240x400x16.wps
@@ -13,17 +13,17 @@
 
 %?C<|>
 %?C<|>
+%?C<|%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>>
 %?C<|%s%ac%?it<%it|%fn>>
 %?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<|>
 %?C<|%ac%?ig<%ig|>>
 %?C<|%ac%?fv<%(vbr%) |>%fb kbit/s %fc>
 %?C<|>
+%?C<%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>|%ac%s%?It<%It|%Fn>>
 %?C<%s%ac%?it<%it|%fn>|>
 %?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|%?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%)>>>
 
diff --git a/wps/cabbiev2.320x240x16.mrobe500.wps b/wps/cabbiev2.320x240x16.mrobe500.wps
index 58ba2e5bad..d7bd9f2190 100644
--- a/wps/cabbiev2.320x240x16.mrobe500.wps
+++ b/wps/cabbiev2.320x240x16.mrobe500.wps
@@ -40,9 +40,9 @@
 %s%al%?Ia<%Ia|%IA>
 
 %Vl(b,0,30,-,130,1)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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:)
diff --git a/wps/cabbiev2.320x240x16.wps b/wps/cabbiev2.320x240x16.wps
index fb0e4f5303..0aff77db77 100644
--- a/wps/cabbiev2.320x240x16.wps
+++ b/wps/cabbiev2.320x240x16.wps
@@ -58,9 +58,9 @@
 #
 # Track Info - Album Art
 %ax%Vl(a,153,30,-,130,1)
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?it<%it|%fn>
 %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:)
@@ -69,9 +69,9 @@
 #
 # Track Info - No Album Art
 %ax%Vl(b,0,30,-,130,1)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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:)
diff --git a/wps/cabbiev2.320x480x16.wps b/wps/cabbiev2.320x480x16.wps
index 88c9404f48..77effcef4a 100644
--- a/wps/cabbiev2.320x480x16.wps
+++ b/wps/cabbiev2.320x480x16.wps
@@ -27,9 +27,9 @@
 %Vl(a,0,60,-,110,-)
 # tap on current title info for playlist (ie. where albumart would normally be)
 %T(70,0,180,180,playlist)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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|>
@@ -47,9 +47,9 @@
 
 # current track info - AA
 %Vl(d,0,240,-,-120,-)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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,-)
diff --git a/wps/cabbiev2.360x400x16.wps b/wps/cabbiev2.360x400x16.wps
index 163d749e50..e98232e5df 100644
--- a/wps/cabbiev2.360x400x16.wps
+++ b/wps/cabbiev2.360x400x16.wps
@@ -58,24 +58,24 @@
 #
 # Track Info - Album Art
 %ax%Vl(a,0,206,-,98,1)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>
 #
 # Track Info - No Album Art
 %Vl(b,0,56,-,247,1)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
-%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %ac%?iy<%iy|>
 
 %ac%?ig<%ig|>
 %ac%?fv<%(vbr%) |>%fb kbit/s %fc
 
 
-%ac%Sx(Next Track:)
+%ac%Sx(Next:)
+%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>
 %ac%s%?It<%It|%Fn>
 %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.400x240x16.wps b/wps/cabbiev2.400x240x16.wps
index 3adb12ff04..469ee3d2f1 100644
--- a/wps/cabbiev2.400x240x16.wps
+++ b/wps/cabbiev2.400x240x16.wps
@@ -58,9 +58,9 @@
 #
 # Track Info - Album Art
 %ax%Vl(a,153,32,-,122,1)
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?it<%it|%fn>
 %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:)
@@ -69,9 +69,9 @@
 #
 # Track Info - No Album Art
 %ax%Vl(b,0,32,-,122,1)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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:)
diff --git a/wps/cabbiev2.480x800x16.wps b/wps/cabbiev2.480x800x16.wps
index 05f24bc293..1b4994eba4 100644
--- a/wps/cabbiev2.480x800x16.wps
+++ b/wps/cabbiev2.480x800x16.wps
@@ -28,9 +28,9 @@
 # tap on current title info for playlist (ie. where albumart would normally be)
 %T(0,0,275,275,playlist)
 
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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|>
@@ -48,9 +48,9 @@
 
 # current track info - AA
 %Vl(d,0,370,-,-200,-)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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,-)
diff --git a/wps/cabbiev2.800x480x16.wps b/wps/cabbiev2.800x480x16.wps
index 2994ab4498..525f45e6a9 100644
--- a/wps/cabbiev2.800x480x16.wps
+++ b/wps/cabbiev2.800x480x16.wps
@@ -17,9 +17,9 @@
 # tap on current title info for playlist (ie. where albumart would normally be)
 %T(0,0,225,225,playlist)
 %Vl(b,0,79,-,225,-)
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %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|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>
@@ -34,9 +34,9 @@
 
 # track & next track info - AA
 %Vl(d,309,83,-,211,-)
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?it<%it|%fn>
 %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|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>
diff --git a/wps/cabbiev2.96x96x16.wps b/wps/cabbiev2.96x96x16.wps
index 327a5aad1c..102e5460b2 100644
--- a/wps/cabbiev2.96x96x16.wps
+++ b/wps/cabbiev2.96x96x16.wps
@@ -57,16 +57,16 @@
 #
 # Track Info - Album Art
 %ax%Vl(a,51,12,-,34,1)
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?it<%it|%fn>
 %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%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
-%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?iy<%iy>
 #
 # Album Art