diff --git a/wps/WPSLIST b/wps/WPSLIST
index 3555f6dcbc..2649b1c435 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -275,6 +275,7 @@ RSBS:
 Author: Johannes Voggenthaler, Apoo Maha, Marc Guay, Alex Vanderpol, Jerry Lange, Keith Perri, Mark Fawcus, and Marianne Arnold with support from Rockbox developers and forums. Based on Cabbie by Yohann Misquitta.
 
 # Preferred font (including .fnt extension - leave blank for player):
+Font.800x480x16: 35-Adobe-Helvetica.fnt
 Font.480x800x16: 35-Adobe-Helvetica.fnt
 Font.320x480x16: 27-Adobe-Helvetica.fnt
 Font.320x240x16: 15-Adobe-Helvetica.fnt
@@ -306,6 +307,7 @@ line selector text color: 000000
 filetype colours:
 
 #backdrop - remember this is the source file name in your SVN folder, not dest name!
+backdrop.800x480x16: backdrops/cabbiev2.800x480x16.bmp
 backdrop.480x800x16: backdrops/cabbiev2.480x800x16.bmp
 backdrop.320x480x16: backdrops/cabbiev2.320x480x16.bmp
 backdrop.320x240x16: backdrops/cabbiev2.320x240x16.bmp
@@ -322,6 +324,7 @@ backdrop.240x320x16: backdrops/cabbiev2.240x320x16.bmp
 backdrop.240x400x16: backdrops/cabbiev2.240x400x16.bmp
 
 #selection bar settings for color targets
+selector type.800x480x16: bar (gradient)
 selector type.480x800x16: bar (gradient)
 selector type.320x480x16: bar (gradient)
 selector type.320x240x16: bar (gradient)
@@ -338,6 +341,7 @@ selector type.160x128x2: bar (inverse)
 selector type.138x110x2: bar (inverse)
 
 #icons
+iconset.800x480x16: icons/tango_small.bmp
 iconset.480x800x16: icons/tango_small.bmp 
 iconset.320x480x16: icons/tango_small.bmp 
 iconset.320x240x16: icons/tango_small.bmp 
@@ -354,6 +358,7 @@ iconset.240x320x16: icons/tango_small.bmp
 iconset.240x400x16: icons/tango_small.bmp 
 
 #viewer icons
+viewers iconset.800x480x16: icons/tango_small_viewers.bmp
 viewers iconset.480x800x16: icons/tango_small_viewers.bmp
 viewers iconset.320x480x16: icons/tango_small_viewers.bmp
 viewers iconset.320x240x16: icons/tango_small_viewers.bmp
diff --git a/wps/cabbiev2.800x480x16.wps b/wps/cabbiev2.800x480x16.wps
new file mode 100644
index 0000000000..7e0dd2ecec
--- /dev/null
+++ b/wps/cabbiev2.800x480x16.wps
@@ -0,0 +1,102 @@
+# cabbie 2.0
+# (C) 2007, Johannes Voggenthaler (Zinc Alloy)
+# (C) 2010, Thomas Martitz ported to 800x480 touchscreens
+# derived from "cabbie" (C) Yohann Misquitta
+
+# TODO:
+#  * images for battery, hold button
+%wd
+%X(wpsbackdrop-800x480x16.bmp)
+
+#%xl(A,lock-240x320x16.bmp,11,0,2)
+#%xl(B,battery-240x320x16.bmp,46,0,10)
+
+%Cl(0,0,225,225,c,c)
+
+%?C<%Vd(c)%?Tl(2.0)<%Vd(t)|%Vd(d)>|%Vd(a)%?Tl(2.0)<%Vd(t)|%Vd(b)>>
+
+# track & next track info - no AA
+%Vl(a,0,79,-,225,-)
+# 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%?it<%it|%fn>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
+
+%s%ac%Sx(Next Track:)
+%s%ac%?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>
+
+#
+# album art viewport
+#
+%Vl(c,58,76,225,225,-)
+# tap on the cover art for playlist
+%T(0,0,225,225,playlist)
+%Cd
+
+# 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%?id<%id|%?d(1)<%d(1)|%(root%)>>
+
+%s%al%Sx(Next Track:)
+%s%al%?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>
+
+# playtime
+%V(30,360,740,36,-)
+%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
+
+# progressbar and bottom icons
+%V(0,323,-,33,-)
+%pb(25,0,750,-,pb-800x480x16.bmp)
+%T(25,0,750,50,progressbar)
+
+#%?mh<%xd(Aa)|%xd(Ab)>
+#%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+# volume
+%xl(C,volume-800x480x16.bmp,340,78,10)
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%T(340,78,88,60,volume)
+
+# shuffle
+%V(468,415,92,43,-)
+%xl(D,shuffle-800x480x16.bmp,0,0)
+%?ps<%xd(D)>
+%T(0,0,92,43,shuffle)
+
+# repeat
+%V(590,404,50,66,-)
+%xl(E,repeat-800x480x16.bmp,0,0,4)
+%xd(E, %mm, -1)
+%T(0,0,50,66,repmode)
+
+# playmode
+%V(700,402,70,70,-)
+%xl(F,playmode-800x480x16.bmp,0,0,5)
+%xd(F, %mp)
+%T(0,0,70,70,play)
+%T(0,0,70,70,&stop)
+
+#
+# popup osd menu
+#
+%Vl(t,309,83,-,211,-)
+%xl(G,popup-800x480x16.bmp,15,20)
+%xd(G)
+%T(10,10,160,140,browse)
+%T(170,10,144,119,quickscreen)
+%T(288,10,123,146,contextmenu)
+
+#
+# ff/rewind button
+#
+%V(166,395,160,75,-)
+%xl(H,rew-800x480x16.bmp,0,5)
+%xl(I,ff-800x480x16.bmp,80,5)
+%xd(H)%xd(I)
+%T(0,0,70,75,&rwd)
+%T(0,0,70,75,prev)
+%T(80,0,70,75,&ffwd)
+%T(80,0,70,75,next)
diff --git a/wps/cabbiev2/ff-800x480x16.bmp b/wps/cabbiev2/ff-800x480x16.bmp
new file mode 100644
index 0000000000..fe287274b5
Binary files /dev/null and b/wps/cabbiev2/ff-800x480x16.bmp differ
diff --git a/wps/cabbiev2/pb-800x480x16.bmp b/wps/cabbiev2/pb-800x480x16.bmp
new file mode 100644
index 0000000000..8b71222465
Binary files /dev/null and b/wps/cabbiev2/pb-800x480x16.bmp differ
diff --git a/wps/cabbiev2/playmode-800x480x16.bmp b/wps/cabbiev2/playmode-800x480x16.bmp
new file mode 100644
index 0000000000..6a25caa174
Binary files /dev/null and b/wps/cabbiev2/playmode-800x480x16.bmp differ
diff --git a/wps/cabbiev2/popup-800x480x16.bmp b/wps/cabbiev2/popup-800x480x16.bmp
new file mode 100644
index 0000000000..9cfdb08b85
Binary files /dev/null and b/wps/cabbiev2/popup-800x480x16.bmp differ
diff --git a/wps/cabbiev2/repeat-800x480x16.bmp b/wps/cabbiev2/repeat-800x480x16.bmp
new file mode 100644
index 0000000000..be4c1a01e3
Binary files /dev/null and b/wps/cabbiev2/repeat-800x480x16.bmp differ
diff --git a/wps/cabbiev2/rew-800x480x16.bmp b/wps/cabbiev2/rew-800x480x16.bmp
new file mode 100644
index 0000000000..978712d00d
Binary files /dev/null and b/wps/cabbiev2/rew-800x480x16.bmp differ
diff --git a/wps/cabbiev2/shuffle-800x480x16.bmp b/wps/cabbiev2/shuffle-800x480x16.bmp
new file mode 100644
index 0000000000..3eb893a3e3
Binary files /dev/null and b/wps/cabbiev2/shuffle-800x480x16.bmp differ
diff --git a/wps/cabbiev2/volume-800x480x16.bmp b/wps/cabbiev2/volume-800x480x16.bmp
new file mode 100644
index 0000000000..2b1893c6c7
Binary files /dev/null and b/wps/cabbiev2/volume-800x480x16.bmp differ
diff --git a/wps/cabbiev2/wpsbackdrop-800x480x16.bmp b/wps/cabbiev2/wpsbackdrop-800x480x16.bmp
new file mode 100644
index 0000000000..cf37142953
Binary files /dev/null and b/wps/cabbiev2/wpsbackdrop-800x480x16.bmp differ