OPENGL: Merged from trunk, from rev 52105 to 53396.

This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.

Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.

svn-id: r53399

167 files changed, 5905 insertions, 1617 deletions

diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index f6af0fcff5..dcc4e37458 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -400,7 +400,7 @@ static void ScummVM_audioMixCallback(JNIEnv* env, jobject self,
 	jsize len = env->GetArrayLength(jbuf);
 	jbyte* buf = env->GetByteArrayElements(jbuf, NULL);
 	if (buf == NULL) {
-		warning("Unable to get Java audio byte array. Skipping.");
+		warning("Unable to get Java audio byte array. Skipping");
 		return;
 	}
 	Audio::MixerImpl* mixer =
@@ -1135,7 +1135,7 @@ OSystem::MutexRef OSystem_Android::createMutex() {
 
 	pthread_mutex_t *mutex = new pthread_mutex_t;
 	if (pthread_mutex_init(mutex, &attr) != 0) {
-		warning("pthread_mutex_init() failed!");
+		warning("pthread_mutex_init() failed");
 		delete mutex;
 		return NULL;
 	}
@@ -1144,18 +1144,18 @@ OSystem::MutexRef OSystem_Android::createMutex() {
 
 void OSystem_Android::lockMutex(MutexRef mutex) {
 	if (pthread_mutex_lock((pthread_mutex_t*)mutex) != 0)
-		warning("pthread_mutex_lock() failed!");
+		warning("pthread_mutex_lock() failed");
 }
 
 void OSystem_Android::unlockMutex(MutexRef mutex) {
 	if (pthread_mutex_unlock((pthread_mutex_t*)mutex) != 0)
-		warning("pthread_mutex_unlock() failed!");
+		warning("pthread_mutex_unlock() failed");
 }
 
 void OSystem_Android::deleteMutex(MutexRef mutex) {
 	pthread_mutex_t* m = (pthread_mutex_t*)mutex;
 	if (pthread_mutex_destroy(m) != 0)
-		warning("pthread_mutex_destroy() failed!");
+		warning("pthread_mutex_destroy() failed");
 	else
 		delete m;
 }
@@ -1330,7 +1330,7 @@ static void ScummVM_enableZoning(JNIEnv* env, jobject self, jboolean enable) {
 static void ScummVM_setSurfaceSize(JNIEnv* env, jobject self,
 								   jint width, jint height) {
 	OSystem_Android* cpp_obj = OSystem_Android::fromJavaObject(env, self);
-	cpp_obj->setSurfaceSize(width, height);	
+	cpp_obj->setSurfaceSize(width, height);
 }
 
 const static JNINativeMethod gMethods[] = {
diff --git a/backends/platform/dc/selector.cpp b/backends/platform/dc/selector.cpp
index 0d9b931d2c..8fd12d66bf 100644
--- a/backends/platform/dc/selector.cpp
+++ b/backends/platform/dc/selector.cpp
@@ -272,7 +272,7 @@ static int findGames(Game *games, int max, bool use_ini)
 			 games[curr_game].dir,
 			 games[curr_game].language,
 			 games[curr_game].platform, games, curr_game)) {
-	    
+
 	    strcpy(games[curr_game].text, ge->description().c_str());
 #if 0
 	    printf("Registered game <%s> (l:%d p:%d) in <%s> <%s> because of <%s> <*>\n",
diff --git a/backends/platform/dingux/README.DINGUX b/backends/platform/dingux/README.DINGUX
new file mode 100644
index 0000000000..d867e02f03
--- /dev/null
+++ b/backends/platform/dingux/README.DINGUX
@@ -0,0 +1,68 @@
+ScummVM-DINGUX README
+==============================================================================
+
+Requirements
+============
+- Dingoo A320/A330
+- Dingux installed on SD card
+- Fixed Tremor libs in dingux rootfs (see below)
+
+Controls
+============
+- Dpad: move mouse cursor
+- Y: left mouse button click
+- A: '0' key
+- B: right mouse button click
+- X: '.' key (skips dialogue line in some engines)
+- Left Trigger: open global menu
+- Right Trigger: ESC button, scene skip in some engines
+- Select: opens virtual keyboard
+- Start: F5 key, game menu in some engines
+
+Installation from binaries
+==============================
+Mount your dingux SD card in your pc, then copy the directory "scummvm" found in
+the release package to a directory inside /pathtosdcard/local/dirofyourchoice
+(on windows it would be SDLETTER:\local\dirofyourchoice).
+At this point is sufficient to point your launcher (eg. gmenu2x) to scummvm.gpe
+file included into the scummvm directory you copied to the SD card, and then launch it.
+
+Building from binaries
+==============================
+* ToDO *
+
+Kernel and rootfs WARNINGS
+==============================
+All the dingux root images (rootfs) i found floating on the net have
+broken tremor libraries, which make scummvm crash in a bad way.
+One solution is to replace the libraries in your rootfs by injecting these fixed ones:
+http://hkzlab.ipv7.net/files/misc/dingux/dingux_fixed_tremor_libs.zip
+After having added these libs, scummvm should work on your standard dingux kernel,
+but this doesn't mean it will work perfectly:
+non-opendingux kernels doesn't have lcd double buffering leading to a lot of annoying
+tearing on screen.
+
+The best way to address all the problems in one shot, is to use an opendingux kernel for
+your dingoo, which has some interesting advantages:
+- The kernel gets updated and kept in sync with main linux tree
+- Double buffering and centering of screen image
+- Support for swap on compressed ram
+I have prepared a rootfs image with fixed libs and swap-on-zram to use together with opendingux kernels:
+http://hkzlab.ipv7.net/files/misc/dingux/opendingux/opendingux_kernel_rootfs.zip
+The kernel and rootfs images in the zip file is what i use for developing scummvm on dingux.
+
+BTW, i have built images for the A330 and A320 with ILI9325 controllers too,
+but these version aren't tested (i have an A320 with ILI9331, but if someone wants to
+donate an A330 to a poor scummvm developer so i can try the port there too... :P)
+
+If you need a launcher with opendingux cpu frequency scaler support, you can find gmenu2x here:
+http://www.treewalker.org/dingux/cpufreq.html
+
+I've also prepared a rootfs image for use on normal dingux kernels (non-opendingux ones).
+It's based on elta's rootfs image with just the fixed libs replaced.
+http://hkzlab.ipv7.net/files/misc/dingux/normal_dingux/rootfs_elta_fixtremor.zip
+I still raccomand the use of opendingux kernel + rootfs, but if you don't, this roofs
+image plus another kernel (eg. SiENcE's one) should be do the job.
+
+Enjoy
+
diff --git a/backends/platform/dingux/dingux-events.cpp b/backends/platform/dingux/dingux-events.cpp
new file mode 100644
index 0000000000..f9b519623d
--- /dev/null
+++ b/backends/platform/dingux/dingux-events.cpp
@@ -0,0 +1,215 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "backends/platform/dingux/dingux.h"
+
+#include "graphics/scaler/aspect.h"	// for aspect2Real
+
+#if defined (DINGUX)
+
+#define PAD_UP    SDLK_UP
+#define PAD_DOWN  SDLK_DOWN
+#define PAD_LEFT  SDLK_LEFT
+#define PAD_RIGHT SDLK_RIGHT
+#define BUT_A     SDLK_LCTRL
+#define BUT_B     SDLK_LALT
+#define BUT_X     SDLK_SPACE
+#define BUT_Y     SDLK_LSHIFT
+#define BUT_SELECT   SDLK_ESCAPE
+#define BUT_START    SDLK_RETURN
+#define TRIG_L    SDLK_TAB
+#define TRIG_R    SDLK_BACKSPACE
+
+static int mapKey(SDLKey key, SDLMod mod, Uint16 unicode) {
+	if (key >= SDLK_F1 && key <= SDLK_F9) {
+		return key - SDLK_F1 + Common::ASCII_F1;
+	} else if (key >= SDLK_KP0 && key <= SDLK_KP9) {
+		return key - SDLK_KP0 + '0';
+	} else if (key >= SDLK_UP && key <= SDLK_PAGEDOWN) {
+		return key;
+	} else if (unicode) {
+		return unicode;
+	} else if (key >= 'a' && key <= 'z' && (mod & KMOD_SHIFT)) {
+		return key & ~0x20;
+	} else if (key >= SDLK_NUMLOCK && key <= SDLK_EURO) {
+		return 0;
+	}
+	return key;
+}
+
+bool OSystem_SDL_Dingux::remapKey(SDL_Event &ev, Common::Event &event) {
+	if (ev.key.keysym.sym == PAD_UP) {
+		if (ev.type == SDL_KEYDOWN) {
+			_km.y_vel = -1;
+			_km.y_down_count = 1;
+		} else {
+			_km.y_vel = 0;
+			_km.y_down_count = 0;
+		}
+
+		event.type = Common::EVENT_MOUSEMOVE;
+		fillMouseEvent(event, _km.x, _km.y);
+
+		return true;
+	} else if (ev.key.keysym.sym == PAD_DOWN) {
+		if (ev.type == SDL_KEYDOWN) {
+			_km.y_vel = 1;
+			_km.y_down_count = 1;
+		} else {
+			_km.y_vel = 0;
+			_km.y_down_count = 0;
+		}
+
+		event.type = Common::EVENT_MOUSEMOVE;
+		fillMouseEvent(event, _km.x, _km.y);
+
+		return true;
+	} else if (ev.key.keysym.sym == PAD_LEFT) {
+		if (ev.type == SDL_KEYDOWN) {
+			_km.x_vel = -1;
+			_km.x_down_count = 1;
+		} else {
+			_km.x_vel = 0;
+			_km.x_down_count = 0;
+		}
+
+		event.type = Common::EVENT_MOUSEMOVE;
+		fillMouseEvent(event, _km.x, _km.y);
+
+		return true;
+	} else if (ev.key.keysym.sym == PAD_RIGHT) {
+		if (ev.type == SDL_KEYDOWN) {
+			_km.x_vel = 1;
+			_km.x_down_count = 1;
+		} else {
+			_km.x_vel = 0;
+			_km.x_down_count = 0;
+		}
+
+		event.type = Common::EVENT_MOUSEMOVE;
+		fillMouseEvent(event, _km.x, _km.y);
+
+		return true;
+	} else if (ev.key.keysym.sym == BUT_Y) { // left mouse button
+		if (ev.type == SDL_KEYDOWN) {
+			event.type = Common::EVENT_LBUTTONDOWN;
+		} else {
+			event.type = Common::EVENT_LBUTTONUP;
+		}
+
+		fillMouseEvent(event, _km.x, _km.y);
+
+		return true;
+	} else if (ev.key.keysym.sym == BUT_B) { // right mouse button
+		if (ev.type == SDL_KEYDOWN) {
+			event.type = Common::EVENT_RBUTTONDOWN;
+		} else {
+			event.type = Common::EVENT_RBUTTONUP;
+		}
+
+		fillMouseEvent(event, _km.x, _km.y);
+
+		return true;
+	} else if (ev.key.keysym.sym == BUT_X) { // '.' skip dialogue
+		ev.key.keysym.sym = SDLK_PERIOD;
+		ev.key.keysym.mod = (SDLMod)0;
+		ev.key.keysym.unicode = '.';
+	} else if (ev.key.keysym.sym == TRIG_L) { // global menu
+		ev.key.keysym.sym = SDLK_F5;
+		event.kbd.keycode = Common::KEYCODE_F5;
+		event.kbd.ascii = Common::ASCII_F5;
+		event.kbd.flags = Common::KBD_CTRL;
+
+		if (ev.type == SDL_KEYDOWN) {
+			event.type = Common::EVENT_KEYDOWN;
+		} else {
+			event.type = Common::EVENT_KEYUP;
+		}
+
+		return true;
+	} else if (ev.key.keysym.sym == BUT_A) { // key '0'
+		ev.key.keysym.sym = SDLK_0;
+
+		event.kbd.keycode = Common::KEYCODE_0;
+		event.kbd.ascii = '0';
+		event.kbd.flags = 0;
+
+		if (ev.type == SDL_KEYDOWN) {
+			event.type = Common::EVENT_KEYDOWN;
+		} else {
+			event.type = Common::EVENT_KEYUP;
+		}
+
+		return true;
+	} else if (ev.key.keysym.sym == BUT_SELECT) { // virtual keyboard
+		ev.key.keysym.sym = SDLK_F7;
+
+	} else if (ev.key.keysym.sym == BUT_START) { // F5, menu in some games
+		ev.key.keysym.sym = SDLK_F5;
+
+	}  else if (ev.key.keysym.sym == TRIG_R) { // ESC
+		ev.key.keysym.sym = SDLK_ESCAPE;
+	} else {
+		event.kbd.keycode = (Common::KeyCode)ev.key.keysym.sym;
+		event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
+	}
+
+	return false;
+}
+
+void OSystem_SDL_Dingux::fillMouseEvent(Common::Event &event, int x, int y) {
+	if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
+		event.mouse.x = x * 2;
+		event.mouse.y = y * 2;
+	} else {
+		event.mouse.x = x;
+		event.mouse.y = y;
+	}
+
+	// Update the "keyboard mouse" coords
+	_km.x = x;
+	_km.y = y;
+
+	// Adjust for the screen scaling
+	if (!_overlayVisible) {
+		event.mouse.x /= _videoMode.scaleFactor;
+		event.mouse.y /= _videoMode.scaleFactor;
+		if (_videoMode.aspectRatioCorrection)
+			event.mouse.y = aspect2Real(event.mouse.y);
+	}
+}
+
+void OSystem_SDL_Dingux::warpMouse(int x, int y) {
+	if (_mouseCurState.x != x || _mouseCurState.y != y) {
+		if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
+			x = x / 2;
+			y = y / 2;
+		}
+	}
+	OSystem_SDL::warpMouse(x, y);
+}
+
+#endif
+
diff --git a/backends/platform/dingux/dingux-graphics.cpp b/backends/platform/dingux/dingux-graphics.cpp
new file mode 100644
index 0000000000..bbd4a58636
--- /dev/null
+++ b/backends/platform/dingux/dingux-graphics.cpp
@@ -0,0 +1,468 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "backends/platform/dingux/dingux.h"
+
+#include "common/mutex.h"
+#include "graphics/scaler.h"
+#include "graphics/scaler/aspect.h"
+#include "graphics/scaler/downscaler.h"
+#include "graphics/surface.h"
+
+#if defined (DINGUX)
+
+static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
+	{"1x", "Standard", GFX_NORMAL},
+	{0, 0, 0}
+};
+
+int OSystem_SDL_Dingux::getDefaultGraphicsMode() const {
+	return GFX_NORMAL;
+}
+
+const OSystem::GraphicsMode *OSystem_SDL_Dingux::getSupportedGraphicsModes() const {
+	return s_supportedGraphicsModes;
+}
+
+bool OSystem_SDL_Dingux::setGraphicsMode(int mode) {
+	Common::StackLock lock(_graphicsMutex);
+
+	assert(_transactionMode == kTransactionActive);
+
+	if (_oldVideoMode.setup && _oldVideoMode.mode == mode)
+		return true;
+
+	int newScaleFactor = 1;
+
+	switch (mode) {
+	case GFX_NORMAL:
+		newScaleFactor = 1;
+		break;
+	case GFX_HALF:
+		newScaleFactor = 1;
+		break;
+	default:
+		warning("unknown gfx mode %d", mode);
+		return false;
+	}
+
+	_transactionDetails.normal1xScaler = (mode == GFX_NORMAL);
+	if (_oldVideoMode.setup && _oldVideoMode.scaleFactor != newScaleFactor)
+		_transactionDetails.needHotswap = true;
+
+	_transactionDetails.needUpdatescreen = true;
+
+	_videoMode.mode = mode;
+	_videoMode.scaleFactor = newScaleFactor;
+
+	return true;
+}
+
+void OSystem_SDL_Dingux::setGraphicsModeIntern() {
+	Common::StackLock lock(_graphicsMutex);
+	ScalerProc *newScalerProc = 0;
+
+	switch (_videoMode.mode) {
+	case GFX_NORMAL:
+		newScalerProc = Normal1x;
+		break;
+	case GFX_HALF:
+		newScalerProc = DownscaleAllByHalf;
+		break;
+
+	default:
+		error("Unknown gfx mode %d", _videoMode.mode);
+	}
+
+	_scalerProc = newScalerProc;
+
+	if (!_screen || !_hwscreen)
+		return;
+
+	// Blit everything to the screen
+	_forceFull = true;
+
+	// Even if the old and new scale factors are the same, we may have a
+	// different scaler for the cursor now.
+	blitCursor();
+}
+
+void OSystem_SDL_Dingux::initSize(uint w, uint h) {
+	assert(_transactionMode == kTransactionActive);
+
+	// Avoid redundant res changes
+	if ((int)w == _videoMode.screenWidth && (int)h == _videoMode.screenHeight)
+		return;
+
+	_videoMode.screenWidth = w;
+	_videoMode.screenHeight = h;
+	if (w > 320 || h > 240) {
+		setGraphicsMode(GFX_HALF);
+		setGraphicsModeIntern();
+		toggleMouseGrab();
+	}
+
+	_transactionDetails.sizeChanged = true;
+}
+
+void OSystem_SDL_Dingux::drawMouse() {
+	if (!_mouseVisible || !_mouseSurface) {
+		_mouseBackup.x = _mouseBackup.y = _mouseBackup.w = _mouseBackup.h = 0;
+		return;
+	}
+
+	SDL_Rect dst;
+	int scale;
+	int hotX, hotY;
+
+	if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
+		dst.x = _mouseCurState.x / 2;
+		dst.y = _mouseCurState.y / 2;
+	} else {
+		dst.x = _mouseCurState.x;
+		dst.y = _mouseCurState.y;
+	}
+
+	if (!_overlayVisible) {
+		scale = _videoMode.scaleFactor;
+		dst.w = _mouseCurState.vW;
+		dst.h = _mouseCurState.vH;
+		hotX = _mouseCurState.vHotX;
+		hotY = _mouseCurState.vHotY;
+	} else {
+		scale = 1;
+		dst.w = _mouseCurState.rW;
+		dst.h = _mouseCurState.rH;
+		hotX = _mouseCurState.rHotX;
+		hotY = _mouseCurState.rHotY;
+	}
+
+	// The mouse is undrawn using virtual coordinates, i.e. they may be
+	// scaled and aspect-ratio corrected.
+
+	_mouseBackup.x = dst.x - hotX;
+	_mouseBackup.y = dst.y - hotY;
+	_mouseBackup.w = dst.w;
+	_mouseBackup.h = dst.h;
+
+	// We draw the pre-scaled cursor image, so now we need to adjust for
+	// scaling, shake position and aspect ratio correction manually.
+
+	if (!_overlayVisible) {
+		dst.y += _currentShakePos;
+	}
+
+	if (_videoMode.aspectRatioCorrection && !_overlayVisible)
+		dst.y = real2Aspect(dst.y);
+
+	dst.x = scale * dst.x - _mouseCurState.rHotX;
+	dst.y = scale * dst.y - _mouseCurState.rHotY;
+	dst.w = _mouseCurState.rW;
+	dst.h = _mouseCurState.rH;
+
+	// Note that SDL_BlitSurface() and addDirtyRect() will both perform any
+	// clipping necessary
+
+	if (SDL_BlitSurface(_mouseSurface, NULL, _hwscreen, &dst) != 0)
+		error("SDL_BlitSurface failed: %s", SDL_GetError());
+
+	// The screen will be updated using real surface coordinates, i.e.
+	// they will not be scaled or aspect-ratio corrected.
+	addDirtyRect(dst.x, dst.y, dst.w, dst.h, true);
+}
+
+void OSystem_SDL_Dingux::undrawMouse() {
+	const int x = _mouseBackup.x;
+	const int y = _mouseBackup.y;
+
+	// When we switch bigger overlay off mouse jumps. Argh!
+	// This is intended to prevent undrawing offscreen mouse
+	if (!_overlayVisible && (x >= _videoMode.screenWidth || y >= _videoMode.screenHeight))
+		return;
+
+	if (_mouseBackup.w != 0 && _mouseBackup.h != 0) {
+		if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
+			addDirtyRect(x*2, y*2, _mouseBackup.w*2, _mouseBackup.h*2);
+		} else {
+			addDirtyRect(x, y, _mouseBackup.w, _mouseBackup.h);
+		}
+	}
+}
+
+void OSystem_SDL_Dingux::internUpdateScreen() {
+	SDL_Surface *srcSurf, *origSurf;
+	int height, width;
+	ScalerProc *scalerProc;
+	int scale1;
+
+#if defined (DEBUG) && ! defined(_WIN32_WCE) // definitions not available for non-DEBUG here. (needed this to compile in SYMBIAN32 & linux?)
+	assert(_hwscreen != NULL);
+	assert(_hwscreen->map->sw_data != NULL);
+#endif
+
+	// If the shake position changed, fill the dirty area with blackness
+	if (_currentShakePos != _newShakePos) {
+		SDL_Rect blackrect = {0, 0, _videoMode.screenWidth * _videoMode.scaleFactor, _newShakePos * _videoMode.scaleFactor};
+
+		if (_videoMode.aspectRatioCorrection && !_overlayVisible)
+			blackrect.h = real2Aspect(blackrect.h - 1) + 1;
+
+		SDL_FillRect(_hwscreen, &blackrect, 0);
+
+		_currentShakePos = _newShakePos;
+
+		_forceFull = true;
+	}
+
+	// Check whether the palette was changed in the meantime and update the
+	// screen surface accordingly.
+	if (_screen && _paletteDirtyEnd != 0) {
+		SDL_SetColors(_screen, _currentPalette + _paletteDirtyStart,
+		              _paletteDirtyStart,
+		              _paletteDirtyEnd - _paletteDirtyStart);
+
+		_paletteDirtyEnd = 0;
+
+		_forceFull = true;
+	}
+
+#ifdef USE_OSD
+	// OSD visible (i.e. non-transparent)?
+	if (_osdAlpha != SDL_ALPHA_TRANSPARENT) {
+		// Updated alpha value
+		const int diff = SDL_GetTicks() - _osdFadeStartTime;
+		if (diff > 0) {
+			if (diff >= kOSDFadeOutDuration) {
+				// Back to full transparency
+				_osdAlpha = SDL_ALPHA_TRANSPARENT;
+			} else {
+				// Do a linear fade out...
+				const int startAlpha = SDL_ALPHA_TRANSPARENT + kOSDInitialAlpha * (SDL_ALPHA_OPAQUE - SDL_ALPHA_TRANSPARENT) / 100;
+				_osdAlpha = startAlpha + diff * (SDL_ALPHA_TRANSPARENT - startAlpha) / kOSDFadeOutDuration;
+			}
+			SDL_SetAlpha(_osdSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, _osdAlpha);
+			_forceFull = true;
+		}
+	}
+#endif
+
+	if (!_overlayVisible) {
+		origSurf = _screen;
+		srcSurf = _tmpscreen;
+		width = _videoMode.screenWidth;
+		height = _videoMode.screenHeight;
+		scalerProc = _scalerProc;
+		scale1 = _videoMode.scaleFactor;
+	} else {
+		origSurf = _overlayscreen;
+		srcSurf = _tmpscreen2;
+		width = _videoMode.overlayWidth;
+		height = _videoMode.overlayHeight;
+		scalerProc = Normal1x;
+		scale1 = 1;
+	}
+
+	// Add the area covered by the mouse cursor to the list of dirty rects if
+	// we have to redraw the mouse.
+	if (_mouseNeedsRedraw)
+		undrawMouse();
+
+	// Force a full redraw if requested
+	if (_forceFull) {
+		_numDirtyRects = 1;
+		_dirtyRectList[0].x = 0;
+		_dirtyRectList[0].y = 0;
+		_dirtyRectList[0].w = width;
+		_dirtyRectList[0].h = height;
+	}
+
+	// Only draw anything if necessary
+	if (_numDirtyRects > 0 || _mouseNeedsRedraw) {
+		SDL_Rect *r;
+		SDL_Rect dst;
+		uint32 srcPitch, dstPitch;
+		SDL_Rect *lastRect = _dirtyRectList + _numDirtyRects;
+
+		for (r = _dirtyRectList; r != lastRect; ++r) {
+			dst = *r;
+			dst.x++;	// Shift rect by one since 2xSai needs to access the data around
+			dst.y++;	// any pixel to scale it, and we want to avoid mem access crashes.
+
+			if (SDL_BlitSurface(origSurf, r, srcSurf, &dst) != 0)
+				error("SDL_BlitSurface failed: %s", SDL_GetError());
+		}
+
+		SDL_LockSurface(srcSurf);
+		SDL_LockSurface(_hwscreen);
+
+		srcPitch = srcSurf->pitch;
+		dstPitch = _hwscreen->pitch;
+
+		for (r = _dirtyRectList; r != lastRect; ++r) {
+			register int dst_y = r->y + _currentShakePos;
+			register int dst_h = 0;
+			register int dst_w = r->w;
+			register int orig_dst_y = 0;
+			register int dst_x = r->x;
+			register int src_y;
+			register int src_x;
+
+			if (dst_y < height) {
+				dst_h = r->h;
+				if (dst_h > height - dst_y)
+					dst_h = height - dst_y;
+
+				orig_dst_y = dst_y;
+				src_x = dst_x;
+				src_y = dst_y;
+
+				if (_videoMode.aspectRatioCorrection && !_overlayVisible)
+					dst_y = real2Aspect(dst_y);
+
+				assert(scalerProc != NULL);
+
+				if ((_videoMode.mode == GFX_HALF) && (scalerProc == DownscaleAllByHalf)) {
+					if (dst_x % 2 == 1) {
+						dst_x--;
+						dst_w++;
+					}
+					if (dst_y % 2 == 1) {
+						dst_y--;
+						dst_h++;
+					}
+					src_x = dst_x;
+					src_y = dst_y;
+					dst_x = dst_x / 2;
+					dst_y = dst_y / 2;
+
+					scalerProc((byte *)srcSurf->pixels + (src_x * 2 + 2) + (src_y + 1) * srcPitch, srcPitch,
+					           (byte *)_hwscreen->pixels + dst_x * 2 + dst_y * dstPitch, dstPitch, dst_w, dst_h);
+
+				} else {
+					scalerProc((byte *)srcSurf->pixels + (r->x * 2 + 2) + (r->y + 1) * srcPitch, srcPitch,
+					           (byte *)_hwscreen->pixels + r->x * 2 + dst_y * dstPitch, dstPitch, r->w, dst_h);
+				}
+			}
+
+			if (_videoMode.mode == GFX_HALF && scalerProc == DownscaleAllByHalf) {
+				r->w = r->w / 2;
+				r->h = dst_h / 2;
+			} else {
+				r->w = r->w;
+				r->h = dst_h;
+			}
+
+			r->x = dst_x;
+			r->y = dst_y;
+
+
+#ifdef USE_SCALERS
+			if (_videoMode.aspectRatioCorrection && orig_dst_y < height && !_overlayVisible)
+				r->h = stretch200To240((uint8 *) _hwscreen->pixels, dstPitch, r->w, r->h, r->x, r->y, orig_dst_y * scale1);
+#endif
+		}
+		SDL_UnlockSurface(srcSurf);
+		SDL_UnlockSurface(_hwscreen);
+
+		// Readjust the dirty rect list in case we are doing a full update.
+		// This is necessary if shaking is active.
+		if (_forceFull) {
+			_dirtyRectList[0].y = 0;
+			_dirtyRectList[0].h = (_videoMode.mode == GFX_HALF) ? effectiveScreenHeight() / 2 : effectiveScreenHeight();
+		}
+
+		drawMouse();
+
+#ifdef USE_OSD
+		if (_osdAlpha != SDL_ALPHA_TRANSPARENT) {
+			SDL_BlitSurface(_osdSurface, 0, _hwscreen, 0);
+		}
+#endif
+		// Finally, blit all our changes to the screen
+		SDL_UpdateRects(_hwscreen, _numDirtyRects, _dirtyRectList);
+	}
+
+	_numDirtyRects = 0;
+	_forceFull = false;
+	_mouseNeedsRedraw = false;
+}
+
+void OSystem_SDL_Dingux::showOverlay() {
+	if (_videoMode.mode == GFX_HALF) {
+		_mouseCurState.x = _mouseCurState.x / 2;
+		_mouseCurState.y = _mouseCurState.y / 2;
+	}
+	OSystem_SDL::showOverlay();
+}
+
+void OSystem_SDL_Dingux::hideOverlay() {
+	if (_videoMode.mode == GFX_HALF) {
+		_mouseCurState.x = _mouseCurState.x * 2;
+		_mouseCurState.y = _mouseCurState.y * 2;
+	}
+	OSystem_SDL::hideOverlay();
+}
+
+bool OSystem_SDL_Dingux::loadGFXMode() {
+
+	// Forcefully disable aspect ratio correction for games
+	// which starts with a native 240px height resolution.
+	// This fixes games with weird resolutions, like MM Nes (256x240)
+	if(_videoMode.screenHeight == 240) {
+		_videoMode.aspectRatioCorrection = false;
+	}
+
+	fprintf(stdout, "Game ScreenMode = %d*%d\n", _videoMode.screenWidth, _videoMode.screenHeight);
+	if (_videoMode.screenWidth > 320 || _videoMode.screenHeight > 240) {
+		_videoMode.aspectRatioCorrection = false;
+		setGraphicsMode(GFX_HALF);
+		fprintf(stdout, "GraphicsMode set to HALF\n");
+	} else {
+		setGraphicsMode(GFX_NORMAL);
+		fprintf(stdout, "GraphicsMode set to NORMAL\n");
+	}
+
+	if ((_videoMode.mode == GFX_HALF) && !_overlayVisible) {
+		_videoMode.overlayWidth = _videoMode.screenWidth / 2;
+		_videoMode.overlayHeight = _videoMode.screenHeight / 2;
+		_videoMode.fullscreen = true;
+	} else {
+
+		_videoMode.overlayWidth = _videoMode.screenWidth * _videoMode.scaleFactor;
+		_videoMode.overlayHeight = _videoMode.screenHeight * _videoMode.scaleFactor;
+
+		if (_videoMode.aspectRatioCorrection)
+			_videoMode.overlayHeight = real2Aspect(_videoMode.overlayHeight);
+
+		_videoMode.hardwareWidth = _videoMode.screenWidth * _videoMode.scaleFactor;
+		_videoMode.hardwareHeight = effectiveScreenHeight();
+	}
+
+
+	return OSystem_SDL::loadGFXMode();
+}
+
+#endif
+
diff --git a/backends/platform/dingux/dingux.cpp b/backends/platform/dingux/dingux.cpp
new file mode 100644
index 0000000000..cdf10600ce
--- /dev/null
+++ b/backends/platform/dingux/dingux.cpp
@@ -0,0 +1,58 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "backends/platform/dingux/dingux.h"
+
+#if defined(DINGUX)
+
+bool OSystem_SDL_Dingux::hasFeature(Feature f) {
+	return
+	    (f == kFeatureAspectRatioCorrection) ||
+	    (f == kFeatureCursorHasPalette);
+}
+
+void OSystem_SDL_Dingux::setFeatureState(Feature f, bool enable) {
+	switch (f) {
+	case kFeatureAspectRatioCorrection:
+		setAspectRatioCorrection(enable);
+		break;
+	default:
+		break;
+	}
+}
+
+bool OSystem_SDL_Dingux::getFeatureState(Feature f) {
+	assert(_transactionMode == kTransactionNone);
+
+	switch (f) {
+	case kFeatureAspectRatioCorrection:
+		return _videoMode.aspectRatioCorrection;
+	default:
+		return false;
+	}
+}
+
+#endif
+
diff --git a/backends/platform/dingux/dingux.h b/backends/platform/dingux/dingux.h
new file mode 100644
index 0000000000..846ad3faf9
--- /dev/null
+++ b/backends/platform/dingux/dingux.h
@@ -0,0 +1,69 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef SDL_DINGUX_COMMON_H
+#define SDL_DINGUX_COMMON_H
+
+#include <SDL.h>
+
+#include "backends/base-backend.h"
+#include "backends/platform/sdl/sdl.h"
+
+#if defined(DINGUX)
+
+enum {
+	GFX_HALF = 12
+};
+
+class OSystem_SDL_Dingux : public OSystem_SDL {
+public:
+	virtual bool hasFeature(Feature f);
+	virtual void setFeatureState(Feature f, bool enable);
+	virtual bool getFeatureState(Feature f);
+	virtual int getDefaultGraphicsMode() const;
+
+	void initSize(uint w, uint h);
+	const OSystem::GraphicsMode *getSupportedGraphicsModes() const;
+	bool setGraphicsMode(const char *name);
+	bool setGraphicsMode(int mode);
+	void setGraphicsModeIntern();
+	void internUpdateScreen();
+	void showOverlay();
+	void hideOverlay();
+	bool loadGFXMode();
+	void drawMouse();
+	void undrawMouse();
+	void warpMouse(int, int);
+	void fillMouseEvent(Common::Event&, int, int);
+
+protected:
+	virtual bool remapKey(SDL_Event &ev, Common::Event &event);
+};
+
+
+#endif
+
+#endif
+
diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk
new file mode 100644
index 0000000000..882078fe46
--- /dev/null
+++ b/backends/platform/dingux/dingux.mk
@@ -0,0 +1,30 @@
+DINGUX_EXE_STRIPPED := scummvm_stripped$(EXEEXT)
+
+bundle_name = dingux-dist/scummvm
+
+all: $(DINGUX_EXE_STRIPPED)
+
+$(DINGUX_EXE_STRIPPED): $(EXECUTABLE)
+	$(STRIP) $< -o $@
+
+dingux-distclean:
+	rm -rf $(bundle_name)
+	rm $(DINGUX_EXE_STRIPPED)
+
+dingux-dist: all
+	$(MKDIR) $(bundle_name)
+	$(MKDIR) $(bundle_name)/saves
+	$(STRIP) $(EXECUTABLE) -o $(bundle_name)/scummvm.elf
+	$(CP) $(DIST_FILES_THEMES) $(bundle_name)/
+ifdef DIST_FILES_ENGINEDATA
+	$(CP) $(DIST_FILES_ENGINEDATA) $(bundle_name)/
+endif
+	$(CP) $(DIST_FILES_DOCS) $(bundle_name)/
+ifdef DYNAMIC_MODULES
+		$(MKDIR) $(bundle_name)/plugins
+		$(CP) $(PLUGINS) $(bundle_name)/plugins
+		$(STRIP) $(bundle_name)/plugins/*
+endif
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/
+	$(CP) $(srcdir)/backends/platform/dingux/scummvm.gpe $(bundle_name)/
+	$(CP) $(srcdir)/backends/platform/dingux/README.DINGUX $(bundle_name)/
diff --git a/backends/platform/gp2xwiz/gp2xwiz-main.cpp b/backends/platform/dingux/main.cpp
index d6601f5250..7b02151c1a 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-main.cpp
+++ b/backends/platform/dingux/main.cpp
@@ -23,28 +23,31 @@
  *
  */
 
-#include "backends/platform/gp2xwiz/gp2xwiz-sdl.h"
-#include "backends/plugins/posix/posix-provider.h"
+#include "backends/platform/dingux/dingux.h"
+#include "backends/plugins/sdl/sdl-provider.h"
+//#include "backends/plugins/posix/posix-provider.h"
 #include "base/main.h"
 
-int main(int argc, char *argv[]) {
+#if defined(DINGUX)
 
-	// Create our OSystem instance
-	g_system = new OSystem_GP2XWIZ();
-	assert(g_system);
+#include <unistd.h>
+
+int main(int argc, char* argv[]) {
 
-	// Pre initialize the backend
-	((OSystem_GP2XWIZ *)g_system)->init();
+	g_system = new OSystem_SDL_Dingux();
+	assert(g_system);
 
 #ifdef DYNAMIC_MODULES
-	PluginManager::instance().addPluginProvider(new POSIXPluginProvider());
+	PluginManager::instance().addPluginProvider(new SDLPluginProvider());
+//	PluginManager::instance().addPluginProvider(new POSIXPluginProvider());
 #endif
 
 	// Invoke the actual ScummVM main entry point:
 	int res = scummvm_main(argc, argv);
-
-	// Free OSystem
-	delete (OSystem_GP2XWIZ *)g_system;
-
+	((OSystem_SDL *)g_system)->deinit();
 	return res;
+
 }
+
+#endif
+
diff --git a/backends/platform/dingux/module.mk b/backends/platform/dingux/module.mk
new file mode 100644
index 0000000000..309fb94442
--- /dev/null
+++ b/backends/platform/dingux/module.mk
@@ -0,0 +1,13 @@
+MODULE := backends/platform/dingux
+
+MODULE_OBJS := \
+	main.o \
+	dingux.o \
+	dingux-events.o \
+	dingux-graphics.o \
+
+MODULE_DIRS += \
+	backends/platform/dingux/
+
+# We don't use the rules.mk here on purpose
+OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
diff --git a/backends/platform/dingux/scummvm.gpe b/backends/platform/dingux/scummvm.gpe
new file mode 100644
index 0000000000..84ab0c6b95
--- /dev/null
+++ b/backends/platform/dingux/scummvm.gpe
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+HOME=`pwd`
+$HOME/scummvm.elf
+
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index eedf75c256..bf9fc1d826 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -66,7 +66,7 @@ else
 	# TODO: Inherit the earth uses so much RAM that I have removed libmad in order to
 	# claw some back.
 
-	
+
 
 	else
 		ifdef DS_BUILD_I
@@ -236,7 +236,7 @@ CXXFLAGS=	$(CFLAGS) -Wno-non-virtual-dtor -Wno-unknown-pragmas -Wno-reorder  \
 
 
 ASFLAGS = -mcpu=arm9tdmi -mthumb-interwork
-DEFINES += -D__DS__ -DNDS -DARM9 -DNONSTANDARD_PORT -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555 -DDISABLE_DOSBOX_OPL -DDISABLE_DEFAULT_SAVEFILEMANAGER -DARM
+DEFINES += -D__DS__ -DNDS -DARM9 -DNONSTANDARD_PORT -DDISABLE_TEXT_CONSOLE -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555 -DDISABLE_DOSBOX_OPL -DDISABLE_DEFAULT_SAVEFILEMANAGER -DARM
 ifdef USE_MAD
 	DEFINES += -DUSE_MAD
 endif
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index 95bfdfe40a..1525647c2e 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -3227,6 +3227,10 @@ int main(void) {
 
 
 int main() {
+#ifndef DISABLE_TEXT_CONSOLE
+	consoleDebugInit(DebugDevice_NOCASH);
+	nocashMessage("startup\n");
+#endif
 	DS::main();
 }
 
diff --git a/backends/platform/ds/arm9/source/portdefs.h b/backends/platform/ds/arm9/source/portdefs.h
index cc38d66a73..ad36503e83 100644
--- a/backends/platform/ds/arm9/source/portdefs.h
+++ b/backends/platform/ds/arm9/source/portdefs.h
@@ -40,10 +40,6 @@
 
 #define double float
 
-#ifndef DISABLE_TEXT_CONSOLE
-#define DISABLE_TEXT_CONSOLE
-#endif
-
 #ifndef DISABLE_COMMAND_LINE
 #define DISABLE_COMMAND_LINE
 #endif
diff --git a/backends/platform/ds/arm9/source/touchkeyboard.cpp b/backends/platform/ds/arm9/source/touchkeyboard.cpp
index 71f4f93c27..581509f939 100644
--- a/backends/platform/ds/arm9/source/touchkeyboard.cpp
+++ b/backends/platform/ds/arm9/source/touchkeyboard.cpp
@@ -177,7 +177,7 @@ void drawText(int tx, int ty, const char *string, bool highlight) {
 			baseAddress[ty * 32 + tx + p] = baseValue | tile;
 		}
 	}
-	
+
 }
 
 
@@ -292,7 +292,7 @@ void drawAutoComplete() {
 		// When there's no completions on the bottom of the screen, it acts like a mouse pad
 		// so this text indicates that
 		drawText(11, 18, "MOUSE AREA", true);
-		
+
 
 	} else {
 
@@ -303,10 +303,10 @@ void drawAutoComplete() {
 		for (int r = 0; r < autoCompleteCount; r++) {
 			int y = 12 + (r % 6) * 2;
 			int x = 0 + ((r / 6) * 16);
-	
+
 			drawText(x, y, autoCompleteWord[r], selectedCompletion == r);
 		}
-	
+
 	}
 }
 
diff --git a/backends/platform/gp2x/build/README-GP2X b/backends/platform/gp2x/build/README-GP2X
index f95a974230..dc93a9f1c9 100644
--- a/backends/platform/gp2x/build/README-GP2X
+++ b/backends/platform/gp2x/build/README-GP2X
@@ -20,10 +20,10 @@ Contents:
 
 Please refer to the:
 
-GP2X/GP2XWiz ScummVM Forum: <http://forums.scummvm.org/viewforum.php?f=14> 
-WiKi: <http://wiki.scummvm.org/index.php/GP2X> 
+GP2X/GP2XWiz ScummVM Forum: <http://forums.scummvm.org/viewforum.php?f=14>
+WiKi: <http://wiki.scummvm.org/index.php/GP2X>
 
-for the most current information on the port and any updates to this 
+for the most current information on the port and any updates to this
 documentation.
 
 ------------------------------------------------------------------------
diff --git a/backends/platform/gp2x/gp2x-bundle.mk b/backends/platform/gp2x/gp2x-bundle.mk
index c6fb72c1c3..67d22d1889 100755
--- a/backends/platform/gp2x/gp2x-bundle.mk
+++ b/backends/platform/gp2x/gp2x-bundle.mk
@@ -6,7 +6,7 @@ gp2x-bundle: $(EXECUTABLE)
 	$(MKDIR) "$(bundle_name)"
 	$(MKDIR) "$(bundle_name)/saves"
 	$(MKDIR) "$(bundle_name)/engine-data"
-	
+
 	echo "Please put your save games in this dir" >> "$(bundle_name)/saves/PUT_SAVES_IN_THIS_DIR"
 
 	$(CP) $(srcdir)/backends/platform/gp2x/build/scummvm.gpe $(bundle_name)/
@@ -28,13 +28,13 @@ ifdef DYNAMIC_MODULES
 endif
 
 	tar -C $(bundle_name) -cvjf $(bundle_name).tar.bz2 .
-	rm -R ./$(bundle_name)	
+	rm -R ./$(bundle_name)
 
 gp2x-bundle-debug: $(EXECUTABLE)
 	$(MKDIR) "$(bundle_name)"
 	$(MKDIR) "$(bundle_name)/saves"
 	$(MKDIR) "$(bundle_name)/engine-data"
-	
+
 	echo "Please put your save games in this dir" >> "$(bundle_name)/saves/PUT_SAVES_IN_THIS_DIR"
 
 	$(CP) $(srcdir)/backends/platform/gp2x/build/scummvm.gpe $(bundle_name)/
@@ -46,15 +46,15 @@ gp2x-bundle-debug: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/engine-data
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/
-	
+
 	$(INSTALL) -c -m 777 $(srcdir)/$(EXECUTABLE) $(bundle_name)/$(EXECUTABLE)
 
 ifdef DYNAMIC_MODULES
 	$(INSTALL) -d "$(bundle_name)/scummvm/plugins"
 	$(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/scummvm/plugins"
 endif
-	
+
 	tar -C $(bundle_name) -cvjf $(bundle_name)-debug.tar.bz2 .
-	rm -R ./$(bundle_name)	
+	rm -R ./$(bundle_name)
 
 .PHONY: gp2x-bundle gp2x-bundle-debug
diff --git a/backends/platform/gp2x/gp2x-hw.cpp b/backends/platform/gp2x/gp2x-hw.cpp
index 2dc5b4f579..75e4ca6471 100644
--- a/backends/platform/gp2x/gp2x-hw.cpp
+++ b/backends/platform/gp2x/gp2x-hw.cpp
@@ -197,3 +197,28 @@ void gp2x_video_wait_vsync(void)
 
 } /* namespace GP2X_HW */
 
+namespace GPH {
+
+enum {
+	/* Touchscreen TapMode */
+	TAPMODE_LEFT		= 0,
+	TAPMODE_RIGHT		= 1,
+	TAPMODE_HOVER		= 2
+};
+
+int tapmodeLevel = TAPMODE_LEFT;
+
+void ToggleTapMode() {
+	if (tapmodeLevel == TAPMODE_LEFT) {
+		tapmodeLevel = TAPMODE_RIGHT;
+	} else if (tapmodeLevel == TAPMODE_RIGHT) {
+		tapmodeLevel = TAPMODE_HOVER;
+	} else if (tapmodeLevel == TAPMODE_HOVER) {
+		tapmodeLevel = TAPMODE_LEFT;
+	} else {
+		tapmodeLevel = TAPMODE_LEFT;
+    }
+}
+
+
+} /* namespace GPH */
diff --git a/backends/platform/gp2x/gp2x-hw.h b/backends/platform/gp2x/gp2x-hw.h
index 7e72812cc4..872c44f118 100644
--- a/backends/platform/gp2x/gp2x-hw.h
+++ b/backends/platform/gp2x/gp2x-hw.h
@@ -54,4 +54,12 @@ extern void gp2x_video_wait_vsync(void);
 
 } /* namespace GP2X_HW */
 
+namespace GPH {
+
+extern int tapmodeLevel;
+
+extern void	ToggleTapMode();
+
+} /* namespace GPH */
+
 #endif //GP2X_HW_H
diff --git a/backends/platform/gp2x/gp2x.cpp b/backends/platform/gp2x/gp2x.cpp
index b4396db0ea..c297a45833 100644
--- a/backends/platform/gp2x/gp2x.cpp
+++ b/backends/platform/gp2x/gp2x.cpp
@@ -50,7 +50,7 @@ void OSystem_GP2X::initBackend() {
 	char workDirName[PATH_MAX + 1];
 
 	if (getcwd(workDirName, PATH_MAX) == NULL) {
-		error("Could not obtain current working directory.");
+		error("Could not obtain current working directory");
 	} else {
 		printf("Current working directory: %s\n", workDirName);
 	}
@@ -162,7 +162,7 @@ void OSystem_GP2X::addSysArchivesToSearchSet(Common::SearchSet &s, int priority)
 	char workDirName[PATH_MAX + 1];
 
 	if (getcwd(workDirName, PATH_MAX) == NULL) {
-		error("Error: Could not obtain current working directory.");
+		error("Error: Could not obtain current working directory");
 	}
 
 	Common::FSNode workdirNode(workDirName);
diff --git a/backends/platform/gp2xwiz/build/README-GP2XWIZ b/backends/platform/gph/build/README-GP2XWIZ
index ec8142a6f3..269fa901c9 100644
--- a/backends/platform/gp2xwiz/build/README-GP2XWIZ
+++ b/backends/platform/gph/build/README-GP2XWIZ
@@ -19,10 +19,10 @@ Contents:
 
 Please refer to the:
 
-GP2X/GP2XWiz ScummVM Forum: <http://forums.scummvm.org/viewforum.php?f=14> 
-WiKi: <http://wiki.scummvm.org/index.php/GP2XWiz> 
+GP2X/GP2XWiz ScummVM Forum: <http://forums.scummvm.org/viewforum.php?f=14>
+WiKi: <http://wiki.scummvm.org/index.php/GP2XWiz>
 
-for the most current information on the port and any updates to this 
+for the most current information on the port and any updates to this
 documentation.
 
 ------------------------------------------------------------------------
@@ -112,7 +112,7 @@ Fancy button combos:
 
 NOTE: To use button combos press and hold the Left Trigger then...
 
-Right Trigger: Display Virtual Keyboard 
+Right Trigger: Display Virtual Keyboard
 Menu: Bring up the Global main menu for ScummVM
 Select: Exit ScummVM completely (and gracefully)
 
diff --git a/backends/platform/gp2xwiz/build/build.sh b/backends/platform/gph/build/build.sh
index 876c3e378a..876c3e378a 100755
--- a/backends/platform/gp2xwiz/build/build.sh
+++ b/backends/platform/gph/build/build.sh
diff --git a/backends/platform/gp2xwiz/build/bundle-debug.sh b/backends/platform/gph/build/bundle-debug.sh
index cd5145b31d..cd5145b31d 100755
--- a/backends/platform/gp2xwiz/build/bundle-debug.sh
+++ b/backends/platform/gph/build/bundle-debug.sh
diff --git a/backends/platform/gp2xwiz/build/bundle.sh b/backends/platform/gph/build/bundle.sh
index 579e2dc77b..579e2dc77b 100755
--- a/backends/platform/gp2xwiz/build/bundle.sh
+++ b/backends/platform/gph/build/bundle.sh
diff --git a/backends/platform/gp2xwiz/build/clean.sh b/backends/platform/gph/build/clean.sh
index 5ec1b9e62c..5ec1b9e62c 100755
--- a/backends/platform/gp2xwiz/build/clean.sh
+++ b/backends/platform/gph/build/clean.sh
diff --git a/backends/platform/gp2xwiz/build/config-alleng.sh b/backends/platform/gph/build/config-alleng.sh
index cfed463edf..cfed463edf 100755
--- a/backends/platform/gp2xwiz/build/config-alleng.sh
+++ b/backends/platform/gph/build/config-alleng.sh
diff --git a/backends/platform/gp2xwiz/build/config.sh b/backends/platform/gph/build/config.sh
index 54c4795298..25c3a83da0 100755
--- a/backends/platform/gp2xwiz/build/config.sh
+++ b/backends/platform/gph/build/config.sh
@@ -17,6 +17,6 @@ export DEFINES=-DNDEBUG
 
 # Edit the configure line to suit.
 cd ../../../..
-./configure --backend=gp2xwiz --disable-mt32emu --host=gp2xwiz --disable-flac --disable-nasm --disable-hq-scalers --with-sdl-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin --with-mpeg2-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-tremor --with-tremor-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-zlib --with-zlib-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-mad --with-mad-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-vkeybd --enable-plugins --default-dynamic 
+./configure --backend=gp2xwiz --disable-mt32emu --host=gp2xwiz --disable-flac --disable-nasm --disable-hq-scalers --with-sdl-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin --with-mpeg2-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-tremor --with-tremor-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-zlib --with-zlib-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-mad --with-mad-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-vkeybd --enable-plugins --default-dynamic
 
 echo Generating config for GP2X Wiz complete. Check for errors.
diff --git a/backends/platform/gp2xwiz/build/scummvm-gdb.gpe b/backends/platform/gph/build/scummvm-gdb.gpe
index 64b6c8b974..f486c288ee 100755
--- a/backends/platform/gp2xwiz/build/scummvm-gdb.gpe
+++ b/backends/platform/gph/build/scummvm-gdb.gpe
@@ -6,7 +6,7 @@ export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
 
 # Run ScummVM via GDB (so make sure you have a terminal open or serial).
 # Oh, and GDB installed of course ;)
-gdb --args ./scummvm.wiz --fullscreen --gfx-mode=1x --config=$(pwd)/.scummvmrc 
+gdb --args ./scummvm.wiz --fullscreen --gfx-mode=1x --config=$(pwd)/.scummvmrc
 
 # Sync the SD card to check that everything is written.
 sync
diff --git a/backends/platform/gp2xwiz/build/scummvm.gpe b/backends/platform/gph/build/scummvm.gpe
index 42cc00a22a..2866825e91 100755
--- a/backends/platform/gp2xwiz/build/scummvm.gpe
+++ b/backends/platform/gph/build/scummvm.gpe
@@ -5,7 +5,7 @@
 export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
 
 # Run ScummVM, important this bit.
-./scummvm.wiz --fullscreen --gfx-mode=1x --config=$(pwd)/.scummvmrc 
+./scummvm.wiz --fullscreen --gfx-mode=1x --config=$(pwd)/.scummvmrc
 
 # Sync the SD card to check that everything is written.
 sync
diff --git a/backends/platform/gp2xwiz/build/scummvm.ini b/backends/platform/gph/build/scummvm.ini
index 5a8e6eefa1..c9cce92379 100644
--- a/backends/platform/gp2xwiz/build/scummvm.ini
+++ b/backends/platform/gph/build/scummvm.ini
@@ -2,3 +2,4 @@
 name="ScummVM"
 path="/scummvm/scummvm.gpe"
 icon="/scummvm/scummvm.png"
+title="/scummvm/scummvmb.png"
diff --git a/backends/platform/gp2xwiz/build/scummvm.png b/backends/platform/gph/build/scummvm.png
index 128e59efc4..128e59efc4 100644
--- a/backends/platform/gp2xwiz/build/scummvm.png
+++ b/backends/platform/gph/build/scummvm.png
diff --git a/backends/platform/gph/build/scummvmb.png b/backends/platform/gph/build/scummvmb.png
new file mode 100644
index 0000000000..24a27bc0e1
--- /dev/null
+++ b/backends/platform/gph/build/scummvmb.png
diff --git a/backends/platform/gph/caanoo-bundle.mk b/backends/platform/gph/caanoo-bundle.mk
new file mode 100755
index 0000000000..c411310688
--- /dev/null
+++ b/backends/platform/gph/caanoo-bundle.mk
@@ -0,0 +1,69 @@
+# Special target to create bundles for the GP2X Caanoo.
+
+#bundle_name = release/scummvm-caanoo-`date '+%Y-%m-%d'`
+bundle_name = release/scummvm-caanoo
+f=$(shell which $(STRIP))
+libloc = $(shell dirname $(f))
+
+caanoo-bundle: $(EXECUTABLE)
+	$(MKDIR) "$(bundle_name)"
+	$(MKDIR) "$(bundle_name)/scummvm"
+	$(MKDIR) "$(bundle_name)/scummvm/saves"
+	$(MKDIR) "$(bundle_name)/scummvm/engine-data"
+	$(MKDIR) "$(bundle_name)/scummvm/lib"
+
+	echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
+
+	$(CP) $(srcdir)/backends/platform/gph/caanoo/scummvm.gpe $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvmb.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/README-GP2XWIZ $(bundle_name)/scummvm/README-CAANOO
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm.ini $(bundle_name)/
+
+	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
+	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
+
+	$(STRIP) $(EXECUTABLE) -o $(bundle_name)/scummvm/$(EXECUTABLE)
+
+ifdef DYNAMIC_MODULES
+	$(INSTALL) -d "$(bundle_name)/scummvm/plugins"
+	$(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/scummvm/plugins"
+	$(STRIP) $(bundle_name)/scummvm/plugins/*
+endif
+
+	tar -C $(bundle_name) -cvjf $(bundle_name).tar.bz2 .
+	rm -R ./$(bundle_name)
+
+caanoo-bundle-debug: $(EXECUTABLE)
+	$(MKDIR) "$(bundle_name)"
+	$(MKDIR) "$(bundle_name)/scummvm"
+	$(MKDIR) "$(bundle_name)/scummvm/saves"
+	$(MKDIR) "$(bundle_name)/scummvm/engine-data"
+	$(MKDIR) "$(bundle_name)/scummvm/lib"
+
+	echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
+
+	$(CP) $(srcdir)/backends/platform/gph/caanoo/scummvm-gdb.gpe $(bundle_name)/scummvm/scummvm.gpe
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvmb.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/README-GP2XWIZ $(bundle_name)/scummvm/README-CAANOO
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm.ini $(bundle_name)/
+
+	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
+	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
+
+	$(INSTALL) -c -m 777 $(srcdir)/$(EXECUTABLE) $(bundle_name)/scummvm/$(EXECUTABLE)
+
+ifdef DYNAMIC_MODULES
+	$(INSTALL) -d "$(bundle_name)/scummvm/plugins"
+	$(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/scummvm/plugins"
+endif
+
+	tar -C $(bundle_name) -cvjf $(bundle_name)-debug.tar.bz2 .
+	rm -R ./$(bundle_name)
+
+.PHONY: caanoo-bundle caanoo-bundle-debug
diff --git a/backends/platform/gph/caanoo/build.sh b/backends/platform/gph/caanoo/build.sh
new file mode 100755
index 0000000000..8000d2595d
--- /dev/null
+++ b/backends/platform/gph/caanoo/build.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+echo Quick script to make building all the time less painful.
+
+# Set the paths up here to support the build.
+
+cd ../../../..
+
+echo Building ScummVM for GP2X Caanoo.
+make
+
+echo Build for GP2X Caanoo - complete - Please check build logs.
diff --git a/backends/platform/gph/caanoo/bundle-debug.sh b/backends/platform/gph/caanoo/bundle-debug.sh
new file mode 100755
index 0000000000..2d5cefe80e
--- /dev/null
+++ b/backends/platform/gph/caanoo/bundle-debug.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo Quick script to make building a distribution of the GP2X Caanoo backend more consistent.
+
+cd ../../../..
+
+echo Building ScummVM for GP2X Caanoo.
+
+make caanoo-bundle-debug
diff --git a/backends/platform/gph/caanoo/bundle.sh b/backends/platform/gph/caanoo/bundle.sh
new file mode 100755
index 0000000000..76fd31cec6
--- /dev/null
+++ b/backends/platform/gph/caanoo/bundle.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo Quick script to make building a distribution of the GP2X Caanoo backend more consistent.
+
+cd ../../../..
+
+echo Building ScummVM for GP2X Caanoo.
+
+make caanoo-bundle
diff --git a/backends/platform/gph/caanoo/clean.sh b/backends/platform/gph/caanoo/clean.sh
new file mode 100755
index 0000000000..5ec1b9e62c
--- /dev/null
+++ b/backends/platform/gph/caanoo/clean.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo Quick script to make building all the time less painful.
+
+cd ../../../..
+
+echo Cleaning ScummVM for the GP2X Wiz.
+make clean
diff --git a/backends/platform/gph/caanoo/config-alleng.sh b/backends/platform/gph/caanoo/config-alleng.sh
new file mode 100755
index 0000000000..7a097c268b
--- /dev/null
+++ b/backends/platform/gph/caanoo/config-alleng.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+echo Quick script to make running configure all the time less painful
+echo and let all the build work be done from the backend/build folder.
+
+# Assume Caanoo toolchain/build env.
+. /opt/arm-caanoo/environment-setup
+
+# Export the tool names for cross-compiling
+export DEFINES=-DNDEBUG
+
+# Edit the configure line to suit.
+cd ../../../..
+./configure --backend=caanoo --disable-mt32emu --host=caanoo --disable-alsa --disable-flac --disable-nasm --disable-vorbis --disable-hq-scalers --with-sdl-prefix=/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr/bin --with-mpeg2-prefix=/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr --enable-tremor --with-tremor-prefix=/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr --enable-zlib --with-zlib-prefix=/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr --enable-mad --with-mad-prefix=/opt/arm-caanoo/arm-none-linux-gnueabi/usr --enable-all-engines --enable-vkeybd --enable-plugins --default-dynamic
+
+echo Generating config for GP2X Caanoo complete. Check for errors.
diff --git a/backends/platform/gph/caanoo/config.sh b/backends/platform/gph/caanoo/config.sh
new file mode 100755
index 0000000000..82e3774dbf
--- /dev/null
+++ b/backends/platform/gph/caanoo/config.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+echo Quick script to make running configure all the time less painful
+echo and let all the build work be done from the backend/build folder.
+
+# Assume Caanoo toolchain/build env.
+. /opt/arm-caanoo/environment-setup
+
+# Export the tool names for cross-compiling
+export DEFINES=-DNDEBUG
+
+# Edit the configure line to suit.
+cd ../../../..
+./configure --backend=caanoo --disable-mt32emu --host=caanoo --disable-alsa --disable-flac --disable-nasm --disable-vorbis --disable-hq-scalers --with-sdl-prefix=/opt/arm-caanoo/arm-none-linux-gnueabi/usr/bin --with-mpeg2-prefix=/opt/arm-caanoo/arm-none-linux-gnueabi/usr --enable-tremor --with-tremor-prefix=/opt/arm-caanoo/arm-none-linux-gnueabi/usr --enable-zlib --with-zlib-prefix=/opt/arm-caanoo/arm-none-linux-gnueabi/usr --enable-mad --with-mad-prefix=/opt/arm-caanoo/arm-none-linux-gnueabi/usr --enable-vkeybd --enable-plugins --default-dynamic
+
+echo Generating config for GP2X Caanoo complete. Check for errors.
diff --git a/backends/platform/gph/caanoo/scummvm-gdb.gpe b/backends/platform/gph/caanoo/scummvm-gdb.gpe
new file mode 100755
index 0000000000..2d776f1bc3
--- /dev/null
+++ b/backends/platform/gph/caanoo/scummvm-gdb.gpe
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# Export the location of any libs ScummVM depends on
+# (to avoid installing to the NAND and overwriting the broken ones there).
+export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
+
+# Run ScummVM via GDB (so make sure you have a terminal open or serial).
+# Oh, and GDB installed of course ;)
+gdb --args ./scummvm.caanoo --fullscreen --gfx-mode=1x --config=$(pwd)/.scummvmrc
+
+# Sync the SD card to check that everything is written.
+sync
+
+# Return to the GPH menu screen
+cd /usr/gp2x
+exec /usr/gp2x/gp2xmenu
diff --git a/backends/platform/gph/caanoo/scummvm.gpe b/backends/platform/gph/caanoo/scummvm.gpe
new file mode 100755
index 0000000000..52bb7a98cd
--- /dev/null
+++ b/backends/platform/gph/caanoo/scummvm.gpe
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Export the location of any libs ScummVM depends on
+# (to avoid installing to the NAND and overwriting the broken ones there).
+export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
+
+# Run ScummVM, important this bit.
+./scummvm.caanoo --fullscreen --gfx-mode=1x --config=$(pwd)/.scummvmrc
+
+# Sync the SD card to check that everything is written.
+sync
+
+# Return to the GPH menu screen
+cd /usr/gp2x
+exec /usr/gp2x/gp2xmenu
diff --git a/backends/platform/gp2xwiz/gp2xwiz-bundle.mk b/backends/platform/gph/gp2xwiz-bundle.mk
index fa5a247865..5ca6c0a9c7 100755
--- a/backends/platform/gp2xwiz/gp2xwiz-bundle.mk
+++ b/backends/platform/gph/gp2xwiz-bundle.mk
@@ -11,13 +11,14 @@ gp2xwiz-bundle: $(EXECUTABLE)
 	$(MKDIR) "$(bundle_name)/scummvm/saves"
 	$(MKDIR) "$(bundle_name)/scummvm/engine-data"
 	$(MKDIR) "$(bundle_name)/scummvm/lib"
-	
+
 	echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
 
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.gpe $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.png $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/README-GP2XWIZ $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.ini $(bundle_name)/	
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm.gpe $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvmb.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/README-GP2XWIZ $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm.ini $(bundle_name)/
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
@@ -31,12 +32,12 @@ ifdef DYNAMIC_MODULES
 	$(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/scummvm/plugins"
 	$(STRIP) $(bundle_name)/scummvm/plugins/*
 endif
-	
+
 	$(CP) $(libloc)/../lib/libz.so.1.2.3 $(bundle_name)/scummvm/lib/libz.so.1
 	$(CP) $(libloc)/../lib/libvorbisidec.so.1.0.2 $(bundle_name)/scummvm/lib/libvorbisidec.so.1
 
 	tar -C $(bundle_name) -cvjf $(bundle_name).tar.bz2 .
-	rm -R ./$(bundle_name)	
+	rm -R ./$(bundle_name)
 
 gp2xwiz-bundle-debug: $(EXECUTABLE)
 	$(MKDIR) "$(bundle_name)"
@@ -44,13 +45,14 @@ gp2xwiz-bundle-debug: $(EXECUTABLE)
 	$(MKDIR) "$(bundle_name)/scummvm/saves"
 	$(MKDIR) "$(bundle_name)/scummvm/engine-data"
 	$(MKDIR) "$(bundle_name)/scummvm/lib"
-	
+
 	echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
 
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm-gdb.gpe $(bundle_name)/scummvm/scummvm.gpe
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.png $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/README-GP2XWIZ $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.ini $(bundle_name)/	
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm-gdb.gpe $(bundle_name)/scummvm/scummvm.gpe
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvmb.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/README-GP2XWIZ $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gph/build/scummvm.ini $(bundle_name)/
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
@@ -63,11 +65,11 @@ ifdef DYNAMIC_MODULES
 	$(INSTALL) -d "$(bundle_name)/scummvm/plugins"
 	$(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/scummvm/plugins"
 endif
-	
+
 	$(CP) $(libloc)/../lib/libz.so.1.2.3 $(bundle_name)/scummvm/lib/libz.so.1
 	$(CP) $(libloc)/../lib/libvorbisidec.so.1.0.2 $(bundle_name)/scummvm/lib/libvorbisidec.so.1
 
 	tar -C $(bundle_name) -cvjf $(bundle_name)-debug.tar.bz2 .
-	rm -R ./$(bundle_name)	
+	rm -R ./$(bundle_name)
 
 .PHONY: gp2xwiz-bundle gp2xwiz-bundle-debug
diff --git a/backends/platform/gph/gph-events.cpp b/backends/platform/gph/gph-events.cpp
new file mode 100644
index 0000000000..91ea30bdc9
--- /dev/null
+++ b/backends/platform/gph/gph-events.cpp
@@ -0,0 +1,482 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+/*
+ * GPH: Device Specific Event Handling.
+ *
+ */
+
+#include "backends/platform/gph/gph-sdl.h"
+#include "backends/platform/gph/gph-hw.h"
+#include "graphics/scaler/aspect.h"
+
+#include "common/util.h"
+#include "common/events.h"
+
+#define JOY_DEADZONE 2200
+
+#define JOY_XAXIS 0
+#define JOY_YAXIS 1
+
+/* Quick default button states for modifiers. */
+int BUTTON_STATE_L					=	false;
+
+#if defined(CAANOO)
+
+	/* Caanoo: Main Joystick Button Mappings */
+	/* 		   The Caanoo has an analogue stick so no digital DPAD */
+	enum {
+		/* Joystick Buttons */
+		BUTTON_A			= 0,
+		BUTTON_X			= 1,
+		BUTTON_B			= 2,
+		BUTTON_Y			= 3,
+		BUTTON_L			= 4,
+		BUTTON_R			= 5,
+		BUTTON_HOME			= 6,	// Home
+		BUTTON_HOLD			= 7,	// Hold (on Power)
+		BUTTON_HELP			= 8,	// Help I
+		BUTTON_HELP2		= 9,	// Help II
+		BUTTON_CLICK		= 10	// Stick Click
+	};
+
+	enum {
+		/* Unused Joystick Buttons on the Caanoo */
+		BUTTON_VOLUP		= 51,
+		BUTTON_VOLDOWN		= 52,
+		BUTTON_UP			= 53,
+		BUTTON_UPLEFT		= 54,
+		BUTTON_LEFT			= 55,
+		BUTTON_DOWNLEFT		= 56,
+		BUTTON_DOWN			= 57,
+		BUTTON_DOWNRIGHT	= 58,
+		BUTTON_RIGHT		= 59,
+		BUTTON_UPRIGHT		= 60,
+		BUTTON_MENU			= 61,
+		BUTTON_SELECT		= 62
+	};
+
+#else
+
+	/* Wiz: Main Joystick Mappings */
+	enum {
+		/* DPAD */
+		BUTTON_UP			= 0,
+		BUTTON_UPLEFT		= 1,
+		BUTTON_LEFT			= 2,
+		BUTTON_DOWNLEFT		= 3,
+		BUTTON_DOWN			= 4,
+		BUTTON_DOWNRIGHT	= 5,
+		BUTTON_RIGHT		= 6,
+		BUTTON_UPRIGHT		= 7,
+		/* Joystick Buttons */
+		BUTTON_MENU			= 8,
+		BUTTON_SELECT		= 9,
+		BUTTON_L			= 10,
+		BUTTON_R			= 11,
+		BUTTON_A			= 12,
+		BUTTON_B			= 13,
+		BUTTON_X			= 14,
+		BUTTON_Y			= 15,
+		BUTTON_VOLUP		= 16,
+		BUTTON_VOLDOWN		= 17
+	};
+
+	enum {
+		/* Unused Joystick Buttons on the Wiz */
+		BUTTON_HOME			= 51,
+		BUTTON_HOLD			= 52,
+		BUTTON_CLICK		= 53,
+		BUTTON_HELP			= 54,
+		BUTTON_HELP2		= 55
+	};
+
+#endif
+
+enum {
+	/* Touchscreen TapMode */
+	TAPMODE_LEFT		= 0,
+	TAPMODE_RIGHT		= 1,
+	TAPMODE_HOVER		= 2
+};
+
+static int mapKey(SDLKey key, SDLMod mod, Uint16 unicode) {
+	if (key >= SDLK_F1 && key <= SDLK_F9) {
+		return key - SDLK_F1 + Common::ASCII_F1;
+	} else if (key >= SDLK_KP0 && key <= SDLK_KP9) {
+		return key - SDLK_KP0 + '0';
+	} else if (key >= SDLK_UP && key <= SDLK_PAGEDOWN) {
+		return key;
+	} else if (unicode) {
+		return unicode;
+	} else if (key >= 'a' && key <= 'z' && (mod & KMOD_SHIFT)) {
+		return key & ~0x20;
+	} else if (key >= SDLK_NUMLOCK && key <= SDLK_EURO) {
+		return 0;
+	}
+	return key;
+}
+
+
+void OSystem_GPH::fillMouseEvent(Common::Event &event, int x, int y) {
+	if (_videoMode.mode == GFX_HALF && !_overlayVisible){
+		event.mouse.x = x*2;
+		event.mouse.y = y*2;
+	} else {
+		event.mouse.x = x;
+		event.mouse.y = y;
+	}
+
+	// Update the "keyboard mouse" coords
+	_km.x = x;
+	_km.y = y;
+
+	// Adjust for the screen scaling
+	if (!_overlayVisible) {
+		event.mouse.x /= _videoMode.scaleFactor;
+		event.mouse.y /= _videoMode.scaleFactor;
+		if (_videoMode.aspectRatioCorrection)
+			event.mouse.y = aspect2Real(event.mouse.y);
+	}
+}
+
+
+void OSystem_GPH::moveStick() {
+	bool stickBtn[32];
+
+	memcpy(stickBtn, _stickBtn, sizeof(stickBtn));
+
+	if ((stickBtn[0])||(stickBtn[2])||(stickBtn[4])||(stickBtn[6]))
+		stickBtn[1] = stickBtn[3] = stickBtn[5] = stickBtn[7] = 0;
+
+	if ((stickBtn[1])||(stickBtn[2])||(stickBtn[3])) {
+		if (_km.x_down_count!=2) {
+			_km.x_vel = -1;
+			_km.x_down_count = 1;
+		} else
+			_km.x_vel = -4;
+	} else if ((stickBtn[5])||(stickBtn[6])||(stickBtn[7])) {
+		if (_km.x_down_count!=2) {
+			_km.x_vel = 1;
+			_km.x_down_count = 1;
+		} else
+			_km.x_vel = 4;
+	} else {
+		_km.x_vel = 0;
+		_km.x_down_count = 0;
+	}
+
+	if ((stickBtn[0])||(stickBtn[1])||(stickBtn[7])) {
+		if (_km.y_down_count!=2) {
+			_km.y_vel = -1;
+			_km.y_down_count = 1;
+		} else
+			_km.y_vel = -4;
+	} else if ((stickBtn[3])||(stickBtn[4])||(stickBtn[5])) {
+		if (_km.y_down_count!=2) {
+			_km.y_vel = 1;
+			_km.y_down_count = 1;
+		} else
+			_km.y_vel = 4;
+	} else {
+		_km.y_vel = 0;
+		_km.y_down_count = 0;
+	}
+}
+
+/* Custom handleMouseButtonDown/handleMouseButtonUp to deal with 'Tap Mode' for the touchscreen */
+
+bool OSystem_GPH::handleMouseButtonDown(SDL_Event &ev, Common::Event &event) {
+	if (ev.button.button == SDL_BUTTON_LEFT){
+		if (BUTTON_STATE_L == true) /* BUTTON_STATE_L = Left Trigger Held, force Right Click */
+			event.type = Common::EVENT_RBUTTONDOWN;
+		else if (GPH::tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */
+			event.type = Common::EVENT_LBUTTONDOWN;
+		else if (GPH::tapmodeLevel == TAPMODE_RIGHT) /* TAPMODE_RIGHT = Right Click Tap Mode */
+			event.type = Common::EVENT_RBUTTONDOWN;
+		else if (GPH::tapmodeLevel == TAPMODE_HOVER) /* TAPMODE_HOVER = Hover (No Click) Tap Mode */
+			event.type = Common::EVENT_MOUSEMOVE;
+		else
+			event.type = Common::EVENT_LBUTTONDOWN; /* For normal mice etc. */
+	}
+	else if (ev.button.button == SDL_BUTTON_RIGHT)
+		event.type = Common::EVENT_RBUTTONDOWN;
+#if defined(SDL_BUTTON_WHEELUP) && defined(SDL_BUTTON_WHEELDOWN)
+	else if (ev.button.button == SDL_BUTTON_WHEELUP)
+		event.type = Common::EVENT_WHEELUP;
+	else if (ev.button.button == SDL_BUTTON_WHEELDOWN)
+		event.type = Common::EVENT_WHEELDOWN;
+#endif
+#if defined(SDL_BUTTON_MIDDLE)
+	else if (ev.button.button == SDL_BUTTON_MIDDLE)
+		event.type = Common::EVENT_MBUTTONDOWN;
+#endif
+	else
+		return false;
+
+	fillMouseEvent(event, ev.button.x, ev.button.y);
+
+	return true;
+}
+
+bool OSystem_GPH::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) {
+	if (ev.button.button == SDL_BUTTON_LEFT){
+		if (BUTTON_STATE_L == true) /* BUTTON_STATE_L = Left Trigger Held, force Right Click */
+			event.type = Common::EVENT_RBUTTONUP;
+		else if (GPH::tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */
+			event.type = Common::EVENT_LBUTTONUP;
+		else if (GPH::tapmodeLevel == TAPMODE_RIGHT) /* TAPMODE_RIGHT = Right Click Tap Mode */
+			event.type = Common::EVENT_RBUTTONUP;
+		else if (GPH::tapmodeLevel == TAPMODE_HOVER) /* TAPMODE_HOVER = Hover (No Click) Tap Mode */
+			event.type = Common::EVENT_MOUSEMOVE;
+		else
+			event.type = Common::EVENT_LBUTTONUP; /* For normal mice etc. */
+
+	}
+	else if (ev.button.button == SDL_BUTTON_RIGHT)
+		event.type = Common::EVENT_RBUTTONUP;
+#if defined(SDL_BUTTON_MIDDLE)
+	else if (ev.button.button == SDL_BUTTON_MIDDLE)
+		event.type = Common::EVENT_MBUTTONUP;
+#endif
+	else
+		return false;
+
+	fillMouseEvent(event, ev.button.x, ev.button.y);
+
+	return true;
+}
+
+/* Custom handleJoyButtonDown/handleJoyButtonUp to deal with the joystick buttons on GPH devices */
+
+bool OSystem_GPH::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) {
+
+	_stickBtn[ev.jbutton.button] = 1;
+	event.kbd.flags = 0;
+
+	switch (ev.jbutton.button) {
+	case BUTTON_UP:
+	case BUTTON_UPLEFT:
+	case BUTTON_LEFT:
+	case BUTTON_DOWNLEFT:
+	case BUTTON_DOWN:
+	case BUTTON_DOWNRIGHT:
+	case BUTTON_RIGHT:
+	case BUTTON_UPRIGHT:
+		moveStick();
+		event.type = Common::EVENT_MOUSEMOVE;
+		fillMouseEvent(event, _km.x, _km.y);
+		break;
+	case BUTTON_B:
+	case BUTTON_CLICK:
+		event.type = Common::EVENT_LBUTTONDOWN;
+		fillMouseEvent(event, _km.x, _km.y);
+		break;
+	case BUTTON_X:
+		event.type = Common::EVENT_RBUTTONDOWN;
+		fillMouseEvent(event, _km.x, _km.y);
+		break;
+	case BUTTON_L:
+		BUTTON_STATE_L = true;
+		break;
+	case BUTTON_R:
+		event.type = Common::EVENT_KEYDOWN;
+		if (BUTTON_STATE_L == true) {
+#ifdef ENABLE_VKEYBD
+			event.kbd.keycode = Common::KEYCODE_F7;
+			event.kbd.ascii = mapKey(SDLK_F7, ev.key.keysym.mod, 0);
+#else
+			event.kbd.keycode = Common::KEYCODE_0;
+			event.kbd.ascii = mapKey(SDLK_0, ev.key.keysym.mod, 0);
+#endif
+		} else {
+			event.kbd.keycode = Common::KEYCODE_RETURN;
+			event.kbd.ascii = mapKey(SDLK_RETURN, ev.key.keysym.mod, 0);
+		}
+		break;
+	case BUTTON_SELECT:
+	case BUTTON_HOME:
+		event.type = Common::EVENT_KEYDOWN;
+		if (BUTTON_STATE_L == true) {
+			event.type = Common::EVENT_QUIT;
+		} else {
+			event.kbd.keycode = Common::KEYCODE_ESCAPE;
+			event.kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0);
+		}
+		break;
+	case BUTTON_A:
+		event.type = Common::EVENT_KEYDOWN;
+		if (BUTTON_STATE_L == true) {
+			event.type = Common::EVENT_PREDICTIVE_DIALOG;
+		} else {
+		event.kbd.keycode = Common::KEYCODE_PERIOD;
+		event.kbd.ascii = mapKey(SDLK_PERIOD, ev.key.keysym.mod, 0);
+		}
+		break;
+	case BUTTON_Y:
+		event.type = Common::EVENT_KEYDOWN;
+		if (BUTTON_STATE_L == true) {
+			GPH::ToggleTapMode();
+			if (GPH::tapmodeLevel == TAPMODE_LEFT) {
+				displayMessageOnOSD("Touchscreen 'Tap Mode' - Left Click");
+			} else if (GPH::tapmodeLevel == TAPMODE_RIGHT) {
+				displayMessageOnOSD("Touchscreen 'Tap Mode' - Right Click");
+			} else if (GPH::tapmodeLevel == TAPMODE_HOVER) {
+				displayMessageOnOSD("Touchscreen 'Tap Mode' - Hover (No Click)");
+			}
+		} else {
+			event.kbd.keycode = Common::KEYCODE_SPACE;
+			event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0);
+		}
+		break;
+	case BUTTON_MENU:
+	case BUTTON_HELP:
+		event.type = Common::EVENT_KEYDOWN;
+		if (BUTTON_STATE_L == true) {
+			event.type = Common::EVENT_MAINMENU;
+		} else {
+			event.kbd.keycode = Common::KEYCODE_F5;
+			event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
+		}
+		break;
+	case BUTTON_VOLUP:
+		WIZ_HW::mixerMoveVolume(2);
+		if (WIZ_HW::volumeLevel == 100) {
+			displayMessageOnOSD("Maximum Volume");
+		} else {
+			displayMessageOnOSD("Increasing Volume");
+		}
+		break;
+	case BUTTON_VOLDOWN:
+		WIZ_HW::mixerMoveVolume(1);
+		if (WIZ_HW::volumeLevel == 0) {
+			displayMessageOnOSD("Minimal Volume");
+		} else {
+			displayMessageOnOSD("Decreasing Volume");
+		}
+		break;
+	case BUTTON_HOLD:
+		event.type = Common::EVENT_QUIT;
+		break;
+	case BUTTON_HELP2:
+		GPH::ToggleTapMode();
+		if (GPH::tapmodeLevel == TAPMODE_LEFT) {
+			displayMessageOnOSD("Touchscreen 'Tap Mode': Left Click");
+		} else if (GPH::tapmodeLevel == TAPMODE_RIGHT) {
+			displayMessageOnOSD("Touchscreen 'Tap Mode': Right Click");
+		} else if (GPH::tapmodeLevel == TAPMODE_HOVER) {
+			displayMessageOnOSD("Touchscreen 'Tap Mode': Hover (No Click)");
+		}
+		break;
+	}
+	return true;
+}
+
+bool OSystem_GPH::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) {
+
+	_stickBtn[ev.jbutton.button] = 0;
+	event.kbd.flags = 0;
+
+	switch (ev.jbutton.button) {
+	case BUTTON_UP:
+	case BUTTON_UPLEFT:
+	case BUTTON_LEFT:
+	case BUTTON_DOWNLEFT:
+	case BUTTON_DOWN:
+	case BUTTON_DOWNRIGHT:
+	case BUTTON_RIGHT:
+	case BUTTON_UPRIGHT:
+		moveStick();
+		event.type = Common::EVENT_MOUSEMOVE;
+		fillMouseEvent(event, _km.x, _km.y);
+		break;
+	case BUTTON_B:
+	case BUTTON_CLICK:
+		event.type = Common::EVENT_LBUTTONUP;
+		fillMouseEvent(event, _km.x, _km.y);
+		break;
+	case BUTTON_X:
+		event.type = Common::EVENT_RBUTTONUP;
+		fillMouseEvent(event, _km.x, _km.y);
+		break;
+	case BUTTON_L:
+		BUTTON_STATE_L = false;
+		break;
+	case BUTTON_SELECT:
+	case BUTTON_HOME:
+		event.type = Common::EVENT_KEYUP;
+		event.kbd.keycode = Common::KEYCODE_ESCAPE;
+		event.kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0);
+		break;
+	case BUTTON_A:
+		event.type = Common::EVENT_KEYUP;
+		event.kbd.keycode = Common::KEYCODE_PERIOD;
+		event.kbd.ascii = mapKey(SDLK_PERIOD, ev.key.keysym.mod, 0);
+		break;
+	case BUTTON_Y:
+		event.type = Common::EVENT_KEYUP;
+		event.kbd.keycode = Common::KEYCODE_SPACE;
+		event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0);
+		break;
+	case BUTTON_MENU:
+	case BUTTON_HELP:
+		event.type = Common::EVENT_KEYUP;
+		if (BUTTON_STATE_L == true) {
+			event.type = Common::EVENT_MAINMENU;
+		} else {
+			event.kbd.keycode = Common::KEYCODE_F5;
+			event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
+		}
+		break;
+	case BUTTON_R:
+		event.type = Common::EVENT_KEYUP;
+		if (BUTTON_STATE_L == true) {
+#ifdef ENABLE_VKEYBD
+			event.kbd.keycode = Common::KEYCODE_F7;
+			event.kbd.ascii = mapKey(SDLK_F7, ev.key.keysym.mod, 0);
+#else
+			event.kbd.keycode = Common::KEYCODE_0;
+			event.kbd.ascii = mapKey(SDLK_0, ev.key.keysym.mod, 0);
+#endif
+		} else {
+			event.kbd.keycode = Common::KEYCODE_RETURN;
+			event.kbd.ascii = mapKey(SDLK_RETURN, ev.key.keysym.mod, 0);
+		}
+		break;
+	case BUTTON_VOLUP:
+		break;
+	case BUTTON_VOLDOWN:
+		break;
+	case BUTTON_HOLD:
+		break;
+	case BUTTON_HELP2:
+		break;
+	}
+	return true;
+}
+
+bool OSystem_GPH::remapKey(SDL_Event &ev,Common::Event &event) {
+	return false;
+}
diff --git a/backends/platform/gph/gph-graphics.cpp b/backends/platform/gph/gph-graphics.cpp
new file mode 100644
index 0000000000..8fada7e40a
--- /dev/null
+++ b/backends/platform/gph/gph-graphics.cpp
@@ -0,0 +1,470 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "backends/platform/gph/gph-sdl.h"
+
+#include "common/mutex.h"
+#include "graphics/font.h"
+#include "graphics/fontman.h"
+#include "graphics/scaler.h"
+#include "graphics/scaler/aspect.h"
+#include "graphics/scaler/downscaler.h"
+#include "graphics/surface.h"
+
+static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
+	{"1x", "Fullscreen", GFX_NORMAL},
+	{0, 0, 0}
+};
+
+const OSystem::GraphicsMode *OSystem_GPH::getSupportedGraphicsModes() const {
+	return s_supportedGraphicsModes;
+}
+
+int OSystem_GPH::getDefaultGraphicsMode() const {
+	return GFX_NORMAL;
+}
+
+bool OSystem_GPH::setGraphicsMode(int mode) {
+	Common::StackLock lock(_graphicsMutex);
+
+	assert(_transactionMode == kTransactionActive);
+
+	if (_oldVideoMode.setup && _oldVideoMode.mode == mode)
+		return true;
+
+	int newScaleFactor = 1;
+
+	switch (mode) {
+	case GFX_NORMAL:
+		newScaleFactor = 1;
+		break;
+	case GFX_HALF:
+		newScaleFactor = 1;
+		break;
+	default:
+		warning("unknown gfx mode %d", mode);
+		return false;
+	}
+
+	_transactionDetails.normal1xScaler = (mode == GFX_NORMAL);
+	if (_oldVideoMode.setup && _oldVideoMode.scaleFactor != newScaleFactor)
+		_transactionDetails.needHotswap = true;
+
+	_transactionDetails.needUpdatescreen = true;
+
+	_videoMode.mode = mode;
+	_videoMode.scaleFactor = newScaleFactor;
+
+	return true;
+}
+
+void OSystem_GPH::setGraphicsModeIntern() {
+	Common::StackLock lock(_graphicsMutex);
+	ScalerProc *newScalerProc = 0;
+
+	switch (_videoMode.mode) {
+	case GFX_NORMAL:
+		newScalerProc = Normal1x;
+		break;
+	case GFX_HALF:
+		newScalerProc = DownscaleAllByHalf;
+		break;
+
+	default:
+		error("Unknown gfx mode %d", _videoMode.mode);
+	}
+
+	_scalerProc = newScalerProc;
+
+	if (!_screen || !_hwscreen)
+		return;
+
+	// Blit everything to the screen
+	_forceFull = true;
+
+	// Even if the old and new scale factors are the same, we may have a
+	// different scaler for the cursor now.
+	blitCursor();
+}
+
+void OSystem_GPH::initSize(uint w, uint h) {
+	assert(_transactionMode == kTransactionActive);
+
+	// Avoid redundant res changes
+	if ((int)w == _videoMode.screenWidth && (int)h == _videoMode.screenHeight)
+		return;
+
+	_videoMode.screenWidth = w;
+	_videoMode.screenHeight = h;
+	if (w > 320 || h > 240){
+		setGraphicsMode(GFX_HALF);
+		setGraphicsModeIntern();
+		toggleMouseGrab();
+	}
+
+	_transactionDetails.sizeChanged = true;
+}
+
+bool OSystem_GPH::loadGFXMode() {
+	if (_videoMode.screenWidth > 320 || _videoMode.screenHeight > 240) {
+		_videoMode.aspectRatioCorrection = false;
+		setGraphicsMode(GFX_HALF);
+		printf("GFX_HALF\n");
+	} else {
+		setGraphicsMode(GFX_NORMAL);
+		printf("GFX_NORMAL\n");
+	}
+
+	if ((_videoMode.mode == GFX_HALF) && !_overlayVisible) {
+		_videoMode.overlayWidth = _videoMode.screenWidth / 2;
+		_videoMode.overlayHeight = _videoMode.screenHeight / 2;
+		_videoMode.fullscreen = true;
+	} else {
+
+		_videoMode.overlayWidth = _videoMode.screenWidth * _videoMode.scaleFactor;
+		_videoMode.overlayHeight = _videoMode.screenHeight * _videoMode.scaleFactor;
+
+		if (_videoMode.aspectRatioCorrection)
+			_videoMode.overlayHeight = real2Aspect(_videoMode.overlayHeight);
+
+		_videoMode.hardwareWidth = _videoMode.screenWidth * _videoMode.scaleFactor;
+		_videoMode.hardwareHeight = effectiveScreenHeight();
+	}
+	return OSystem_SDL::loadGFXMode();
+}
+
+void OSystem_GPH::drawMouse() {
+	if (!_mouseVisible || !_mouseSurface) {
+		_mouseBackup.x = _mouseBackup.y = _mouseBackup.w = _mouseBackup.h = 0;
+		return;
+	}
+
+	SDL_Rect dst;
+	int scale;
+	int width, height;
+	int hotX, hotY;
+
+	if (_videoMode.mode == GFX_HALF && !_overlayVisible){
+		dst.x = _mouseCurState.x/2;
+		dst.y = _mouseCurState.y/2;
+	} else {
+		dst.x = _mouseCurState.x;
+		dst.y = _mouseCurState.y;
+	}
+
+	if (!_overlayVisible) {
+		scale = _videoMode.scaleFactor;
+		width = _videoMode.screenWidth;
+		height = _videoMode.screenHeight;
+		dst.w = _mouseCurState.vW;
+		dst.h = _mouseCurState.vH;
+		hotX = _mouseCurState.vHotX;
+		hotY = _mouseCurState.vHotY;
+	} else {
+		scale = 1;
+		width = _videoMode.overlayWidth;
+		height = _videoMode.overlayHeight;
+		dst.w = _mouseCurState.rW;
+		dst.h = _mouseCurState.rH;
+		hotX = _mouseCurState.rHotX;
+		hotY = _mouseCurState.rHotY;
+	}
+
+	// The mouse is undrawn using virtual coordinates, i.e. they may be
+	// scaled and aspect-ratio corrected.
+
+	_mouseBackup.x = dst.x - hotX;
+	_mouseBackup.y = dst.y - hotY;
+	_mouseBackup.w = dst.w;
+	_mouseBackup.h = dst.h;
+
+	// We draw the pre-scaled cursor image, so now we need to adjust for
+	// scaling, shake position and aspect ratio correction manually.
+
+	if (!_overlayVisible) {
+		dst.y += _currentShakePos;
+	}
+
+	if (_videoMode.aspectRatioCorrection && !_overlayVisible)
+		dst.y = real2Aspect(dst.y);
+
+	dst.x = scale * dst.x - _mouseCurState.rHotX;
+	dst.y = scale * dst.y - _mouseCurState.rHotY;
+	dst.w = _mouseCurState.rW;
+	dst.h = _mouseCurState.rH;
+
+	// Note that SDL_BlitSurface() and addDirtyRect() will both perform any
+	// clipping necessary
+
+	if (SDL_BlitSurface(_mouseSurface, NULL, _hwscreen, &dst) != 0)
+		error("SDL_BlitSurface failed: %s", SDL_GetError());
+
+	// The screen will be updated using real surface coordinates, i.e.
+	// they will not be scaled or aspect-ratio corrected.
+	addDirtyRect(dst.x, dst.y, dst.w, dst.h, true);
+}
+
+void OSystem_GPH::undrawMouse() {
+	const int x = _mouseBackup.x;
+	const int y = _mouseBackup.y;
+
+	// When we switch bigger overlay off mouse jumps. Argh!
+	// This is intended to prevent undrawing offscreen mouse
+	if (!_overlayVisible && (x >= _videoMode.screenWidth || y >= _videoMode.screenHeight))
+		return;
+
+	if (_mouseBackup.w != 0 && _mouseBackup.h != 0){
+		if (_videoMode.mode == GFX_HALF && !_overlayVisible){
+			addDirtyRect(x*2, y*2, _mouseBackup.w*2, _mouseBackup.h*2);
+		} else {
+			addDirtyRect(x, y, _mouseBackup.w, _mouseBackup.h);
+		}
+	}
+}
+
+void OSystem_GPH::internUpdateScreen() {
+	SDL_Surface *srcSurf, *origSurf;
+	int height, width;
+	ScalerProc *scalerProc;
+	int scale1;
+
+#if defined (DEBUG)
+	assert(_hwscreen != NULL);
+	assert(_hwscreen->map->sw_data != NULL);
+#endif
+
+	// If the shake position changed, fill the dirty area with blackness
+	if (_currentShakePos != _newShakePos ||
+		(_mouseNeedsRedraw && _mouseBackup.y <= _currentShakePos)) {
+		SDL_Rect blackrect = {0, 0, _videoMode.screenWidth * _videoMode.scaleFactor, _newShakePos * _videoMode.scaleFactor};
+
+		if (_videoMode.aspectRatioCorrection && !_overlayVisible)
+			blackrect.h = real2Aspect(blackrect.h - 1) + 1;
+
+		SDL_FillRect(_hwscreen, &blackrect, 0);
+
+		_currentShakePos = _newShakePos;
+
+		_forceFull = true;
+	}
+
+	// Check whether the palette was changed in the meantime and update the
+	// screen surface accordingly.
+	if (_screen && _paletteDirtyEnd != 0) {
+		SDL_SetColors(_screen, _currentPalette + _paletteDirtyStart,
+			_paletteDirtyStart,
+			_paletteDirtyEnd - _paletteDirtyStart);
+
+		_paletteDirtyEnd = 0;
+
+		_forceFull = true;
+	}
+
+#ifdef USE_OSD
+	// OSD visible (i.e. non-transparent)?
+	if (_osdAlpha != SDL_ALPHA_TRANSPARENT) {
+		// Updated alpha value
+		const int diff = SDL_GetTicks() - _osdFadeStartTime;
+		if (diff > 0) {
+			if (diff >= kOSDFadeOutDuration) {
+				// Back to full transparency
+				_osdAlpha = SDL_ALPHA_TRANSPARENT;
+			} else {
+				// Do a linear fade out...
+				const int startAlpha = SDL_ALPHA_TRANSPARENT + kOSDInitialAlpha * (SDL_ALPHA_OPAQUE - SDL_ALPHA_TRANSPARENT) / 100;
+				_osdAlpha = startAlpha + diff * (SDL_ALPHA_TRANSPARENT - startAlpha) / kOSDFadeOutDuration;
+			}
+			SDL_SetAlpha(_osdSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, _osdAlpha);
+			_forceFull = true;
+		}
+	}
+#endif
+
+	if (!_overlayVisible) {
+		origSurf = _screen;
+		srcSurf = _tmpscreen;
+		width = _videoMode.screenWidth;
+		height = _videoMode.screenHeight;
+		scalerProc = _scalerProc;
+		scale1 = _videoMode.scaleFactor;
+	} else {
+		origSurf = _overlayscreen;
+		srcSurf = _tmpscreen2;
+		width = _videoMode.overlayWidth;
+		height = _videoMode.overlayHeight;
+		scalerProc = Normal1x;
+
+		scale1 = 1;
+	}
+
+	// Add the area covered by the mouse cursor to the list of dirty rects if
+	// we have to redraw the mouse.
+	if (_mouseNeedsRedraw)
+		undrawMouse();
+
+	// Force a full redraw if requested
+	if (_forceFull) {
+		_numDirtyRects = 1;
+		_dirtyRectList[0].x = 0;
+		_dirtyRectList[0].y = 0;
+		_dirtyRectList[0].w = width;
+		_dirtyRectList[0].h = height;
+	}
+
+	// Only draw anything if necessary
+	if (_numDirtyRects > 0 || _mouseNeedsRedraw) {
+		SDL_Rect *r;
+		SDL_Rect dst;
+		uint32 srcPitch, dstPitch;
+		SDL_Rect *lastRect = _dirtyRectList + _numDirtyRects;
+
+		for (r = _dirtyRectList; r != lastRect; ++r) {
+			dst = *r;
+			dst.x++;	// Shift rect by one since 2xSai needs to access the data around
+			dst.y++;	// any pixel to scale it, and we want to avoid mem access crashes.
+
+			if (SDL_BlitSurface(origSurf, r, srcSurf, &dst) != 0)
+				error("SDL_BlitSurface failed: %s", SDL_GetError());
+		}
+
+		SDL_LockSurface(srcSurf);
+		SDL_LockSurface(_hwscreen);
+
+		srcPitch = srcSurf->pitch;
+		dstPitch = _hwscreen->pitch;
+
+		for (r = _dirtyRectList; r != lastRect; ++r) {
+			register int dst_y = r->y + _currentShakePos;
+			register int dst_h = 0;
+			register int dst_w = r->w;
+			register int orig_dst_y = 0;
+			register int dst_x = r->x;
+			register int src_y;
+			register int src_x;
+
+			if (dst_y < height) {
+				dst_h = r->h;
+				if (dst_h > height - dst_y)
+					dst_h = height - dst_y;
+
+				orig_dst_y = dst_y;
+				src_x = dst_x;
+				src_y = dst_y;
+
+				if (_videoMode.aspectRatioCorrection && !_overlayVisible)
+					dst_y = real2Aspect(dst_y);
+
+				assert(scalerProc != NULL);
+
+				if ((_videoMode.mode == GFX_HALF) && (scalerProc == DownscaleAllByHalf)) {
+					if (dst_x%2==1){
+						dst_x--;
+						dst_w++;
+					}
+					if (dst_y%2==1){
+						dst_y--;
+						dst_h++;
+					}
+					src_x = dst_x;
+					src_y = dst_y;
+					dst_x = dst_x / 2;
+					dst_y = dst_y / 2;
+
+					scalerProc((byte *)srcSurf->pixels + (src_x * 2 + 2) + (src_y + 1) * srcPitch, srcPitch,
+						   (byte *)_hwscreen->pixels + dst_x * 2 + dst_y * dstPitch, dstPitch, dst_w, dst_h);
+				} else {
+					scalerProc((byte *)srcSurf->pixels + (r->x * 2 + 2) + (r->y + 1) * srcPitch, srcPitch,
+					           (byte *)_hwscreen->pixels + r->x * 2 + dst_y * dstPitch, dstPitch, r->w, dst_h);
+				}
+			}
+
+			if (_videoMode.mode == GFX_HALF && scalerProc == DownscaleAllByHalf){
+				r->w = r->w / 2;
+				r->h = dst_h / 2;
+			} else {
+				r->w = r->w;
+				r->h = dst_h;
+			}
+
+			r->x = dst_x;
+			r->y = dst_y;
+
+
+#ifdef USE_SCALERS
+			if (_videoMode.aspectRatioCorrection && orig_dst_y < height && !_overlayVisible)
+				r->h = stretch200To240((uint8 *) _hwscreen->pixels, dstPitch, r->w, r->h, r->x, r->y, orig_dst_y * scale1);
+#endif
+		}
+		SDL_UnlockSurface(srcSurf);
+		SDL_UnlockSurface(_hwscreen);
+
+		// Readjust the dirty rect list in case we are doing a full update.
+		// This is necessary if shaking is active.
+		if (_forceFull) {
+			_dirtyRectList[0].y = 0;
+			_dirtyRectList[0].h = (_videoMode.mode == GFX_HALF) ? effectiveScreenHeight()/2 : effectiveScreenHeight();
+		}
+
+		drawMouse();
+
+#ifdef USE_OSD
+		if (_osdAlpha != SDL_ALPHA_TRANSPARENT) {
+			SDL_BlitSurface(_osdSurface, 0, _hwscreen, 0);
+		}
+#endif
+		// Finally, blit all our changes to the screen
+		SDL_UpdateRects(_hwscreen, _numDirtyRects, _dirtyRectList);
+	}
+
+	_numDirtyRects = 0;
+	_forceFull = false;
+	_mouseNeedsRedraw = false;
+}
+
+void OSystem_GPH::showOverlay() {
+	if (_videoMode.mode == GFX_HALF){
+		_mouseCurState.x = _mouseCurState.x / 2;
+		_mouseCurState.y = _mouseCurState.y / 2;
+	}
+	OSystem_SDL::showOverlay();
+}
+
+void OSystem_GPH::hideOverlay() {
+	if (_videoMode.mode == GFX_HALF){
+		_mouseCurState.x = _mouseCurState.x * 2;
+		_mouseCurState.y = _mouseCurState.y * 2;
+	}
+	OSystem_SDL::hideOverlay();
+}
+
+void OSystem_GPH::warpMouse(int x, int y) {
+	if (_mouseCurState.x != x || _mouseCurState.y != y) {
+		if (_videoMode.mode == GFX_HALF && !_overlayVisible){
+			x = x / 2;
+			y = y / 2;
+		}
+	}
+	OSystem_SDL::warpMouse(x, y);
+}
diff --git a/backends/platform/gp2xwiz/gp2xwiz-hw.cpp b/backends/platform/gph/gph-hw.cpp
index bc1aa00ce4..b43324b547 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-hw.cpp
+++ b/backends/platform/gph/gph-hw.cpp
@@ -28,7 +28,7 @@
  *
  */
 
-#include "backends/platform/gp2xwiz/gp2xwiz-hw.h"
+#include "backends/platform/gph/gph-hw.h"
 
 #include <fcntl.h>
 #include <signal.h>
@@ -82,3 +82,28 @@ void mixerMoveVolume(int direction) {
 }
 
 } /* namespace WIZ_HW */
+
+namespace GPH {
+
+enum {
+	/* Touchscreen TapMode */
+	TAPMODE_LEFT		= 0,
+	TAPMODE_RIGHT		= 1,
+	TAPMODE_HOVER		= 2
+};
+
+int tapmodeLevel = TAPMODE_LEFT;
+
+void ToggleTapMode() {
+	if (tapmodeLevel == TAPMODE_LEFT) {
+		tapmodeLevel = TAPMODE_RIGHT;
+	} else if (tapmodeLevel == TAPMODE_RIGHT) {
+		tapmodeLevel = TAPMODE_HOVER;
+	} else if (tapmodeLevel == TAPMODE_HOVER) {
+		tapmodeLevel = TAPMODE_LEFT;
+	} else {
+		tapmodeLevel = TAPMODE_LEFT;
+    }
+}
+
+} /* namespace GPH */
diff --git a/backends/platform/gp2xwiz/gp2xwiz-hw.h b/backends/platform/gph/gph-hw.h
index 507841e902..7276276608 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-hw.h
+++ b/backends/platform/gph/gph-hw.h
@@ -28,8 +28,8 @@
  *
  */
 
-#ifndef GP2XWIZ_HW_H
-#define GP2XWIZ_HW_H
+#ifndef GPH_HW_H
+#define GPH_HW_H
 
 namespace WIZ_HW {
 
@@ -41,4 +41,12 @@ extern void	mixerMoveVolume(int);
 
 } /* namespace WIZ_HW */
 
-#endif //GP2XWIZ_HW_H
+namespace GPH {
+
+extern int tapmodeLevel;
+
+extern void	ToggleTapMode();
+
+} /* namespace GPH */
+
+#endif //GPH_HW_H
diff --git a/backends/platform/gp2xwiz/gp2xwiz-sdl.cpp b/backends/platform/gph/gph-main.cpp
index b07eaa0ffa..727d599cc8 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-sdl.cpp
+++ b/backends/platform/gph/gph-main.cpp
@@ -23,15 +23,27 @@
  *
  */
 
-#include "backends/platform/gp2xwiz/gp2xwiz-sdl.h"
-#include "backends/platform/gp2xwiz/gp2xwiz-hw.h"
+#include "common/scummsys.h"
+#include <SDL/SDL.h>
 
-#include "backends/graphics/gp2xwizsdl/gp2xwizsdl-graphics.h"
-#include "backends/events/gp2xsdl/gp2xsdl-events.h"
-#include "backends/saves/default/default-saves.h"
+#include "backends/platform/gph/gph-sdl.h"
+#include "backends/platform/gph/gph-hw.h"
+#include "backends/plugins/posix/posix-provider.h"
+#include "base/main.h"
 
+#include "common/archive.h"
 #include "common/config-manager.h"
 #include "common/debug.h"
+#include "common/events.h"
+#include "common/util.h"
+
+#include "common/file.h"
+#include "base/main.h"
+
+#include "backends/saves/default/default-saves.h"
+
+#include "backends/timer/default/default-timer.h"
+#include "sound/mixer_intern.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,11 +51,26 @@
 #include <limits.h>
 #include <errno.h>
 #include <sys/stat.h>
+#include <time.h>	// for getTimeAndDate()
 
 /* Dump console info to files. */
-// #define DUMP_STDOUT
+#define DUMP_STDOUT
+
+int main(int argc, char *argv[]) {
+	g_system = new OSystem_GPH();
+	assert(g_system);
+#ifdef DYNAMIC_MODULES
+	PluginManager::instance().addPluginProvider(new POSIXPluginProvider());
+#endif
 
-void OSystem_GP2XWIZ::initBackend() {
+	// Invoke the actual ScummVM main entry point:
+	int res = scummvm_main(argc, argv);
+	g_system->quit();
+
+	return res;
+}
+
+void OSystem_GPH::initBackend() {
 
 	/* Setup default save path to be workingdir/saves */
 
@@ -51,7 +78,7 @@ void OSystem_GP2XWIZ::initBackend() {
 	char workDirName[PATH_MAX+1];
 
 	if (getcwd(workDirName, PATH_MAX) == NULL) {
-		error("Could not obtain current working directory.");
+		error("Could not obtain current working directory");
 	} else {
 		printf("Current working directory: %s\n", workDirName);
 	}
@@ -65,7 +92,7 @@ void OSystem_GP2XWIZ::initBackend() {
 			if (mkdir(savePath, 0755) != 0)
 				warning("mkdir for '%s' failed!", savePath);
 
-	_savefileManager = new DefaultSaveFileManager(savePath);
+	_savefile = new DefaultSaveFileManager(savePath);
 
 	#ifdef DUMP_STDOUT
 		// The GP2X Wiz has a serial console on the breakout board but most users do not use this so we
@@ -131,27 +158,19 @@ void OSystem_GP2XWIZ::initBackend() {
 	/* Make sure SDL knows that we have a joystick we want to use. */
 	ConfMan.setInt("joystick_num", 0);
 
-	// Create the events manager
-	if (_eventManager == 0)
-		_eventManager = new GP2XSdlEventManager(this);
-
-	// Create the graphics manager
-	if (_graphicsManager == 0)
-		_graphicsManager = new GP2XWIZSdlGraphicsManager();
-
-	printf("%s\n", "Passing to OSystem_POSIX initBackend.");
+	printf("%s\n", "Passing to OSystem::SDL initBackend.");
 
 	/* Pass to SDL backend to do the heavy lifting */
-	OSystem_POSIX::initBackend();
+	OSystem_SDL::initBackend();
 }
 
-void OSystem_GP2XWIZ::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
+void OSystem_GPH::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
 
 	/* Setup default extra data paths for engine data files and plugins */
-	char workDirName[PATH_MAX + 1];
+	char workDirName[PATH_MAX+1];
 
 	if (getcwd(workDirName, PATH_MAX) == NULL) {
-		error("Error: Could not obtain current working directory.");
+		error("Error: Could not obtain current working directory");
 	}
 
 	Common::FSNode workdirNode(workDirName);
@@ -159,7 +178,7 @@ void OSystem_GP2XWIZ::addSysArchivesToSearchSet(Common::SearchSet &s, int priori
 		s.add("__GP2XWIZ_WORKDIR__", new Common::FSDirectory(workDirName), priority);
 	}
 
-	char enginedataPath[PATH_MAX + 1];
+	char enginedataPath[PATH_MAX+1];
 
 	strcpy(enginedataPath, workDirName);
 	strcat(enginedataPath, "/engine-data");
@@ -169,7 +188,7 @@ void OSystem_GP2XWIZ::addSysArchivesToSearchSet(Common::SearchSet &s, int priori
 		s.add("__GP2XWIZ_ENGDATA__", new Common::FSDirectory(enginedataPath), priority);
 	}
 
-	char pluginsPath[PATH_MAX + 1];
+	char pluginsPath[PATH_MAX+1];
 
 	strcpy(pluginsPath, workDirName);
 	strcat(pluginsPath, "/plugins");
@@ -180,7 +199,7 @@ void OSystem_GP2XWIZ::addSysArchivesToSearchSet(Common::SearchSet &s, int priori
 	}
 }
 
-void OSystem_GP2XWIZ::quit() {
+void OSystem_GPH::quit() {
 
 	WIZ_HW::deviceDeinit();
 
@@ -190,5 +209,5 @@ void OSystem_GP2XWIZ::quit() {
 		fclose(stderr);
 	#endif /* DUMP_STDOUT */
 
-	OSystem_POSIX::quit();
+	OSystem_SDL::quit();
 }
diff --git a/backends/platform/gph/gph-sdl.h b/backends/platform/gph/gph-sdl.h
new file mode 100644
index 0000000000..136363f9a0
--- /dev/null
+++ b/backends/platform/gph/gph-sdl.h
@@ -0,0 +1,81 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef GPH_SDL_H
+#define GPH_SDL_H
+
+#include "backends/platform/sdl/sdl.h"
+
+// FIXME: For now keep hacks in this header to save polluting the SDL backend.
+enum {
+    GFX_HALF = 12
+};
+
+#define __GP2XWIZ__
+#define MIXER_DOUBLE_BUFFERING 1
+
+#ifndef PATH_MAX
+	#define PATH_MAX 255
+#endif
+
+class OSystem_GPH : public OSystem_SDL {
+public:
+	OSystem_GPH() {}
+
+	/* Graphics */
+    void initSize(uint w, uint h);
+    void setGraphicsModeIntern();
+    bool setGraphicsMode(int mode);
+    void internUpdateScreen();
+    const OSystem::GraphicsMode *getSupportedGraphicsModes() const;
+	bool setGraphicsMode(const char *name);
+    int getDefaultGraphicsMode() const;
+    bool loadGFXMode();
+    void drawMouse();
+    void undrawMouse();
+    void showOverlay();
+    void hideOverlay();
+
+	/* Event Stuff */
+	void moveStick();
+	void fillMouseEvent(Common::Event&, int, int);
+	void warpMouse(int, int);
+	bool remapKey(SDL_Event&, Common::Event&);
+
+	/* Platform Setup Stuff */
+	void addSysArchivesToSearchSet(Common::SearchSet &s, int priority);
+	void initBackend();
+	void quit();
+
+protected:
+	bool _stickBtn[32];
+
+	bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event);
+	bool handleMouseButtonUp(SDL_Event &ev, Common::Event &event);
+	bool handleJoyButtonDown(SDL_Event &ev, Common::Event &event);
+	bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event);
+};
+
+#endif //GPH_SDL_H
diff --git a/backends/platform/gp2xwiz/module.mk b/backends/platform/gph/module.mk
index cca77058af..f5567f581e 100644
--- a/backends/platform/gp2xwiz/module.mk
+++ b/backends/platform/gph/module.mk
@@ -1,9 +1,10 @@
-MODULE := backends/platform/gp2xwiz
+MODULE := backends/platform/gph
 
 MODULE_OBJS := \
-	gp2xwiz-hw.o \
-	gp2xwiz-main.o \
-	gp2xwiz-sdl.o
+	gph-events.o \
+	gph-graphics.o \
+	gph-hw.o \
+	gph-main.o
 
 # We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
 MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
diff --git a/backends/platform/iphone/iphone_common.h b/backends/platform/iphone/iphone_common.h
index 1f5ed01982..7c7770f443 100644
--- a/backends/platform/iphone/iphone_common.h
+++ b/backends/platform/iphone/iphone_common.h
@@ -67,12 +67,19 @@ void iphone_main(int argc, char *argv[]);
 #endif
 
 // On the ObjC side
-void iPhone_updateScreen();
+void iPhone_updateScreen(int mouseX, int mouseY);
 void iPhone_updateScreenRect(unsigned short* screen, int x1, int y1, int x2, int y2);
+void iPhone_updateOverlayRect(unsigned short* screen, int x1, int y1, int x2, int y2);
 void iPhone_initSurface(int width, int height);
 bool iPhone_fetchEvent(int *outEvent, float *outX, float *outY);
 const char* iPhone_getDocumentsDir();
 bool iPhone_isHighResDevice();
+int iPhone_getScreenHeight();
+int iPhone_getScreenWidth();
+void iPhone_enableOverlay(int state);
+void iPhone_setMouseCursor(short* buffer, int width, int height);
+
+uint getSizeNextPOT(uint size);
 
 #ifdef __cplusplus
 }
diff --git a/backends/platform/iphone/iphone_main.m b/backends/platform/iphone/iphone_main.m
index d8992de5bb..1fb2cc3788 100644
--- a/backends/platform/iphone/iphone_main.m
+++ b/backends/platform/iphone/iphone_main.m
@@ -103,13 +103,24 @@ int main(int argc, char** argv) {
 	[NSThread detachNewThreadSelector:@selector(mainLoop:) toTarget:self withObject:nil];
 }
 
+- (void)applicationDidResume
+{
+}
+
+- (void)applicationWillSuspend
+{
+}
+
+- (void)applicationWillTerminate
+{
+}
+
 - (void)applicationSuspend:(struct __GSEvent *)event {
 	//[self setApplicationBadge:NSLocalizedString(@"ON", nil)];
 	[_view applicationSuspend];
 }
 
 - (void)applicationResume:(struct __GSEvent *)event {
-	[self removeApplicationBadge];
 	[_view applicationResume];
 
 	// Workaround, need to "hide" and unhide the statusbar to properly remove it,
diff --git a/backends/platform/iphone/iphone_video.h b/backends/platform/iphone/iphone_video.h
index 1060a2a223..aed15ecfd5 100644
--- a/backends/platform/iphone/iphone_video.h
+++ b/backends/platform/iphone/iphone_video.h
@@ -54,6 +54,8 @@
 	GLint _visibleWidth;
 	GLint _visibleHeight;
 	GLuint _screenTexture;
+	GLuint _overlayTexture;
+	GLuint _mouseCursorTexture;
 }
 
 - (id)initWithFrame:(struct CGRect)frame;
@@ -65,6 +67,11 @@
 - (void)initSurface;
 
 - (void)updateSurface;
+- (void)updateMainSurface;
+- (void)updateOverlaySurface;
+- (void)updateMouseSurface;
+
+-(void)updateMouseCursor;
 
 - (id)getEvent;
 
diff --git a/backends/platform/iphone/iphone_video.m b/backends/platform/iphone/iphone_video.m
index cd8b38acb3..821d3de634 100644
--- a/backends/platform/iphone/iphone_video.m
+++ b/backends/platform/iphone/iphone_video.m
@@ -32,23 +32,88 @@ static int _height = 0;
 static int _fullWidth;
 static int _fullHeight;
 static CGRect _screenRect;
+
 static char* _textureBuffer = 0;
 static int _textureWidth = 0;
 static int _textureHeight = 0;
+
+static char* _overlayTexBuffer = 0;
+static int _overlayTexWidth = 0;
+static int _overlayTexHeight = 0;
+static int _overlayWidth = 0;
+static int _overlayHeight = 0;
+static float _overlayPortraitRatio = 1.0f;
+
 NSLock* _lock = nil;
 static int _needsScreenUpdate = 0;
+static int _overlayIsEnabled = 0;
 
 static UITouch* _firstTouch = NULL;
 static UITouch* _secondTouch = NULL;
 
+static short* _mouseCursor = NULL;
+static int _mouseCursorHeight = 0;
+static int _mouseCursorWidth = 0;
+static int _mouseX = 0;
+static int _mouseY = 0;
+
 // static long lastTick = 0;
 // static int frames = 0;
 
+#define printOpenGLError() printOglError(__FILE__, __LINE__)
+
+int printOglError(const char *file, int line)
+{
+	int     retCode = 0;
+
+	// returns 1 if an OpenGL error occurred, 0 otherwise.
+	GLenum glErr = glGetError();
+	while( glErr != GL_NO_ERROR)
+	{
+		fprintf(stderr, "glError: %u (%s: %d)\n", glErr, file, line );
+		retCode = 1;
+		glErr = glGetError();
+	}
+	return retCode;
+}
+
+void iPhone_setMouseCursor(short* buffer, int width, int height) {
+	_mouseCursor = buffer;
+
+	_mouseCursorWidth = width;
+	_mouseCursorHeight = height;
+
+	[sharedInstance performSelectorOnMainThread:@selector(updateMouseCursor) withObject:nil waitUntilDone: YES];
+}
+
+void iPhone_enableOverlay(int state) {
+	_overlayIsEnabled = state;
+}
+
+int iPhone_getScreenHeight() {
+	return _overlayHeight;
+}
+
+int iPhone_getScreenWidth() {
+	return _overlayWidth;
+}
+
 bool iPhone_isHighResDevice() {
 	return _fullHeight > 480;
 }
 
-void iPhone_updateScreen() {
+void iPhone_updateScreen(int mouseX, int mouseY) {
+	//printf("Mouse: (%i, %i)\n", mouseX, mouseY);
+
+	//_mouseX = _overlayHeight - (float)mouseX / _width * _overlayHeight;
+	//_mouseY = (float)mouseY / _height * _overlayWidth;
+
+	//_mouseX = _overlayHeight - mouseX;
+	//_mouseY = mouseY;
+
+	_mouseX = (_overlayWidth - mouseX) / (float)_overlayWidth * _overlayHeight;
+	_mouseY = mouseY / (float)_overlayHeight * _overlayWidth;
+
 	if (!_needsScreenUpdate) {
 		_needsScreenUpdate = 1;
 		[sharedInstance performSelectorOnMainThread:@selector(updateSurface) withObject:nil waitUntilDone: NO];
@@ -56,16 +121,17 @@ void iPhone_updateScreen() {
 }
 
 void iPhone_updateScreenRect(unsigned short* screen, int x1, int y1, int x2, int y2) {
-	//[_lock lock];
-
 	int y;
-	for (y = y1; y < y2; ++y) {
+	for (y = y1; y < y2; ++y)
 		memcpy(&_textureBuffer[(y * _textureWidth + x1 )* 2], &screen[y * _width + x1], (x2 - x1) * 2);
-	}
-
-	//[_lock unlock];
 }
 
+void iPhone_updateOverlayRect(unsigned short* screen, int x1, int y1, int x2, int y2) {
+	int y;
+	//printf("Overlaywidth: %u, fullwidth %u\n", _overlayWidth, _fullWidth);
+	for (y = y1; y < y2; ++y)
+		memcpy(&_overlayTexBuffer[(y * _overlayTexWidth + x1 )* 2], &screen[y * _overlayWidth + x1], (x2 - x1) * 2);
+}
 
 void iPhone_initSurface(int width, int height) {
 	_width = width;
@@ -92,6 +158,19 @@ bool iPhone_fetchEvent(int *outEvent, float *outX, float *outY) {
 	return true;
 }
 
+uint getSizeNextPOT(uint size) {
+    if ((size & (size - 1)) || !size) {
+        int log = 0;
+
+        while (size >>= 1)
+            ++log;
+
+        size = (2 << log);
+    }
+
+    return size;
+}
+
 const char* iPhone_getDocumentsDir() {
 	NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
 	NSString *documentsDirectory = [paths objectAtIndex:0];
@@ -110,18 +189,6 @@ bool getLocalMouseCoords(CGPoint *point) {
 	return true;
 }
 
-uint getSizeNextPOT(uint size) {
-    if ((size & (size - 1)) || !size) {
-        int log = 0;
-
-        while (size >>= 1)
-            ++log;
-
-        size = (2 << log);
-    }
-
-    return size;
-}
 
 @implementation iPhoneView
 
@@ -131,7 +198,15 @@ uint getSizeNextPOT(uint size) {
 }
 
 - (id)initWithFrame:(struct CGRect)frame {
-	[super initWithFrame: frame];
+	self = [super initWithFrame: frame];
+
+	if([[UIScreen mainScreen] respondsToSelector: NSSelectorFromString(@"scale")])
+	{
+		if([self respondsToSelector: NSSelectorFromString(@"contentScaleFactor")])
+		{
+			//self.contentScaleFactor = [[UIScreen mainScreen] scale];
+		}
+	}
 
 	_fullWidth = frame.size.width;
 	_fullHeight = frame.size.height;
@@ -143,6 +218,8 @@ uint getSizeNextPOT(uint size) {
 	_keyboardView = nil;
 	_context = nil;
 	_screenTexture = 0;
+	_overlayTexture = 0;
+	_mouseCursorTexture = 0;
 
 	return self;
 }
@@ -156,6 +233,8 @@ uint getSizeNextPOT(uint size) {
 
 	if (_screenTexture)
 		free(_textureBuffer);
+
+	free(_overlayTexBuffer);
 }
 
 - (void *)getSurface {
@@ -181,6 +260,38 @@ uint getSizeNextPOT(uint size) {
 	}
 	_needsScreenUpdate = 0;
 
+	if (_overlayIsEnabled) {
+		glClear(GL_COLOR_BUFFER_BIT); printOpenGLError();
+	}
+
+	[self updateMainSurface];
+
+	if (_overlayIsEnabled) {
+		[self updateOverlaySurface];
+		[self updateMouseSurface];
+	}
+
+	glBindRenderbufferOES(GL_RENDERBUFFER_OES, _viewRenderbuffer); printOpenGLError();
+	[_context presentRenderbuffer:GL_RENDERBUFFER_OES];
+
+}
+
+-(void)updateMouseCursor {
+	if (_mouseCursorTexture == 0) {
+		glGenTextures(1, &_mouseCursorTexture); printOpenGLError();
+		glBindTexture(GL_TEXTURE_2D, _mouseCursorTexture); printOpenGLError();
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); printOpenGLError();
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); printOpenGLError();
+	}
+
+	glBindTexture(GL_TEXTURE_2D, _mouseCursorTexture); printOpenGLError();
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, getSizeNextPOT(_mouseCursorWidth), getSizeNextPOT(_mouseCursorHeight), 0, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, _mouseCursor); printOpenGLError();
+
+	free(_mouseCursor);
+	_mouseCursor = NULL;
+}
+
+- (void)updateMainSurface {
 	GLfloat vertices[] = {
 		0.0f + _heightOffset, 0.0f + _widthOffset,
 		_visibleWidth - _heightOffset, 0.0f + _widthOffset,
@@ -198,20 +309,76 @@ uint getSizeNextPOT(uint size) {
 		0.0f, texHeight
 	};
 
-	glVertexPointer(2, GL_FLOAT, 0, vertices);
-	glTexCoordPointer(2, GL_FLOAT, 0, texCoords);
+	glVertexPointer(2, GL_FLOAT, 0, vertices); printOpenGLError();
+	glTexCoordPointer(2, GL_FLOAT, 0, texCoords); printOpenGLError();
+
+	glBindTexture(GL_TEXTURE_2D, _screenTexture); printOpenGLError();
 
-	//[_lock lock];
 	// Unfortunately we have to update the whole texture every frame, since glTexSubImage2D is actually slower in all cases
 	// due to the iPhone internals having to convert the whole texture back from its internal format when used.
 	// In the future we could use several tiled textures instead.
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, _textureWidth, _textureHeight, 0, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, _textureBuffer);
-	//[_lock unlock];
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, _textureWidth, _textureHeight, 0, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, _textureBuffer); printOpenGLError();
+	glDisable(GL_BLEND);
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); printOpenGLError();
+}
 
-	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-	glBindRenderbufferOES(GL_RENDERBUFFER_OES, _viewRenderbuffer);
-	[_context presentRenderbuffer:GL_RENDERBUFFER_OES];
+- (void)updateOverlaySurface {
+	GLfloat vertices[] = {
+		0.0f, 0.0f,
+		_overlayHeight, 0.0f,
+		0.0f,  _overlayWidth * _overlayPortraitRatio,
+		_overlayHeight,  _overlayWidth * _overlayPortraitRatio
+	};
+
+	float texWidth = _overlayWidth / (float)_overlayTexWidth;
+	float texHeight = _overlayHeight / (float)_overlayTexHeight;
 
+	const GLfloat texCoords[] = {
+		texWidth, 0.0f,
+		0.0f, 0.0f,
+		texWidth, texHeight,
+		0.0f, texHeight
+	};
+
+	glVertexPointer(2, GL_FLOAT, 0, vertices); printOpenGLError();
+	glTexCoordPointer(2, GL_FLOAT, 0, texCoords); printOpenGLError();
+
+	glBindTexture(GL_TEXTURE_2D, _overlayTexture); printOpenGLError();
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, _overlayTexWidth, _overlayTexHeight, 0, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, _overlayTexBuffer); printOpenGLError();
+	glEnable(GL_BLEND);
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); printOpenGLError();
+}
+
+- (void)updateMouseSurface {
+
+	int width = _mouseCursorWidth / (float)_backingWidth * _backingHeight;
+	int height = _mouseCursorHeight / (float)_backingHeight * _backingWidth;
+
+	GLfloat vertices[] = {
+		_mouseX, _mouseY,
+		_mouseX + height, _mouseY,
+		_mouseX, _mouseY + width,
+		_mouseX + height,  _mouseY + width
+	};
+
+	//printf("Cursor: width %u height %u\n", _mouseCursorWidth, _mouseCursorHeight);
+
+	float texWidth = _mouseCursorWidth / (float)getSizeNextPOT(_mouseCursorWidth);
+	float texHeight = _mouseCursorHeight / (float)getSizeNextPOT(_mouseCursorHeight);
+
+	const GLfloat texCoords[] = {
+		texWidth, 0.0f,
+		0.0f, 0.0f,
+		texWidth, texHeight,
+		0.0f, texHeight
+	};
+
+	glVertexPointer(2, GL_FLOAT, 0, vertices); printOpenGLError();
+	glTexCoordPointer(2, GL_FLOAT, 0, texCoords); printOpenGLError();
+
+	glBindTexture(GL_TEXTURE_2D, _mouseCursorTexture); printOpenGLError();
+	glEnable(GL_BLEND);
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); printOpenGLError();
 }
 
 - (void)initSurface {
@@ -232,28 +399,39 @@ uint getSizeNextPOT(uint size) {
 
 		_context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES1];
 		if (!_context || [EAGLContext setCurrentContext:_context]) {
-			glGenFramebuffersOES(1, &_viewFramebuffer);
-			glGenRenderbuffersOES(1, &_viewRenderbuffer);
+			glGenFramebuffersOES(1, &_viewFramebuffer); printOpenGLError();
+			glGenRenderbuffersOES(1, &_viewRenderbuffer); printOpenGLError();
 
-			glBindFramebufferOES(GL_FRAMEBUFFER_OES, _viewFramebuffer);
-			glBindRenderbufferOES(GL_RENDERBUFFER_OES, _viewRenderbuffer);
+			glBindFramebufferOES(GL_FRAMEBUFFER_OES, _viewFramebuffer); printOpenGLError();
+			glBindRenderbufferOES(GL_RENDERBUFFER_OES, _viewRenderbuffer); printOpenGLError();
 			[_context renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:(id<EAGLDrawable>)self.layer];
-			glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, _viewRenderbuffer);
+			glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, _viewRenderbuffer); printOpenGLError();
 
-			glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_WIDTH_OES, &_backingWidth);
-			glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_HEIGHT_OES, &_backingHeight);
+			glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_WIDTH_OES, &_backingWidth); printOpenGLError();
+			glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_HEIGHT_OES, &_backingHeight); printOpenGLError();
 
 			if (glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES) != GL_FRAMEBUFFER_COMPLETE_OES) {
 				NSLog(@"Failed to make complete framebuffer object %x.", glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES));
 				return;
 			}
 
-			glViewport(0, 0, _backingWidth, _backingHeight);
-			glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+			_overlayHeight = _backingWidth;
+			_overlayWidth = _backingHeight;
+			_overlayTexWidth = getSizeNextPOT(_overlayHeight);
+			_overlayTexHeight = getSizeNextPOT(_overlayWidth);
+
+			int textureSize = _overlayTexWidth * _overlayTexHeight * 2;
+			_overlayTexBuffer = (char *)malloc(textureSize);
+			memset(_overlayTexBuffer, 0, textureSize);
 
-			glEnable(GL_TEXTURE_2D);
-			glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-			glEnableClientState(GL_VERTEX_ARRAY);
+			glViewport(0, 0, _backingWidth, _backingHeight); printOpenGLError();
+			glClearColor(0.0f, 0.0f, 0.0f, 1.0f); printOpenGLError();
+
+			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+			glEnable(GL_TEXTURE_2D); printOpenGLError();
+			glEnableClientState(GL_TEXTURE_COORD_ARRAY); printOpenGLError();
+			glEnableClientState(GL_VERTEX_ARRAY); printOpenGLError();
 		}
 	}
 
@@ -261,22 +439,32 @@ uint getSizeNextPOT(uint size) {
 	glLoadIdentity();
 
 	if (orientation ==  UIDeviceOrientationLandscapeRight) {
-		glRotatef(-90, 0, 0, 1);
+		glRotatef(-90, 0, 0, 1); printOpenGLError();
 	} else if (orientation == UIDeviceOrientationLandscapeLeft) {
-		glRotatef(90, 0, 0, 1);
+		glRotatef(90, 0, 0, 1); printOpenGLError();
 	} else {
-		glRotatef(180, 0, 0, 1);
+		glRotatef(180, 0, 0, 1); printOpenGLError();
 	}
 
-	glOrthof(0, _backingWidth, 0, _backingHeight, 0, 1);
+	glOrthof(0, _backingWidth, 0, _backingHeight, 0, 1); printOpenGLError();
 
 	if (_screenTexture > 0) {
-		glDeleteTextures(1, &_screenTexture);
+		glDeleteTextures(1, &_screenTexture); printOpenGLError();
+	}
+
+	glGenTextures(1, &_screenTexture); printOpenGLError();
+	glBindTexture(GL_TEXTURE_2D, _screenTexture); printOpenGLError();
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); printOpenGLError();
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); printOpenGLError();
+
+	if (_overlayTexture > 0) {
+		glDeleteTextures(1, &_overlayTexture); printOpenGLError();
 	}
 
-	glGenTextures(1, &_screenTexture);
-	glBindTexture(GL_TEXTURE_2D, _screenTexture);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glGenTextures(1, &_overlayTexture); printOpenGLError();
+	glBindTexture(GL_TEXTURE_2D, _overlayTexture); printOpenGLError();
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); printOpenGLError();
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); printOpenGLError();
 
 	if (_textureBuffer) {
 		free(_textureBuffer);
@@ -286,12 +474,12 @@ uint getSizeNextPOT(uint size) {
 	_textureBuffer = (char*)malloc(textureSize);
 	memset(_textureBuffer, 0, textureSize);
 
-	glBindRenderbufferOES(GL_RENDERBUFFER_OES, _viewRenderbuffer);
+	glBindRenderbufferOES(GL_RENDERBUFFER_OES, _viewRenderbuffer); printOpenGLError();
 
 	// The color buffer is triple-buffered, so we clear it multiple times right away to avid doing any glClears later.
 	int clearCount = 5;
 	while (clearCount-- > 0) {
-		glClear(GL_COLOR_BUFFER_BIT);
+		glClear(GL_COLOR_BUFFER_BIT); printOpenGLError();
 		[_context presentRenderbuffer:GL_RENDERBUFFER_OES];
 	}
 
@@ -320,6 +508,7 @@ uint getSizeNextPOT(uint size) {
 
 		//printf("Rect: %i, %i, %i, %i\n", _widthOffset, _heightOffset, rectWidth, rectHeight);
 		_screenRect = CGRectMake(_widthOffset, _heightOffset, rectWidth, rectHeight);
+		_overlayPortraitRatio = 1.0f;
 	} else {
 		float ratio = (float)_height / (float)_width;
 		int height = _fullWidth * ratio;
@@ -340,6 +529,7 @@ uint getSizeNextPOT(uint size) {
 		[self addSubview:[_keyboardView inputView]];
 		[self addSubview: _keyboardView];
 		[[_keyboardView inputView] becomeFirstResponder];
+		_overlayPortraitRatio = (_overlayHeight * ratio) / _overlayWidth;
 	}
 }
 
@@ -421,7 +611,7 @@ uint getSizeNextPOT(uint size) {
 
 - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
 {
-	NSSet *allTouches = [event allTouches];
+	//NSSet *allTouches = [event allTouches];
 
 	for (UITouch* touch in touches) {
 		if (touch == _firstTouch) {
diff --git a/backends/platform/iphone/osys_events.cpp b/backends/platform/iphone/osys_events.cpp
index c1c7ffdc0c..22f529dfac 100644
--- a/backends/platform/iphone/osys_events.cpp
+++ b/backends/platform/iphone/osys_events.cpp
@@ -60,16 +60,31 @@ bool OSystem_IPHONE::pollEvent(Common::Event &event) {
 		int y = 0;
 		switch (_screenOrientation) {
 			case kScreenOrientationPortrait:
-				x = (int)(xUnit * _screenWidth);
-				y = (int)(yUnit * _screenHeight);
+				if (_overlayVisible) {
+					x = (int)(xUnit * _overlayWidth);
+					y = (int)(yUnit * _overlayHeight);
+				} else {
+					x = (int)(xUnit * _screenWidth);
+					y = (int)(yUnit * _screenHeight);
+				}
 				break;
 			case kScreenOrientationLandscape:
-				x = (int)(yUnit * _screenWidth);
-				y = (int)((1.0 - xUnit) * _screenHeight);
+				if (_overlayVisible) {
+					x = (int)(yUnit * _overlayWidth);
+					y = (int)((1.0 - xUnit) * _overlayHeight);
+				} else {
+					x = (int)(yUnit * _screenWidth);
+					y = (int)((1.0 - xUnit) * _screenHeight);
+				}
 				break;
 			case kScreenOrientationFlippedLandscape:
-				x = (int)((1.0 - yUnit) * _screenWidth);
-				y = (int)(xUnit * _screenHeight);
+				if (_overlayVisible) {
+					x = (int)((1.0 - yUnit) * _overlayWidth);
+					y = (int)(xUnit * _overlayHeight);
+				} else {
+					x = (int)((1.0 - yUnit) * _screenWidth);
+					y = (int)(xUnit * _screenHeight);
+				}
 				break;
 		}
 
@@ -262,15 +277,18 @@ bool OSystem_IPHONE::handleEvent_mouseDragged(Common::Event &event, int x, int y
 		mouseNewPosX = (int)(_mouseX - deltaX / 0.5f);
 		mouseNewPosY = (int)(_mouseY - deltaY / 0.5f);
 
+		int widthCap = _overlayVisible ? _overlayWidth : _screenWidth;
+		int heightCap = _overlayVisible ? _overlayHeight : _screenHeight;
+
 		if (mouseNewPosX < 0)
 			mouseNewPosX = 0;
-		else if (mouseNewPosX > _screenWidth)
-			mouseNewPosX = _screenWidth;
+		else if (mouseNewPosX > widthCap)
+			mouseNewPosX = widthCap;
 
 		if (mouseNewPosY < 0)
 			mouseNewPosY = 0;
-		else if (mouseNewPosY > _screenHeight)
-			mouseNewPosY = _screenHeight;
+		else if (mouseNewPosY > heightCap)
+			mouseNewPosY = heightCap;
 
 	} else {
 		mouseNewPosX = x;
diff --git a/backends/platform/iphone/osys_main.cpp b/backends/platform/iphone/osys_main.cpp
index 6c26b6ca8d..a1fb8f0d5e 100644
--- a/backends/platform/iphone/osys_main.cpp
+++ b/backends/platform/iphone/osys_main.cpp
@@ -54,13 +54,13 @@ void *OSystem_IPHONE::s_soundParam = NULL;
 
 OSystem_IPHONE::OSystem_IPHONE() :
 	_savefile(NULL), _mixer(NULL), _timer(NULL), _offscreen(NULL),
-	_overlayVisible(false), _overlayBuffer(NULL), _fullscreen(NULL),
+	_overlayVisible(false), _fullscreen(NULL),
 	_mouseHeight(0), _mouseWidth(0), _mouseBuf(NULL), _lastMouseTap(0),
 	_secondaryTapped(false), _lastSecondaryTap(0), _screenOrientation(kScreenOrientationFlippedLandscape),
 	_needEventRestPeriod(false), _mouseClickAndDragEnabled(false),
 	_gestureStartX(-1), _gestureStartY(-1), _fullScreenIsDirty(false), _fullScreenOverlayIsDirty(false),
-	_mouseDirty(false), _timeSuspended(0), _lastDragPosX(-1), _lastDragPosY(-1), _screenChangeCount(0)
-
+	_mouseDirty(false), _timeSuspended(0), _lastDragPosX(-1), _lastDragPosY(-1), _screenChangeCount(0),
+	_overlayHeight(0), _overlayWidth(0), _overlayBuffer(0)
 {
 	_queuedInputEvent.type = (Common::EventType)0;
 	_lastDrawnMouseRect = Common::Rect(0, 0, 0, 0);
diff --git a/backends/platform/iphone/osys_main.h b/backends/platform/iphone/osys_main.h
index 3c80c83998..c925078b46 100644
--- a/backends/platform/iphone/osys_main.h
+++ b/backends/platform/iphone/osys_main.h
@@ -66,6 +66,9 @@ protected:
 	Graphics::Surface _framebuffer;
 	byte *_offscreen;
 	OverlayColor  *_overlayBuffer;
+	uint16 _overlayHeight;
+	uint16 _overlayWidth;
+
 	uint16 *_fullscreen;
 
 	uint16  _palette[256];
@@ -144,7 +147,7 @@ public:
 	virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
 	virtual int16 getOverlayHeight();
 	virtual int16 getOverlayWidth();
-	virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<565>(); }
+	virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<5551>(); }
 
 	virtual bool showMouse(bool visible);
 
diff --git a/backends/platform/iphone/osys_video.cpp b/backends/platform/iphone/osys_video.cpp
index 76c2031758..d30a412a9f 100644
--- a/backends/platform/iphone/osys_video.cpp
+++ b/backends/platform/iphone/osys_video.cpp
@@ -57,10 +57,10 @@ void OSystem_IPHONE::initSize(uint width, uint height, const Graphics::PixelForm
 	_offscreen = (byte *)malloc(width * height);
 	bzero(_offscreen, width * height);
 
-	free(_overlayBuffer);
+	//free(_overlayBuffer);
 
 	int fullSize = _screenWidth * _screenHeight * sizeof(OverlayColor);
-	_overlayBuffer = (OverlayColor *)malloc(fullSize);
+	//_overlayBuffer = (OverlayColor *)malloc(fullSize);
 	clearOverlay();
 
 	free(_fullscreen);
@@ -70,6 +70,14 @@ void OSystem_IPHONE::initSize(uint width, uint height, const Graphics::PixelForm
 
 	iPhone_initSurface(width, height);
 
+	if (_overlayBuffer == NULL) {
+		_overlayHeight = iPhone_getScreenHeight();
+		_overlayWidth = iPhone_getScreenWidth();
+
+		printf("Overlay: (%u x %u)\n", _overlayWidth, _overlayHeight);
+		_overlayBuffer = new OverlayColor[_overlayHeight * _overlayWidth];
+	}
+
 	_fullScreenIsDirty = false;
 	dirtyFullScreen();
 	_mouseVisible = false;
@@ -187,7 +195,7 @@ void OSystem_IPHONE::updateScreen() {
 	_fullScreenIsDirty = false;
 	_fullScreenOverlayIsDirty = false;
 
-	iPhone_updateScreen();
+	iPhone_updateScreen(_mouseX - _mouseHotspotX, _mouseY - _mouseHotspotY);
 }
 
 void OSystem_IPHONE::internUpdateScreen() {
@@ -222,8 +230,9 @@ void OSystem_IPHONE::internUpdateScreen() {
 
 		if (_overlayVisible)
 			drawDirtyOverlayRect(dirtyRect);
+		else
+			drawMouseCursorOnRectUpdate(dirtyRect, mouseRect);
 
-		drawMouseCursorOnRectUpdate(dirtyRect, mouseRect);
 		updateHardwareSurfaceForRect(dirtyRect);
 	}
 
@@ -234,8 +243,8 @@ void OSystem_IPHONE::internUpdateScreen() {
 			//printf("Drawing: (%i, %i) -> (%i, %i)\n", dirtyRect.left, dirtyRect.top, dirtyRect.right, dirtyRect.bottom);
 
 			drawDirtyOverlayRect(dirtyRect);
-			drawMouseCursorOnRectUpdate(dirtyRect, mouseRect);
-			updateHardwareSurfaceForRect(dirtyRect);
+			//drawMouseCursorOnRectUpdate(dirtyRect, mouseRect);
+			//updateHardwareSurfaceForRect(dirtyRect);
 		}
 	}
 }
@@ -256,16 +265,17 @@ void OSystem_IPHONE::drawDirtyRect(const Common::Rect& dirtyRect) {
 }
 
 void OSystem_IPHONE::drawDirtyOverlayRect(const Common::Rect& dirtyRect) {
-	int h = dirtyRect.bottom - dirtyRect.top;
-
-	uint16 *src = (uint16 *)&_overlayBuffer[dirtyRect.top * _screenWidth + dirtyRect.left];
-	uint16 *dst = &_fullscreen[dirtyRect.top * _screenWidth + dirtyRect.left];
-	int x = (dirtyRect.right - dirtyRect.left) * 2;
-	for (int y = h; y > 0; y--) {
-		memcpy(dst, src, x);
-		src += _screenWidth;
-		dst += _screenWidth;
-	}
+	// int h = dirtyRect.bottom - dirtyRect.top;
+	//
+	// uint16 *src = (uint16 *)&_overlayBuffer[dirtyRect.top * _screenWidth + dirtyRect.left];
+	// uint16 *dst = &_fullscreen[dirtyRect.top * _screenWidth + dirtyRect.left];
+	// int x = (dirtyRect.right - dirtyRect.left) * 2;
+	// for (int y = h; y > 0; y--) {
+	// 	memcpy(dst, src, x);
+	// 	src += _screenWidth;
+	// 	dst += _screenWidth;
+	// }
+	iPhone_updateOverlayRect(_overlayBuffer, dirtyRect.left, dirtyRect.top, dirtyRect.right, dirtyRect.bottom);
 }
 
 void OSystem_IPHONE::drawMouseCursorOnRectUpdate(const Common::Rect& updatedRect, const Common::Rect& mouseRect) {
@@ -283,16 +293,19 @@ void OSystem_IPHONE::drawMouseCursorOnRectUpdate(const Common::Rect& updatedRect
 			srcY -= top;
 			top = 0;
 		}
-			//int right = left + _mouseWidth;
+
 		int bottom = top + _mouseHeight;
 		if (bottom > _screenWidth)
 			bottom = _screenWidth;
-			int displayWidth = _mouseWidth;
+
+		int displayWidth = _mouseWidth;
 		if (_mouseWidth + left > _screenWidth)
 			displayWidth = _screenWidth - left;
-			int displayHeight = _mouseHeight;
+
+		int displayHeight = _mouseHeight;
 		if (_mouseHeight + top > _screenHeight)
 			displayHeight = _screenHeight - top;
+
 		byte *src = &_mouseBuf[srcY * _mouseWidth + srcX];
 		uint16 *dst = &_fullscreen[top * _screenWidth + left];
 		for (int y = displayHeight; y > srcY; y--) {
@@ -337,6 +350,7 @@ void OSystem_IPHONE::showOverlay() {
 	//printf("showOverlay()\n");
 	_overlayVisible = true;
 	dirtyFullOverlayScreen();
+	iPhone_enableOverlay(true);
 }
 
 void OSystem_IPHONE::hideOverlay() {
@@ -344,11 +358,12 @@ void OSystem_IPHONE::hideOverlay() {
 	_overlayVisible = false;
 	_dirtyOverlayRects.clear();
 	dirtyFullScreen();
+	iPhone_enableOverlay(false);
 }
 
 void OSystem_IPHONE::clearOverlay() {
 	//printf("clearOverlay()\n");
-	bzero(_overlayBuffer, _screenWidth * _screenHeight * sizeof(OverlayColor));
+	bzero(_overlayBuffer, _overlayWidth * _overlayHeight * sizeof(OverlayColor));
 	dirtyFullOverlayScreen();
 }
 
@@ -358,8 +373,8 @@ void OSystem_IPHONE::grabOverlay(OverlayColor *buf, int pitch) {
 	OverlayColor *src = _overlayBuffer;
 
 	do {
-		memcpy(buf, src, _screenWidth * sizeof(OverlayColor));
-		src += _screenWidth;
+		memcpy(buf, src, _overlayWidth * sizeof(OverlayColor));
+		src += _overlayWidth;
 		buf += pitch;
 	} while (--h);
 }
@@ -380,11 +395,11 @@ void OSystem_IPHONE::copyRectToOverlay(const OverlayColor *buf, int pitch, int x
 		y = 0;
 	}
 
-	if (w > _screenWidth - x)
-		w = _screenWidth - x;
+	if (w > _overlayWidth - x)
+		w = _overlayWidth - x;
 
-	if (h > _screenHeight - y)
-		h = _screenHeight - y;
+	if (h > _overlayHeight - y)
+		h = _overlayHeight - y;
 
 	if (w <= 0 || h <= 0)
 		return;
@@ -393,24 +408,24 @@ void OSystem_IPHONE::copyRectToOverlay(const OverlayColor *buf, int pitch, int x
 		_dirtyOverlayRects.push_back(Common::Rect(x, y, x + w, y + h));
 	}
 
-	OverlayColor *dst = _overlayBuffer + (y * _screenWidth + x);
-	if (_screenWidth == pitch && pitch == w)
+	OverlayColor *dst = _overlayBuffer + (y * _overlayWidth + x);
+	if (_overlayWidth == pitch && pitch == w)
 		memcpy(dst, buf, h * w * sizeof(OverlayColor));
 	else {
 		do {
 			memcpy(dst, buf, w * sizeof(OverlayColor));
 			buf += pitch;
-			dst += _screenWidth;
+			dst += _overlayWidth;
 		} while (--h);
 	}
 }
 
 int16 OSystem_IPHONE::getOverlayHeight() {
-	return _screenHeight;
+	return _overlayHeight;
 }
 
 int16 OSystem_IPHONE::getOverlayWidth() {
-	return _screenWidth;
+	return _overlayWidth;
 }
 
 bool OSystem_IPHONE::showMouse(bool visible) {
@@ -440,13 +455,31 @@ void OSystem_IPHONE::dirtyFullScreen() {
 void OSystem_IPHONE::dirtyFullOverlayScreen() {
 	if (!_fullScreenOverlayIsDirty) {
 		_dirtyOverlayRects.clear();
-		_dirtyOverlayRects.push_back(Common::Rect(0, 0, _screenWidth, _screenHeight));
+		_dirtyOverlayRects.push_back(Common::Rect(0, 0, _overlayWidth, _overlayHeight));
 		_fullScreenOverlayIsDirty = true;
 	}
 }
 
 void OSystem_IPHONE::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) {
-	//printf("setMouseCursor(%i, %i)\n", hotspotX, hotspotY);
+	//printf("setMouseCursor(%i, %i, scale %u)\n", hotspotX, hotspotY, cursorTargetScale);
+
+	int texWidth = getSizeNextPOT(w);
+	int texHeight = getSizeNextPOT(h);
+	int bufferSize =  texWidth * texHeight * sizeof(int16);
+	int16* mouseBuf = (int16*)malloc(bufferSize);
+	memset(mouseBuf, 0, bufferSize);
+
+	for (int x = 0; x < w; ++x) {
+		for (int y = 0; y < h; ++y) {
+			byte color = buf[y * w + x];
+			if (color != keycolor)
+				mouseBuf[y * texWidth + x] = _palette[color] | 0x1;
+			else
+				mouseBuf[y * texWidth + x] = 0x0;
+		}
+	}
+
+	iPhone_setMouseCursor(mouseBuf, w, h);
 
 	if (_mouseBuf != NULL && (_mouseWidth != w || _mouseHeight != h)) {
 		free(_mouseBuf);
diff --git a/backends/platform/n64/Makefile b/backends/platform/n64/Makefile
index b8b2e61f77..cffe277312 100644
--- a/backends/platform/n64/Makefile
+++ b/backends/platform/n64/Makefile
@@ -15,7 +15,7 @@ AR = $(GCCN64PREFIX)ar cru
 RANLIB = $(GCCN64PREFIX)ranlib
 
 DEFINES += -D__N64__ -DLIMIT_FPS -DNONSTANDARD_PORT -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DDISABLE_FANCY_THEMES -DDISABLE_DOSBOX_OPL -DENABLE_VKEYBD -DUSE_ZLIB
-LIBS += -lpakfs -lframfs -ln64 -ln64utils -lromfs 
+LIBS += -lpakfs -lframfs -ln64 -ln64utils -lromfs
 
 #DEFINES += -D_ENABLE_DEBUG_
 
@@ -31,7 +31,7 @@ DEFINES += -DUSE_VORBIS -DUSE_TREMOR
 LIBS	+= -lvorbisidec
 endif
 
-LIBS += -lm -lstdc++ -lc -lgcc -lz -lnosys 
+LIBS += -lm -lstdc++ -lc -lgcc -lz -lnosys
 
 CXXFLAGS = -g -mno-extern-sdata -O2 --param max-inline-insns-auto=20 -fomit-frame-pointer -march=vr4300 -mtune=vr4300 -mhard-float -fno-rtti -fno-exceptions -Wno-multichar -Wshadow -I$(LIBN64PATH) -I$(TOOLPATH)/include -I./ -I$(srcdir) -I$(srcdir)/engines
 LDFLAGS = -g -march=vr4300 -mtune=vr4300 -nodefaultlibs -nostartfiles -mno-crt0 -L$(LIBN64PATH) -L$(TOOLPATH)/lib $(LIBS) -T n64ld_cpp.x -Xlinker -Map -Xlinker scummvm.map
@@ -49,7 +49,7 @@ USE_RGB_COLOR=0
 
 ENABLED=STATIC_PLUGIN
 
-ENABLE_SCUMM = $(ENABLED)
+#ENABLE_SCUMM = $(ENABLED)
 #ENABLE_SCI = $(ENABLED)
 #ENABLE_GOB = $(ENABLED)
 #ENABLE_PARALLACTION = $(ENABLED)
@@ -74,7 +74,7 @@ all: $(TARGET).v64
 
 $(TARGET).v64: $(TARGET).bin ROMFS.img bootcode
 	cat bootcode $(TARGET).bin ROMFS.img > $(TARGET).v64
-	./pad_rom.sh
+	./pad_rom.sh $(TARGET).v64
 
 ROMFS.img:
 	genromfs -f ./ROMFS.img -d ./ROMFS -V romtest
diff --git a/backends/platform/n64/README.N64 b/backends/platform/n64/README.N64
index 276436b676..b47b239658 100644
--- a/backends/platform/n64/README.N64
+++ b/backends/platform/n64/README.N64
@@ -97,19 +97,20 @@ A                           - '.' / Skip dialogues in some games
 C buttons                   - Numeric keypad keys
 
 * Using a N64 Mouse:
-Used like a normal PC mouse. 
+Used like a normal PC mouse.
 
 Notes
 =====
 
-- If virtual keyboard doesn't show up, you need to make sure you included 
+- If virtual keyboard doesn't show up, you need to make sure you included
   'vkeybd_default.zip' in the root of your romfs image.
 
-- In some games (mostly gob) cursor movement might be choppy, it's a known 
+- In some games (mostly gob) cursor movement might be choppy, it's a known
   problem and related on how N64 port manages screen updates.
 
 
 ** TODO **
 ==========
+
 Write the rest of this README.
 
diff --git a/backends/platform/n64/module.mk b/backends/platform/n64/module.mk
index 429b63802e..c8ceb32701 100644
--- a/backends/platform/n64/module.mk
+++ b/backends/platform/n64/module.mk
@@ -6,7 +6,7 @@ MODULE_OBJS := \
 	osys_n64_events.o \
 	osys_n64_utilities.o \
 	pakfs_save_manager.o \
-	framfs_save_manager.o 
+	framfs_save_manager.o
 
 # We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
 MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
diff --git a/backends/platform/n64/n64.mk b/backends/platform/n64/n64.mk
new file mode 100644
index 0000000000..2e383e670d
--- /dev/null
+++ b/backends/platform/n64/n64.mk
@@ -0,0 +1,29 @@
+N64_EXE_STRIPPED := scummvm_stripped$(EXEEXT)
+
+bundle_name = n64-dist/scummvm
+BASESIZE = 2097152
+
+all: $(N64_EXE_STRIPPED)
+
+$(N64_EXE_STRIPPED): $(EXECUTABLE)
+	$(STRIP) $< -o $@
+
+n64-distclean:
+	rm -rf $(bundle_name)
+	rm $(N64_EXE_STRIPPED)
+
+n64-dist: all
+	$(MKDIR) $(bundle_name)
+	$(MKDIR) $(bundle_name)/romfs
+ifdef DIST_FILES_ENGINEDATA
+	$(CP) $(DIST_FILES_ENGINEDATA) $(bundle_name)/romfs
+endif
+	$(CP) $(DIST_FILES_DOCS) $(bundle_name)/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/romfs
+	genromfs -f $(bundle_name)/romfs.img -d $(bundle_name)/romfs -V scummvmn64
+	mips64-objcopy $(EXECUTABLE) $(bundle_name)/scummvm.elf -O binary
+	cat $(N64SDK)/hkz-libn64/bootcode $(bundle_name)/scummvm.elf $(bundle_name)/romfs.img > scummvm.v64
+	$(srcdir)/backends/platform/n64/pad_rom.sh scummvm.v64
+	rm scummvm.bak
+	mv scummvm.v64 $(bundle_name)/scummvm.v64
+
diff --git a/backends/platform/n64/osys_n64.h b/backends/platform/n64/osys_n64.h
index f7560eb4d3..707bb1b7ae 100644
--- a/backends/platform/n64/osys_n64.h
+++ b/backends/platform/n64/osys_n64.h
@@ -98,7 +98,7 @@ protected:
 	uint16 _gameWidth, _gameHeight;
 	uint16 _frameBufferWidth; // Width of framebuffer in N64 memory
 	uint8 _offscrPixels; // Pixels to skip on each line before start drawing, used to center image
-	uint8 _maxFps;
+	uint8 _maxFps; // Max frames-per-second which can be shown on screen
 
 	int _shakeOffset;
 
@@ -123,7 +123,7 @@ protected:
 
 	uint8 _controllerPort;
 	int8 _mousePort;
-	bool _controllerHasRumble;
+	bool _controllerHasRumble; // Gets enabled if rumble-pak is detected
 
 	bool _dirtyOffscreen;
 
@@ -133,8 +133,8 @@ public:
 	uint16 _audioBufferSize;
 	uint32 _viClockRate; // Clock rate of video system, depending on VI mode
 
-	int _timerCallbackNext;
-	int _timerCallbackTimer;
+	uint32 _timerCallbackNext;
+	uint32 _timerCallbackTimer;
 	TimerProc _timerCallback;
 	/* *** */
 
diff --git a/backends/platform/n64/osys_n64_base.cpp b/backends/platform/n64/osys_n64_base.cpp
index 5e4b84ba3f..8862693138 100644
--- a/backends/platform/n64/osys_n64_base.cpp
+++ b/backends/platform/n64/osys_n64_base.cpp
@@ -346,8 +346,7 @@ int16 OSystem_N64::getWidth() {
 }
 
 void OSystem_N64::setPalette(const byte *colors, uint start, uint num) {
-	for (int i = 0; i < num; ++i) {
-		uint8 c[4];
+	for (uint i = 0; i < num; ++i) {
 		_screenPalette[start + i] = colRGB888toBGR555(colors[2], colors[1], colors[0]);
 		colors += 4;
 	}
@@ -413,7 +412,7 @@ void OSystem_N64::grabPalette(byte *colors, uint start, uint num) {
 }
 
 void OSystem_N64::setCursorPalette(const byte *colors, uint start, uint num) {
-	for (int i = 0; i < num; ++i) {
+	for (uint i = 0; i < num; ++i) {
 		_cursorPalette[start + i] = colRGB888toBGR555(colors[2], colors[1], colors[0]);
 		colors += 4;
 	}
@@ -860,7 +859,7 @@ void OSystem_N64::getTimeAndDate(TimeDate &t) const {
 	// No RTC inside the N64, read mips timer to simulate
 	// passing of time, not a perfect solution, but can't think
 	// of anything better.
-	
+
 	uint32 now = getMilliTick();
 
 	t.tm_sec  = (now / 1000) % 60;
@@ -868,7 +867,7 @@ void OSystem_N64::getTimeAndDate(TimeDate &t) const {
 	t.tm_hour = (((now / 1000) / 60) / 60) % 24;
 	t.tm_mday = 1;
 	t.tm_mon  = 0;
-	t.tm_year = 1900;
+	t.tm_year = 110;
 
 	return;
 }
@@ -878,6 +877,8 @@ FilesystemFactory *OSystem_N64::getFilesystemFactory() {
 }
 
 void OSystem_N64::setTimerCallback(TimerProc callback, int interval) {
+	assert (interval > 0);
+
 	if (callback != NULL) {
 		_timerCallbackTimer = interval;
 		_timerCallbackNext = getMillis() + interval;
diff --git a/backends/platform/n64/osys_n64_utilities.cpp b/backends/platform/n64/osys_n64_utilities.cpp
index bc4661889f..88a2970d7d 100644
--- a/backends/platform/n64/osys_n64_utilities.cpp
+++ b/backends/platform/n64/osys_n64_utilities.cpp
@@ -42,9 +42,6 @@ void disableAudioPlayback(void) {
 
 	_audioEnabled = false;
 
-	OSystem_N64 *osys = (OSystem_N64 *)g_system;
-	Audio::MixerImpl *localmixer = (Audio::MixerImpl *)osys->getMixer();
-
 	while (AI_busy()); // Wait for audio to stop
 }
 
diff --git a/backends/platform/n64/pad_rom.sh b/backends/platform/n64/pad_rom.sh
index 0660f6c204..085203306f 100644
--- a/backends/platform/n64/pad_rom.sh
+++ b/backends/platform/n64/pad_rom.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-TARGET="scummvm"
+TARGET=$1
 BASESIZE=2097152
 
-CARTSIZE=`ls -l $TARGET.v64 | cut -d" " -f5`
+CARTSIZE=`ls -l $1 | cut -d" " -f5`
 
 REMAINDER=`echo $CARTSIZE % $BASESIZE   | bc`
 REMAINDER=`echo $BASESIZE - $REMAINDER  | bc`
 CARTSIZE=`echo $CARTSIZE + $REMAINDER  | bc`
 
-ucon64 -q --n64 --v64 --chk --padn=$CARTSIZE  $TARGET.v64
+ucon64 -q --n64 --v64 --chk --padn=$CARTSIZE  $1
 
diff --git a/backends/platform/openpandora/build/PXML.xml b/backends/platform/openpandora/build/PXML.xml
new file mode 100755
index 0000000000..f4d2e2a595
--- /dev/null
+++ b/backends/platform/openpandora/build/PXML.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PXML xmlns="http://openpandora.org/namespaces/PXML" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="PXML_schema.xsd">
+
+  <application id="scummvm.djwillis.0001" appdata="scummvm">
+
+    <title lang="en_US">ScummVM</title>
+
+    <exec command="./runscummvm.sh"/>
+    <icon src="icon/scummvm.png"/>
+
+    <previewpics>
+      <pic src="icon/preview-pic.png"/>
+    </previewpics>
+
+    <info name="ScummVM Documentation" type="text/html" src="docs/index.html"/>
+
+    <description lang="en_US">Point & click game interpreter.</description>
+
+    <author name="DJWillis" website="http://www.scummvm.org/"/>
+
+    <version major="1" minor="1" release="1" build="1"/><!--This programs version-->
+    <osversion major="1" minor="0" release="0" build="0"/><!--The minimum OS version required-->
+
+    <categories>
+      <category name="Game"><!--category like "Games", "Graphics", "Internet" etc-->
+	<subcategory name="Adventure Games"/><!--subcategory, like "Board Games", "Strategy", "First Person Shooters"-->
+      </category>
+    </categories>
+
+    <clockspeed frequency="500"/><!--Frequency in Hz-->
+
+  </application>
+
+</PXML>
diff --git a/backends/platform/openpandora/build/README-OPENPANDORA b/backends/platform/openpandora/build/README-OPENPANDORA
new file mode 100755
index 0000000000..c3aa5e8ea9
--- /dev/null
+++ b/backends/platform/openpandora/build/README-OPENPANDORA
@@ -0,0 +1,19 @@
+ScummVM - OPENPANDORA SPECIFIC README - HEAD SVN
+------------------------------------------------------------------------
+Please refer to the:
+
+ScummVM Forum: <http://forums.scummvm.org/>
+WiKi: <http://wiki.scummvm.org/index.php/OpenPandora>
+
+for the most current information on the port and any updates to this
+documentation.
+
+The wiki includes detailed instructions on how to use the port and 
+control information.
+
+------------------------------------------------------------------------
+Credits
+
+Core ScummVM code (c) The ScummVM Team
+OpenPandora backend (c) John Willis
+Detailed (c) information can be found within the source code
diff --git a/backends/platform/openpandora/build/README-PND.txt b/backends/platform/openpandora/build/README-PND.txt
new file mode 100755
index 0000000000..942c3a43e2
--- /dev/null
+++ b/backends/platform/openpandora/build/README-PND.txt
@@ -0,0 +1,38 @@
+ScummVM - OPENPANDORA README - HOW TO INSTALL
+------------------------------------------------------------------------
+
+Please refer to the:
+
+ScummVM Forum: <http://forums.scummvm.org/>
+WiKi: <http://wiki.scummvm.org/index.php/OpenPandora>
+
+for the most current information on the port and any updates to this
+documentation.
+
+------------------------------------------------------------------------
+Installing:
+
+This archive contains ScummVM in a PND format ready to be copied to the
+OpenPandora and used.
+
+To install just copy the .pnd file from this archive to your device.
+
+You will need to place the .pnd file in a suitable location on your SD
+card.
+
+/pandora/desktop <- place here if you wish the icon to show on the
+			desktop. Documentation will show in the menu.
+
+/pandora/menu <- place here if you wish the icon to show on the
+			Xfce menu. Documentation will show in the menu.
+
+/pandora/apps <- place here if you wish the icon to show on the
+			desktop and in the menu. Documentation will show
+			in the menu.
+
+------------------------------------------------------------------------
+Credits
+
+Core ScummVM code (c) The ScummVM Team
+OpenPandora backend (c) John Willis
+Detailed (c) information can be found within the source code
diff --git a/backends/platform/openpandora/build/build.sh b/backends/platform/openpandora/build/build.sh
new file mode 100755
index 0000000000..10b98fe092
--- /dev/null
+++ b/backends/platform/openpandora/build/build.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+echo Quick script to make building all the time less painful.
+
+. /usr/local/angstrom/arm/environment-setup
+
+CROSS_COMPILE=arm-angstrom-linux-gnueabi-
+export CROSS_COMPILE
+
+# Export the tool names for cross-compiling
+export CXX=arm-angstrom-linux-gnueabi-g++
+export CC=arm-angstrom-linux-gnueabi-gcc
+export DEFINES=-DNDEBUG
+
+cd ../../../..
+
+echo Building ScummVM/OpenPandora.
+make
+
+echo Build for OpenPandora complete - Please check build logs.
diff --git a/backends/platform/openpandora/build/bundle.sh b/backends/platform/openpandora/build/bundle.sh
new file mode 100755
index 0000000000..12d34380bc
--- /dev/null
+++ b/backends/platform/openpandora/build/bundle.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. /usr/local/angstrom/arm/environment-setup
+
+CROSS_COMPILE=arm-angstrom-linux-gnueabi-
+export CROSS_COMPILE
+
+echo Quick script to make building a distribution of the OpenPanodra backend more consistent.
+
+cd ../../../..
+
+make op-bundle
+make op-pnd
diff --git a/backends/platform/openpandora/build/clean.sh b/backends/platform/openpandora/build/clean.sh
new file mode 100755
index 0000000000..3574db2298
--- /dev/null
+++ b/backends/platform/openpandora/build/clean.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+echo Quick script to make building all the time less painful.
+
+. /usr/local/angstrom/arm/environment-setup
+
+cd ../../../..
+
+echo Cleaning ScummVM for the OpenPandora.
+make clean
diff --git a/backends/platform/openpandora/build/config-alleng.sh b/backends/platform/openpandora/build/config-alleng.sh
new file mode 100755
index 0000000000..cd9a17ef40
--- /dev/null
+++ b/backends/platform/openpandora/build/config-alleng.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+echo Quick script to make running configure all the time less painful
+echo and let all the build work be done from the backend/build folder.
+
+. /usr/local/angstrom/arm/environment-setup
+
+CROSS_COMPILE=arm-angstrom-linux-gnueabi-
+export CROSS_COMPILE
+
+# Export the tool names for cross-compiling
+export CXX=arm-angstrom-linux-gnueabi-g++
+export CPPFLAGS=-I/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr/include
+export LDFLAGS=-L/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr/lib
+
+export DEFINES=-DNDEBUG
+
+# Edit the configure line to suit.
+cd ../../../..
+./configure --backend=openpandora --host=openpandora --disable-nasm --with-sdl-prefix=/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr/bin --with-mpeg2-prefix=/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr --disable-vorbis --enable-tremor --with-tremor-prefix=/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr --enable-zlib --with-zlib-prefix=/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr --enable-mad --with-mad-prefix=/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr --enable-all-engines --enable-plugins --default-dynamic
+
+echo Generating config for OpenPandora complete. Check for errors.
diff --git a/backends/platform/openpandora/build/config.sh b/backends/platform/openpandora/build/config.sh
new file mode 100755
index 0000000000..8be16f1317
--- /dev/null
+++ b/backends/platform/openpandora/build/config.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+echo Quick script to make running configure all the time less painful
+echo and let all the build work be done from the backend/build folder.
+
+. /usr/local/angstrom/arm/environment-setup
+
+CROSS_COMPILE=arm-angstrom-linux-gnueabi-
+export CROSS_COMPILE
+
+# Export the tool names for cross-compiling
+export CXX=arm-angstrom-linux-gnueabi-g++
+export CPPFLAGS=-I/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr/include
+export LDFLAGS=-L/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr/lib
+
+export DEFINES=-DNDEBUG
+
+# Edit the configure line to suit.
+cd ../../../..
+./configure --backend=openpandora --host=openpandora --disable-nasm --with-sdl-prefix=/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr/bin --with-mpeg2-prefix=/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr --disable-vorbis --enable-tremor --with-tremor-prefix=/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr --enable-zlib --with-zlib-prefix=/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr --enable-mad --with-mad-prefix=/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr --enable-plugins --default-dynamic
+
+echo Generating config for OpenPandora complete. Check for errors.
diff --git a/backends/platform/openpandora/build/icon/preview-pic.png b/backends/platform/openpandora/build/icon/preview-pic.png
new file mode 100755
index 0000000000..2f4a536d30
--- /dev/null
+++ b/backends/platform/openpandora/build/icon/preview-pic.png
diff --git a/backends/platform/openpandora/build/icon/scummvm.png b/backends/platform/openpandora/build/icon/scummvm.png
new file mode 100755
index 0000000000..128e59efc4
--- /dev/null
+++ b/backends/platform/openpandora/build/icon/scummvm.png
diff --git a/backends/platform/openpandora/build/index.html b/backends/platform/openpandora/build/index.html
new file mode 100755
index 0000000000..34d381d0f8
--- /dev/null
+++ b/backends/platform/openpandora/build/index.html
@@ -0,0 +1,26 @@
+<html>
+
+<h3>
+  <p>Welcome to the ScummVM!</p>
+</h3>
+
+<h4>
+  <p>ScummVM: OpenPandora Specific Documentation</p>
+</h4>
+
+<A href="docs/README-OPENPANDORA">ScummVM OpenPandora README</a><br/>
+<A href="http://scummvm.distant-earth.com/">ScummVM OpenPandora Website</a><br/>
+<A href="http://wiki.scummvm.org/index.php/OpenPandora">ScummVM OpenPandora WiKi</a><br/>
+
+<h4>
+  <p>ScummVM: General Documentation</p>
+</h4>
+
+<A href="http://www.scummvm.org/">ScummVM website</a><br/>
+<A href="docs/README">ScummVM README</a><br/>
+<A href="docs/NEWS">ScummVM NEWS</a><br/>
+<A href="docs/AUTHORS">ScummVM Authors</a><br/>
+<A href="docs/COPYRIGHT">ScummVM Copyright</a><br/>
+<A href="docs/COPYING">GPL Licence</a><br/>
+
+</html>
diff --git a/backends/platform/openpandora/build/pnd_make.sh b/backends/platform/openpandora/build/pnd_make.sh
new file mode 100755
index 0000000000..b19de87bb4
--- /dev/null
+++ b/backends/platform/openpandora/build/pnd_make.sh
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+######adjust path of genpxml.sh if you want to use that "feture"#####
+
+TEMP=`getopt -o p:d:x:i:c -- "$@"`
+
+if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
+
+eval set -- "$TEMP"
+while true ; do
+	case "$1" in
+		-p) echo "PNDNAME set to $2" ;PNDNAME=$2;shift 2;;
+		-d) echo "FOLDER set to $2" ;FOLDER=$2;shift 2 ;;
+		-x) echo "PXML set to $2" ;PXML=$2;shift 2 ;;
+		-i) echo "ICON set to $2" ;ICON=$2;shift 2 ;;
+		-c) echo "-c set, will create compressed squasfs image instead of iso $2" ;SQUASH=1;shift 1 ;;
+		--) shift ; break ;;
+		*) echo "Error while parsing arguments! $2" ; exit 1 ;;
+	esac
+done
+
+rnd=$RANDOM; # random number for genpxml and index$rnd.xml
+
+#generate pxml if guess or empty
+if [ ! $PXML ] || [ $PXML = "guess" ] && [  $PNDNAME ] && [ $FOLDER ];  then
+	PXMLtxt=$(/home/user/libpnd/pandora-libraries/testdata/scripts/genpxml.sh $FOLDER $ICON)
+	PXML=$FOLDER/PXML.xml
+	echo "$PXMLtxt" > $FOLDER/PXML.xml
+fi
+
+#check arguments
+if [ ! $PNDNAME ] || [ ! $FOLDER ] || [ ! $PXML ]; then
+	echo " Usage: pnd_make.sh -p your.pnd -d folder/containing/your/app/ -x
+	your.pxml (or \"guess\" to try to generate it from the folder) -i icon.png"
+	exit 1
+fi
+if [ ! -d $FOLDER ]; then echo "$FOLDER doesnt exist"; exit 1; fi #check if folder actually exists
+if [ ! -f $PXML ]; then echo "$PXML doesnt exist"; exit 1; fi #check if pxml actually exists
+
+#make iso from folder
+if [ ! $SQUASH ]; then
+	mkisofs -o $PNDNAME.iso -R $FOLDER
+else
+	if [ $(mksquashfs -version |  awk '{if ($3 >= 4) print 1}') = 1 ]; then
+		echo "your squashfs version is older then version 4, please upgrade to 4.0 or later"
+		exit 1
+	fi
+	mksquashfs -no-recovery -nopad $FOLDER $PNDNAME.iso
+fi
+#append pxml to iso
+cat $PNDNAME.iso $PXML >  $PNDNAME
+rm $PNDNAME.iso #cleanup
+
+#append icon if specified
+if [ $ICON ]; then # check if we want to add an icon
+	if [ ! -f $ICON ]; then #does the icon actually exist?
+		echo "$ICON doesnt exist"
+	else # yes
+	mv $PNDNAME $PNDNAME.tmp
+	cat $PNDNAME.tmp $ICON > $PNDNAME # append icon
+	rm $PNDNAME.tmp #cleanup
+	fi
+fi
+
+if [ $PXML = "guess" ];then rm $FOLDER/PXML.xml; fi #cleanup
diff --git a/backends/platform/openpandora/build/runscummvm.sh b/backends/platform/openpandora/build/runscummvm.sh
new file mode 100755
index 0000000000..48d24a2b81
--- /dev/null
+++ b/backends/platform/openpandora/build/runscummvm.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Make sure any extra libs not in the firmware are pulled in.
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:../lib
+export LD_LIBRARY_PATH
+
+# Ensure we have a folder to store save games on the SD card.
+mkdir saves
+
+# make a runtime dir, just incase it creates anything in CWD
+mkdir runtime
+cd runtime
+
+../bin/scummvm --fullscreen --gfx-mode=2x --config=../scummvm.config 
diff --git a/backends/platform/openpandora/module.mk b/backends/platform/openpandora/module.mk
new file mode 100755
index 0000000000..1e5f6bcd69
--- /dev/null
+++ b/backends/platform/openpandora/module.mk
@@ -0,0 +1,16 @@
+MODULE := backends/platform/openpandora
+
+MODULE_OBJS := \
+	op-graphics.o \
+	op-events.o \
+	op-options.o \
+	op-main.o
+
+MODULE_DIRS += \
+	backends/platform/openpandora/
+
+# We don't use the rules.mk here on purpose
+OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+
+# Hack to ensure the SDL backend is built so we can use OSystem_SDL.
+-include $(srcdir)/backends/platform/sdl/module.mk
diff --git a/backends/platform/openpandora/op-bundle.mk b/backends/platform/openpandora/op-bundle.mk
new file mode 100755
index 0000000000..163f4711ce
--- /dev/null
+++ b/backends/platform/openpandora/op-bundle.mk
@@ -0,0 +1,85 @@
+# Special target to create bundles and PND's for the OpenPandora.
+
+#bundle_name = release/scummvm-op-`date '+%Y-%m-%d'`
+bundle_name = release/scummvm-op
+f=$(shell which $(STRIP))
+libloc = $(shell dirname $(f))
+
+op-bundle: $(EXECUTABLE)
+	$(MKDIR) "$(bundle_name)"
+	$(MKDIR) "$(bundle_name)/scummvm"
+	$(MKDIR) "$(bundle_name)/scummvm/bin"
+	$(MKDIR) "$(bundle_name)/scummvm/data"
+	$(MKDIR) "$(bundle_name)/scummvm/docs"
+	$(MKDIR) "$(bundle_name)/scummvm/icon"
+	$(MKDIR) "$(bundle_name)/scummvm/lib"
+
+	$(CP) $(srcdir)/backends/platform/openpandora/build/runscummvm.sh $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/openpandora/build/PXML.xml $(bundle_name)/scummvm/data/
+
+	$(CP) $(srcdir)/backends/platform/openpandora/build/icon/scummvm.png $(bundle_name)/scummvm/icon/
+	$(CP) $(srcdir)/backends/platform/openpandora/build/icon/preview-pic.png  $(bundle_name)/scummvm/icon/
+
+
+	$(CP) $(srcdir)/backends/platform/openpandora/build/README-OPENPANDORA $(bundle_name)/scummvm/docs/
+	$(CP) $(srcdir)/backends/platform/openpandora/build/index.html $(bundle_name)/scummvm/docs/
+
+	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/docs/
+
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/data/
+	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/data/
+
+	$(STRIP) $(EXECUTABLE) -o $(bundle_name)/scummvm/bin/$(EXECUTABLE)
+
+ifdef DYNAMIC_MODULES
+	$(INSTALL) -d "$(bundle_name)/scummvm/plugins"
+	$(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/scummvm/plugins"
+	$(STRIP) $(bundle_name)/scummvm/plugins/*
+endif
+
+	$(CP) $(libloc)/../arm-angstrom-linux-gnueabi/usr/lib/libFLAC.so.8.2.0 $(bundle_name)/scummvm/lib/libFLAC.so.8
+	tar -C $(bundle_name) -cvjf $(bundle_name).tar.bz2 .
+	rm -R ./$(bundle_name)
+
+op-pnd: $(EXECUTABLE)
+	$(MKDIR) "$(bundle_name)"
+	$(MKDIR) "$(bundle_name)/scummvm"
+	$(MKDIR) "$(bundle_name)/scummvm/bin"
+	$(MKDIR) "$(bundle_name)/scummvm/data"
+	$(MKDIR) "$(bundle_name)/scummvm/docs"
+	$(MKDIR) "$(bundle_name)/scummvm/icon"
+	$(MKDIR) "$(bundle_name)/scummvm/lib"
+
+	$(CP) $(srcdir)/backends/platform/openpandora/build/runscummvm.sh $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/openpandora/build/PXML.xml $(bundle_name)/scummvm/data/
+
+	$(CP) $(srcdir)/backends/platform/openpandora/build/icon/scummvm.png $(bundle_name)/scummvm/icon/
+	$(CP) $(srcdir)/backends/platform/openpandora/build/icon/preview-pic.png  $(bundle_name)/scummvm/icon/
+
+
+	$(CP) $(srcdir)/backends/platform/openpandora/build/README-OPENPANDORA $(bundle_name)/scummvm/docs/
+	$(CP) $(srcdir)/backends/platform/openpandora/build/index.html $(bundle_name)/scummvm/docs/
+
+	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/docs/
+
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/data/
+	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/data/
+
+	$(STRIP) $(EXECUTABLE) -o $(bundle_name)/scummvm/bin/$(EXECUTABLE)
+
+ifdef DYNAMIC_MODULES
+	$(INSTALL) -d "$(bundle_name)/scummvm/plugins"
+	$(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/scummvm/plugins"
+	$(STRIP) $(bundle_name)/scummvm/plugins/*
+endif
+
+	$(CP) $(libloc)/../arm-angstrom-linux-gnueabi/usr/lib/libFLAC.so.8.2.0 $(bundle_name)/scummvm/lib/libFLAC.so.8
+
+	$(srcdir)/backends/platform/openpandora/build/pnd_make.sh -p $(bundle_name).pnd -d $(bundle_name)/scummvm -x $(bundle_name)/scummvm/data/PXML.xml -i $(bundle_name)/scummvm/icon/scummvm.png
+
+	$(CP) $(srcdir)/backends/platform/openpandora/build/README-PND.txt $(bundle_name)
+	tar -cvjf $(bundle_name)-pnd.tar.bz2 $(bundle_name).pnd $(bundle_name)/README-PND.txt
+	rm -R ./$(bundle_name)
+#	rm $(bundle_name).pnd
+
+.PHONY: op-bundle op-pnd
diff --git a/backends/platform/openpandora/op-events.cpp b/backends/platform/openpandora/op-events.cpp
new file mode 100755
index 0000000000..24283aa8ba
--- /dev/null
+++ b/backends/platform/openpandora/op-events.cpp
@@ -0,0 +1,176 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+/*
+ * OpenPandora: Device Specific Event Handling.
+ *
+ */
+
+#include "backends/platform/openpandora/op-sdl.h"
+#include "backends/platform/openpandora/op-options.h"
+
+/* Quick default button states for modifiers. */
+int BUTTON_STATE_L					=	false;
+
+enum {
+	/* Touchscreen TapMode */
+	TAPMODE_LEFT		= 0,
+	TAPMODE_RIGHT		= 1,
+	TAPMODE_HOVER		= 2
+};
+
+/* On the OpenPandora by default the ABXY and L/R Trigger buttons are returned by SDL as
+   (A): SDLK_HOME (B): SDLK_END (X): SDLK_PAGEDOWN (Y): SDLK_PAGEUP (L): SDLK_RSHIFT (R): SDLK_RCTRL
+*/
+
+bool OSystem_OP::handleKeyDown(SDL_Event &ev, Common::Event &event) {
+	switch (ev.key.keysym.sym) {
+	case SDLK_HOME:
+		event.type = Common::EVENT_LBUTTONDOWN;
+		fillMouseEvent(event, _km.x, _km.y);
+		return true;
+		break;
+	case SDLK_END:
+		event.type = Common::EVENT_RBUTTONDOWN;
+		fillMouseEvent(event, _km.x, _km.y);
+		return true;
+		break;
+	case SDLK_PAGEDOWN:
+		event.type = Common::EVENT_MAINMENU;
+		return true;
+		break;
+	case SDLK_PAGEUP:
+		OP::ToggleTapMode();
+		if (OP::tapmodeLevel == TAPMODE_LEFT) {
+			displayMessageOnOSD("Touchscreen 'Tap Mode' - Left Click");
+		} else if (OP::tapmodeLevel == TAPMODE_RIGHT) {
+			displayMessageOnOSD("Touchscreen 'Tap Mode' - Right Click");
+		} else if (OP::tapmodeLevel == TAPMODE_HOVER) {
+			displayMessageOnOSD("Touchscreen 'Tap Mode' - Hover (No Click)");
+		}
+		break;
+	case SDLK_RSHIFT:
+		BUTTON_STATE_L = true;
+		break;
+	case SDLK_RCTRL:
+		break;
+	default:
+		return OSystem_SDL::handleKeyDown(ev, event);
+		break;
+	}
+	return false;
+}
+
+bool OSystem_OP::handleKeyUp(SDL_Event &ev, Common::Event &event) {
+	switch (ev.key.keysym.sym) {
+	case SDLK_HOME:
+		event.type = Common::EVENT_LBUTTONUP;
+		fillMouseEvent(event, _km.x, _km.y);
+		return true;
+		break;
+	case SDLK_END:
+		event.type = Common::EVENT_RBUTTONUP;
+		fillMouseEvent(event, _km.x, _km.y);
+		return true;
+		break;
+	case SDLK_PAGEDOWN:
+		event.type = Common::EVENT_MAINMENU;
+		return true;
+		break;
+	case SDLK_PAGEUP:
+		break;
+	case SDLK_RSHIFT:
+		BUTTON_STATE_L = false;
+		break;
+	case SDLK_RCTRL:
+		break;
+	default:
+		return OSystem_SDL::handleKeyUp(ev, event);
+		break;
+	}
+	return false;
+}
+
+/* Custom handleMouseButtonDown/handleMouseButtonUp to deal with 'Tap Mode' for the touchscreen */
+
+bool OSystem_OP::handleMouseButtonDown(SDL_Event &ev, Common::Event &event) {
+	if (ev.button.button == SDL_BUTTON_LEFT){
+		if (BUTTON_STATE_L == true) /* BUTTON_STATE_L = Left Trigger Held, force Right Click */
+			event.type = Common::EVENT_RBUTTONDOWN;
+		else if (OP::tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */
+			event.type = Common::EVENT_LBUTTONDOWN;
+		else if (OP::tapmodeLevel == TAPMODE_RIGHT) /* TAPMODE_RIGHT = Right Click Tap Mode */
+			event.type = Common::EVENT_RBUTTONDOWN;
+		else if (OP::tapmodeLevel == TAPMODE_HOVER) /* TAPMODE_HOVER = Hover (No Click) Tap Mode */
+			event.type = Common::EVENT_MOUSEMOVE;
+		else
+			event.type = Common::EVENT_LBUTTONDOWN; /* For normal mice etc. */
+	}
+	else if (ev.button.button == SDL_BUTTON_RIGHT)
+		event.type = Common::EVENT_RBUTTONDOWN;
+#if defined(SDL_BUTTON_WHEELUP) && defined(SDL_BUTTON_WHEELDOWN)
+	else if (ev.button.button == SDL_BUTTON_WHEELUP)
+		event.type = Common::EVENT_WHEELUP;
+	else if (ev.button.button == SDL_BUTTON_WHEELDOWN)
+		event.type = Common::EVENT_WHEELDOWN;
+#endif
+#if defined(SDL_BUTTON_MIDDLE)
+	else if (ev.button.button == SDL_BUTTON_MIDDLE)
+		event.type = Common::EVENT_MBUTTONDOWN;
+#endif
+	else
+		return false;
+
+	fillMouseEvent(event, ev.button.x, ev.button.y);
+
+	return true;
+}
+
+bool OSystem_OP::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) {
+	if (ev.button.button == SDL_BUTTON_LEFT){
+		if (BUTTON_STATE_L == true) /* BUTTON_STATE_L = Left Trigger Held, force Right Click */
+			event.type = Common::EVENT_RBUTTONUP;
+		else if (OP::tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */
+			event.type = Common::EVENT_LBUTTONUP;
+		else if (OP::tapmodeLevel == TAPMODE_RIGHT) /* TAPMODE_RIGHT = Right Click Tap Mode */
+			event.type = Common::EVENT_RBUTTONUP;
+		else if (OP::tapmodeLevel == TAPMODE_HOVER) /* TAPMODE_HOVER = Hover (No Click) Tap Mode */
+			event.type = Common::EVENT_MOUSEMOVE;
+		else
+			event.type = Common::EVENT_LBUTTONUP; /* For normal mice etc. */
+	}
+	else if (ev.button.button == SDL_BUTTON_RIGHT)
+		event.type = Common::EVENT_RBUTTONUP;
+#if defined(SDL_BUTTON_MIDDLE)
+	else if (ev.button.button == SDL_BUTTON_MIDDLE)
+		event.type = Common::EVENT_MBUTTONUP;
+#endif
+	else
+		return false;
+
+	fillMouseEvent(event, ev.button.x, ev.button.y);
+
+	return true;
+}
diff --git a/backends/platform/openpandora/op-graphics.cpp b/backends/platform/openpandora/op-graphics.cpp
new file mode 100755
index 0000000000..ef95f52e99
--- /dev/null
+++ b/backends/platform/openpandora/op-graphics.cpp
@@ -0,0 +1,50 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "backends/platform/openpandora/op-sdl.h"
+#include "common/mutex.h"
+#include "common/translation.h"
+#include "common/util.h"
+
+#include "graphics/scaler/aspect.h"
+#include "graphics/surface.h"
+
+bool OSystem_OP::loadGFXMode() {
+	/* FIXME: For now we just cheat and set the overlay to 640*480 not 800*480 and let SDL
+	   deal with the boarders (it saves cleaning up the overlay when the game screen is
+	   smaller than the overlay ;)
+	*/
+	_videoMode.overlayWidth = 640;
+	_videoMode.overlayHeight = 480;
+	_videoMode.fullscreen = true;
+
+	if (_videoMode.screenHeight != 200 && _videoMode.screenHeight != 400)
+		_videoMode.aspectRatioCorrection = false;
+
+	OSystem_SDL::loadGFXMode();
+
+	return true;
+
+}
diff --git a/backends/platform/openpandora/op-main.cpp b/backends/platform/openpandora/op-main.cpp
new file mode 100755
index 0000000000..4febd404c3
--- /dev/null
+++ b/backends/platform/openpandora/op-main.cpp
@@ -0,0 +1,265 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "common/scummsys.h"
+#include <SDL/SDL.h>
+
+#include "backends/platform/openpandora/op-sdl.h"
+#include "backends/plugins/posix/posix-provider.h"
+#include "base/main.h"
+
+#include "common/archive.h"
+#include "common/config-manager.h"
+#include "common/debug.h"
+#include "common/events.h"
+#include "common/util.h"
+
+#include "common/file.h"
+#include "base/main.h"
+
+#include "backends/saves/default/default-saves.h"
+
+#include "backends/timer/default/default-timer.h"
+#include "sound/mixer_intern.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <limits.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <time.h>	// for getTimeAndDate()
+
+/* Dump console info to files. */
+#define DUMP_STDOUT
+
+static SDL_Cursor *hiddenCursor;
+
+int main(int argc, char *argv[]) {
+	g_system = new OSystem_OP();
+	assert(g_system);
+
+#ifdef DYNAMIC_MODULES
+	PluginManager::instance().addPluginProvider(new POSIXPluginProvider());
+#endif
+
+	// Invoke the actual ScummVM main entry point:
+	int res = scummvm_main(argc, argv);
+	g_system->quit();
+
+	return res;
+}
+
+static Uint32 timer_handler(Uint32 interval, void *param) {
+	((DefaultTimerManager *)param)->handler();
+	return interval;
+}
+
+void OSystem_OP::initBackend() {
+
+	assert(!_inited);
+
+    uint8_t hiddenCursorData = 0;
+
+	int joystick_num = ConfMan.getInt("joystick_num");
+	uint32 sdlFlags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER;
+
+	if (ConfMan.hasKey("disable_sdl_parachute"))
+		sdlFlags |= SDL_INIT_NOPARACHUTE;
+
+	if (joystick_num > -1)
+		sdlFlags |= SDL_INIT_JOYSTICK;
+
+	if (SDL_Init(sdlFlags) == -1) {
+		error("Could not initialize SDL: %s", SDL_GetError());
+	}
+
+    hiddenCursor = SDL_CreateCursor(&hiddenCursorData, &hiddenCursorData, 8, 1, 0, 0);
+
+	/* Setup default save path to be workingdir/saves */
+
+	char savePath[PATH_MAX+1];
+	char workDirName[PATH_MAX+1];
+
+	if (getcwd(workDirName, PATH_MAX) == NULL) {
+		error("Could not obtain current working directory.");
+	} else {
+		printf("Current working directory: %s\n", workDirName);
+	}
+
+	strcpy(savePath, workDirName);
+	strcat(savePath, "/../saves");
+	printf("Current save directory: %s\n", savePath);
+	struct stat sb;
+	if (stat(savePath, &sb) == -1)
+		if (errno == ENOENT) // Create the dir if it does not exist
+			if (mkdir(savePath, 0755) != 0)
+				warning("mkdir for '%s' failed!", savePath);
+
+	_savefile = new DefaultSaveFileManager(savePath);
+
+	#ifdef DUMP_STDOUT
+		// The OpenPandora has a serial console on the EXT connection but most users do not use this so we
+		// output all our STDOUT and STDERR to files for debug purposes.
+		char STDOUT_FILE[PATH_MAX+1];
+		char STDERR_FILE[PATH_MAX+1];
+
+		strcpy(STDOUT_FILE, workDirName);
+		strcpy(STDERR_FILE, workDirName);
+		strcat(STDOUT_FILE, "/scummvm.stdout.txt");
+		strcat(STDERR_FILE, "/scummvm.stderr.txt");
+
+		// Flush the output in case anything is queued
+		fclose(stdout);
+		fclose(stderr);
+
+		// Redirect standard input and standard output
+		FILE *newfp = freopen(STDOUT_FILE, "w", stdout);
+		if (newfp == NULL) {
+		#if !defined(stdout)
+			stdout = fopen(STDOUT_FILE, "w");
+		#else
+			newfp = fopen(STDOUT_FILE, "w");
+			if (newfp) {
+				*stdout = *newfp;
+			}
+		#endif
+		}
+
+		newfp = freopen(STDERR_FILE, "w", stderr);
+		if (newfp == NULL) {
+		#if !defined(stderr)
+			stderr = fopen(STDERR_FILE, "w");
+		#else
+			newfp = fopen(STDERR_FILE, "w");
+			if (newfp) {
+				*stderr = *newfp;
+			}
+		#endif
+		}
+
+		setbuf(stderr, NULL);
+		printf("%s\n", "Debug: STDOUT and STDERR redirected to text files.");
+	#endif /* DUMP_STDOUT */
+
+	/* Trigger autosave every 4 minutes. */
+	ConfMan.registerDefault("autosave_period", 4 * 60);
+
+	ConfMan.registerDefault("fullscreen", true);
+
+	/* Make sure that aspect ratio correction is enabled on the 1st run to stop
+	   users asking me what the 'wasted space' at the bottom is ;-). */
+	ConfMan.registerDefault("aspect_ratio", true);
+
+	/* Make sure SDL knows that we have a joystick we want to use. */
+	ConfMan.setInt("joystick_num", 0);
+
+	_graphicsMutex = createMutex();
+
+	/* On the OpenPandora we need to work around an SDL assumption that
+	   returns relative mouse coordinates when you get to the screen
+	   edges using the touchscreen. The workaround is to set a blank
+	   SDL cursor and not disable it (Hackish I know).
+
+	   The root issues likes in the Windows Manager GRAB code in SDL.
+	   That is why the issue is not seen on framebuffer devices like the
+	   GP2X (there is no X window manager ;)).
+	*/
+	SDL_ShowCursor(SDL_ENABLE);
+	SDL_SetCursor(hiddenCursor);
+
+	// Enable unicode support if possible
+	SDL_EnableUNICODE(1);
+
+	memset(&_oldVideoMode, 0, sizeof(_oldVideoMode));
+	memset(&_videoMode, 0, sizeof(_videoMode));
+	memset(&_transactionDetails, 0, sizeof(_transactionDetails));
+
+	_videoMode.mode = GFX_DOUBLESIZE;
+	_videoMode.scaleFactor = 2;
+	_videoMode.aspectRatioCorrection = ConfMan.getBool("aspect_ratio");
+	_scalerProc = Normal2x;
+	_scalerType = 0;
+
+	_videoMode.fullscreen = true;
+
+	// enable joystick
+	if (joystick_num > -1 && SDL_NumJoysticks() > 0) {
+		printf("Using joystick: %s\n", SDL_JoystickName(0));
+		_joystick = SDL_JoystickOpen(joystick_num);
+	}
+
+	setupMixer();
+
+	// Note: We could implement a custom SDLTimerManager by using
+	// SDL_AddTimer. That might yield better timer resolution, but it would
+	// also change the semantics of a timer: Right now, ScummVM timers
+	// *never* run in parallel, due to the way they are implemented. If we
+	// switched to SDL_AddTimer, each timer might run in a separate thread.
+	// However, not all our code is prepared for that, so we can't just
+	// switch. Still, it's a potential future change to keep in mind.
+	_timer = new DefaultTimerManager();
+	_timerID = SDL_AddTimer(10, &timer_handler, _timer);
+
+	// Invoke parent implementation of this method
+	OSystem::initBackend();
+
+	_inited = true;
+}
+
+void OSystem_OP::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
+
+	/* Setup default extra data paths for engine data files and plugins */
+
+	char workDirName[PATH_MAX+1];
+
+	if (getcwd(workDirName, PATH_MAX) == NULL) {
+		error("Error: Could not obtain current working directory.");
+	}
+
+	char enginedataPath[PATH_MAX+1];
+
+	strcpy(enginedataPath, workDirName);
+	strcat(enginedataPath, "/../data");
+	printf("Default engine data directory: %s\n", enginedataPath);
+
+	Common::FSNode engineNode(enginedataPath);
+	if (engineNode.exists() && engineNode.isDirectory()) {
+		s.add("__OP_ENGDATA__", new Common::FSDirectory(enginedataPath), priority);
+	}
+}
+
+void OSystem_OP::quit() {
+
+	SDL_FreeCursor(hiddenCursor);
+
+	#ifdef DUMP_STDOUT
+		printf("%s\n", "Debug: STDOUT and STDERR text files closed.");
+		fclose(stdout);
+		fclose(stderr);
+	#endif /* DUMP_STDOUT */
+
+	OSystem_SDL::quit();
+}
diff --git a/backends/platform/openpandora/op-options.cpp b/backends/platform/openpandora/op-options.cpp
new file mode 100755
index 0000000000..f8711b868a
--- /dev/null
+++ b/backends/platform/openpandora/op-options.cpp
@@ -0,0 +1,56 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+/*
+ * OpenPandora: Options, custom code and hardware stuff.
+ *
+ */
+
+#include "backends/platform/openpandora/op-options.h"
+
+namespace OP {
+
+enum {
+	/* Touchscreen TapMode */
+	TAPMODE_LEFT		= 0,
+	TAPMODE_RIGHT		= 1,
+	TAPMODE_HOVER		= 2
+};
+
+int tapmodeLevel = TAPMODE_LEFT;
+
+void ToggleTapMode() {
+	if (tapmodeLevel == TAPMODE_LEFT) {
+		tapmodeLevel = TAPMODE_RIGHT;
+	} else if (tapmodeLevel == TAPMODE_RIGHT) {
+		tapmodeLevel = TAPMODE_HOVER;
+	} else if (tapmodeLevel == TAPMODE_HOVER) {
+		tapmodeLevel = TAPMODE_LEFT;
+	} else {
+		tapmodeLevel = TAPMODE_LEFT;
+    }
+}
+
+} /* namespace OP */
diff --git a/backends/platform/gp2xwiz/gp2xwiz-sdl.h b/backends/platform/openpandora/op-options.h
index 56ca883b02..8c2bb1cc89 100644..100755
--- a/backends/platform/gp2xwiz/gp2xwiz-sdl.h
+++ b/backends/platform/openpandora/op-options.h
@@ -23,20 +23,20 @@
  *
  */
 
-#ifndef PLATFORM_SDL_GP2XWIZ_H
-#define PLATFORM_SDL_GP2XWIZ_H
+/*
+ * OpenPandora: Options, custom code and hardware stuff.
+ *
+ */
+
+#ifndef OP_OPTIONS_H
+#define OP_OPTIONS_H
+
+namespace OP {
 
-#include "backends/platform/sdl/posix/posix.h"
+extern int tapmodeLevel;
 
-#ifndef PATH_MAX
-	#define PATH_MAX 255
-#endif
+extern void	ToggleTapMode();
 
-class OSystem_GP2XWIZ : public OSystem_POSIX {
-public:
-	virtual void initBackend();
-	virtual void quit();
-	virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority);
-};
+} /* namespace OP */
 
-#endif
+#endif //OP_OPTIONS_H
diff --git a/backends/platform/openpandora/op-sdl.h b/backends/platform/openpandora/op-sdl.h
new file mode 100755
index 0000000000..8561b42498
--- /dev/null
+++ b/backends/platform/openpandora/op-sdl.h
@@ -0,0 +1,59 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef OP_SDL_H
+#define OP_SDL_H
+
+#include "backends/platform/sdl/sdl.h"
+
+#define __OPENPANDORA__
+#define MIXER_DOUBLE_BUFFERING 1
+
+#ifndef PATH_MAX
+	#define PATH_MAX 255
+#endif
+
+class OSystem_OP : public OSystem_SDL {
+public:
+	OSystem_OP() {}
+
+	/* Events */
+	bool handleKeyDown(SDL_Event &ev, Common::Event &event);
+	bool handleKeyUp(SDL_Event &ev, Common::Event &event);
+	bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event);
+	bool handleMouseButtonUp(SDL_Event &ev, Common::Event &event);
+
+	/* Graphics */
+	bool loadGFXMode();
+
+	/* Platform Setup Stuff */
+	void addSysArchivesToSearchSet(Common::SearchSet &s, int priority);
+	void initBackend();
+	void quit();
+
+protected:
+
+};
+#endif
diff --git a/backends/platform/ps2/Makefile.gdb b/backends/platform/ps2/Makefile.gdb
index 53646a9546..48dcebc1d4 100644
--- a/backends/platform/ps2/Makefile.gdb
+++ b/backends/platform/ps2/Makefile.gdb
@@ -51,7 +51,7 @@ INCDIR = ../../../
 DEFINES  = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -D__PS2_DEBUG__ -g -Wall -Wno-multichar
 
 
-INCLUDES  = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS)) 
+INCLUDES  = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS))
 INCLUDES += -I $(PS2GDB)/ee -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines
 
 TARGET = elf/scummvm.elf
@@ -72,16 +72,16 @@ OBJS := backends/platform/ps2/DmaPipe.o \
     backends/platform/ps2/ps2mutex.o \
     backends/platform/ps2/ps2time.o \
 	backends/platform/ps2/ps2debug.o
-    
+
 MODULE_DIRS += .
 
 BACKEND := ps2
 
 include $(srcdir)/Makefile.common
 
-LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T $(PS2SDK)/ee/startup/linkfile 
+LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T $(PS2SDK)/ee/startup/linkfile
 LDFLAGS += -L $(PS2GDB)/lib  -L $(PS2SDK)/ee/lib -L .
-LDFLAGS += $(addprefix -L$(PS2_EXTRA),$(PS2_EXTRA_LIBS)) 
+LDFLAGS += $(addprefix -L$(PS2_EXTRA),$(PS2_EXTRA_LIBS))
 LDFLAGS += -lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm -lmad -ltremor -lz -lm -lc -lfileXio -lps2gdbStub -lps2ip -ldebug -lkernel -lstdc++
 
 all: $(TARGET)
diff --git a/backends/platform/ps2/Makefile.ps2 b/backends/platform/ps2/Makefile.ps2
index d2a8d210e4..472ba5ec3a 100644
--- a/backends/platform/ps2/Makefile.ps2
+++ b/backends/platform/ps2/Makefile.ps2
@@ -51,7 +51,7 @@ INCDIR = ../../../
 DEFINES  = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -O2 -Wall -Wno-multichar
 
 
-INCLUDES  = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS)) 
+INCLUDES  = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS))
 INCLUDES += -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines
 
 TARGET = elf/scummvm.elf
@@ -72,18 +72,18 @@ OBJS := backends/platform/ps2/DmaPipe.o \
     backends/platform/ps2/ps2mutex.o \
     backends/platform/ps2/ps2time.o \
 	backends/platform/ps2/ps2debug.o
-    
+
 MODULE_DIRS += .
 
 BACKEND := ps2
 
 include $(srcdir)/Makefile.common
 
-LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T $(PS2SDK)/ee/startup/linkfile 
+LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T $(PS2SDK)/ee/startup/linkfile
 LDFLAGS += -L $(PS2SDK)/ee/lib -L .
-LDFLAGS += $(addprefix -L$(PS2_EXTRA),$(PS2_EXTRA_LIBS)) 
-LDFLAGS += -lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm -lmad -ltremor -lz -lm -lc -lfileXio -lkernel -lstdc++ 
-LDFLAGS += -s 
+LDFLAGS += $(addprefix -L$(PS2_EXTRA),$(PS2_EXTRA_LIBS))
+LDFLAGS += -lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm -lmad -ltremor -lz -lm -lc -lfileXio -lkernel -lstdc++
+LDFLAGS += -s
 
 all: $(TARGET)
 
diff --git a/backends/platform/ps2/iop/CoDyVDfs/iop/imports.lst b/backends/platform/ps2/iop/CoDyVDfs/iop/imports.lst
index d3ed3b0442..eb85e04462 100644
--- a/backends/platform/ps2/iop/CoDyVDfs/iop/imports.lst
+++ b/backends/platform/ps2/iop/CoDyVDfs/iop/imports.lst
@@ -24,10 +24,10 @@ I_DelDrv
 iomanX_IMPORTS_end
 
 sifcmd_IMPORTS_start
-I_sceSifInitRpc 
-I_sceSifSetRpcQueue 
-I_sceSifRegisterRpc 
-I_sceSifRpcLoop 
+I_sceSifInitRpc
+I_sceSifSetRpcQueue
+I_sceSifRegisterRpc
+I_sceSifRpcLoop
 sifcmd_IMPORTS_end
 
 stdio_IMPORTS_start
@@ -59,7 +59,7 @@ thbase_IMPORTS_start
 I_CreateThread
 I_StartThread
 I_GetThreadId
-I_DelayThread 
+I_DelayThread
 thbase_IMPORTS_end
 
 
diff --git a/backends/platform/psp/Makefile b/backends/platform/psp/Makefile
index 617ef7c8cc..7f9ae153eb 100644
--- a/backends/platform/psp/Makefile
+++ b/backends/platform/psp/Makefile
@@ -148,6 +148,7 @@ OBJS := powerman.o \
 	thread.o \
 	rtc.o \
 	mp3.o \
+	png_loader.o \
 	tests.o
 
 BACKEND := psp
@@ -199,4 +200,4 @@ SCEkxploit: $(TARGET).elf $(PSP_EBOOT_SFO)
 	$(PACK_PBP) "%__SCE__$(TARGET)/$(PSP_EBOOT)" $(PSP_EBOOT_SFO) $(PSP_EBOOT_ICON)  \
 		$(PSP_EBOOT_ICON1) $(PSP_EBOOT_PIC0) $(PSP_EBOOT_PIC1)  \
 		$(PSP_EBOOT_SND0) NULL $(PSP_EBOOT_PSAR)
-		
+
diff --git a/backends/platform/psp/README.PSP b/backends/platform/psp/README.PSP
index f4d5bae6d6..0849d68c78 100644
--- a/backends/platform/psp/README.PSP
+++ b/backends/platform/psp/README.PSP
@@ -1,81 +1,97 @@
-ScummVM-PSP 1.2.0svn README
+ScummVM-PSP 1.3.0svn README
 ==============================================================================
 
 Installation
 ============
- - Copy the relevant game datafiles to your memory stick (location
-   doesn't matter).
- - Install ScummVM like any other homebrew
- - Run ScummVM and use the launcher to add games and run them
-
+ - Copy the relevant game datafiles to your memory stick (location doesn't matter).
+ - Install ScummVM like any other homebrew.
+ - Run ScummVM and use the launcher to add games and run them.
 
 Controls
 ========
-
-Left trigger			- ESC
 Right trigger			- Modifier key (see below for uses)
+Left trigger			- ESC (Usually skips cutscenes. Depends on game)
 Analog					- Mouse movement
-Right trigger + Analog	- Fine control mouse
-Directions				- Arrow keys
-Directions + Right Trigger - Diagonal arrow keys
-Triangle				- Enter
-Cross					- Mouse button 1
-Circle					- Mouse button 2
-Square					- '.' (skip dialogue in some games)
-Start					- F5 (Main Menu)
-Right trigger + Start	- Return-To-Launcher menu
-
-Virtual Keyboard
-================
-
-Select					- Show/Hide Virtual Keyboard. Hold down to move keyboard onscreen.
-Start					- Enter
-Right trigger			- Switch to/between letter modes
-Left trigger			- Switch to/between numbers and symbols
-D-Pad					- Select square of characters
-Buttons/Triggers		- Choose a specific character
+Right trigger + Analog	- Fine mouse movement
+D-Pad					- Arrow keys (useful mostly in SCI and AGI games)
+D-Pad + Right Trigger 	- Diagonal arrow keys (it's hard to input diagonals on some PSPs)
+Triangle				- Enter (useful for some dialogs)
+Cross					- Left Mouse Button (usually the main button)
+Circle					- Right Mouse Button (secondary button in some games)
+Square					- '.' (skip dialogue in some games e.g. Scumm)
+Right trigger + Square	- Spacebar (useful in Gobli*ns and SCI games)
+Start					- Global Menu. Allows you to 'Return To Launcher' to play another game
+Right trigger + Start	- F5 (Main Menu in some games)
+Select					- Show/Hide Virtual Keyboard. Hold down to move keyboard onscreen (with D-Pad).
+
+Virtual Keyboard Mode
+=====================
+Start					- Enter key. Also exits virtual keyboard mode
+Select					- Exit the virtual keyboard mode
+Right trigger			- Input letters: lowercase/uppercase (press to toggle)
+Left trigger			- Input numbers/symbols (press to toggle)
+D-Pad					- Select square of characters (up, down, left or right)
+Buttons/Triggers		- Choose a specific character in the square. The four center characters are chosen
+						  by the button in the corresponding position. The 2 top characters are chosen by the
+						  triggers.
+Analog					- Moves in a direction (left/right/up/down) (Useful to keep moving
+						  while typing in AGI games among other things)
+
+1st Person Game Mode (Can be ignored by most users)
+====================
+This is a special mode built for 1st person games like Lands of Lore. If you don't have these games you can
+safely ignore this mode. To enter or leave this mode, use the combo:
+
+Right Trigger + Left Trigger + Square
+
+Some buttons have been switched around to make these games more playable:
+Square					- Is the modifier key instead of Right Trigger.
+Left/Right Trigger		- Strafe left/right
+D-Pad Left/Right		- Turn left/right
+Square + D-Pad			- F1/F2/F3/F4
+Square + Start			- Esc (shows game menu)
+
 
 Notes
 =====
+- Notice that you can switch between games! This is much faster than quitting
+  and having to start ScummVM all over again. Go to the global menu and choose 'Return To Launcher'.
+  (Some games may not have the Return To Launcher option available yet.)
+
+- The PSP version of ScummVM uses the Media Engine to accelerate decoding of MP3 files. This means
+  that if you have the choice of compressing using Ogg files or MP3 files, choose MP3 -- the game
+  will generally run faster.
 
-- Plugin files are NOT interchangeable between versions! You must copy ALL the
-  plugin files that come with every version of scummvm. They sit in the /plugin
+- Plugin files are NOT interchangeable between ScummVM versions! You must copy ALL the
+  plugin files that come with every version of ScummVM. They sit in the /plugin
   subdirectory. If you get a crash upon startup, try deleting all the existing
   plugin files in the plugin directory and copying the new ones over again.
 
-- While it's possible to compress certain game resources to reduce their size,
-  this can (and usually will) cause games (especially animation) to be choppy
-  sometimes, as it ofcourse needs extra CPU power to decode these files.
-  As such, it is recommended to play games in their original, uncompressed,
-  form whenever possible.
-
 - This README may be outdated, for more up-to-date instructions and notes see
   the PSP Port Wiki: http://wiki.scummvm.org/index.php/PlayStation_Portable
 
 Frequently Asked Questions
 ==========================
 
-Q:  Pressing select doesn't make the virtual keyboard show up on screen!
-A:  You need to make sure that the kbd.zip file is in the same directory as the scummvm executable.
-
 Q:  Scummvm crashes upon starting up!
 A:  See the first note above.
 
+Q:  Pressing select doesn't make the virtual keyboard show up on screen!
+A:  You need to make sure that the kbd.zip file is in the same directory as the ScummVM executable.
+
 Q:  What do I need to run the games?
-A:  A 1.00 or 1.50 firmware PSP (or an EBOOT loader on firmware 2.00 or
-    higher), and the necessary datafiles for the game you want to play and
-    obviously this ScummVM port.
+A:  A PSP that can run homebrew and the necessary datafiles for the game you want to play.
 
 Q:  Can I run game X with this?
 A:  You can find the list of supported games on the compatibility page
-    on http://www.scummvm.org.
-    Note that ScummVM is NOT a 'DOS (game) emulator', but written
-    specifically for certain games/engines.
+    at http://www.scummvm.org
+    Note that ScummVM is NOT an emulator. The supported games engines have been painstakingly rewritten.
+	It's not easy to add support for a game you want that currently isn't supported.
 
 Q:  My Monkey Island 1 doesn't have any music, what gives?
 A:  If your version of Monkey Island came on a CD then it has the music
-    as CD Audio tracks. You need to rip those to MP3/Ogg and copy them
-    to the same directory as the game datafiles for music to work.
+    as CD Audio tracks. You need to rip those to MP3/Ogg (MP3 is preferred), naming them track1.mp3 track2.mp3
+	etc. and copy them to the same directory as the game datafiles for music to work.
 
 Q:  Game X crashes, or feature Y doesn't work. Can you fix this?
 A:  Possibly.
@@ -83,21 +99,23 @@ A:  Possibly.
     played them all start-to-finish on the PSP, so it's possible there
     are bugs or issues that we're not aware of.
     When you encounter such a bug, please use the "Bug Tracker" you find linked
-    on the ScummVM website, and mention all relevant info (i.e. that you're
+    on the ScummVM website, and mention all relevant info i.e. that you're
     using the PSP version, which ScummVM version it is, if the problem exists
-    in a recent PC SVN version, a detailed description of the problem,
-    and if at all possible a nearby savegame), this will make it much easier
+    in a recent PC version, a detailed description of the problem,
+    and if at all possible a nearby savegame. This will make it much easier
     for us to reproduce (and hopefully fix) the problem.
 
 Building the source code
 ========================
 To build ScummVM for PSP you need:
 
+- ScummVM source code (svn co https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk)
+
 - PSP toolchain	(svn co svn://svn.pspdev.org/psp/trunk/psptoolchain)
 
 - PSPSDK	(svn co svn://svn.pspdev.org/psp/trunk/pspsdk)
-		Note: This usually gets installed by the PSP toolchain,
-		so you don't have to do it manually.
+			Note: This usually gets installed by the PSP toolchain,
+			so you don't have to do it manually.
 
 - zlib		(svn co svn://svn.pspdev.org/psp/trunk/zlib)
 
@@ -107,21 +125,15 @@ To build ScummVM for PSP you need:
 
 - libTremor(*)	(svn co svn://svn.pspdev.org/psp/trunk/libTremor)
 
-
-
 (*) = optional
 
-When you've installed these libraries (read their README.PSP for instructions),
-type "make" in the backends/platform/psp directory to build a 1.00 firmware
-EBOOT.PBP, or "make kxploit" to build the 1.50/kxploit EBOOT.PBPs
-
-You can control most of the build process (engines and libraries used) from
-the Makefile.
-
+Once you've installed these libraries (read their README.PSP for instructions),
+create a subdirectory in your ScummVM folder called 'builds/psp'. Then, in this folder, type
+'../../configure --host=psp --enable-plugins --default-dynamic'. If everything is installed
+correctly, ScummVM will inform you as it finds the right components. Finally type 'make' to build.
 
 Port Authors
 ============
-
 Joost Peters   (joostp@scummvm.org)
 Paolo Costabel (paoloc@pacbell.net)
 Thomas Mayer   (tommybear@internode.on.net)
diff --git a/backends/platform/psp/README.PSP.in b/backends/platform/psp/README.PSP.in
index 2d53fd3b47..57058abd85 100644
--- a/backends/platform/psp/README.PSP.in
+++ b/backends/platform/psp/README.PSP.in
@@ -3,79 +3,95 @@ ScummVM-PSP @VERSION@ README
 
 Installation
 ============
- - Copy the relevant game datafiles to your memory stick (location
-   doesn't matter).
- - Install ScummVM like any other homebrew
- - Run ScummVM and use the launcher to add games and run them
-
+ - Copy the relevant game datafiles to your memory stick (location doesn't matter).
+ - Install ScummVM like any other homebrew.
+ - Run ScummVM and use the launcher to add games and run them.
 
 Controls
 ========
-
-Left trigger			- ESC
 Right trigger			- Modifier key (see below for uses)
+Left trigger			- ESC (Usually skips cutscenes. Depends on game)
 Analog					- Mouse movement
-Right trigger + Analog	- Fine control mouse
-Directions				- Arrow keys
-Directions + Right Trigger - Diagonal arrow keys
-Triangle				- Enter
-Cross					- Mouse button 1
-Circle					- Mouse button 2
-Square					- '.' (skip dialogue in some games)
-Start					- F5 (Main Menu)
-Right trigger + Start	- Return-To-Launcher menu
-
-Virtual Keyboard
-================
-
-Select					- Show/Hide Virtual Keyboard. Hold down to move keyboard onscreen.
-Start					- Enter
-Right trigger			- Switch to/between letter modes
-Left trigger			- Switch to/between numbers and symbols
-D-Pad					- Select square of characters
-Buttons/Triggers		- Choose a specific character
+Right trigger + Analog	- Fine mouse movement
+D-Pad					- Arrow keys (useful mostly in SCI and AGI games)
+D-Pad + Right Trigger 	- Diagonal arrow keys (it's hard to input diagonals on some PSPs)
+Triangle				- Enter (useful for some dialogs)
+Cross					- Left Mouse Button (usually the main button)
+Circle					- Right Mouse Button (secondary button in some games)
+Square					- '.' (skip dialogue in some games e.g. Scumm)
+Right trigger + Square	- Spacebar (useful in Gobli*ns and SCI games)
+Start					- Global Menu. Allows you to 'Return To Launcher' to play another game
+Right trigger + Start	- F5 (Main Menu in some games)
+Select					- Show/Hide Virtual Keyboard. Hold down to move keyboard onscreen (with D-Pad).
+
+Virtual Keyboard Mode
+=====================
+Start					- Enter key. Also exits virtual keyboard mode
+Select					- Exit the virtual keyboard mode
+Right trigger			- Input letters: lowercase/uppercase (press to toggle)
+Left trigger			- Input numbers/symbols (press to toggle)
+D-Pad					- Select square of characters (up, down, left or right)
+Buttons/Triggers		- Choose a specific character in the square. The four center characters are chosen
+						  by the button in the corresponding position. The 2 top characters are chosen by the
+						  triggers.
+Analog					- Moves in a direction (left/right/up/down) (Useful to keep moving
+						  while typing in AGI games among other things)
+
+1st Person Game Mode (Can be ignored by most users)
+====================
+This is a special mode built for 1st person games like Lands of Lore. If you don't have these games you can
+safely ignore this mode. To enter or leave this mode, use the combo:
+
+Right Trigger + Left Trigger + Square
+
+Some buttons have been switched around to make these games more playable:
+Square					- Is the modifier key instead of Right Trigger.
+Left/Right Trigger		- Strafe left/right
+D-Pad Left/Right		- Turn left/right
+Square + D-Pad			- F1/F2/F3/F4
+Square + Start			- Esc (shows game menu)
+
 
 Notes
 =====
+- Notice that you can switch between games! This is much faster than quitting
+  and having to start ScummVM all over again. Go to the global menu and choose 'Return To Launcher'.
+  (Some games may not have the Return To Launcher option available yet.)
+
+- The PSP version of ScummVM uses the Media Engine to accelerate decoding of MP3 files. This means
+  that if you have the choice of compressing using Ogg files or MP3 files, choose MP3 -- the game
+  will generally run faster.
 
-- Plugin files are NOT interchangeable between versions! You must copy ALL the
-  plugin files that come with every version of scummvm. They sit in the /plugin
+- Plugin files are NOT interchangeable between ScummVM versions! You must copy ALL the
+  plugin files that come with every version of ScummVM. They sit in the /plugin
   subdirectory. If you get a crash upon startup, try deleting all the existing
   plugin files in the plugin directory and copying the new ones over again.
 
-- While it's possible to compress certain game resources to reduce their size,
-  this can (and usually will) cause games (especially animation) to be choppy
-  sometimes, as it ofcourse needs extra CPU power to decode these files.
-  As such, it is recommended to play games in their original, uncompressed,
-  form whenever possible.
-
 - This README may be outdated, for more up-to-date instructions and notes see
   the PSP Port Wiki: http://wiki.scummvm.org/index.php/PlayStation_Portable
 
 Frequently Asked Questions
 ==========================
 
-Q:  Pressing select doesn't make the virtual keyboard show up on screen!
-A:  You need to make sure that the kbd.zip file is in the same directory as the scummvm executable.
-
 Q:  Scummvm crashes upon starting up!
 A:  See the first note above.
 
+Q:  Pressing select doesn't make the virtual keyboard show up on screen!
+A:  You need to make sure that the kbd.zip file is in the same directory as the ScummVM executable.
+
 Q:  What do I need to run the games?
-A:  A 1.00 or 1.50 firmware PSP (or an EBOOT loader on firmware 2.00 or
-    higher), and the necessary datafiles for the game you want to play and
-    obviously this ScummVM port.
+A:  A PSP that can run homebrew and the necessary datafiles for the game you want to play.
 
 Q:  Can I run game X with this?
 A:  You can find the list of supported games on the compatibility page
-    on http://www.scummvm.org.
-    Note that ScummVM is NOT a 'DOS (game) emulator', but written
-    specifically for certain games/engines.
+    at http://www.scummvm.org
+    Note that ScummVM is NOT an emulator. The supported games engines have been painstakingly rewritten.
+	It's not easy to add support for a game you want that currently isn't supported.
 
 Q:  My Monkey Island 1 doesn't have any music, what gives?
 A:  If your version of Monkey Island came on a CD then it has the music
-    as CD Audio tracks. You need to rip those to MP3/Ogg and copy them
-    to the same directory as the game datafiles for music to work.
+    as CD Audio tracks. You need to rip those to MP3/Ogg (MP3 is preferred), naming them track1.mp3 track2.mp3
+	etc. and copy them to the same directory as the game datafiles for music to work.
 
 Q:  Game X crashes, or feature Y doesn't work. Can you fix this?
 A:  Possibly.
@@ -83,21 +99,23 @@ A:  Possibly.
     played them all start-to-finish on the PSP, so it's possible there
     are bugs or issues that we're not aware of.
     When you encounter such a bug, please use the "Bug Tracker" you find linked
-    on the ScummVM website, and mention all relevant info (i.e. that you're
+    on the ScummVM website, and mention all relevant info i.e. that you're
     using the PSP version, which ScummVM version it is, if the problem exists
-    in a recent PC SVN version, a detailed description of the problem,
-    and if at all possible a nearby savegame), this will make it much easier
+    in a recent PC version, a detailed description of the problem,
+    and if at all possible a nearby savegame. This will make it much easier
     for us to reproduce (and hopefully fix) the problem.
 
 Building the source code
 ========================
 To build ScummVM for PSP you need:
 
+- ScummVM source code (svn co https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk)
+
 - PSP toolchain	(svn co svn://svn.pspdev.org/psp/trunk/psptoolchain)
 
 - PSPSDK	(svn co svn://svn.pspdev.org/psp/trunk/pspsdk)
-		Note: This usually gets installed by the PSP toolchain,
-		so you don't have to do it manually.
+			Note: This usually gets installed by the PSP toolchain,
+			so you don't have to do it manually.
 
 - zlib		(svn co svn://svn.pspdev.org/psp/trunk/zlib)
 
@@ -107,21 +125,15 @@ To build ScummVM for PSP you need:
 
 - libTremor(*)	(svn co svn://svn.pspdev.org/psp/trunk/libTremor)
 
-
-
 (*) = optional
 
-When you've installed these libraries (read their README.PSP for instructions),
-type "make" in the backends/platform/psp directory to build a 1.00 firmware
-EBOOT.PBP, or "make kxploit" to build the 1.50/kxploit EBOOT.PBPs
-
-You can control most of the build process (engines and libraries used) from
-the Makefile.
-
+Once you've installed these libraries (read their README.PSP for instructions),
+create a subdirectory in your ScummVM folder called 'builds/psp'. Then, in this folder, type
+'../../configure --host=psp --enable-plugins --default-dynamic'. If everything is installed
+correctly, ScummVM will inform you as it finds the right components. Finally type 'make' to build.
 
 Port Authors
 ============
-
 Joost Peters   (joostp@scummvm.org)
 Paolo Costabel (paoloc@pacbell.net)
 Thomas Mayer   (tommybear@internode.on.net)
diff --git a/backends/platform/psp/audio.cpp b/backends/platform/psp/audio.cpp
index e540733162..d7487b0c1a 100644
--- a/backends/platform/psp/audio.cpp
+++ b/backends/platform/psp/audio.cpp
@@ -23,10 +23,10 @@
  *
  */
 
-#include <pspthreadman.h> 
+#include <pspthreadman.h>
 #include <pspaudio.h>
- 
-#include "common/scummsys.h" 
+
+#include "common/scummsys.h"
 #include "backends/platform/psp/audio.h"
 
 //#define __PSP_DEBUG_FUNCS__	/* For debugging function calls */
@@ -39,37 +39,37 @@ bool PspAudio::open(uint32 freq, uint32 numOfChannels, uint32 numOfSamples, call
 	if (_init) {
 		PSP_ERROR("audio device already initialized\n");
 		return true;
-	}		
+	}
 
-	PSP_DEBUG_PRINT("freq[%d], numOfChannels[%d], numOfSamples[%d], callback[%p], userData[%x]\n", 
+	PSP_DEBUG_PRINT("freq[%d], numOfChannels[%d], numOfSamples[%d], callback[%p], userData[%x]\n",
 			freq, numOfChannels, numOfSamples, callback, (uint32)userData);
-	
+
 	numOfSamples = PSP_AUDIO_SAMPLE_ALIGN(numOfSamples);
 	uint32 bufLen = numOfSamples * numOfChannels * NUM_BUFFERS * sizeof(uint16);
-	
+
 	PSP_DEBUG_PRINT("total buffer size[%d]\n", bufLen);
-		
+
 	_buffers[0] = (byte *)memalign(64, bufLen);
 	if (!_buffers[0]) {
 		PSP_ERROR("failed to allocate memory for audio buffers\n");
 		return false;
 	}
 	memset(_buffers[0], 0, bufLen);	// clean the buffer
-	
+
 	// Fill in the rest of the buffer pointers
 	byte *pBuffer = _buffers[0];
 	for (int i = 1; i < NUM_BUFFERS; i++) {
 		pBuffer += numOfSamples * numOfChannels * sizeof(uint16);
 		_buffers[i] = pBuffer;
 	}
-	
+
 	// Reserve a HW channel for our audio
 	_pspChannel = sceAudioChReserve(PSP_AUDIO_NEXT_CHANNEL, numOfSamples, numOfChannels == 2 ? PSP_AUDIO_FORMAT_STEREO : PSP_AUDIO_FORMAT_MONO);
 	if (_pspChannel < 0) {
 		PSP_ERROR("failed to reserve audio channel\n");
 		return false;
 	}
-	
+
 	PSP_DEBUG_PRINT("reserved channel[%d] for audio\n", _pspChannel);
 
 	// Save our data
@@ -80,17 +80,17 @@ bool PspAudio::open(uint32 freq, uint32 numOfChannels, uint32 numOfSamples, call
 	_userData = userData;
 	_bufferToFill = 0;
 	_bufferToPlay = 0;
-	
+
 	_init = true;
 	_paused = true;	// start in paused mode
-	
+
 	threadCreateAndStart("audioThread", PRIORITY_AUDIO_THREAD, STACK_AUDIO_THREAD);	// start the consumer thread
-	
+
 	return true;
 }
 
 // The real thread function
-void PspAudio::threadFunction() {	
+void PspAudio::threadFunction() {
 	assert(_callback);
 	PSP_DEBUG_PRINT_FUNC("audio thread started\n");
 
@@ -108,12 +108,12 @@ void PspAudio::threadFunction() {
 		PSP_DEBUG_PRINT("filling buffer[%d]\n", _bufferToFill);
 		_callback(_userData, _buffers[_bufferToFill], _bufferSize); // ask mixer to fill in data
 		nextBuffer(_bufferToFill);
-		
+
 		PSP_DEBUG_PRINT("playing buffer[%d].\n", _bufferToPlay);
 		playBuffer();
 		nextBuffer(_bufferToPlay);
 	} // while _init
-	
+
 	// destroy everything
 	free(_buffers[0]);
 	sceAudioChRelease(_pspChannel);
@@ -136,7 +136,7 @@ inline bool PspAudio::playBuffer() {
 		ret = sceAudioOutputBlocking(_pspChannel, PSP_AUDIO_VOLUME_MAX, _buffers[_bufferToPlay]);
 	else
 		ret = sceAudioOutputPannedBlocking(_pspChannel, PSP_AUDIO_VOLUME_MAX, PSP_AUDIO_VOLUME_MAX, _buffers[_bufferToPlay]);
-	
+
 	if (ret < 0) {
 		PSP_ERROR("failed to output audio. Error[%d]\n", ret);
 		return false;
@@ -146,5 +146,5 @@ inline bool PspAudio::playBuffer() {
 
 void PspAudio::close() {
 	PSP_DEBUG_PRINT("close has been called ***************\n");
-	_init = false; 
+	_init = false;
 }
diff --git a/backends/platform/psp/audio.h b/backends/platform/psp/audio.h
index eeba598fed..ec9801185f 100644
--- a/backends/platform/psp/audio.h
+++ b/backends/platform/psp/audio.h
@@ -35,9 +35,9 @@ public:
 		FREQUENCY = 44100	/* only frequency we allow */
 	};
 	typedef void (* callbackFunc)(void *userData, byte *samples, int len);	// audio callback to call
-	PspAudio() : _pspChannel(0), 
-			_numOfChannels(0), _numOfSamples(0), _callback(0), 
-			_bufferToPlay(0), _bufferToFill(0), 
+	PspAudio() : _pspChannel(0),
+			_numOfChannels(0), _numOfSamples(0), _callback(0),
+			_bufferToPlay(0), _bufferToFill(0),
 			_init(false), _paused(true) {
 		for (int i=0; i<NUM_BUFFERS; i++)
 			_buffers[i] = 0;
@@ -51,7 +51,7 @@ public:
 	void pause() { _paused = true; }
 	void unpause() { _paused = false; }
 	virtual void threadFunction();	// actual audio thread
-	
+
 private:
 	int _pspChannel;				// chosen hardware output channel
 	uint32 _numOfChannels;			// 1 for mono; 2 for stereo
diff --git a/backends/platform/psp/cursor.h b/backends/platform/psp/cursor.h
index c3d4d76803..2ff0415c6c 100644
--- a/backends/platform/psp/cursor.h
+++ b/backends/platform/psp/cursor.h
@@ -26,6 +26,8 @@
 #ifndef MOUSE_H
 #define MOUSE_H
 
+#include "backends/platform/psp/default_display_client.h"
+
 class Cursor : public DefaultDisplayClient {
 private:
 	int	_hotspotX, _hotspotY;
diff --git a/backends/platform/psp/display_client.cpp b/backends/platform/psp/display_client.cpp
index 71b505ec7c..916b6c1aae 100644
--- a/backends/platform/psp/display_client.cpp
+++ b/backends/platform/psp/display_client.cpp
@@ -32,6 +32,7 @@
 #include "backends/platform/psp/psppixelformat.h"
 #include "backends/platform/psp/display_client.h"
 #include "backends/platform/psp/display_manager.h"
+#define PSP_INCLUDE_SWAP
 #include "backends/platform/psp/memory.h"
 
 //#define __PSP_DEBUG_FUNCS__	/* For debugging the stack */
@@ -341,14 +342,14 @@ void Buffer::copyFromRect(const byte *buf, uint32 pitch, int destX, int destY, u
 	if (pitch == realWidthInBytes && pitch == recWidthInBytes) {
 		//memcpy(dst, buf, _pixelFormat.pixelsToBytes(recHeight * recWidth));
 		if (_pixelFormat.swapRB)
-			PspMemory::fastSwap(dst, buf, _pixelFormat.pixelsToBytes(recHeight * recWidth), _pixelFormat);
+			PspMemorySwap::fastSwap(dst, buf, _pixelFormat.pixelsToBytes(recHeight * recWidth), _pixelFormat);
 		else
 			PspMemory::fastCopy(dst, buf, _pixelFormat.pixelsToBytes(recHeight * recWidth));
 	} else {
 		do {
 			//memcpy(dst, buf, recWidthInBytes);
 			if (_pixelFormat.swapRB)
-				PspMemory::fastSwap(dst, buf, recWidthInBytes, _pixelFormat);
+				PspMemorySwap::fastSwap(dst, buf, recWidthInBytes, _pixelFormat);
 			else
 				PspMemory::fastCopy(dst, buf, recWidthInBytes);
 			buf += pitch;
@@ -370,7 +371,7 @@ void Buffer::copyToArray(byte *dst, int pitch) {
 	do {
 		//memcpy(dst, src, sourceWidthInBytes);
 		if (_pixelFormat.swapRB)
-			PspMemory::fastSwap(dst, src, sourceWidthInBytes, _pixelFormat);
+			PspMemorySwap::fastSwap(dst, src, sourceWidthInBytes, _pixelFormat);
 		else
 			PspMemory::fastCopy(dst, src, sourceWidthInBytes);
 		src += realWidthInBytes;
@@ -698,14 +699,14 @@ void GuRenderer::fillVertices(Vertex *vertices) {
 	// Save scaled offset on screen
 	float scaledOffsetOnScreenX = scaleSourceToOutputX(_offsetOnScreen.x);
 	float scaledOffsetOnScreenY = scaleSourceToOutputY(_offsetOnScreen.y);
-	
+
 	float imageStartX, imageStartY, imageEndX, imageEndY;
 
 	imageStartX = gapX + scaledOffsetOnScreenX + (scaleSourceToOutputX(_maxTextureOffset.x));
 	imageStartY = gapY + scaledOffsetOnScreenY;
 
 	if (_fullScreen) { // shortcut
-		imageEndX = PSP_SCREEN_WIDTH - gapX + scaledOffsetOnScreenX; 
+		imageEndX = PSP_SCREEN_WIDTH - gapX + scaledOffsetOnScreenX;
 		imageEndY = PSP_SCREEN_HEIGHT - gapY + scaledOffsetOnScreenY; // needed for screen shake
 	} else { /* !fullScreen */
 		imageEndX = imageStartX + scaleSourceToOutputX(_drawSize.width);
diff --git a/backends/platform/psp/display_client.h b/backends/platform/psp/display_client.h
index d05b0b046c..feec477282 100644
--- a/backends/platform/psp/display_client.h
+++ b/backends/platform/psp/display_client.h
@@ -30,6 +30,7 @@
 #include "graphics/surface.h"
 #include "common/system.h"
 #include "backends/platform/psp/memory.h"
+#include "backends/platform/psp/psppixelformat.h"
 
 #define MAX_TEXTURE_SIZE 512
 
diff --git a/backends/platform/psp/display_manager.cpp b/backends/platform/psp/display_manager.cpp
index 5037543f12..5d75ac531e 100644
--- a/backends/platform/psp/display_manager.cpp
+++ b/backends/platform/psp/display_manager.cpp
@@ -53,35 +53,99 @@
 uint32 __attribute__((aligned(16))) MasterGuRenderer::_displayList[2048];
 
 const OSystem::GraphicsMode DisplayManager::_supportedModes[] = {
-	{ "320x200 (centered)", "320x200 16-bit centered", CENTERED_320X200 },
-	{ "435x272 (best-fit, centered)", "435x272 16-bit centered", CENTERED_435X272 },
-	{ "480x272 (full screen)", "480x272 16-bit stretched", STRETCHED_480X272 },
-	{ "362x272 (4:3, centered)", "362x272 16-bit centered", CENTERED_362X272 },
+	{ "Original Resolution", "Original Resolution", ORIGINAL_RESOLUTION },
+	{ "Keep Aspect Ratio", "Keep Aspect Ratio", KEEP_ASPECT_RATIO },
+	{ "Full Screen", "Full Screen", STRETCHED_FULL_SCREEN },
 	{0, 0, 0}
 };
 
+
+// Class VramAllocator -----------------------------------
+
+DECLARE_SINGLETON(VramAllocator)
+
+//#define __PSP_DEBUG_FUNCS__	/* For debugging the stack */
+//#define __PSP_DEBUG_PRINT__
+
+#include "backends/platform/psp/trace.h"
+
+
+void *VramAllocator::allocate(int32 size, bool smallAllocation /* = false */) {
+	DEBUG_ENTER_FUNC();
+	assert(size > 0);
+
+	byte *lastAddress = smallAllocation ? (byte *)VRAM_SMALL_ADDRESS : (byte *)VRAM_START_ADDRESS;
+	Common::List<Allocation>::iterator i;
+
+	// Find a block that fits, starting from the beginning
+	for (i = _allocList.begin(); i != _allocList.end(); ++i) {
+		byte *currAddress = (*i).address;
+
+		if (currAddress - lastAddress >= size) // We found a match
+			break;
+
+		if ((*i).getEnd() > lastAddress)
+			lastAddress = (byte *)(*i).getEnd();
+	}
+
+	if (lastAddress + size > (byte *)VRAM_END_ADDRESS) {
+		PSP_DEBUG_PRINT("No space for allocation of %d bytes. %d bytes already allocated.\n",
+		                size, _bytesAllocated);
+		return NULL;
+	}
+
+	_allocList.insert(i, Allocation(lastAddress, size));
+	_bytesAllocated += size;
+
+	PSP_DEBUG_PRINT("Allocated in VRAM, size %u at %p.\n", size, lastAddress);
+	PSP_DEBUG_PRINT("Total allocated %u, remaining %u.\n", _bytesAllocated, (2 * 1024 * 1024) - _bytesAllocated);
+
+	return lastAddress;
+}
+
+// Deallocate a block from VRAM
+void VramAllocator::deallocate(void *address) {
+	DEBUG_ENTER_FUNC();
+	address = (byte *)CACHED(address);	// Make sure all addresses are the same
+
+	Common::List<Allocation>::iterator i;
+
+	// Find the Allocator to deallocate
+	for (i = _allocList.begin(); i != _allocList.end(); ++i) {
+		if ((*i).address == address) {
+			_bytesAllocated -= (*i).size;
+			_allocList.erase(i);
+			PSP_DEBUG_PRINT("Deallocated address[%p], size[%u]\n", (*i).address, (*i).size);
+			return;
+		}
+	}
+
+	PSP_DEBUG_PRINT("Address[%p] not allocated.\n", address);
+}
+
+
 // Class MasterGuRenderer ----------------------------------------------
 
 void MasterGuRenderer::setupCallbackThread() {
 	DEBUG_ENTER_FUNC();
-	
+
 	// start the thread that updates the display
-	threadCreateAndStart("DisplayCbThread", PRIORITY_DISPLAY_THREAD, STACK_DISPLAY_THREAD);		
+	threadCreateAndStart("DisplayCbThread", PRIORITY_DISPLAY_THREAD, STACK_DISPLAY_THREAD);
 }
 
 // this function gets called by PspThread when starting the new thread
 void MasterGuRenderer::threadFunction() {
 	DEBUG_ENTER_FUNC();
-	
+
 	// Create the callback. It should always get the pointer to MasterGuRenderer
 	_callbackId = sceKernelCreateCallback("Display Callback", guCallback, this);
 	if (_callbackId < 0) {
-		PSP_ERROR("failed to create display callback\n");		
+		PSP_ERROR("failed to create display callback\n");
 	}
-	
+
 	PSP_DEBUG_PRINT("created callback. Going to sleep\n");
 
-	sceKernelSleepThreadCB();	// sleep until we get a callback	
+	sceKernelSleepThreadCB();	// sleep until we get a callback
 }
 
 // This callback is called when the render is finished. It swaps the buffers
@@ -89,12 +153,12 @@ int MasterGuRenderer::guCallback(int, int, void *__this) {
 
 	MasterGuRenderer *_this = (MasterGuRenderer *)__this;
 
-	sceGuSync(0, 0);				// make sure we wait for GU to finish		
+	sceGuSync(0, 0);				// make sure we wait for GU to finish
 	sceDisplayWaitVblankStartCB();	// wait for v-blank without eating main thread cycles
 	sceGuSwapBuffers();				// swap the back and front buffers
 
 	_this->_renderFinished = true;	// Only this thread can set the variable to true
-	
+
 	return 0;
 }
 
@@ -150,7 +214,7 @@ inline void MasterGuRenderer::guPreRender() {
 	DEBUG_ENTER_FUNC();
 
 	_renderFinished = false;	// set to synchronize with callback thread
-	
+
 #ifdef ENABLE_RENDER_MEASURE
 	_lastRenderTime = g_system->getMillis();
 #endif /* ENABLE_RENDER_MEASURE */
@@ -179,7 +243,7 @@ inline void MasterGuRenderer::guPostRender() {
 	else
 		sceKernelNotifyCallback(_callbackId, 0);	// notify the callback. Nothing extra to pass
 #else
-	sceGuSync(0, 0);	
+	sceGuSync(0, 0);
 
 #ifdef ENABLE_RENDER_MEASURE
 	uint32 now = g_system->getMillis();
@@ -189,7 +253,7 @@ inline void MasterGuRenderer::guPostRender() {
 	sceDisplayWaitVblankStart();
 	sceGuSwapBuffers();
 	_renderFinished = true;
-#endif /* !USE_DISPLAY_CALLBACK */	
+#endif /* !USE_DISPLAY_CALLBACK */
 }
 
 void MasterGuRenderer::guShutDown() {
@@ -217,7 +281,7 @@ void DisplayManager::init() {
 #ifdef USE_DISPLAY_CALLBACK
 	_masterGuRenderer.setupCallbackThread();
 #endif
-	
+
 }
 
 void DisplayManager::setSizeAndPixelFormat(uint width, uint height, const Graphics::PixelFormat *format) {
@@ -263,38 +327,50 @@ bool DisplayManager::setGraphicsMode(int mode) {
 
 	_graphicsMode = mode;
 
+	calculateScaleParams();
+
+	return true;
+}
+
+void DisplayManager::calculateScaleParams() {
+
+	if (!_displayParams.screenSource.width || !_displayParams.screenSource.height)
+		return; // we can't calculate anything without these
+
 	switch (_graphicsMode) {
-	case CENTERED_320X200:
-		_displayParams.screenOutput.width = 320;
-		_displayParams.screenOutput.height = 200;
-		break;
-	case CENTERED_435X272:
-		_displayParams.screenOutput.width = 435;
-		_displayParams.screenOutput.height = 272;
+	case ORIGINAL_RESOLUTION:
+		// check if we can fit the original resolution inside the screen
+		if ((_displayParams.screenSource.width < PSP_SCREEN_WIDTH) &&
+			(_displayParams.screenSource.height < PSP_SCREEN_HEIGHT)) {
+			_displayParams.screenOutput.width =  _displayParams.screenSource.width;
+			_displayParams.screenOutput.height =  _displayParams.screenSource.height;
+		} else { // revert to stretch to fit
+			_displayParams.screenOutput.width = PSP_SCREEN_WIDTH;
+			_displayParams.screenOutput.height = PSP_SCREEN_HEIGHT;
+		}
 		break;
-	case STRETCHED_480X272:
-		_displayParams.screenOutput.width = 480;
-		_displayParams.screenOutput.height = 272;
+	case KEEP_ASPECT_RATIO:	{ // maximize the height while keeping aspect ratio
+			float aspectRatio = (float)_displayParams.screenSource.width / (float)_displayParams.screenSource.height;
+
+			_displayParams.screenOutput.height = PSP_SCREEN_HEIGHT;	// always full height
+			_displayParams.screenOutput.width = (uint32)(PSP_SCREEN_HEIGHT * aspectRatio);
+
+			if (_displayParams.screenOutput.width > PSP_SCREEN_WIDTH) // we can't have wider than the screen
+				_displayParams.screenOutput.width = PSP_SCREEN_WIDTH;
+		}
 		break;
-	case CENTERED_362X272:
-		_displayParams.screenOutput.width = 362;
-		_displayParams.screenOutput.height = 272;
+	case STRETCHED_FULL_SCREEN:	// we simply stretch to the whole screen
+		_displayParams.screenOutput.width = PSP_SCREEN_WIDTH;
+		_displayParams.screenOutput.height = PSP_SCREEN_HEIGHT;
 		break;
 	default:
 		PSP_ERROR("Unsupported graphics mode[%d].\n", _graphicsMode);
 	}
 
-	calculateScaleParams();
-
-	return true;
-}
+	// calculate scale factors for X and Y
+	_displayParams.scaleX = ((float)_displayParams.screenOutput.width) / _displayParams.screenSource.width;
+	_displayParams.scaleY = ((float)_displayParams.screenOutput.height) / _displayParams.screenSource.height;
 
-void DisplayManager::calculateScaleParams() {
-	if (_displayParams.screenOutput.width && _displayParams.screenSource.width &&
-	        _displayParams.screenOutput.height && _displayParams.screenSource.height) {
-		_displayParams.scaleX = ((float)_displayParams.screenOutput.width) / _displayParams.screenSource.width;
-		_displayParams.scaleY = ((float)_displayParams.screenOutput.height) / _displayParams.screenSource.height;
-	}
 }
 
 // return true if we really rendered or no dirty. False otherwise
@@ -305,9 +381,9 @@ bool DisplayManager::renderAll() {
 	if (!_masterGuRenderer.isRenderFinished()) {
 		PSP_DEBUG_PRINT("Callback render not finished.\n");
 		return false;	// didn't render
-	}	
+	}
 #endif /* USE_DISPLAY_CALLBACK */
-	
+
 	// This is cheaper than checking time, so we do it first
 	if (!_screen->isDirty() &&
 	        (!_overlay->isDirty()) &&
@@ -317,7 +393,7 @@ bool DisplayManager::renderAll() {
 		return true;	// nothing to render
 	}
 
-	if (!isTimeToUpdate()) 
+	if (!isTimeToUpdate())
 		return false;	// didn't render
 
 	PSP_DEBUG_PRINT("screen[%s], overlay[%s], cursor[%s], keyboard[%s]\n",
@@ -349,7 +425,7 @@ bool DisplayManager::renderAll() {
 	_keyboard->setClean();
 
 	_masterGuRenderer.guPostRender();
-	
+
 	return true;	// rendered successfully
 }
 
diff --git a/backends/platform/psp/display_manager.h b/backends/platform/psp/display_manager.h
index 1f7320902c..00d3851243 100644
--- a/backends/platform/psp/display_manager.h
+++ b/backends/platform/psp/display_manager.h
@@ -27,6 +27,48 @@
 #define PSP_DISPLAY_MAN_H
 
 #include "backends/platform/psp/thread.h"
+#include "common/list.h"
+
+#define UNCACHED(x)		((byte *)(((uint32)(x)) | 0x40000000))	/* make an uncached access */
+#define CACHED(x)		((byte *)(((uint32)(x)) & 0xBFFFFFFF))	/* make an uncached access into a cached one */
+
+/**
+ *	Class that allocates memory in the VRAM
+ */
+class VramAllocator : public Common::Singleton<VramAllocator> {
+public:
+	VramAllocator() : _bytesAllocated(0) {}
+	void *allocate(int32 size, bool smallAllocation = false);	// smallAllocation e.g. palettes
+	void deallocate(void *pointer);
+
+	static inline bool isAddressInVram(void *address) {
+		if ((uint32)(CACHED(address)) >= VRAM_START_ADDRESS && (uint32)(CACHED(address)) < VRAM_END_ADDRESS)
+			return true;
+		return false;
+	}
+
+
+private:
+	/**
+	 *	Used to allocate in VRAM
+	 */
+	struct Allocation {
+		byte *address;
+		uint32 size;
+		void *getEnd() { return address + size; }
+		Allocation(void *Address, uint32 Size) : address((byte *)Address), size(Size) {}
+		Allocation() : address(0), size(0) {}
+	};
+
+	enum {
+		VRAM_START_ADDRESS = 0x04000000,
+		VRAM_END_ADDRESS   = 0x04200000,
+		VRAM_SMALL_ADDRESS = VRAM_END_ADDRESS - (4 * 1024)	// 4K in the end for small allocations
+	};
+	Common::List <Allocation> _allocList;		// List of allocations
+	uint32 _bytesAllocated;
+};
+
 
 /**
  *	Class used only by DisplayManager to start/stop GU rendering
@@ -39,7 +81,7 @@ public:
 	void guPostRender();
 	void guShutDown();
 	bool isRenderFinished() { return _renderFinished; }
-	void setupCallbackThread();	
+	void setupCallbackThread();
 private:
 	virtual void threadFunction();			// for the display callback thread
 	static uint32 _displayList[];
@@ -47,7 +89,7 @@ private:
 	void guProgramDisplayBufferSizes();
 	static int guCallback(int, int, void *__this);	// for the display callback
 	bool _renderFinished;					// for sync with render callback
-	int _callbackId;						// to keep track of render callback	
+	int _callbackId;						// to keep track of render callback
 };
 
 class Screen;
@@ -61,10 +103,9 @@ class PSPKeyboard;
 class DisplayManager {
 public:
 	enum GraphicsModeID {			///> Possible output formats onscreen
-		CENTERED_320X200,
-		CENTERED_435X272,
-		STRETCHED_480X272,
-		CENTERED_362X272
+		ORIGINAL_RESOLUTION,
+		KEEP_ASPECT_RATIO,
+		STRETCHED_FULL_SCREEN
 	};
 	DisplayManager() : _screen(0), _cursor(0), _overlay(0), _keyboard(0), _lastUpdateTime(0), _graphicsMode(0) {}
 	~DisplayManager();
@@ -74,7 +115,7 @@ public:
 	bool setGraphicsMode(int mode);
 	bool setGraphicsMode(const char *name);
 	int getGraphicsMode() const { return _graphicsMode; }
-	uint32 getDefaultGraphicsMode() const { return STRETCHED_480X272; }
+	uint32 getDefaultGraphicsMode() const { return STRETCHED_FULL_SCREEN; }
 	const OSystem::GraphicsMode* getSupportedGraphicsModes() const { return _supportedModes; }
 
 	// Setters
diff --git a/backends/platform/psp/input.cpp b/backends/platform/psp/input.cpp
index 4fe7cb3f92..ed868ef375 100644
--- a/backends/platform/psp/input.cpp
+++ b/backends/platform/psp/input.cpp
@@ -23,238 +23,272 @@
  *
  */
 
-// Todo: handle events that should fire because of shift going off
-// Solution: handle shift on a button-by-button basis, only allowing it when the button is up. Also a inputmap-wide button. At buttonup, shiftstate is inspected per button.
+#include <pspctrl.h>
+#include "gui/message.h"
+#include "backends/platform/psp/input.h"
 
 //#define __PSP_DEBUG_FUNCS__	/* Uncomment for debugging the stack */
 //#define __PSP_DEBUG_PRINT__ /* Uncomment for debug prints */
-
 #include "backends/platform/psp/trace.h"
 
-#include "backends/platform/psp/psppixelformat.h"
-#include "backends/platform/psp/input.h"
-
 // Defines for working with PSP buttons
-#define CHANGED(x)	 (_buttonsChanged & (x))
-#define PRESSED(x)   ((_buttonsChanged & (x)) && (pad.Buttons & (x)))
-#define UNPRESSED(x) ((_buttonsChanged & (x)) && !(pad.Buttons & (x)))
-#define DOWN(x)		 (pad.Buttons & (x))
+#define DOWN(x)		 ((pad.Buttons & (x)) == (x))
 #define UP(x)		 (!(pad.Buttons & (x)))
 #define PSP_DPAD	 (PSP_CTRL_DOWN|PSP_CTRL_UP|PSP_CTRL_LEFT|PSP_CTRL_RIGHT)
 #define PSP_4BUTTONS (PSP_CTRL_CROSS | PSP_CTRL_CIRCLE | PSP_CTRL_TRIANGLE | PSP_CTRL_SQUARE)
 #define PSP_TRIGGERS (PSP_CTRL_LTRIGGER | PSP_CTRL_RTRIGGER)
+#define PSP_ALL_BUTTONS (PSP_DPAD | PSP_4BUTTONS | PSP_TRIGGERS | PSP_CTRL_START | PSP_CTRL_SELECT)
 
 #define PAD_CHECK_TIME	53
 
-void InputHandler::init() {
-	sceCtrlSetSamplingCycle(0);	// set sampling to vsync. n = n usecs
-	sceCtrlSetSamplingMode(1);  // analog
+Button::Button() {
+	clear();
 }
 
-bool InputHandler::getAllInputs(Common::Event &event) {
-	DEBUG_ENTER_FUNC();
+inline void Button::clear() {
+	_key = Common::KEYCODE_INVALID;
+	_ascii = 0;
+	_flag = 0;
+	_pspEventDown.clear();
+	_pspEventUp.clear();
+}
 
-	uint32 time = g_system->getMillis();	// may not be necessary with read
-	if (time - _lastPadCheckTime < PAD_CHECK_TIME) {
-		return false;
+inline bool Button::getEvent(Common::Event &event, PspEvent &pspEvent, bool down) {
+	if (down) {
+		if (!_pspEventDown.isEmpty())
+			pspEvent = _pspEventDown;
+	} else { // up
+		if (!_pspEventUp.isEmpty())
+			pspEvent = _pspEventUp;
 	}
+	if (_key != Common::KEYCODE_INVALID) {
+		event.type = down ? Common::EVENT_KEYDOWN : Common::EVENT_KEYUP;
+		event.kbd.keycode = _key;
+		event.kbd.ascii = _ascii;
+		event.kbd.flags |= _flag;
+		return true;
+	} else if (_flag) {	// handle flag only events
+		event.type = down ? Common::EVENT_KEYDOWN : Common::EVENT_KEYUP;
+		event.kbd.flags |= down ? _flag : 0;
+		return true;
+	}
+	return false;
+}
 
-	_lastPadCheckTime = time;
-	SceCtrlData pad;
-
-	sceCtrlPeekBufferPositive(&pad, 1);	// Peek ignores sleep. Read sleeps thread
-
-	bool haveEvent;
-
-	memset(&event, 0, sizeof(event));
+void Button::setPspEvent(PspEventType typeDown, uint32 dataDown, PspEventType typeUp, uint32 dataUp) {
+	_pspEventDown.type = typeDown;
+	_pspEventDown.data = dataDown;
+	_pspEventUp.type = typeUp;
+	_pspEventUp.data = dataUp;
+}
 
-	if (_keyboard->isVisible())
-		haveEvent = _keyboard->processInput(event, pad);
-	else
-		haveEvent = getEvent(event, pad);
+// Translates bitfields to our constants
+// We put combined bitfields first to make sure we pick up diagonals
+const uint32 ButtonPad::_buttonMap[] = {
+	PSP_CTRL_UP | PSP_CTRL_LEFT,
+	PSP_CTRL_UP | PSP_CTRL_RIGHT,
+	PSP_CTRL_DOWN | PSP_CTRL_RIGHT,
+	PSP_CTRL_DOWN | PSP_CTRL_LEFT,
+	PSP_CTRL_RIGHT, PSP_CTRL_DOWN, PSP_CTRL_LEFT, PSP_CTRL_UP,
+	PSP_CTRL_CROSS, PSP_CTRL_CIRCLE, PSP_CTRL_TRIANGLE, PSP_CTRL_SQUARE,
+	PSP_CTRL_LTRIGGER, PSP_CTRL_RTRIGGER, PSP_CTRL_START, PSP_CTRL_SELECT
+};
+
+ButtonPad::ButtonPad() : _prevButtonState(0), _shifted(UNSHIFTED), _padMode(PAD_MODE_NORMAL),
+						_comboMode(false) {
+	for (int i = UNSHIFTED; i < SHIFTED_MODE_LAST; i++)
+		_buttonsChanged[i] = 0;
+	clearButtons();
+}
 
-	if (haveEvent) {
-		PSP_DEBUG_PRINT("Have event[%s]\n", haveEvent ? "true" : "false");
-		PSP_DEBUG_PRINT("event.type[%d]\n", event.type);
+void ButtonPad::clearButtons() {
+	for (int i = BTN_UP_LEFT; i < BTN_LAST; i++) {
+		_button[i][UNSHIFTED].clear();
+		_button[i][SHIFTED].clear();
 	}
+}
 
-	return haveEvent;
+void ButtonPad::initButtons() {
+	switch (_padMode) {
+	case PAD_MODE_NORMAL:
+		initButtonsNormalMode();
+		break;
+	case PAD_MODE_LOL:
+		initButtonsLolMode();
+		break;
+	default:
+		break;
+	}
 }
 
-bool InputHandler::getEvent(Common::Event &event, SceCtrlData &pad) {
+void ButtonPad::initButtonsNormalMode() {
 	DEBUG_ENTER_FUNC();
+	PSP_DEBUG_PRINT("initializing buttons for normal mode\n");
+	clearButtons();
+
+	// Dpad
+	_button[BTN_UP_LEFT][UNSHIFTED].setKey(Common::KEYCODE_KP7, '7');
+	_button[BTN_LEFT][SHIFTED].setKey(Common::KEYCODE_KP7, '7');		// same as up_left
+	_button[BTN_UP][UNSHIFTED].setKey(Common::KEYCODE_KP8, '8');
+	_button[BTN_UP_RIGHT][UNSHIFTED].setKey(Common::KEYCODE_KP9, '9');
+	_button[BTN_UP][SHIFTED].setKey(Common::KEYCODE_KP9, '9');			// same as up_right
+	_button[BTN_LEFT][UNSHIFTED].setKey(Common::KEYCODE_KP4, '4');
+	_button[BTN_RIGHT][UNSHIFTED].setKey(Common::KEYCODE_KP6, '6');
+	_button[BTN_DOWN_LEFT][UNSHIFTED].setKey(Common::KEYCODE_KP1, '1');
+	_button[BTN_DOWN][SHIFTED].setKey(Common::KEYCODE_KP1, '1');		// same as down_left
+	_button[BTN_DOWN][UNSHIFTED].setKey(Common::KEYCODE_KP2, '2');
+	_button[BTN_DOWN_RIGHT][UNSHIFTED].setKey(Common::KEYCODE_KP3, '3');
+	_button[BTN_RIGHT][SHIFTED].setKey(Common::KEYCODE_KP3, '3');		// same as down_right
+
+	// Other buttons
+	_button[BTN_CROSS][UNSHIFTED].setPspEvent(PSP_EVENT_LBUTTON, true, PSP_EVENT_LBUTTON, false);
+	_button[BTN_CIRCLE][UNSHIFTED].setPspEvent(PSP_EVENT_RBUTTON, true, PSP_EVENT_RBUTTON, false);
+	_button[BTN_TRIANGLE][UNSHIFTED].setKey(Common::KEYCODE_RETURN, '\r');
+	_button[BTN_SQUARE][UNSHIFTED].setKey(Common::KEYCODE_PERIOD, '.');
+	_button[BTN_SQUARE][SHIFTED].setKey(Common::KEYCODE_SPACE, ' ');
+	_button[BTN_LTRIGGER][UNSHIFTED].setKey(Common::KEYCODE_ESCAPE, 27);
+	_button[BTN_RTRIGGER][SHIFTED].setPspEvent(PSP_EVENT_SHIFT, true, PSP_EVENT_SHIFT, false);
+	_button[BTN_RTRIGGER][UNSHIFTED].setPspEvent(PSP_EVENT_SHIFT, true, PSP_EVENT_SHIFT, false);
+	_button[BTN_RTRIGGER][SHIFTED].setKey(Common::KEYCODE_INVALID, 0, Common::KBD_SHIFT);
+	_button[BTN_RTRIGGER][UNSHIFTED].setKey(Common::KEYCODE_INVALID, 0, Common::KBD_SHIFT);
+	_button[BTN_START][SHIFTED].setKey(Common::KEYCODE_F5, Common::ASCII_F5);
+	_button[BTN_START][UNSHIFTED].setKey(Common::KEYCODE_F5, Common::ASCII_F5, Common::KBD_CTRL);
+	_button[BTN_SELECT][UNSHIFTED].setPspEvent(PSP_EVENT_SHOW_VIRTUAL_KB, true, PSP_EVENT_NONE, 0);
+}
 
-	_buttonsChanged = pad.Buttons ^ _prevButtons;
-	bool haveEvent = false;
+void ButtonPad::initButtonsLolMode() {
+	DEBUG_ENTER_FUNC();
+	initButtonsNormalMode();	// set normal button configuration
+	PSP_DEBUG_PRINT("initializing buttons for LOL mode\n");
+
+	// Square is our new shift button
+	_button[BTN_SQUARE][UNSHIFTED].clear();
+	_button[BTN_SQUARE][UNSHIFTED].setPspEvent(PSP_EVENT_SHIFT, true, PSP_EVENT_SHIFT, false);
+	_button[BTN_SQUARE][SHIFTED].clear();
+	_button[BTN_SQUARE][SHIFTED].setPspEvent(PSP_EVENT_SHIFT, true, PSP_EVENT_SHIFT, false);
+
+	// Dpad
+	_button[BTN_LEFT][UNSHIFTED].clear();
+	_button[BTN_LEFT][UNSHIFTED].setKey(Common::KEYCODE_KP7, '7');
+	_button[BTN_LEFT][SHIFTED].clear();
+	_button[BTN_LEFT][SHIFTED].setKey(Common::KEYCODE_F1, Common::ASCII_F1);
+	_button[BTN_UP][SHIFTED].clear();
+	_button[BTN_UP][SHIFTED].setKey(Common::KEYCODE_F2, Common::ASCII_F2);
+	_button[BTN_RIGHT][UNSHIFTED].clear();
+	_button[BTN_RIGHT][UNSHIFTED].setKey(Common::KEYCODE_KP9, '9');
+	_button[BTN_RIGHT][SHIFTED].clear();
+	_button[BTN_RIGHT][SHIFTED].setKey(Common::KEYCODE_F3, Common::ASCII_F3);
+	_button[BTN_DOWN][SHIFTED].clear();
+	_button[BTN_DOWN][SHIFTED].setKey(Common::KEYCODE_F4, Common::ASCII_F4);
+
+	// Buttons
+	_button[BTN_LTRIGGER][UNSHIFTED].clear();
+	_button[BTN_LTRIGGER][SHIFTED].clear();
+	_button[BTN_LTRIGGER][UNSHIFTED].setKey(Common::KEYCODE_KP4, '4');		// Triggers turn
+	_button[BTN_RTRIGGER][UNSHIFTED].clear();
+	_button[BTN_RTRIGGER][SHIFTED].clear();
+	_button[BTN_RTRIGGER][UNSHIFTED].setKey(Common::KEYCODE_KP6, '6');
+	_button[BTN_START][SHIFTED].clear();
+	_button[BTN_START][SHIFTED].setKey(Common::KEYCODE_ESCAPE, 27);
+}
 
-	// Collect events from different sources
-	haveEvent = getDpadEvent(event, pad);
+bool ButtonPad::getEvent(Common::Event &event, PspEvent &pspEvent, SceCtrlData &pad) {
+	DEBUG_ENTER_FUNC();
 
-	if (!haveEvent)
-		haveEvent = getButtonEvent(event, pad);
+	//PSP_DEBUG_PRINT("buttons[%x]\n", pad.Buttons);
 
-	if (!haveEvent)
-		haveEvent = getNubEvent(event, pad);
+	uint32 curButtonState = PSP_ALL_BUTTONS & pad.Buttons;	// we only care about these
 
-	_prevButtons = pad.Buttons;
+	modifyButtonsForCombos(pad);						// change buttons for combos
 
-	return haveEvent;
+	return getEventFromButtonState(event, pspEvent, curButtonState);
 }
 
-bool InputHandler::getDpadEvent(Common::Event &event, SceCtrlData &pad) {
+bool ButtonPad::getEventFromButtonState(Common::Event &event, PspEvent &pspEvent, uint32 buttonState) {
 	DEBUG_ENTER_FUNC();
+	_buttonsChanged[_shifted] |= buttonState ^ _prevButtonState;	// add any buttons that changed
+	_prevButtonState = buttonState;
+
+	for (int shiftState = UNSHIFTED; shiftState < SHIFTED_MODE_LAST; shiftState++) {
+		if (_buttonsChanged[shiftState]) {	// any button to address?
+			PSP_DEBUG_PRINT("found changed buttons\n");
+			ButtonType buttonType = BTN_LAST;
+			bool buttonDown = false;		// normally we release a button (as in when we're in a different shiftmode)
+
+			for (int i = BTN_UP_LEFT; i < BTN_LAST; i++) {
+				uint32 buttonCode = _buttonMap[i];
+				if ((_buttonsChanged[shiftState] & buttonCode) == buttonCode) { // check for this changed button
+					buttonType = (ButtonType)i;						// we know which button changed
+					_buttonsChanged[shiftState] &= ~buttonCode;	// save the fact that we treated this button
+					if (shiftState == _shifted)
+						buttonDown = buttonState & buttonCode ? true : false; // pressed or released?
+
+					PSP_DEBUG_PRINT("button[%i] pressed\n", i);
+					break;
+				}
+			}
 
-	int newDpadX = 0, newDpadY = 0;
-	bool haveEvent = false;
-
-	if (DOWN(PSP_CTRL_UP)) {
-		newDpadY++;
-		if (DOWN(PSP_CTRL_RTRIGGER))	// Shifting causes diagonals
-			newDpadX++;
-	}
-	if (DOWN(PSP_CTRL_RIGHT)) {
-		newDpadX++;
-		if (DOWN(PSP_CTRL_RTRIGGER))
-			newDpadY--;
-	}
-	if (DOWN(PSP_CTRL_DOWN)) {
-		newDpadY--;
-		if (DOWN(PSP_CTRL_RTRIGGER))
-			newDpadX--;
-	}
-	if (DOWN(PSP_CTRL_LEFT)) {
-		newDpadX--;
-		if (DOWN(PSP_CTRL_RTRIGGER))
-			newDpadY++;
-	}
-
-	if (newDpadX != _dpadX || newDpadY != _dpadY) {
-		if (_dpadX == 0 && _dpadY == 0)	{		// We were in the middle so we pressed dpad
-			event.type = Common::EVENT_KEYDOWN;
-			event.kbd.keycode = translateDpad(newDpadX, newDpadY);
-			event.kbd.ascii = event.kbd.keycode - Common::KEYCODE_KP0 + '0';	// Get ascii
-			_dpadX = newDpadX;
-			_dpadY = newDpadY;
-		} else if (newDpadX == 0 && newDpadY == 0) {// We're now centered so we unpressed dpad
-			event.type = Common::EVENT_KEYUP;
-			event.kbd.keycode = translateDpad(_dpadX, _dpadY);
-			event.kbd.ascii = event.kbd.keycode - Common::KEYCODE_KP0 + '0';
-			_dpadX = newDpadX;
-			_dpadY = newDpadY;
-		} else { 	// we moved from one pressed dpad direction to another one
-			event.type = Common::EVENT_KEYUP;	// first release the last dpad direction
-			event.kbd.keycode = translateDpad(_dpadX, _dpadY);
-			event.kbd.ascii = event.kbd.keycode - Common::KEYCODE_KP0 + '0';
-			_dpadX = 0; // so that we'll pick up a new dpad movement the next round
-			_dpadY = 0;
+			assert (buttonType < BTN_LAST);
+			bool haveEvent = _button[buttonType][shiftState].getEvent(event, pspEvent, buttonDown);
+			if (haveEvent)
+				PSP_DEBUG_PRINT("have event. key[%d] flag[%x] %s\n", event.kbd.ascii, event.kbd.flags, buttonDown ? "down" : "up");
+			return haveEvent;
 		}
-
-		PSP_DEBUG_PRINT("Keypad event. DpadX[%d], DpadY[%d]\n", _dpadX, _dpadY);
-		haveEvent = true;
 	}
 
-	return haveEvent;
+	return false;
 }
 
-inline Common::KeyCode InputHandler::translateDpad(int x, int y) {
-	DEBUG_ENTER_FUNC();
-	Common::KeyCode key;
-
-	if (x == -1) {
-		if (y == -1)
-			key = Common::KEYCODE_KP1;
-		else if (y == 0)
-			key = Common::KEYCODE_KP4;
-		else /* y == 1 */
-			key = Common::KEYCODE_KP7;
-	} else if (x == 0) {
-		if (y == -1)
-			key = Common::KEYCODE_KP2;
-		else /* y == 1 */
-			key = Common::KEYCODE_KP8;
-	} else {/* x == 1 */
-		if (y == -1)
-			key = Common::KEYCODE_KP3;
-		else if (y == 0)
-			key = Common::KEYCODE_KP6;
-		else /* y == 1 */
-			key = Common::KEYCODE_KP9;
+void ButtonPad::modifyButtonsForCombos(SceCtrlData &pad) {
+	if (DOWN(PSP_CTRL_RTRIGGER | PSP_CTRL_LTRIGGER)) {
+		if (!_comboMode) {  // we're entering combo mode
+			PSP_DEBUG_PRINT("entering combo mode\n");
+			_button[BTN_SQUARE][UNSHIFTED].clear();
+			_button[BTN_SQUARE][SHIFTED].clear();
+			_button[BTN_DOWN][SHIFTED].clear();
+			_button[BTN_DOWN][UNSHIFTED].clear();
+			_button[BTN_UP][SHIFTED].clear();
+			_button[BTN_UP][UNSHIFTED].clear();
+			_button[BTN_SQUARE][UNSHIFTED].setPspEvent(PSP_EVENT_MODE_SWITCH, true, PSP_EVENT_NONE, true);
+			_button[BTN_SQUARE][SHIFTED].setPspEvent(PSP_EVENT_MODE_SWITCH, true, PSP_EVENT_NONE, true);
+			_button[BTN_DOWN][UNSHIFTED].setPspEvent(PSP_EVENT_CHANGE_SPEED, false, PSP_EVENT_NONE, true);
+			_button[BTN_DOWN][SHIFTED].setPspEvent(PSP_EVENT_CHANGE_SPEED, false, PSP_EVENT_NONE, true);
+			_button[BTN_UP][UNSHIFTED].setPspEvent(PSP_EVENT_CHANGE_SPEED, true, PSP_EVENT_NONE, true);
+			_button[BTN_UP][SHIFTED].setPspEvent(PSP_EVENT_CHANGE_SPEED, true, PSP_EVENT_NONE, true);
+			_comboMode = true;
+		}
+	} else {					// no combo buttons are pressed	now
+		if (_comboMode) {		// we have been running in combo mode
+			initButtons();		// reset the button configuration
+			_comboMode = false;
+		}
 	}
-
-	return key;
 }
 
-
-bool InputHandler::getButtonEvent(Common::Event &event, SceCtrlData &pad) {
+bool Nub::getEvent(Common::Event &event, PspEvent &pspEvent, SceCtrlData &pad) {
 	DEBUG_ENTER_FUNC();
-	bool haveEvent = false;
 
-	if (PRESSED(PSP_CTRL_SELECT))
-		_keyboard->setVisible(true);
-
-	else if (CHANGED(PSP_4BUTTONS | PSP_TRIGGERS | PSP_CTRL_START)) {
-		if (CHANGED(PSP_CTRL_CROSS)) {
-			event.type = DOWN(PSP_CTRL_CROSS) ? Common::EVENT_LBUTTONDOWN : Common::EVENT_LBUTTONUP;
-			event.mouse.x = _cursor->getX();	// Could this have to do with SCI enter problem?
-			event.mouse.y = _cursor->getY();
-			PSP_DEBUG_PRINT("%s\n", event.type == Common::EVENT_LBUTTONDOWN ? "LButtonDown" : "LButtonUp");
-		} else if (CHANGED(PSP_CTRL_CIRCLE)) {
-			event.type = DOWN(PSP_CTRL_CIRCLE) ? Common::EVENT_RBUTTONDOWN : Common::EVENT_RBUTTONUP;
-			event.mouse.x = _cursor->getX();
-			event.mouse.y = _cursor->getY();
-			PSP_DEBUG_PRINT("%s\n", event.type == Common::EVENT_LBUTTONDOWN ? "RButtonDown" : "RButtonUp");
-		} else {
-			//any of the other buttons.
-			event.type = _buttonsChanged & pad.Buttons ? Common::EVENT_KEYDOWN : Common::EVENT_KEYUP;
-			event.kbd.ascii = 0;
-			event.kbd.flags = 0;
-
-			if (CHANGED(PSP_CTRL_LTRIGGER)) {
-				event.kbd.keycode = Common::KEYCODE_ESCAPE;
-				event.kbd.ascii = 27;
-			} else if (CHANGED(PSP_CTRL_START)) {
-				event.kbd.keycode = Common::KEYCODE_F5;
-				event.kbd.ascii = Common::ASCII_F5;
-				if (DOWN(PSP_CTRL_RTRIGGER)) {
-					event.kbd.flags |= Common::KBD_CTRL;	// Main menu to allow RTL
-				}
-			} else if (CHANGED(PSP_CTRL_SQUARE)) {
-				event.kbd.keycode = Common::KEYCODE_PERIOD;
-				event.kbd.ascii = '.';
-			} else if (CHANGED(PSP_CTRL_TRIANGLE)) {
-				event.kbd.keycode = Common::KEYCODE_RETURN;
-				event.kbd.ascii = '\r';
-			} else if (DOWN(PSP_CTRL_RTRIGGER)) {			// An event
-				event.kbd.flags |= Common::KBD_SHIFT;
-			}
-			PSP_DEBUG_PRINT("Ascii[%d]. Key %s.\n", event.kbd.ascii, event.type == Common::EVENT_KEYDOWN ? "down" : "up");
-		}
-
-		haveEvent = true;
+	if (_dpadMode) {	// Convert the nub to a D-Pad
+		uint32 buttonState;
+		translateToDpadState(pad.Lx, pad.Ly, buttonState);
+		return _buttonPad.getEventFromButtonState(event, pspEvent, buttonState);
 	}
 
-	return haveEvent;
-}
-
-bool InputHandler::getNubEvent(Common::Event &event, SceCtrlData &pad) {
-	DEBUG_ENTER_FUNC();
-
-	bool haveEvent = false;
 	int32 analogStepX = pad.Lx;		// Goes up to 255.
 	int32 analogStepY = pad.Ly;
 
-	int32 oldX = _cursor->getX();
-	int32 oldY = _cursor->getY();
-
 	analogStepX = modifyNubAxisMotion(analogStepX);
 	analogStepY = modifyNubAxisMotion(analogStepY);
 
+	int32 oldX = _cursor->getX();
+	int32 oldY = _cursor->getY();
+
 	if (analogStepX != 0 || analogStepY != 0) {
 
 		PSP_DEBUG_PRINT("raw x[%d], y[%d]\n", analogStepX, analogStepY);
 
 		// If no movement then this has no effect
-		if (DOWN(PSP_CTRL_RTRIGGER)) {
+		if (_shifted) {
 			// Fine control mode for analog
 			if (analogStepX != 0) {
 				if (analogStepX > 0)
@@ -281,15 +315,29 @@ bool InputHandler::getNubEvent(Common::Event &event, SceCtrlData &pad) {
 			event.type = Common::EVENT_MOUSEMOVE;
 			event.mouse.x = newX;
 			event.mouse.y = newY;
-			haveEvent = true;
-
 			PSP_DEBUG_PRINT("Nub event. X[%d], Y[%d]\n", newX, newY);
+			return true;
 		}
 	}
-	return haveEvent;
+	return false;
+}
+
+void Nub::translateToDpadState(int dpadX, int dpadY, uint32 &buttonState) {
+	#define MIN_NUB_POSITION 70
+	buttonState = 0;
+
+	if (dpadX > 127 + MIN_NUB_POSITION)
+		buttonState |= PSP_CTRL_RIGHT;
+	else if (dpadX < 127 - MIN_NUB_POSITION)
+		buttonState |= PSP_CTRL_LEFT;
+
+	if (dpadY > 127 + MIN_NUB_POSITION)
+		buttonState |= PSP_CTRL_DOWN;
+	else if (dpadY < 127 - MIN_NUB_POSITION)
+		buttonState |= PSP_CTRL_UP;
 }
 
-inline int32 InputHandler::modifyNubAxisMotion(int32 input) {
+inline int32 Nub::modifyNubAxisMotion(int32 input) {
 	DEBUG_ENTER_FUNC();
 	const int MIN_NUB_MOTION = 30;
 
@@ -304,3 +352,160 @@ inline int32 InputHandler::modifyNubAxisMotion(int32 input) {
 
 	return input;
 }
+
+inline bool Nub::isButtonDown() {
+	if (_dpadMode) 		// only relevant in dpad mode
+		return _buttonPad.isButtonDown();
+	return false;
+}
+
+const char *InputHandler::_padModeText[] = {
+	"Normal Button Mode",
+	"1st Person RPG Button Mode"
+};
+
+void InputHandler::init() {
+	sceCtrlSetSamplingCycle(0);	// set sampling to vsync. n = n usecs
+	sceCtrlSetSamplingMode(1);  // analog
+
+	_buttonPad.initButtons();
+}
+
+bool InputHandler::getAllInputs(Common::Event &event) {
+	DEBUG_ENTER_FUNC();
+
+	uint32 time = g_system->getMillis();	// may not be necessary with read
+	if (time - _lastPadCheckTime < PAD_CHECK_TIME) {
+		return false;
+	}
+
+	_lastPadCheckTime = time;
+	SceCtrlData pad;
+
+	sceCtrlPeekBufferPositive(&pad, 1);	// Peek doesn't sleep. Read sleeps the thread
+
+	bool haveEvent;
+	//memset(&event, 0, sizeof(event));
+
+	haveEvent = getEvent(event, pad);
+
+	if (haveEvent) {
+		PSP_DEBUG_PRINT("Have event[%s]. Type[%d]\n", haveEvent ? "true" : "false", event.type);
+	}
+
+	return haveEvent;
+}
+
+bool InputHandler::getEvent(Common::Event &event, SceCtrlData &pad) {
+	DEBUG_ENTER_FUNC();
+
+	PspEvent pspEvent;
+	bool haveEvent = false;
+
+	if (_keyboard->isVisible()) {
+		haveEvent = _keyboard->processInput(event, pspEvent, pad);
+	} else {	// only process buttonpad if keyboard invisible
+		haveEvent = _buttonPad.getEvent(event, pspEvent, pad);
+	}
+
+	if (!haveEvent && pspEvent.isEmpty())
+		haveEvent = _nub.getEvent(event, pspEvent, pad);
+
+	// handle any pending PSP events
+	if (!haveEvent && pspEvent.isEmpty()) {
+		if (!_pendingPspEvent.isEmpty()) {
+			pspEvent = _pendingPspEvent;
+			_pendingPspEvent.clear();
+		}
+	}
+
+	// handle any PSP events we might have
+	if (!pspEvent.isEmpty())
+		haveEvent |= handlePspEvent(event, pspEvent);	// overrides any event we might have
+
+	return haveEvent;
+}
+
+bool InputHandler::handlePspEvent(Common::Event &event, PspEvent &pspEvent) {
+	bool haveEvent = false;
+
+	PSP_DEBUG_PRINT("have pspEvent[%d] data[%d]\n", pspEvent.type, pspEvent.data);
+
+	switch (pspEvent.type) {
+	case PSP_EVENT_SHIFT:
+		handleShiftEvent((ShiftMode)pspEvent.data);
+		break;
+	case PSP_EVENT_SHOW_VIRTUAL_KB:
+		_keyboard->setVisible((bool)pspEvent.data);
+		if ((pspEvent.data && _keyboard->isVisible()) || !pspEvent.data) 	// don't change mode if keyboard didn't load
+			_nub.setDpadMode((bool)pspEvent.data);							// set nub to keypad/regular mode
+		break;
+	case PSP_EVENT_LBUTTON:
+		haveEvent = true;
+		if (pspEvent.data) // down
+			handleMouseEvent(event, Common::EVENT_LBUTTONDOWN, "LButtonDown");
+		else
+			handleMouseEvent(event, Common::EVENT_LBUTTONUP, "LButtonUp");
+		break;
+	case PSP_EVENT_RBUTTON:
+		haveEvent = true;
+		if (pspEvent.data) // down
+			handleMouseEvent(event, Common::EVENT_RBUTTONDOWN, "RButtonDown");
+		else
+			handleMouseEvent(event, Common::EVENT_RBUTTONUP, "RButtonUp");
+		break;
+	case PSP_EVENT_MODE_SWITCH:
+		handleModeSwitchEvent();
+		break;
+	/*case PSP_EVENT_CHANGE_SPEED:
+		handleSpeedChange(pspEvent.data);
+		break;*/
+	default:
+		PSP_ERROR("Unhandled PSP Event[%d]\n", pspEvent.type);
+		break;
+	}
+
+	return haveEvent;
+}
+
+void InputHandler::handleMouseEvent(Common::Event &event, Common::EventType type, const char *string) {
+	event.type = type;
+	event.mouse.x = _cursor->getX();
+	event.mouse.y = _cursor->getY();
+	PSP_DEBUG_PRINT("%s event, x[%d], y[%d]\n", string, event.mouse.x, event.mouse.y);
+}
+
+void InputHandler::handleShiftEvent(ShiftMode shifted) {
+	_buttonPad.setShifted(shifted);
+	_nub.setShifted(shifted);
+}
+
+void InputHandler::handleModeSwitchEvent() {
+	// check if we can't switch modes right now
+	if (_buttonPad.isButtonDown() || _nub.isButtonDown()) {	// can't switch yet
+		PSP_DEBUG_PRINT("postponing mode switch event\n");
+		_pendingPspEvent.type = PSP_EVENT_MODE_SWITCH;		// queue it to be done later
+	} else {	// we can switch
+		PSP_DEBUG_PRINT("mode switch event\n");
+		_padMode = (PspPadMode)(_padMode + 1);
+		if (_padMode >= PAD_MODE_LAST)
+			_padMode = PAD_MODE_NORMAL;
+
+		GUI::TimedMessageDialog dialog(_padModeText[_padMode], 1500);
+		dialog.runModal();
+
+		_buttonPad.setPadMode(_padMode);
+		_buttonPad.initButtons();
+	}
+}
+
+/*
+void InputHandler::handleSpeedChange(bool up) {
+	char *dialogMsg;
+
+	if (up) {
+		dialogMsg = "
+
+	GUI::TimedMessageDialog dialog(_padModeText[_padMode], 1500);
+	dialog.runModal();
+}*/
diff --git a/backends/platform/psp/input.h b/backends/platform/psp/input.h
index cd686d9e02..acca04f376 100644
--- a/backends/platform/psp/input.h
+++ b/backends/platform/psp/input.h
@@ -28,36 +28,154 @@
 
 #include "common/scummsys.h"
 #include "common/events.h"
-#include "backends/platform/psp/display_client.h"
-#include "backends/platform/psp/default_display_client.h"
 #include "backends/platform/psp/pspkeyboard.h"
 #include "backends/platform/psp/cursor.h"
 #include <pspctrl.h>
 
+enum PspEventType {
+	PSP_EVENT_NONE = 0,
+	PSP_EVENT_SHIFT,
+	PSP_EVENT_SHOW_VIRTUAL_KB,
+	PSP_EVENT_LBUTTON,
+	PSP_EVENT_RBUTTON,
+	PSP_EVENT_MODE_SWITCH,
+	PSP_EVENT_CHANGE_SPEED,
+	PSP_EVENT_LAST
+};
+
+
+struct PspEvent {
+	PspEventType type;
+	uint32 data;
+	PspEvent() { clear(); }
+	void clear() {
+		type = PSP_EVENT_NONE;
+		data = 0;
+	}
+	bool isEmpty() { return type == PSP_EVENT_NONE; }
+};
+
+enum PspPadMode {
+	PAD_MODE_NORMAL,
+	PAD_MODE_LOL,
+	PAD_MODE_LAST
+};
+
+enum ShiftMode {
+	UNSHIFTED = 0,
+	SHIFTED = 1,
+	SHIFTED_MODE_LAST
+};
+
+
+class Button {
+private:
+	Common::KeyCode _key;
+	uint32 _ascii;
+	uint32 _flag;
+	PspEvent _pspEventDown;	// event when we press
+	PspEvent _pspEventUp;	// event when we release
+public:
+	Button();
+	void clear();
+	bool getEvent(Common::Event &event, PspEvent &pspEvent, bool buttonDown);
+	void setKey(Common::KeyCode key, uint32 ascii = 0, uint32 flag = 0) { _key = key; _ascii = ascii; _flag = flag; }
+	void setPspEvent(PspEventType typeDown, uint32 dataDown, PspEventType typeUp, uint32 dataUp);
+};
+
+class ButtonPad {
+public:
+	enum ButtonType {	// must match the buttonMap
+		BTN_UP_LEFT,
+		BTN_UP_RIGHT,
+		BTN_DOWN_RIGHT,
+		BTN_DOWN_LEFT,
+		BTN_RIGHT,
+		BTN_DOWN,
+		BTN_LEFT,
+		BTN_UP,
+		BTN_CROSS,
+		BTN_CIRCLE,
+		BTN_TRIANGLE,
+		BTN_SQUARE,
+		BTN_LTRIGGER,
+		BTN_RTRIGGER,
+		BTN_START,
+		BTN_SELECT,
+		BTN_LAST
+	};
+
+private:
+	Button _button[BTN_LAST][SHIFTED_MODE_LAST];
+	uint32 _buttonsChanged[SHIFTED_MODE_LAST];		// normal and shifted
+	uint32 _prevButtonState;
+	ShiftMode _shifted;
+	PspPadMode _padMode;
+	bool _comboMode;								// are we in the middle of combos
+	static const uint32 _buttonMap[];						// maps the buttons to their values
+
+	void initButtonsNormalMode();
+	void initButtonsLolMode();
+	void modifyButtonsForCombos(SceCtrlData &pad);
+	void clearButtons();
+
+public:
+	ButtonPad();
+	bool getEvent(Common::Event &event, PspEvent &pspEvent, SceCtrlData &pad);
+	bool getEventFromButtonState(Common::Event &event, PspEvent &pspEvent, uint32 buttonState);
+	void setShifted(ShiftMode shifted) { _shifted = shifted; }
+	void setPadMode(PspPadMode mode) { _padMode = mode; }
+	bool isButtonDown() { return _prevButtonState; }
+	void initButtons();
+};
+
+class Nub {
+private:
+	Cursor *_cursor;		// to enable changing/getting cursor position
+
+	ButtonPad _buttonPad;	// private buttonpad for dpad mode
+	ShiftMode _shifted;
+	bool _dpadMode;
+
+public:
+	Nub() : _shifted(UNSHIFTED), _dpadMode(false) { _buttonPad.initButtons(); }
+
+	void setCursor(Cursor *cursor) { _cursor = cursor; }
+	void setDpadMode(bool active) { _dpadMode = active; }
+	void setShifted(ShiftMode shifted) { _shifted = shifted; }
+	bool isButtonDown();
+
+	bool getEvent(Common::Event &event, PspEvent &pspEvent, SceCtrlData &pad);
+	int32 modifyNubAxisMotion(int32 input);
+	void translateToDpadState(int dpadX, int dpadY, uint32 &buttonState);	// convert nub data to dpad data
+};
+
 class InputHandler {
 public:
-	InputHandler() : _cursor(0), _keyboard(0), _prevButtons(0), _lastPadCheckTime(0), _buttonsChanged(0), _dpadX(0), _dpadY(0) {}
+	InputHandler() : _keyboard(0), _cursor(0), _padMode(PAD_MODE_NORMAL), _lastPadCheckTime(0) {}
+	void setKeyboard(PSPKeyboard *keyboard) { _keyboard = keyboard; }
+	void setCursor(Cursor *cursor) { _cursor = cursor; _nub.setCursor(cursor); }
 
 	void init();
 	bool getAllInputs(Common::Event &event);
-	void setKeyboard(PSPKeyboard *keyboard) { _keyboard = keyboard; }
-	void setCursor(Cursor *cursor) { _cursor = cursor; }
 
 private:
-	Cursor *_cursor;
 	PSPKeyboard *_keyboard;
-	uint32	_prevButtons;
+	Cursor *_cursor;
+
+	Nub _nub;
+	ButtonPad _buttonPad;
+
+	PspPadMode _padMode;				// whice mode we're in
+	PspEvent _pendingPspEvent;			// an event that can't be handled yet
 	uint32	_lastPadCheckTime;
-	uint32 _buttonsChanged;
-	int32 _dpadX, _dpadY;
-	int32 _accelX, _accelY;
+	static const char *_padModeText[];
 
 	bool getEvent(Common::Event &event, SceCtrlData &pad);
-	bool getDpadEvent(Common::Event &event, SceCtrlData &pad);
-	bool getButtonEvent(Common::Event &event, SceCtrlData &pad);
-	bool getNubEvent(Common::Event &event, SceCtrlData &pad);
-	int32 modifyNubAxisMotion(int32 input);
-	Common::KeyCode translateDpad(int x, int y);
+	bool handlePspEvent(Common::Event &event, PspEvent &pspEvent);
+	void handleMouseEvent(Common::Event &event, Common::EventType type, const char *string);
+	void handleShiftEvent(ShiftMode shifted);
+	void handleModeSwitchEvent();
 };
 
 #endif /* PSP_INPUT_H */
diff --git a/backends/platform/psp/memory.cpp b/backends/platform/psp/memory.cpp
index 29d0482d9a..924ab356e8 100644
--- a/backends/platform/psp/memory.cpp
+++ b/backends/platform/psp/memory.cpp
@@ -25,8 +25,8 @@
 
 #include "common/scummsys.h"
 #include "common/singleton.h"
-#include "common/list.h"
 #include "backends/platform/psp/psppixelformat.h"
+#define PSP_INCLUDE_SWAP
 #include "backends/platform/psp/memory.h"
 
 // Class Copier --------------------------------------------------------------------------
@@ -37,23 +37,6 @@
 
 //#define TEST_MEMORY_COPY
 
-extern "C" {
-
-#ifdef TEST_MEMORY_COPY		/* we won't be able to run in this case b/c of printouts */
-extern void *__real_memcpy(void *dst, void *src, size_t bytes);
-#endif
-
-void *__wrap_memcpy(void *dst, void *src, size_t bytes) {
-#ifdef TEST_MEMORY_COPY		/* we won't be able to run in this case */
-	return __real_memcpy(dst, src, bytes);
-#else
-	PspMemory::fastCopy((byte *)dst, (byte *)src, bytes);
-	return dst;
-#endif
-}
-
-}
-
 void PspMemory::copy(byte *dst, const byte *src, uint32 bytes) {
 	DEBUG_ENTER_FUNC();
 
@@ -66,29 +49,29 @@ void PspMemory::copy(byte *dst, const byte *src, uint32 bytes) {
 
 	// align the destination pointer first
 	uint32 prefixDst = (((uint32)dst) & 0x3);
-	
+
 	if (prefixDst) {
-		prefixDst = 4 - prefixDst;				// prefix only if we have address % 4 != 0	
+		prefixDst = 4 - prefixDst;				// prefix only if we have address % 4 != 0
 		PSP_DEBUG_PRINT("prefixDst[%d]\n", prefixDst);
 
 		bytes -= prefixDst;						// remember we assume bytes >= 4
-		
+
 		if (bytes < MIN_AMOUNT_FOR_COMPLEX_COPY) {	// check if it's worthwhile to continue
 			copy8(dst, src, bytes + prefixDst);
 #ifdef TEST_MEMORY_COPY
 			testCopy(debugDst, debugSrc, debugBytes);
-#endif		
+#endif
 			return;
 		}
-		
+
 		while (prefixDst--) {
 			*dst++ = *src++;
-		}		
+		}
 	}
-	
+
 	// check the source pointer alignment now
 	uint32 alignSrc = (((uint32)src) & 0x3);
-	
+
 	if (alignSrc) {						// we'll need to realign our reads
 		copy32Misaligned((uint32 *)dst, src, bytes, alignSrc);
 	} else {
@@ -97,104 +80,14 @@ void PspMemory::copy(byte *dst, const byte *src, uint32 bytes) {
 
 #ifdef TEST_MEMORY_COPY
 	testCopy(debugDst, debugSrc, debugBytes);
-#endif		
-}
-
-void PspMemory::testCopy(const byte *debugDst, const byte *debugSrc, uint32 debugBytes) {
-	
-	bool mismatch = false;
-	PSP_INFO_PRINT("testing fastCopy...");
-
-	for (uint32 i = 0; i < debugBytes; i++) {
-		if (debugDst[i] != debugSrc[i]) {
-			if (!mismatch) {
-				PSP_INFO_PRINT("**** mismatch in copy! ****\n");
-				PSP_INFO_PRINT("dst[%p], src[%p], bytes[%u]\n", debugDst, debugSrc, debugBytes);
-				mismatch = true;
-			}
-			PSP_INFO_PRINT("[%d]%x!=%x ", i, debugSrc[i], debugDst[i]);
-		}
-	}
-	if (mismatch) {
-		PSP_INFO_PRINT("\n");
-	} else {
-		PSP_INFO_PRINT("ok\n");
-	}	
-}
-
-// 
-// used to swap red and blue
-void PspMemory::swap(uint16 *dst16, const uint16 *src16, uint32 bytes, PSPPixelFormat &format) {
-	DEBUG_ENTER_FUNC();
-
-#ifdef TEST_MEMORY_COPY
-	uint32 debugBytes = bytes;
-	const uint16 *debugDst = dst16, *debugSrc = src16;
 #endif
-	
-	// align the destination pointer first
-	uint32 prefixDst = (((uint32)dst16) & 0x3);	// for swap, we can only have 2 or 0 as our prefix
-	
-	if (prefixDst) {
-		bytes -= prefixDst;						// remember we assume bytes > 4
-		*dst16++ = format.swapRedBlue16(*src16++);
-		
-		if (bytes < MIN_AMOUNT_FOR_COMPLEX_COPY) { // check if it's worthwhile to continue
-			swap16(dst16, src16, bytes, format);
-
-#ifdef TEST_MEMORY_COPY
-			testSwap(debugDst, debugSrc, debugBytes, format);
-#endif		
-			return;
-		}
-	}
-	
-	// check the source pointer alignment now
-	uint32 alignSrc = (((uint32)src16) & 0x3);
-	
-	if (alignSrc) {						// we'll need to realign our reads
-		PSP_DEBUG_PRINT("misaligned copy of %u bytes from %p to %p\n", bytes, src16, dst16);
-		swap32Misaligned((uint32 *)dst16, src16, bytes, format);
-	} else {
-		swap32Aligned((uint32 *)dst16, (const uint32 *)src16, bytes, format);
-	}
-	
-#ifdef TEST_MEMORY_COPY
-	testSwap(debugDst, debugSrc, debugBytes, format);
-#endif		
-	
-}
-
-void PspMemory::testSwap(const uint16 *debugDst, const uint16 *debugSrc, uint32 debugBytes, PSPPixelFormat &format) {
-	
-	bool mismatch = false;
-	PSP_INFO_PRINT("testing fastSwap...");
-	
-	uint32 shorts = debugBytes >> 1;
-
-	for (uint32 i = 0; i < shorts; i++) {
-		if (debugDst[i] != format.swapRedBlue16(debugSrc[i])) {
-			if (!mismatch) {
-				PSP_INFO_PRINT("**** mismatch in swap! ****\n");
-				PSP_INFO_PRINT("dst[%p], src[%p], bytes[%u]\n", debugDst, debugSrc, debugBytes);
-				mismatch = true;
-			}
-			PSP_INFO_PRINT("[%d]%x!=%x ", i<<1, format.swapRedBlue16(debugSrc[i]), debugDst[i]);
-		}
-	}
-	if (mismatch) {
-		PSP_INFO_PRINT("\n");
-	} else {
-		PSP_INFO_PRINT("ok\n");
-	}	
 }
 
-
 void PspMemory::copy32Aligned(uint32 *dst32, const uint32 *src32, uint32 bytes) {
 	PSP_DEBUG_PRINT("copy32Aligned(): dst32[%p], src32[%p], bytes[%d]\n", dst32, src32, bytes);
 
 	int words8 = bytes >> 5;
-	
+
 	// try blocks of 8 words at a time
 	if (words8) {
 		while (words8--) {
@@ -217,11 +110,11 @@ void PspMemory::copy32Aligned(uint32 *dst32, const uint32 *src32, uint32 bytes)
 			dst32[7] = d;
 			dst32 += 8;
 			src32 += 8;
-		}				
+		}
 	}
-	
+
 	int words4 = (bytes & 0x1F) >> 4;
-	
+
 	// try blocks of 4 words at a time
 	if (words4) {
 		uint32 a, b, c, d;
@@ -236,10 +129,10 @@ void PspMemory::copy32Aligned(uint32 *dst32, const uint32 *src32, uint32 bytes)
 		dst32 += 4;
 		src32 += 4;
 	}
-	
+
 	int bytesLeft = (bytes & 0xF);	// only look at bytes left after we did the above
 	int wordsLeft = bytesLeft >> 2;
-	
+
 	// now just do single words
 	while (wordsLeft) {
 		*dst32++ = *src32++;
@@ -252,55 +145,20 @@ void PspMemory::copy32Aligned(uint32 *dst32, const uint32 *src32, uint32 bytes)
 
 	byte *dst = (byte *)dst32;
 	byte *src = (byte *)src32;
-	
+
 	while (bytesLeft--) {
 		*dst++ = *src++;
 	}
 }
 
-void PspMemory::swap32Aligned(uint32 *dst32, const uint32 *src32, uint32 bytes, PSPPixelFormat &format) {
-	DEBUG_ENTER_FUNC();
-	int words4 = bytes >> 4;
-	
-	// try blocks of 4 words at a time
-	while (words4--) {
-		uint32 a, b, c, d;
-		a = format.swapRedBlue32(src32[0]);
-		b = format.swapRedBlue32(src32[1]);
-		c = format.swapRedBlue32(src32[2]);
-		d = format.swapRedBlue32(src32[3]);
-		dst32[0] = a;
-		dst32[1] = b;
-		dst32[2] = c;
-		dst32[3] = d;
-		dst32 += 4;
-		src32 += 4;
-	}
-
-	uint32 bytesLeft = bytes & 0xF;
-	uint32 words = bytesLeft >> 2;
-	
-	// now just do words
-	while (words--) {
-		*dst32++ = format.swapRedBlue32(*src32++);
-	}	
-
-	bytesLeft = bytes & 0x3;
-	
-	if (bytesLeft) {	// for swap, can only be 1 short left
-		*((uint16 *)dst32) = format.swapRedBlue16(*((uint16 *)src32));
-	}
-}
-
-
 // More challenging -- need to shift
 // Assume dst is aligned
 void PspMemory::copy32Misaligned(uint32 *dst32, const byte *src, uint32 bytes, uint32 alignSrc) {
 	PSP_DEBUG_PRINT("copy32Misaligned: dst32[%p], src[%p], bytes[%d], alignSrc[%d]\n", dst32, src, bytes, alignSrc);
-	
+
 	uint32 *src32 = (uint32 *)(((uint32)src) & 0xFFFFFFFC);	// remove misalignment
 	uint32 shiftValue, lastShiftValue;
-	
+
 	switch (alignSrc) {
 	case 1:
 		shiftValue = 8;
@@ -320,9 +178,9 @@ void PspMemory::copy32Misaligned(uint32 *dst32, const byte *src, uint32 bytes, u
 
 	// Try to do groups of 4 words
 	uint32 words4 = bytes >> 4;
-	
+
 	srcWord = *src32;		// preload 1st word so we read ahead
-	
+
 	for (; words4; words4--) {
 		dstWord = srcWord >> shiftValue;
 		srcWord = src32[1];
@@ -343,12 +201,12 @@ void PspMemory::copy32Misaligned(uint32 *dst32, const byte *src, uint32 bytes, u
 		src32 += 4;
 		dst32 += 4;
 	}
-	
+
 	uint32 words = (bytes & 0xF) >> 2;	// now get remaining words
-	
+
 	// we read one word ahead of what we write
 	// setup the first read
-	
+
 	for (; words ;words--) {
 		dstWord = srcWord >> shiftValue;
 		srcWord = src32[1];				// we still go one ahead
@@ -356,9 +214,9 @@ void PspMemory::copy32Misaligned(uint32 *dst32, const byte *src, uint32 bytes, u
 		dstWord |= srcWord << lastShiftValue;
 		*dst32++ = dstWord;
 	}
-	
+
 	uint32 bytesLeft = bytes & 3;	// and remaining bytes
-		
+
 	if (bytesLeft) {
 		byte *dst8 = (byte *)dst32;
 		byte *src8 = ((byte *)src32) + ((uint32)src & 0x3);	// get exact location we should be at
@@ -369,14 +227,137 @@ void PspMemory::copy32Misaligned(uint32 *dst32, const byte *src, uint32 bytes, u
 	}
 }
 
+void PspMemory::testCopy(const byte *debugDst, const byte *debugSrc, uint32 debugBytes) {
+
+	bool mismatch = false;
+	PSP_INFO_PRINT("testing fastCopy...");
+
+	for (uint32 i = 0; i < debugBytes; i++) {
+		if (debugDst[i] != debugSrc[i]) {
+			if (!mismatch) {
+				PSP_INFO_PRINT("**** mismatch in copy! ****\n");
+				PSP_INFO_PRINT("dst[%p], src[%p], bytes[%u]\n", debugDst, debugSrc, debugBytes);
+				mismatch = true;
+			}
+			PSP_INFO_PRINT("[%d]%x!=%x ", i, debugSrc[i], debugDst[i]);
+		}
+	}
+	if (mismatch) {
+		PSP_INFO_PRINT("\n");
+	} else {
+		PSP_INFO_PRINT("ok\n");
+	}
+}
+
+//
+// used to swap red and blue
+void PspMemorySwap::swap(uint16 *dst16, const uint16 *src16, uint32 bytes, PSPPixelFormat &format) {
+	DEBUG_ENTER_FUNC();
+
+#ifdef TEST_MEMORY_COPY
+	uint32 debugBytes = bytes;
+	const uint16 *debugDst = dst16, *debugSrc = src16;
+#endif
+
+	// align the destination pointer first
+	uint32 prefixDst = (((uint32)dst16) & 0x3);	// for swap, we can only have 2 or 0 as our prefix
+
+	if (prefixDst) {
+		bytes -= prefixDst;						// remember we assume bytes > 4
+		*dst16++ = format.swapRedBlue16(*src16++);
+
+		if (bytes < MIN_AMOUNT_FOR_COMPLEX_COPY) { // check if it's worthwhile to continue
+			swap16(dst16, src16, bytes, format);
+
+#ifdef TEST_MEMORY_COPY
+			testSwap(debugDst, debugSrc, debugBytes, format);
+#endif
+			return;
+		}
+	}
+
+	// check the source pointer alignment now
+	uint32 alignSrc = (((uint32)src16) & 0x3);
+
+	if (alignSrc) {						// we'll need to realign our reads
+		PSP_DEBUG_PRINT("misaligned copy of %u bytes from %p to %p\n", bytes, src16, dst16);
+		swap32Misaligned((uint32 *)dst16, src16, bytes, format);
+	} else {
+		swap32Aligned((uint32 *)dst16, (const uint32 *)src16, bytes, format);
+	}
+
+#ifdef TEST_MEMORY_COPY
+	testSwap(debugDst, debugSrc, debugBytes, format);
+#endif
+
+}
+
+void PspMemorySwap::testSwap(const uint16 *debugDst, const uint16 *debugSrc, uint32 debugBytes, PSPPixelFormat &format) {
+
+	bool mismatch = false;
+	PSP_INFO_PRINT("testing fastSwap...");
+
+	uint32 shorts = debugBytes >> 1;
+
+	for (uint32 i = 0; i < shorts; i++) {
+		if (debugDst[i] != format.swapRedBlue16(debugSrc[i])) {
+			if (!mismatch) {
+				PSP_INFO_PRINT("**** mismatch in swap! ****\n");
+				PSP_INFO_PRINT("dst[%p], src[%p], bytes[%u]\n", debugDst, debugSrc, debugBytes);
+				mismatch = true;
+			}
+			PSP_INFO_PRINT("[%d]%x!=%x ", i<<1, format.swapRedBlue16(debugSrc[i]), debugDst[i]);
+		}
+	}
+	if (mismatch) {
+		PSP_INFO_PRINT("\n");
+	} else {
+		PSP_INFO_PRINT("ok\n");
+	}
+}
+
+void PspMemorySwap::swap32Aligned(uint32 *dst32, const uint32 *src32, uint32 bytes, PSPPixelFormat &format) {
+	DEBUG_ENTER_FUNC();
+	int words4 = bytes >> 4;
+
+	// try blocks of 4 words at a time
+	while (words4--) {
+		uint32 a, b, c, d;
+		a = format.swapRedBlue32(src32[0]);
+		b = format.swapRedBlue32(src32[1]);
+		c = format.swapRedBlue32(src32[2]);
+		d = format.swapRedBlue32(src32[3]);
+		dst32[0] = a;
+		dst32[1] = b;
+		dst32[2] = c;
+		dst32[3] = d;
+		dst32 += 4;
+		src32 += 4;
+	}
+
+	uint32 bytesLeft = bytes & 0xF;
+	uint32 words = bytesLeft >> 2;
+
+	// now just do words
+	while (words--) {
+		*dst32++ = format.swapRedBlue32(*src32++);
+	}
+
+	bytesLeft = bytes & 0x3;
+
+	if (bytesLeft) {	// for swap, can only be 1 short left
+		*((uint16 *)dst32) = format.swapRedBlue16(*((uint16 *)src32));
+	}
+}
+
 // More challenging -- need to shift
 // We assume dst is aligned
-void PspMemory::swap32Misaligned(uint32 *dst32, const uint16 *src16, uint32 bytes, PSPPixelFormat &format) {
+void PspMemorySwap::swap32Misaligned(uint32 *dst32, const uint16 *src16, uint32 bytes, PSPPixelFormat &format) {
 	DEBUG_ENTER_FUNC();
 
 	const uint32 shiftValue = 16;
 	uint32 *src32 = (uint32 *)(((uint32)src16) & 0xFFFFFFFC);	// remove misalignment
-	
+
 	// Try to do groups of 4 words
 	uint32 words4 = bytes >> 4;
 	uint32 srcWord = src32[0];	// preload
@@ -401,15 +382,15 @@ void PspMemory::swap32Misaligned(uint32 *dst32, const uint16 *src16, uint32 byte
 		src32 += 4;
 		dst32 += 4;
 	}
-	
+
 	uint32 words = (bytes & 0xF) >> 2;
-	
+
 	// we read one word ahead of what we write
 	// setup the first read
 	if (words) {
 		//srcWord = *src32++;	// don't need this. already loaded
 		src32++;	// we already have the value loaded in
-		
+
 		while (words--) {
 			uint32 dstWord = srcWord >> shiftValue;
 			srcWord = *src32++;
@@ -417,86 +398,10 @@ void PspMemory::swap32Misaligned(uint32 *dst32, const uint16 *src16, uint32 byte
 			*dst32++ = format.swapRedBlue32(dstWord);
 		}
 	}
-	
+
 	uint32 bytesLeft = bytes & 3;
-	
+
 	if (bytesLeft) {	// for swap, can only be 1 short left
 		*((uint16 *)dst32) = format.swapRedBlue16((uint16)(srcWord >> shiftValue));
 	}
 }
-
-inline void PspMemory::copy16(uint16 *dst16, const uint16 *src16, uint32 bytes) {
-	PSP_DEBUG_PRINT("copy16(): dst16[%p], src16[%p], bytes[%d]\n", dst16, src16, bytes);
-	
-	uint32 shorts = bytes >> 1;
-	uint32 remainingBytes = bytes & 1;
-
-	for (; shorts > 0 ; shorts--) {
-		*dst16++ = *src16++;
-	}
-	if (remainingBytes)
-		*(byte *)dst16 = *(byte *)src16;
-}
-
-// Class VramAllocator -----------------------------------
-
-DECLARE_SINGLETON(VramAllocator)
-
-//#define __PSP_DEBUG_FUNCS__	/* For debugging the stack */
-//#define __PSP_DEBUG_PRINT__
-
-#include "backends/platform/psp/trace.h"
-
-
-void *VramAllocator::allocate(int32 size, bool smallAllocation /* = false */) {
-	DEBUG_ENTER_FUNC();
-	assert(size > 0);
-
-	byte *lastAddress = smallAllocation ? (byte *)VRAM_SMALL_ADDRESS : (byte *)VRAM_START_ADDRESS;
-	Common::List<Allocation>::iterator i;
-
-	// Find a block that fits, starting from the beginning
-	for (i = _allocList.begin(); i != _allocList.end(); ++i) {
-		byte *currAddress = (*i).address;
-
-		if (currAddress - lastAddress >= size) // We found a match
-			break;
-
-		if ((*i).getEnd() > lastAddress)
-			lastAddress = (byte *)(*i).getEnd();
-	}
-
-	if (lastAddress + size > (byte *)VRAM_END_ADDRESS) {
-		PSP_DEBUG_PRINT("No space for allocation of %d bytes. %d bytes already allocated.\n",
-		                size, _bytesAllocated);
-		return NULL;
-	}
-
-	_allocList.insert(i, Allocation(lastAddress, size));
-	_bytesAllocated += size;
-
-	PSP_DEBUG_PRINT("Allocated in VRAM, size %u at %p.\n", size, lastAddress);
-	PSP_DEBUG_PRINT("Total allocated %u, remaining %u.\n", _bytesAllocated, (2 * 1024 * 1024) - _bytesAllocated);
-
-	return lastAddress;
-}
-
-// Deallocate a block from VRAM
-void VramAllocator::deallocate(void *address) {
-	DEBUG_ENTER_FUNC();
-	address = (byte *)CACHED(address);	// Make sure all addresses are the same
-
-	Common::List<Allocation>::iterator i;
-
-	// Find the Allocator to deallocate
-	for (i = _allocList.begin(); i != _allocList.end(); ++i) {
-		if ((*i).address == address) {
-			_bytesAllocated -= (*i).size;
-			_allocList.erase(i);
-			PSP_DEBUG_PRINT("Deallocated address[%p], size[%u]\n", (*i).address, (*i).size);
-			return;
-		}
-	}
-
-	PSP_DEBUG_PRINT("Address[%p] not allocated.\n", address);
-}
diff --git a/backends/platform/psp/memory.h b/backends/platform/psp/memory.h
index 793bc94888..54e9225b2e 100644
--- a/backends/platform/psp/memory.h
+++ b/backends/platform/psp/memory.h
@@ -27,18 +27,24 @@
 #ifndef PSP_MEMORY_H
 #define PSP_MEMORY_H
 
-#include "backends/platform/psp/psppixelformat.h"
-#include "common/list.h"
-
-#define UNCACHED(x)		((byte *)(((uint32)(x)) | 0x40000000))	/* make an uncached access */
-#define CACHED(x)		((byte *)(((uint32)(x)) & 0xBFFFFFFF))	/* make an uncached access into a cached one */
-
 #define MIN_AMOUNT_FOR_COMPLEX_COPY  8
 #define MIN_AMOUNT_FOR_MISALIGNED_COPY 8
 
 //#define __PSP_DEBUG_PRINT__
 
-#include "backends/platform/psp/trace.h"
+//#include "backends/platform/psp/trace.h"
+
+// These instructions don't generate automatically but are faster then copying byte by byte
+inline void lwl_copy(byte *dst, const byte *src) {
+	register uint32 data;
+	asm volatile ("lwr %0,0(%1)\n\t"
+		 "lwl %0,3(%1)\n\t"
+		 : "=&r" (data) : "r" (src), "m" (*src));
+
+	asm volatile ("swr %1,0(%2)\n\t"
+		 "swl %1,3(%2)\n\t"
+		 : "=m" (*dst) : "r" (data), "r" (dst));
+}
 
 /**
  *	Class that does memory copying and swapping if needed
@@ -46,42 +52,69 @@
 class PspMemory {
 private:
 	static void testCopy(const byte *debugDst, const byte *debugSrc, uint32 debugBytes);
-	static void testSwap(const uint16 *debugDst, const uint16 *debugSrc, uint32 debugBytes, PSPPixelFormat &format);
 	static void copy(byte *dst, const byte *src, uint32 bytes);
-	static void swap(uint16 *dst16, const uint16 *src16, uint32 bytes, PSPPixelFormat &format);
 	static void copy32Aligned(uint32 *dst32, const uint32 *src32, uint32 bytes);
-	static void swap32Aligned(uint32 *dst32, const uint32 *src32, uint32 bytes, PSPPixelFormat &format);
 	static void copy32Misaligned(uint32 *dst32, const byte *src, uint32 bytes, uint32 alignSrc);
-	static void swap32Misaligned(uint32 *dst32, const uint16 *src16, uint32 bytes, PSPPixelFormat &format);
-	static void copy16(uint16 *dst, const uint16 *src, uint32 bytes);
-
-	// For swapping, we know that we have multiples of 16 bits
-	static void swap16(uint16 *dst16, const uint16 *src16, uint32 bytes, PSPPixelFormat &format) {
-		PSP_DEBUG_PRINT("swap16 called with dst16[%p], src16[%p], bytes[%d]\n", dst16, src16, bytes);
-		uint32 shorts = bytes >> 1;
 
-		while (shorts--) {
-			*dst16++ = format.swapRedBlue16(*src16++);
+	static inline void copy8(byte *dst, const byte *src, int32 bytes) {
+		//PSP_DEBUG_PRINT("copy8 called with dst[%p], src[%p], bytes[%d]\n", dst, src, bytes);
+		uint32 words = bytes >> 2;
+		for (; words; words--) {
+			lwl_copy(dst, src);
+			dst += 4;
+			src += 4;
 		}
-	}
-	
-	static void copy8(byte *dst, const byte *src, uint32 bytes) {
-		PSP_DEBUG_PRINT("copy8 called with dst[%p], src[%p], bytes[%d]\n", dst, src, bytes);
-		while (bytes--) {
+
+		uint32 bytesLeft = bytes & 0x3;
+		for (; bytesLeft; bytesLeft--) {
 			*dst++ = *src++;
 		}
 	}
 
-public:	
+public:
 	// This is the interface to the outside world
-	static void fastCopy(byte *dst, const byte *src, uint32 bytes) {
+	static void *fastCopy(void *dstv, const void *srcv, int32 bytes) {
+		byte *dst = (byte *)dstv;
+		byte *src = (byte *)srcv;
+
 		if (bytes < MIN_AMOUNT_FOR_COMPLEX_COPY) {
 			copy8(dst, src, bytes);
 		} else {	// go to more powerful copy
 			copy(dst, src, bytes);
 		}
+
+		return dstv;
 	}
+};
+
+inline void *psp_memcpy(void *dst, const void *src, int32 bytes) {
+	return PspMemory::fastCopy(dst, src, bytes);
+}
+
+#endif /* PSP_MEMORY_H */
+
+#if defined(PSP_INCLUDE_SWAP) && !defined(PSP_MEMORY_SWAP_H)
+#define PSP_MEMORY_SWAP_H
 
+//#include "backends/platform/psp/psppixelformat.h"
+
+class PspMemorySwap {
+private:
+	static void testSwap(const uint16 *debugDst, const uint16 *debugSrc, uint32 debugBytes, PSPPixelFormat &format);
+	static void swap(uint16 *dst16, const uint16 *src16, uint32 bytes, PSPPixelFormat &format);
+	static void swap32Aligned(uint32 *dst32, const uint32 *src32, uint32 bytes, PSPPixelFormat &format);
+	static void swap32Misaligned(uint32 *dst32, const uint16 *src16, uint32 bytes, PSPPixelFormat &format);
+	// For swapping, we know that we have multiples of 16 bits
+	static void swap16(uint16 *dst16, const uint16 *src16, uint32 bytes, PSPPixelFormat &format) {
+	PSP_DEBUG_PRINT("swap16 called with dst16[%p], src16[%p], bytes[%d]\n", dst16, src16, bytes);
+	uint32 shorts = bytes >> 1;
+
+	while (shorts--) {
+		*dst16++ = format.swapRedBlue16(*src16++);
+	}
+}
+
+public:
 	static void fastSwap(byte *dst, const byte *src, uint32 bytes, PSPPixelFormat &format) {
 		if (bytes < MIN_AMOUNT_FOR_COMPLEX_COPY * 2) {
 			swap16((uint16 *)dst, (uint16 *)src, bytes, format);
@@ -91,41 +124,6 @@ public:
 	}
 };
 
-/**
- *	Class that allocates memory in the VRAM
- */
-class VramAllocator : public Common::Singleton<VramAllocator> {
-public:
-	VramAllocator() : _bytesAllocated(0) {}
-	void *allocate(int32 size, bool smallAllocation = false);	// smallAllocation e.g. palettes
-	void deallocate(void *pointer);
-
-	static inline bool isAddressInVram(void *address) {
-		if ((uint32)(CACHED(address)) >= VRAM_START_ADDRESS && (uint32)(CACHED(address)) < VRAM_END_ADDRESS)
-			return true;
-		return false;
-	}
-
+#endif /* PSP_INCLUDE_SWAP */
 
-private:
-	/**
-	 *	Used to allocate in VRAM
-	 */
-	struct Allocation {
-		byte *address;
-		uint32 size;
-		void *getEnd() { return address + size; }
-		Allocation(void *Address, uint32 Size) : address((byte *)Address), size(Size) {}
-		Allocation() : address(0), size(0) {}
-	};
-
-	enum {
-		VRAM_START_ADDRESS = 0x04000000,
-		VRAM_END_ADDRESS   = 0x04200000,
-		VRAM_SMALL_ADDRESS = VRAM_END_ADDRESS - (4 * 1024)	// 4K in the end for small allocations
-	};
-	Common::List <Allocation> _allocList;		// List of allocations
-	uint32 _bytesAllocated;
-};
 
-#endif /* PSP_MEMORY_H */
diff --git a/backends/platform/psp/module.mk b/backends/platform/psp/module.mk
index 4652189ab4..f96c4ef583 100644
--- a/backends/platform/psp/module.mk
+++ b/backends/platform/psp/module.mk
@@ -17,6 +17,7 @@ MODULE_OBJS := powerman.o \
 	thread.o \
 	rtc.o \
 	mp3.o \
+	png_loader.o \
 	tests.o
 
 # We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
diff --git a/backends/platform/psp/mp3.cpp b/backends/platform/psp/mp3.cpp
index a2fe9a62f3..0e88418f13 100644
--- a/backends/platform/psp/mp3.cpp
+++ b/backends/platform/psp/mp3.cpp
@@ -38,13 +38,13 @@
 #include <pspsysmem.h>
 #include <pspmodulemgr.h>
 #include <psputility_avmodules.h>
-#include <mad.h> 
+#include <mad.h>
 #include "backends/platform/psp/mp3.h"
 
 //#define DISABLE_PSP_MP3		// to make us use the regular MAD decoder instead
 
 //#define __PSP_DEBUG_FUNCS__	/* For debugging the stack */
-//#define __PSP_DEBUG_PRINT__ 
+//#define __PSP_DEBUG_PRINT__
 #include "backends/platform/psp/trace.h"
 
 //#define PRINT_BUFFERS	/* to debug MP3 buffers */
@@ -60,9 +60,24 @@ bool Mp3PspStream::_decoderFail = true;		// pretend the decoder failed
 bool Mp3PspStream::_decoderFail = false;	// has the decoder failed to load
 #endif
 
+// Arranged in groups of 3 (layers), starting with MPEG-1 and ending with MPEG 2.5
+static uint32 mp3SamplesPerFrame[9] = {384, 1152, 1152, 384, 1152, 576, 384, 1152, 576};
+
+// The numbering below doesn't correspond to the way they are in the header
+enum {
+	MPEG_VER1 = 0,
+	MPEG_VER1_HEADER = 0x3,
+	MPEG_VER2 = 1,
+	MPEG_VER2_HEADER = 0x2,
+	MPEG_VER2_5 = 2,
+	MPEG_VER2_5_HEADER = 0x0
+};
+
+#define HEADER_GET_MPEG_VERSION(x) ((((x)[1])>>3) & 0x3)
+
 bool Mp3PspStream::initDecoder() {
 	DEBUG_ENTER_FUNC();
-	
+
 	if (_decoderInit) {
 		PSP_ERROR("Already initialized!");
 		return true;
@@ -82,15 +97,15 @@ bool Mp3PspStream::initDecoder() {
 			PSP_ERROR("failed to load audiocodec.prx. ME cannot start.\n");
 			_decoderFail = true;
 			return false;
-		}	
-    } else {		
+		}
+    } else {
         if (sceUtilityLoadAvModule(PSP_AV_MODULE_AVCODEC) < 0) {
 			PSP_ERROR("failed to load AVCODEC module. ME cannot start.\n");
 			_decoderFail = true;
 			return false;
 		}
 	}
-	
+
 	PSP_DEBUG_PRINT("Using PSP's ME for MP3\n");	// important to know this is happening
 
 	_decoderInit = true;
@@ -99,12 +114,12 @@ bool Mp3PspStream::initDecoder() {
 
 bool Mp3PspStream::stopDecoder() {
 	DEBUG_ENTER_FUNC();
-	
+
 	if (!_decoderInit)
 		return true;
-		
+
 	// Based on PSP firmware version, we need to do different things to do Media Engine processing
-    if (sceKernelDevkitVersion() == 0x01050001){
+    if (sceKernelDevkitVersion() == 0x01050001){  // TODO: how do we unload?
 /*      if (!unloadAudioModule("flash0:/kd/me_for_vsh.prx", PSP_MEMORY_PARTITION_KERNEL) ||
 			!unloadAudioModule("flash0:/kd/audiocodec.prx", PSP_MEMORY_PARTITION_KERNEL) {
 			PSP_ERROR("failed to unload audio module\n");
@@ -115,10 +130,10 @@ bool Mp3PspStream::stopDecoder() {
         if (sceUtilityUnloadModule(PSP_MODULE_AV_AVCODEC) < 0) {
 			PSP_ERROR("failed to unload avcodec module\n");
 			return false;
-		}	
+		}
 	}
-		
-	_decoderInit = false;	
+
+	_decoderInit = false;
 	return true;
 }
 
@@ -161,28 +176,28 @@ Mp3PspStream::Mp3PspStream(Common::SeekableReadStream *inStream, DisposeAfterUse
 	_length(0, 1000),
 	_sampleRate(0),
 	_totalTime(mad_timer_zero) {
-	
+
 	DEBUG_ENTER_FUNC();
 
 	assert(_decoderInit);	// must be initialized by now
-	
+
 	// let's leave the buffer guard -- who knows, it may be good?
 	memset(_buf, 0, sizeof(_buf));
 	memset(_codecInBuffer, 0, sizeof(_codecInBuffer));
-	
+
 	initStream();	// init needed stuff for the stream
 
+	findValidHeader();	// get a first header so we can read basic stuff
+
+	_sampleRate = _header.samplerate;	// copy it before it gets destroyed
+	_stereo = (MAD_NCHANNELS(&_header) == 2);
+
 	while (_state != MP3_STATE_EOS)
 		findValidHeader();	// get a first header so we can read basic stuff
-	
-	_sampleRate = _header.samplerate;	// copy it before it gets destroyed
-	
+
 	_length = Timestamp(mad_timer_count(_totalTime, MAD_UNITS_MILLISECONDS), getRate());
-	
-	//initStreamME();		// init the stuff needed for the ME to work
-	
+
 	deinitStream();
-	//releaseStreamME();
 
 	_state = MP3_STATE_INIT;
 }
@@ -207,7 +222,7 @@ int Mp3PspStream::initStream() {
 
 	// Read the first few sample bytes into the buffer
 	readMP3DataIntoBuffer();
-	
+
 	return true;
 }
 
@@ -215,7 +230,7 @@ bool Mp3PspStream::initStreamME() {
 	// The following will eventually go into the thread
 
 	memset(_codecParams, 0, sizeof(_codecParams));
-	
+
 	// Init the MP3 hardware
 	int ret = 0;
 	ret = sceAudiocodecCheckNeedMem(_codecParams, 0x1002);
@@ -230,22 +245,22 @@ bool Mp3PspStream::initStreamME() {
 		return false;
 	}
 	PSP_DEBUG_PRINT("sceAudioCodecGetEDRAM returned %d\n", ret);
-	
+
 	PSP_DEBUG_PRINT("samplerate[%d]\n", _sampleRate);
 	_codecParams[10] = _sampleRate;
-	
+
 	ret = sceAudiocodecInit(_codecParams, 0x1002);
 	if (ret < 0) {
 		PSP_ERROR("failed to init MP3 ME module. sceAudiocodecInit returned 0x%x.\n", ret);
 		return false;
 	}
-	
+
 	return true;
 }
 
 Mp3PspStream::~Mp3PspStream() {
 	DEBUG_ENTER_FUNC();
-	
+
 	deinitStream();
 	releaseStreamME(); 	// free the memory used for this stream
 
@@ -262,17 +277,17 @@ void Mp3PspStream::deinitStream() {
 	// Deinit MAD
 	mad_header_finish(&_header);
 	mad_stream_finish(&_stream);
-	
+
 	_state = MP3_STATE_EOS;
 }
 
 void Mp3PspStream::releaseStreamME() {
 	sceAudiocodecReleaseEDRAM(_codecParams);
-}	
+}
 
 void Mp3PspStream::decodeMP3Data() {
 	DEBUG_ENTER_FUNC();
-	
+
 	do {
 		if (_state == MP3_STATE_INIT) {
 			initStream();
@@ -281,31 +296,27 @@ void Mp3PspStream::decodeMP3Data() {
 
 		if (_state == MP3_STATE_EOS)
 			return;
-			
+
 		findValidHeader();	// seach for next valid header
 
-		while (_state == MP3_STATE_READY) {
+		while (_state == MP3_STATE_READY) {	// not a real 'while'. Just for easy flow
 			_stream.error = MAD_ERROR_NONE;
 
 			uint32 frame_size = _stream.next_frame - _stream.this_frame;
-			uint32 samplesPerFrame = _header.layer == MAD_LAYER_III ? 576 : 1152; 	// Varies by layer
-			// calculate frame size -- try
-			//uint32 calc_frame_size = ((144 * _header.bitrate) / 22050) + (_header.flags & MAD_FLAG_PADDING ? 1 : 0);
-			
-			// Get stereo/mono
-			uint32 multFactor = 1;
-			if (_header.mode != MAD_MODE_SINGLE_CHANNEL)	// mono	- x2 for 16bit
-				multFactor *= 2;							// stereo - x4 for 16bit
-			
-			PSP_DEBUG_PRINT("MP3 frame size[%d]. Samples[%d]. Multfactor[%d] pad[%d]\n", frame_size, samplesPerFrame, multFactor, _header.flags & MAD_FLAG_PADDING);
+
+			updatePcmLength(); // Retrieve the number of PCM samples.
+							   // We seem to change this, so it needs to be dynamic
+
+			PSP_DEBUG_PRINT("MP3 frame size[%d]. pcmLength[%d]\n", frame_size, _pcmLength);
+
 			memcpy(_codecInBuffer, _stream.this_frame, frame_size);	// we need it aligned
 
 			// set up parameters for ME
 			_codecParams[6] = (unsigned long)_codecInBuffer;
 			_codecParams[8] = (unsigned long)_pcmSamples;
 			_codecParams[7] = frame_size;
-			_codecParams[9] = samplesPerFrame * multFactor;	// x2 for stereo
-			
+			_codecParams[9] = _pcmLength * 2;	// x2 for stereo, though this one's not so important
+
 			// debug
 #ifdef PRINT_BUFFERS
 			PSP_DEBUG_PRINT("mp3 frame:\n");
@@ -319,7 +330,6 @@ void Mp3PspStream::decodeMP3Data() {
 			int ret = sceAudiocodecDecode(_codecParams, 0x1002);
 			if (ret < 0) {
 				PSP_INFO_PRINT("failed to decode MP3 data in ME. sceAudiocodecDecode returned 0x%x\n", ret);
-				// handle error here
 			}
 
 #ifdef PRINT_BUFFERS
@@ -329,7 +339,6 @@ void Mp3PspStream::decodeMP3Data() {
 			}
 			PSP_DEBUG_PRINT("\n");
 #endif
-			_pcmLength = samplesPerFrame;
 			_posInFrame = 0;
 			break;
 		}
@@ -339,6 +348,27 @@ void Mp3PspStream::decodeMP3Data() {
 		_state = MP3_STATE_EOS;
 }
 
+inline void Mp3PspStream::updatePcmLength() {
+	uint32 mpegVer = HEADER_GET_MPEG_VERSION(_stream.this_frame);	// sadly, MAD can't do this for us
+	PSP_DEBUG_PRINT("mpeg ver[%x]\n", mpegVer);
+	switch (mpegVer) {
+		case MPEG_VER1_HEADER:
+			mpegVer = MPEG_VER1;
+			break;
+		case MPEG_VER2_HEADER:
+			mpegVer = MPEG_VER2;
+			break;
+		case MPEG_VER2_5_HEADER:
+			mpegVer = MPEG_VER2_5;
+			break;
+		default:
+			PSP_ERROR("Unknown MPEG version %x\n", mpegVer);
+			break;
+	}
+	PSP_DEBUG_PRINT("layer[%d]\n", _header.layer);
+	_pcmLength = mp3SamplesPerFrame[(mpegVer * 3) + _header.layer - 1];
+}
+
 void Mp3PspStream::readMP3DataIntoBuffer() {
 	DEBUG_ENTER_FUNC();
 
@@ -386,16 +416,15 @@ bool Mp3PspStream::seek(const Timestamp &where) {
 	mad_timer_t destination;
 	mad_timer_set(&destination, time / 1000, time % 1000, 1000);
 
+	// Important to release and re-init the ME
+	releaseStreamME();
+	initStreamME();
+
 	// Check if we need to rewind
 	if (_state != MP3_STATE_READY || mad_timer_compare(destination, _totalTime) < 0) {
 		initStream();
-		initStreamME();
 	}
 
-	// The ME will need clear data no matter what once we seek?
-	//if (mad_timer_compare(destination, _totalTime) > 0 && _state != MP3_STATE_EOS)
-	//	initStreamME();
-
 	// Skip ahead
 	while (mad_timer_compare(destination, _totalTime) > 0 && _state != MP3_STATE_EOS)
 		findValidHeader();
@@ -444,43 +473,38 @@ int Mp3PspStream::readBuffer(int16 *buffer, const int numSamples) {
 	DEBUG_ENTER_FUNC();
 
 	int samples = 0;
-#ifdef PRINT_BUFFERS	
+#ifdef PRINT_BUFFERS
 	int16 *debugBuffer = buffer;
-#endif	
-	
+#endif
+
 	// Keep going as long as we have input available
 	while (samples < numSamples && _state != MP3_STATE_EOS) {
 		const int len = MIN(numSamples, samples + (int)(_pcmLength - _posInFrame) * MAD_NCHANNELS(&_header));
-		
+
 		while (samples < len) {
 			*buffer++ = _pcmSamples[_posInFrame << 1];
 			samples++;
 			if (MAD_NCHANNELS(&_header) == 2) {
 				*buffer++ = _pcmSamples[(_posInFrame << 1) + 1];
 				samples++;
-			} 
+			}
 			_posInFrame++;	// always skip an extra sample since ME always outputs stereo
 		}
-		
-		//memcpy(buffer, &_pcmSamples[_posInFrame], len << 1);	   // 16 bits
-		//_posInFrame += len;		// next time we start from the middle
 
 		if (_posInFrame >= _pcmLength) {
 			// We used up all PCM data in the current frame -- read & decode more
 			decodeMP3Data();
 		}
 	}
-	
+
 #ifdef PRINT_BUFFERS
 		PSP_INFO_PRINT("buffer:\n");
 		for (int i = 0; i<numSamples; i++)
 			PSP_INFO_PRINT("%d ", debugBuffer[i]);
 		PSP_INFO_PRINT("\n\n");
-#endif		
-	
+#endif
+
 	return samples;
 }
 
 } // End of namespace Audio
-
-
diff --git a/backends/platform/psp/mp3.h b/backends/platform/psp/mp3.h
index 029b3e498c..1d2fe5ec2f 100644
--- a/backends/platform/psp/mp3.h
+++ b/backends/platform/psp/mp3.h
@@ -46,36 +46,37 @@ protected:
 		MP3_STATE_EOS		// end of data reached (may need to loop)
 	};
 
-	#define MAX_SAMPLES_PER_FRAME	2048 * 2
+	#define MAX_SAMPLES_PER_FRAME	1152 * 2	/* x2 for stereo */
 	int16 _pcmSamples[MAX_SAMPLES_PER_FRAME] __attribute__((aligned(64)));	// samples to output PCM data into
 	byte _codecInBuffer[3072] __attribute__((aligned(64))); // the codec always needs alignment
 	unsigned long _codecParams[65]__attribute__((aligned(64)));		// TODO: change to struct
 
 	Common::SeekableReadStream *_inStream;
 	DisposeAfterUse::Flag _disposeAfterUse;
-	
-	uint32 _pcmLength;		// how many pcm samples we have (/2 for mono)
-	
+
+	uint32 _pcmLength;		// how many pcm samples we have for this type of file (x2 this for stereo)
+
 	uint _posInFrame;		// position in frame
 	State _state;			// what state the stream is in
 
 	Timestamp _length;
 	uint32 _sampleRate;
+	bool _stereo;
 
 	mad_timer_t _totalTime;
 	mad_stream _stream;		//
 	mad_header _header;		// This is all we need from libmad
-	
+
 	static bool _decoderInit;	// has the decoder been initialized
 	static bool _decoderFail;	// has the decoder failed to load
-	
+
 	enum {
 		BUFFER_SIZE = 5 * 8192
 	};
 
 	// This buffer contains a slab of input data
 	byte _buf[BUFFER_SIZE + MAD_BUFFER_GUARD];
-	
+
 	void decodeMP3Data();
 	void readMP3DataIntoBuffer();
 
@@ -83,19 +84,20 @@ protected:
 	int initStream();
 	void findValidHeader();
 	void deinitStream();
+	void updatePcmLength();
 
 	// to init and uninit ME decoder
 	static bool initDecoder();
 	static bool stopDecoder();
-	
+
 	// ME functions for stream
 	bool initStreamME();
 	void releaseStreamME();
-	
+
 public:
 	Mp3PspStream(Common::SeekableReadStream *inStream, DisposeAfterUse::Flag dispose);
 	~Mp3PspStream();
-	
+
 	// This function avoids having to create streams when it's not possible
 	static inline bool isOkToCreateStream() {
 		if (_decoderFail)			// fatal failure
@@ -103,13 +105,13 @@ public:
 		if (!_decoderInit)			// if we're not initialized
 			if (!initDecoder())		// check if we failed init
 				return false;
-		return true;	
+		return true;
 	}
 
 	int readBuffer(int16 *buffer, const int numSamples);
 
 	bool endOfData() const		{ return _state == MP3_STATE_EOS; }
-	bool isStereo() const		{ return MAD_NCHANNELS(&_header) == 2; }
+	bool isStereo() const		{ return _stereo; }
 	int getRate() const			{ return _sampleRate; }
 
 	bool seek(const Timestamp &where);
diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp
index b09d9c0c00..047ec1957f 100644
--- a/backends/platform/psp/osys_psp.cpp
+++ b/backends/platform/psp/osys_psp.cpp
@@ -67,7 +67,7 @@ void OSystem_PSP::initBackend() {
 
 	// Instantiate real time clock
 	PspRtc::instance();
-	
+
 	_cursor.enableCursorPalette(false);
 	_cursor.setXY(PSP_SCREEN_WIDTH >> 1, PSP_SCREEN_HEIGHT >> 1);	// Mouse in the middle of the screen
 
@@ -148,7 +148,7 @@ Common::List<Graphics::PixelFormat> OSystem_PSP::getSupportedFormats() const {
 
 void OSystem_PSP::initSize(uint width, uint height, const Graphics::PixelFormat *format) {
 	DEBUG_ENTER_FUNC();
-	_pendingUpdate = false;	
+	_pendingUpdate = false;
 	_displayManager.setSizeAndPixelFormat(width, height, format);
 
 	_cursor.setVisible(false);
@@ -167,7 +167,7 @@ int16 OSystem_PSP::getHeight() {
 
 void OSystem_PSP::setPalette(const byte *colors, uint start, uint num) {
 	DEBUG_ENTER_FUNC();
-	_pendingUpdate = false;	
+	_pendingUpdate = false;
 	_screen.setPartialPalette(colors, start, num);
 	_cursor.setScreenPalette(colors, start, num);
 	_cursor.clearKeyColor();
@@ -175,7 +175,7 @@ void OSystem_PSP::setPalette(const byte *colors, uint start, uint num) {
 
 void OSystem_PSP::setCursorPalette(const byte *colors, uint start, uint num) {
 	DEBUG_ENTER_FUNC();
-	_pendingUpdate = false;	
+	_pendingUpdate = false;
 	_cursor.setCursorPalette(colors, start, num);
 	_cursor.enableCursorPalette(true);
 	_cursor.clearKeyColor();	// Do we need this?
@@ -183,25 +183,25 @@ void OSystem_PSP::setCursorPalette(const byte *colors, uint start, uint num) {
 
 void OSystem_PSP::disableCursorPalette(bool disable) {
 	DEBUG_ENTER_FUNC();
-	_pendingUpdate = false;	
+	_pendingUpdate = false;
 	_cursor.enableCursorPalette(!disable);
 }
 
 void OSystem_PSP::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) {
 	DEBUG_ENTER_FUNC();
-	_pendingUpdate = false;	
+	_pendingUpdate = false;
 	_screen.copyFromRect(buf, pitch, x, y, w, h);
 }
 
 Graphics::Surface *OSystem_PSP::lockScreen() {
 	DEBUG_ENTER_FUNC();
-	_pendingUpdate = false;	
+	_pendingUpdate = false;
 	return _screen.lockAndGetForEditing();
 }
 
 void OSystem_PSP::unlockScreen() {
 	DEBUG_ENTER_FUNC();
-	_pendingUpdate = false;	
+	_pendingUpdate = false;
 	// The screen is always completely updated anyway, so we don't have to force a full update here.
 	_screen.unlock();
 }
@@ -219,7 +219,7 @@ void OSystem_PSP::setShakePos(int shakeOffset) {
 
 void OSystem_PSP::showOverlay() {
 	DEBUG_ENTER_FUNC();
-	_pendingUpdate = false;	
+	_pendingUpdate = false;
 	_overlay.setVisible(true);
 	_cursor.setLimits(_overlay.getWidth(), _overlay.getHeight());
 	_cursor.useGlobalScaler(false);	// mouse with overlay is 1:1
@@ -227,7 +227,7 @@ void OSystem_PSP::showOverlay() {
 
 void OSystem_PSP::hideOverlay() {
 	DEBUG_ENTER_FUNC();
-	_pendingUpdate = false;	
+	_pendingUpdate = false;
 	_overlay.setVisible(false);
 	_cursor.setLimits(_screen.getWidth(), _screen.getHeight());
 	_cursor.useGlobalScaler(true);	// mouse needs to be scaled with screen
@@ -235,7 +235,7 @@ void OSystem_PSP::hideOverlay() {
 
 void OSystem_PSP::clearOverlay() {
 	DEBUG_ENTER_FUNC();
-	_pendingUpdate = false;	
+	_pendingUpdate = false;
 	_overlay.clearBuffer();
 }
 
@@ -246,7 +246,7 @@ void OSystem_PSP::grabOverlay(OverlayColor *buf, int pitch) {
 
 void OSystem_PSP::copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h) {
 	DEBUG_ENTER_FUNC();
-	_pendingUpdate = false;	
+	_pendingUpdate = false;
 	_overlay.copyFromRect(buf, pitch, x, y, w, h);
 }
 
@@ -266,7 +266,7 @@ void OSystem_PSP::grabPalette(byte *colors, uint start, uint num) {
 bool OSystem_PSP::showMouse(bool v) {
 	DEBUG_ENTER_FUNC();
 	_pendingUpdate = false;
-	
+
 	PSP_DEBUG_PRINT("%s\n", v ? "true" : "false");
 	bool last = _cursor.isVisible();
 	_cursor.setVisible(v);
@@ -276,14 +276,14 @@ bool OSystem_PSP::showMouse(bool v) {
 
 void OSystem_PSP::warpMouse(int x, int y) {
 	DEBUG_ENTER_FUNC();
-	_pendingUpdate = false;	
+	_pendingUpdate = false;
 	_cursor.setXY(x, y);
 }
 
 void OSystem_PSP::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) {
 	DEBUG_ENTER_FUNC();
-	_pendingUpdate = false;	
-	
+	_pendingUpdate = false;
+
 	PSP_DEBUG_PRINT("pbuf[%p], w[%u], h[%u], hotspot:X[%d], Y[%d], keycolor[%d], scale[%d], pformat[%p]\n", buf, w, h, hotspotX, hotspotY, keycolor, cursorTargetScale, format);
 	if (format) {
 		PSP_DEBUG_PRINT("format: bpp[%d], rLoss[%d], gLoss[%d], bLoss[%d], aLoss[%d], rShift[%d], gShift[%d], bShift[%d], aShift[%d]\n", format->bytesPerPixel, format->rLoss, format->gLoss, format->bLoss, format->aLoss, format->rShift, format->gShift, format->bShift, format->aShift);
@@ -310,16 +310,16 @@ bool OSystem_PSP::pollEvent(Common::Event &event) {
 	// Time between event polls is usually 5-10ms, so waiting for 4 calls before checking to update the screen should be fine
 	if (_pendingUpdate) {
 		_pendingUpdateCounter++;
-		
+
 		if (_pendingUpdateCounter >= 4) {
 			PSP_DEBUG_PRINT("servicing pending update\n");
 			updateScreen();
 			if (!_pendingUpdate) 	// we handled the update
-				_pendingUpdateCounter = 0;				
+				_pendingUpdateCounter = 0;
 		}
-	} else 
+	} else
 		_pendingUpdateCounter = 0;	// reset the counter, no pending
-		
+
 	return _inputHandler.getAllInputs(event);
 }
 
diff --git a/backends/platform/psp/plugin.ld b/backends/platform/psp/plugin.ld
index db4df45264..7534c15290 100644
--- a/backends/platform/psp/plugin.ld
+++ b/backends/platform/psp/plugin.ld
@@ -208,7 +208,7 @@ SECTIONS
   .debug_varnames  0 : { *(.debug_varnames) }
   /DISCARD/ : { *(.comment) *(.pdr) }
   /DISCARD/ : { *(.note.GNU-stack) }
-  
+
   . = __plugin_hole_start;
   .got            : { *(.got.plt) *(.got) } : shorts
   /* We want the small data sections together, so single-instruction offsets
@@ -235,5 +235,5 @@ SECTIONS
     PROVIDE (___sbss_end = .);
   }
 
-  
+
 }
diff --git a/backends/platform/psp/png_loader.cpp b/backends/platform/psp/png_loader.cpp
new file mode 100644
index 0000000000..978db3eaf9
--- /dev/null
+++ b/backends/platform/psp/png_loader.cpp
@@ -0,0 +1,187 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "common/scummsys.h"
+#include "common/stream.h"
+#include "backends/platform/psp/psppixelformat.h"
+#include "backends/platform/psp/display_client.h"
+#include "backends/platform/psp/png_loader.h"
+
+PngLoader::Status PngLoader::allocate() {
+	if (!findImageDimensions()) {
+		PSP_ERROR("failed to get image dimensions\n");
+		return BAD_FILE;
+	}
+
+	PSP_DEBUG_PRINT("width[%d], height[%d], paletteSize[%d], bitDepth[%d]\n", _width, _height, _paletteSize, _bitDepth);
+	_buffer->setSize(_width, _height, _sizeBy);
+
+	if (_paletteSize) {	// 8 or 4-bit image
+		if (_paletteSize <= 16) { 					// 4 bit
+			_buffer->setPixelFormat(PSPPixelFormat::Type_Palette_4bit);
+			_palette->setPixelFormats(PSPPixelFormat::Type_4444, PSPPixelFormat::Type_Palette_4bit);
+			_paletteSize = 16;
+		} else if (_paletteSize <= 256) {			// 8-bit image
+			_paletteSize = 256;
+			_buffer->setPixelFormat(PSPPixelFormat::Type_Palette_8bit);
+			_palette->setPixelFormats(PSPPixelFormat::Type_4444, PSPPixelFormat::Type_Palette_8bit);
+		} else {
+			PSP_ERROR("palette of %d too big!\n", _paletteSize);
+			return BAD_FILE;
+		}
+
+	} else {	// 32-bit image
+		_buffer->setPixelFormat(PSPPixelFormat::Type_8888);
+	}
+
+	if (!_buffer->allocate()) {
+		PSP_ERROR("failed to allocate buffer\n");
+		return OUT_OF_MEMORY;
+	}
+	if (!_palette->allocate()) {
+		PSP_ERROR("failed to allocate palette\n");
+		return OUT_OF_MEMORY;
+	}
+	return OK;
+}
+
+bool PngLoader::load() {
+	// Try to load the image
+	_file->seek(0);	// Go back to start
+
+	if (!loadImageIntoBuffer()) {
+		PSP_DEBUG_PRINT("failed to load image\n");
+		return false;
+	}
+
+	PSP_DEBUG_PRINT("succeded in loading image\n");
+
+	if (_paletteSize == 16)		// 4-bit
+		_buffer->flipNibbles();	// required because of PNG 4-bit format
+	return true;
+}
+
+void PngLoader::warningFn(png_structp png_ptr, png_const_charp warning_msg) {
+	// ignore PNG warnings
+}
+
+// Read function for png library to be able to read from our SeekableReadStream
+//
+void PngLoader::libReadFunc(png_structp pngPtr, png_bytep data, png_size_t length) {
+	Common::SeekableReadStream *file;
+
+	file = (Common::SeekableReadStream *)pngPtr->io_ptr;
+
+	file->read(data, length);
+}
+
+bool PngLoader::basicImageLoad() {
+	_pngPtr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+	if (!_pngPtr)
+		return false;
+
+	png_set_error_fn(_pngPtr, (png_voidp) NULL, (png_error_ptr) NULL, warningFn);
+
+	_infoPtr = png_create_info_struct(_pngPtr);
+	if (!_infoPtr) {
+		png_destroy_read_struct(&_pngPtr, png_infopp_NULL, png_infopp_NULL);
+		return false;
+	}
+	// Set the png lib to use our read function
+	png_set_read_fn(_pngPtr, (void *)_file, libReadFunc);
+
+	unsigned int sig_read = 0;
+
+	png_set_sig_bytes(_pngPtr, sig_read);
+	png_read_info(_pngPtr, _infoPtr);
+	int interlaceType;
+	png_get_IHDR(_pngPtr, _infoPtr, (png_uint_32 *)&_width, (png_uint_32 *)&_height, &_bitDepth,
+		&_colorType, &interlaceType, int_p_NULL, int_p_NULL);
+
+	if (_colorType & PNG_COLOR_MASK_PALETTE)
+		_paletteSize = _infoPtr->num_palette;
+
+	return true;
+}
+
+/* Get the width and height of a png image */
+bool PngLoader::findImageDimensions() {
+	DEBUG_ENTER_FUNC();
+
+	if (!basicImageLoad())
+		return false;
+
+	png_destroy_read_struct(&_pngPtr, &_infoPtr, png_infopp_NULL);
+	return true;
+}
+
+//
+// Load a texture from a png image
+//
+bool PngLoader::loadImageIntoBuffer() {
+	DEBUG_ENTER_FUNC();
+
+	if (!basicImageLoad())
+		return false;
+
+	// Strip off 16 bit channels. Not really needed but whatever
+	png_set_strip_16(_pngPtr);
+
+	if (_paletteSize) {
+		// Copy the palette
+		png_colorp srcPal = _infoPtr->palette;
+		for (int i = 0; i < (int)_paletteSize; i++) {
+			unsigned char alphaVal = (i < _infoPtr->num_trans) ? _infoPtr->trans[i] : 0xFF;	// Load alpha if it's there
+			_palette->setSingleColorRGBA(i, srcPal->red, srcPal->green, srcPal->blue, alphaVal);
+			srcPal++;
+		}
+	} else {	// Not a palettized image
+		if (_colorType == PNG_COLOR_TYPE_GRAY && _bitDepth < 8)
+			png_set_gray_1_2_4_to_8(_pngPtr);	// Round up grayscale images
+		if (png_get_valid(_pngPtr, _infoPtr, PNG_INFO_tRNS))
+			png_set_tRNS_to_alpha(_pngPtr);		// Convert trans channel to alpha for 32 bits
+
+		png_set_filler(_pngPtr, 0xff, PNG_FILLER_AFTER);	// Filler for alpha?
+	}
+
+	unsigned char *line = (unsigned char*) malloc(_infoPtr->rowbytes);
+	if (!line) {
+		png_destroy_read_struct(&_pngPtr, png_infopp_NULL, png_infopp_NULL);
+		PSP_ERROR("Couldn't allocate line\n");
+		return false;
+	}
+
+	for (size_t y = 0; y < _height; y++) {
+		png_read_row(_pngPtr, line, png_bytep_NULL);
+		_buffer->copyFromRect(line, _infoPtr->rowbytes, 0, y, _width, 1);	// Copy into buffer
+	}
+
+	free(line);
+
+	png_read_end(_pngPtr, _infoPtr);
+	png_destroy_read_struct(&_pngPtr, &_infoPtr, png_infopp_NULL);
+
+	return true;
+}
diff --git a/backends/platform/psp/png_loader.h b/backends/platform/psp/png_loader.h
new file mode 100644
index 0000000000..6b0282621a
--- /dev/null
+++ b/backends/platform/psp/png_loader.h
@@ -0,0 +1,70 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef PSP_PNG_IMAGE_H
+#define PSP_PNG_IMAGE_H
+
+#include <png.h>
+
+class PngLoader {
+private:
+	bool basicImageLoad();		// common operation
+	bool findImageDimensions();	// find dimensions of a given PNG file
+	bool loadImageIntoBuffer();
+
+	static void warningFn(png_structp png_ptr, png_const_charp warning_msg);
+	static void libReadFunc(png_structp pngPtr, png_bytep data, png_size_t length);
+
+	Common::SeekableReadStream *_file;
+	Buffer *_buffer;
+	Palette *_palette;
+
+	uint32 _width;
+	uint32 _height;
+	uint32 _paletteSize;
+	int _bitDepth;
+	Buffer::HowToSize _sizeBy;
+	png_structp _pngPtr;
+	png_infop _infoPtr;
+	int _colorType;
+
+public:
+	enum Status {
+		OK,
+		OUT_OF_MEMORY,
+		BAD_FILE
+	};
+
+	PngLoader(Common::SeekableReadStream *file, Buffer &buffer, Palette &palette,
+		Buffer::HowToSize sizeBy = Buffer::kSizeByTextureSize) :
+			_file(file), _buffer(&buffer), _palette(&palette),
+			_width(0), _height(0), _paletteSize(0),
+			_bitDepth(0), _sizeBy(sizeBy), _pngPtr(0), _infoPtr(0), _colorType(0) {}
+
+	PngLoader::Status allocate();
+	bool load();
+};
+
+#endif /* PSP_PNG_IMAGE_H */
diff --git a/backends/platform/psp/powerman.cpp b/backends/platform/psp/powerman.cpp
index eaadad16c5..869d9b3023 100644
--- a/backends/platform/psp/powerman.cpp
+++ b/backends/platform/psp/powerman.cpp
@@ -84,7 +84,7 @@ bool PowerManager::unregisterForSuspend(Suspendable *item) {
 
 	// Unregister from stream list
 	_listMutex.lock();
-	
+
 	_suspendList.remove(item);
 	_listCounter--;
 
@@ -114,11 +114,11 @@ PowerManager::~PowerManager() {
 ********************************************/
 void PowerManager::pollPauseEngine() {
 	DEBUG_ENTER_FUNC();
-	
-	
+
+
 	bool pause = _pauseFlag;		// We copy so as not to have multiple values
 
-	if (pause != _pauseFlagOld) { 
+	if (pause != _pauseFlagOld) {
 		if (g_engine) { // Check to see if we have an engine
 			if (pause && _pauseClientState == UNPAUSED) {
 				_pauseClientState = PAUSING;		// Tell PM we're in the middle of pausing
@@ -147,7 +147,7 @@ bool PowerManager::beginCriticalSection() {
 	DEBUG_ENTER_FUNC();
 
 	bool ret = false;
-	
+
 	_flagMutex.lock();
 
 	// Check the access flag
@@ -156,7 +156,7 @@ bool PowerManager::beginCriticalSection() {
 
 		PSP_DEBUG_PRINT("I got blocked. ThreadId[%x]\n", sceKernelGetThreadId());
 		debugPM();
-		
+
 		_threadSleep.wait(_flagMutex);
 
 		PSP_DEBUG_PRINT_FUNC("I got released. ThreadId[%x]\n", sceKernelGetThreadId());
@@ -184,11 +184,11 @@ void PowerManager::endCriticalSection() {
 		if (_suspendFlag) {		// If the PM is sleeping, this flag must be set
 				PSP_DEBUG_PRINT_FUNC("PM is asleep. Waking it up.\n");
 				debugPM();
-				
+
 				_pmSleep.releaseAll();
-				
+
 				PSP_DEBUG_PRINT_FUNC("Woke up the PM\n");
-			
+
 				debugPM();
 		}
 
@@ -198,7 +198,7 @@ void PowerManager::endCriticalSection() {
 		}
 	}
 
-	_flagMutex.unlock();	
+	_flagMutex.unlock();
 }
 
 /*******************************************
@@ -209,7 +209,7 @@ void PowerManager::endCriticalSection() {
 void PowerManager::suspend() {
 	DEBUG_ENTER_FUNC();
 
-	if (_pauseFlag) 
+	if (_pauseFlag)
 		return;					// Very important - make sure we only suspend once
 
 	scePowerLock(0);			// Also critical to make sure PSP doesn't suspend before we're done
@@ -232,9 +232,9 @@ void PowerManager::suspend() {
 			PspThread::delayMicros(50000);	// We wait 50 msec at a time
 	}
 
-	// It's possible that the polling thread missed our pause event, but there's 
+	// It's possible that the polling thread missed our pause event, but there's
 	// nothing we can do about that.
-	// We can't know if there's polling going on or not. 
+	// We can't know if there's polling going on or not.
 	// It's usually not a critical thing anyway.
 
 	_PMStatus = kGettingFlagMutexSuspend;
@@ -249,12 +249,12 @@ void PowerManager::suspend() {
 	// Check if anyone is in a critical section. If so, we'll wait for them
 	if (_criticalCounter > 0) {
 		_PMStatus = kWaitCritSectionSuspend;
-		
+
 		_pmSleep.wait(_flagMutex);
-		
+
 		_PMStatus = kDoneWaitingCritSectionSuspend;
-	} 
-		
+	}
+
 	_flagMutex.unlock();
 
 	_PMStatus = kGettingListMutexSuspend;
@@ -275,7 +275,7 @@ void PowerManager::suspend() {
 	_PMStatus = kDoneSuspend;
 
 	scePowerUnlock(0);				// Allow the PSP to go to sleep now
-	
+
 	_PMStatus = kDonePowerUnlock;
 }
 
@@ -286,22 +286,22 @@ void PowerManager::suspend() {
 ********************************************/
 void PowerManager::resume() {
 	DEBUG_ENTER_FUNC();
-	
+
 	_PMStatus = kBeginResume;
 
 	// Make sure we can't get another suspend
 	scePowerLock(0);
 
 	_PMStatus = kCheckingPauseFlag;
-	
-	if (!_pauseFlag) 
+
+	if (!_pauseFlag)
 		return;						// Make sure we can only resume once
 
 	_PMStatus = kGettingListMutexResume;
 
 	// First we notify our Suspendables. Loop over list, calling resume()
 	_listMutex.lock();
-	
+
 	_PMStatus = kIteratingListResume;
 
 	// Iterate
@@ -314,12 +314,12 @@ void PowerManager::resume() {
 	_PMStatus = kDoneIteratingListResume;
 
 	_listMutex.unlock();
-	
+
 	_PMStatus = kGettingFlagMutexResume;
 
 	// Now we set the suspend flag to false
 	_flagMutex.lock();
-	
+
 	_PMStatus = kGotFlagMutexResume;
 
 	_suspendFlag = false;
@@ -328,11 +328,11 @@ void PowerManager::resume() {
 
 	// Signal the threads to wake up
 	_threadSleep.releaseAll();
-	
+
 	_PMStatus = kDoneSignallingSuspendedThreadsResume;
 
 	_flagMutex.unlock();
-	
+
 	_PMStatus = kDoneResume;
 
 	_pauseFlag = false;	// Signal engine to unpause -- no mutex needed
diff --git a/backends/platform/psp/psp_main.cpp b/backends/platform/psp/psp_main.cpp
index dba9a8fc2b..d24c614e33 100644
--- a/backends/platform/psp/psp_main.cpp
+++ b/backends/platform/psp/psp_main.cpp
@@ -104,7 +104,7 @@ int exit_callback(void) {
 
 #ifdef ENABLE_PROFILING
 	gprof_cleanup();
-#endif	
+#endif
 
 	sceKernelExitGame();
 	return 0;
@@ -171,12 +171,12 @@ int main(void) {
 #endif
 
 /* unit/speed tests */
-#if defined (PSP_ENABLE_UNIT_TESTS) || defined (PSP_ENABLE_SPEED_TESTS)	
+#if defined (PSP_ENABLE_UNIT_TESTS) || defined (PSP_ENABLE_SPEED_TESTS)
 	PSP_INFO_PRINT("running tests\n");
 	psp_tests();
 	sceKernelSleepThread();	// that's it. That's all we're doing
 #endif
-	
+
 	int res = scummvm_main(argc, argv);
 
 	g_system->quit();	// TODO: Consider removing / replacing this!
diff --git a/backends/platform/psp/pspkeyboard.cpp b/backends/platform/psp/pspkeyboard.cpp
index eb081fc5f4..3dd5e9789b 100644
--- a/backends/platform/psp/pspkeyboard.cpp
+++ b/backends/platform/psp/pspkeyboard.cpp
@@ -26,16 +26,17 @@
 //#define PSP_KB_SHELL	/* Need a hack to properly load the keyboard from the PSP shell */
 
 #ifdef PSP_KB_SHELL
-#define PSP_KB_SHELL_PATH 	"ms0:/psp/game4xx/scummvm-solid/"	/* path to kbd.zip */
+#define PSP_KB_SHELL_PATH 	"ms0:/psp/game5xx/scummvm-solid/"	/* path to kbd.zip */
 #endif
 
 
 #include <malloc.h>
 #include <pspkernel.h>
-#include <png.h>
 
 #include "backends/platform/psp/psppixelformat.h"
 #include "backends/platform/psp/pspkeyboard.h"
+#include "backends/platform/psp/png_loader.h"
+#include "backends/platform/psp/input.h"
 #include "common/keyboard.h"
 #include "common/fs.h"
 #include "common/unzip.h"
@@ -91,16 +92,6 @@ short PSPKeyboard::_modeChar[MODE_COUNT][5][6] = {
 	}
 };
 
-// Read function for png library to be able to read from our SeekableReadStream
-//
-void pngReadStreamRead(png_structp png_ptr, png_bytep data, png_size_t length) {
-	Common::SeekableReadStream *file;
-
-	file = (Common::SeekableReadStream *)png_ptr->io_ptr;
-
-	file->read(data, length);
-}
-
 // Array with file names
 const char *PSPKeyboard::_guiStrings[] = {
 	"keys4.png", "keys_s4.png",
@@ -281,8 +272,6 @@ bool PSPKeyboard::load() {
 
 	// Loop through all png images
 	for (i = 0; i < guiStringsSize; i++) {
-		uint32 height = 0, width = 0, paletteSize = 0;
-
 		PSP_DEBUG_PRINT("Opening %s.\n", _guiStrings[i]);
 
 		// Look for the file in the kbd directory
@@ -309,49 +298,18 @@ bool PSPKeyboard::load() {
 			goto ERROR;
 		}
 
-		if (getPngImageSize(file, &width, &height, &paletteSize) == 0) { // Check image size and palette size
-			// Allocate memory for image
-			PSP_DEBUG_PRINT("width[%d], height[%d], paletteSize[%d]\n", width, height, paletteSize);
-			_buffers[i].setSize(width, height, Buffer::kSizeByTextureSize);
-
-			if (paletteSize) {	// 8 or 4-bit image
-				if (paletteSize <= 16) { // 4 bit
-					_buffers[i].setPixelFormat(PSPPixelFormat::Type_Palette_4bit);
-					_palettes[i].setPixelFormats(PSPPixelFormat::Type_4444, PSPPixelFormat::Type_Palette_4bit);
-					paletteSize = 16;
-				} else if (paletteSize <= 256) {			// 8-bit image
-					paletteSize = 256;
-					_buffers[i].setPixelFormat(PSPPixelFormat::Type_Palette_8bit);
-					_palettes[i].setPixelFormats(PSPPixelFormat::Type_4444, PSPPixelFormat::Type_Palette_8bit);
-				} else {
-					PSP_ERROR("palette of %d too big!\n", paletteSize);
-					goto ERROR;
-				}
-
-			} else {				// 32-bit image
-				_buffers[i].setPixelFormat(PSPPixelFormat::Type_8888);
-			}
-
-			_buffers[i].allocate();
-			_palettes[i].allocate();
+		PngLoader image(file, _buffers[i], _palettes[i]);
 
-			// Try to load the image
-			file->seek(0);	// Go back to start
-
-			if (loadPngImage(file, _buffers[i], _palettes[i]) != 0)
-				goto ERROR;
-			else {	// Success
-				PSP_DEBUG_PRINT("Managed to load the image\n");
-
-				if (paletteSize == 16)		// 4-bit
-					_buffers[i].flipNibbles();
-
-				delete file;
-			}
-		} else {
-			PSP_ERROR("couldn't obtain PNG image size\n");
+		if (image.allocate() != PngLoader::OK) {
+			PSP_ERROR("Failed to allocate memory for keyboard image %s\n", _guiStrings[i]);
 			goto ERROR;
 		}
+		if (!image.load()) {
+			PSP_ERROR("Failed to load image from file %s\n", _guiStrings[i]);
+			goto ERROR;
+		}
+
+		delete file;
 	} /* for loop */
 
 	_init = true;
@@ -376,124 +334,6 @@ ERROR:
 	return false;
 }
 
-static void user_warning_fn(png_structp png_ptr, png_const_charp warning_msg) {
-	// ignore PNG warnings
-}
-
-/* Get the width and height of a png image */
-int PSPKeyboard::getPngImageSize(Common::SeekableReadStream *file, uint32 *png_width, uint32 *png_height, u32 *paletteSize) {
-	DEBUG_ENTER_FUNC();
-
-	png_structp png_ptr;
-	png_infop info_ptr;
-	unsigned int sig_read = 0;
-	png_uint_32 width, height;
-	int bit_depth, color_type, interlace_type;
-
-	png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-	if (png_ptr == NULL) {
-		return -1;
-	}
-	png_set_error_fn(png_ptr, (png_voidp) NULL, (png_error_ptr) NULL, user_warning_fn);
-	info_ptr = png_create_info_struct(png_ptr);
-	if (info_ptr == NULL) {
-		png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
-		return -1;
-	}
-	// Set the png lib to use our read function
-	png_set_read_fn(png_ptr, (void *)file, pngReadStreamRead);
-
-	png_set_sig_bytes(png_ptr, sig_read);
-	png_read_info(png_ptr, info_ptr);
-	png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, int_p_NULL, int_p_NULL);
-	if (color_type & PNG_COLOR_MASK_PALETTE)
-		*paletteSize = info_ptr->num_palette;
-	else
-		*paletteSize = 0;
-
-	png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-
-	*png_width = width;
-	*png_height = height;
-
-	return 0;
-}
-
-// Load a texture from a png image
-//
-int PSPKeyboard::loadPngImage(Common::SeekableReadStream *file, Buffer &buffer, Palette &palette) {
-	DEBUG_ENTER_FUNC();
-
-	png_structp png_ptr;
-	png_infop info_ptr;
-	unsigned int sig_read = 0;
-	png_uint_32 width, height;
-	int bit_depth, color_type, interlace_type;
-	size_t y;
-
-	png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-	if (png_ptr == NULL) {
-		PSP_ERROR("Couldn't create read struct to load keyboard\n");
-		return -1;
-	}
-	// Use dummy error function
-	png_set_error_fn(png_ptr, (png_voidp) NULL, (png_error_ptr) NULL, user_warning_fn);
-
-	info_ptr = png_create_info_struct(png_ptr);
-	if (info_ptr == NULL) {
-		PSP_ERROR("Couldn't create info struct to load keyboard\n");
-		png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
-		return -1;
-	}
-
-	// Set the png lib to use our customized read function
-	png_set_read_fn(png_ptr, (void *)file, pngReadStreamRead);
-
-	png_set_sig_bytes(png_ptr, sig_read);
-	png_read_info(png_ptr, info_ptr);
-	png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, int_p_NULL, int_p_NULL);
-
-	// Strip off 16 bit channels. Not really needed but whatever
-	png_set_strip_16(png_ptr);
-
-	if (color_type == PNG_COLOR_TYPE_PALETTE) {
-		// Copy the palette
-		png_colorp srcPal = info_ptr->palette;
-		for (int i = 0; i < info_ptr->num_palette; i++) {
-			unsigned char alphaVal = (i < info_ptr->num_trans) ? info_ptr->trans[i] : 0xFF;	// Load alpha if it's there
-			palette.setSingleColorRGBA(i, srcPal->red, srcPal->green, srcPal->blue, alphaVal);
-			srcPal++;
-		}
-	} else {	// Not a palettized image
-		// Round up grayscale images
-		if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) png_set_gray_1_2_4_to_8(png_ptr);
-		// Convert trans channel to alpha for 32 bits
-		if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr);
-		// Filler for alpha?
-		png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
-	}
-
-	unsigned char *line = (unsigned char*) malloc(info_ptr->rowbytes);
-	if (!line) {
-		png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
-		PSP_ERROR("Couldn't allocate line\n");
-		return -1;
-	}
-
-	for (y = 0; y < height; y++) {
-		png_read_row(png_ptr, line, png_bytep_NULL);
-		buffer.copyFromRect(line, info_ptr->rowbytes, 0, y, width, 1);	// Copy into buffer
-		//memcpy(buffer.getPixels()[y * buffer.getWidthInBytes()], line, info_ptr->rowbytes);
-	}
-
-	free(line);
-
-	png_read_end(png_ptr, info_ptr);
-	png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-
-	return 0;
-}
-
 // Defines for working with PSP buttons
 #define CHANGED(x)	 (_buttonsChanged & (x))
 #define PRESSED(x)   ((_buttonsChanged & (x)) && (pad.Buttons & (x)))
@@ -508,10 +348,11 @@ int PSPKeyboard::loadPngImage(Common::SeekableReadStream *file, Buffer &buffer,
  *  Uses the state machine.
  *  returns whether we have an event
  */
-bool PSPKeyboard::processInput(Common::Event &event, SceCtrlData &pad) {
+bool PSPKeyboard::processInput(Common::Event &event, PspEvent &pspEvent, SceCtrlData &pad) {
 	DEBUG_ENTER_FUNC();
 
 	bool haveEvent = false;		// Whether we have an event for the event manager to process
+	bool havePspEvent = false;
 	event.kbd.flags = 0;
 
 	_buttonsChanged = _prevButtons ^ pad.Buttons;
@@ -530,11 +371,11 @@ bool PSPKeyboard::processInput(Common::Event &event, SceCtrlData &pad) {
 		haveEvent = true;
 		_dirty = true;
 		if (UP(PSP_CTRL_START))
-			_state = kInvisible;			// Make us invisible if unpressed
+			havePspEvent = true;
 	}
 	// Check for being in state of moving the keyboard onscreen or pressing select
 	else if (_state == kMove)
-		handleMoveState(pad);
+		havePspEvent = handleMoveState(pad);
 	else if (_state == kDefault)
 		haveEvent = handleDefaultState(event, pad);
 	else if (_state == kCornersSelected)
@@ -544,12 +385,16 @@ bool PSPKeyboard::processInput(Common::Event &event, SceCtrlData &pad) {
 	else if (_state == kLTriggerDown)
 		handleLTriggerDownState(pad);	// Deal with trigger states
 
+	if (havePspEvent) {
+		pspEvent.type = PSP_EVENT_SHOW_VIRTUAL_KB;	// tell the input handler we're off
+		pspEvent.data = false;
+	}
 	_prevButtons = pad.Buttons;
 
 	return haveEvent;
 }
 
-void PSPKeyboard::handleMoveState(SceCtrlData &pad) {
+bool PSPKeyboard::handleMoveState(SceCtrlData &pad) {
 	DEBUG_ENTER_FUNC();
 	if (UP(PSP_CTRL_SELECT)) {
 		// Toggle between visible and invisible
@@ -560,6 +405,9 @@ void PSPKeyboard::handleMoveState(SceCtrlData &pad) {
 			_state = kDefault;
 			_moved = false;				// reset moved flag
 		}
+		if (_state == kInvisible) {
+			return true;				// we become invisible
+		}
 	} else if (DOWN(PSP_DPAD)) {		// How we move the KB onscreen
 		_moved = true;
 		_dirty = true;
@@ -573,6 +421,7 @@ void PSPKeyboard::handleMoveState(SceCtrlData &pad) {
 		else  /* DOWN(PSP_CTRL_RIGHT) */
 			increaseKeyboardLocationX(5);
 	}
+	return false;
 }
 
 bool PSPKeyboard::handleDefaultState(Common::Event &event, SceCtrlData &pad) {
diff --git a/backends/platform/psp/pspkeyboard.h b/backends/platform/psp/pspkeyboard.h
index a30e7d0f32..ebf21cfd54 100644
--- a/backends/platform/psp/pspkeyboard.h
+++ b/backends/platform/psp/pspkeyboard.h
@@ -29,12 +29,15 @@
 #include "common/events.h"
 #include "common/stream.h"
 #include "backends/platform/psp/display_client.h"
+//#include "backends/platform/psp/input.h"
 #include <pspctrl.h>
 
 //number of modes
 #define MODE_COUNT 4
 #define guiStringsSize 8 /* size of guistrings array */
 
+class PspEvent;
+
 class PSPKeyboard : public DisplayClient {
 
 private:
@@ -58,10 +61,9 @@ public:
 	void setClean() { _dirty = false; }
 	bool isVisible() const { return _state != kInvisible; }			// Check if visible
 	void setVisible(bool val);
-	bool processInput(Common::Event &event, SceCtrlData &pad);	// Process input
+	bool processInput(Common::Event &event, PspEvent &pspEvent, SceCtrlData &pad);	// Process input
 	void moveTo(const int newX, const int newY);				// Move keyboard
 	void render();												// Draw the keyboard onscreen
-
 private:
 	enum CursorDirections {
 		kUp = 0,
@@ -75,14 +77,11 @@ private:
 	Palette _palettes[guiStringsSize];
 	GuRenderer _renderer;
 
-	int loadPngImage(Common::SeekableReadStream *file, Buffer &buffer, Palette &palette);
-	int getPngImageSize(Common::SeekableReadStream *, uint32 *png_width, uint32 *png_height, uint32 *paletteSize);
-	uint32 convert_pow2(uint32 size);
 	void increaseKeyboardLocationX(int amount);		// Move keyboard onscreen
 	void increaseKeyboardLocationY(int amount);
 	void convertCursorToXY(CursorDirections cur, int &x, int &y);
 
-	void handleMoveState(SceCtrlData &pad);
+	bool handleMoveState(SceCtrlData &pad);
 	bool handleDefaultState(Common::Event &event, SceCtrlData &pad);
 	bool handleCornersSelectedState(Common::Event &event, SceCtrlData &pad);
 	bool getInputChoice(Common::Event &event, SceCtrlData &pad);
diff --git a/backends/platform/psp/rtc.cpp b/backends/platform/psp/rtc.cpp
index 57edea7e49..f26e5770a6 100644
--- a/backends/platform/psp/rtc.cpp
+++ b/backends/platform/psp/rtc.cpp
@@ -23,13 +23,13 @@
  *
  */
 
-#include <time.h> 
+#include <time.h>
 #include <psptypes.h>
 #include <psprtc.h>
- 
-#include "common/scummsys.h" 
-#include "backends/platform/psp/rtc.h" 
- 
+
+#include "common/scummsys.h"
+#include "backends/platform/psp/rtc.h"
+
 //#define __PSP_DEBUG_FUNCS__	/* For debugging function calls */
 //#define __PSP_DEBUG_PRINT__	/* For debug printouts */
 
@@ -51,13 +51,13 @@ void PspRtc::init() {						// init our starting ticks
 #define MS_LOOP_AROUND 4294967				/* We loop every 2^32 / 1000 = 71 minutes */
 #define MS_LOOP_CHECK  60000				/* Threading can cause weird mixups without this */
 
-// Note that after we fill up 32 bits ie 50 days we'll loop back to 0, which may cause 
+// Note that after we fill up 32 bits ie 50 days we'll loop back to 0, which may cause
 // unpredictable results
 uint32 PspRtc::getMillis() {
 	uint32 ticks[2];
-	
+
 	sceRtcGetCurrentTick((u64 *)ticks);		// can introduce weird thread delays
-	
+
 	uint32 millis = ticks[0]/1000;
 	millis -= _startMillis;					// get ms since start of program
 
@@ -66,22 +66,22 @@ uint32 PspRtc::getMillis() {
 			_looped = true;
 			_milliOffset += MS_LOOP_AROUND;		// add the needed offset
 			PSP_DEBUG_PRINT("looping around. last ms[%d], curr ms[%d]\n", _lastMillis, millis);
-		}	
+		}
 	} else {
 		_looped = false;
 	}
-	
-	_lastMillis = millis;	
-	
+
+	_lastMillis = millis;
+
 	return millis + _milliOffset;
 }
 
 uint32 PspRtc::getMicros() {
 	uint32 ticks[2];
-	
+
 	sceRtcGetCurrentTick((u64 *)ticks);
 	ticks[0] -= _startMicros;
-	
-	return ticks[0]; 
+
+	return ticks[0];
 }
 
diff --git a/backends/platform/psp/rtc.h b/backends/platform/psp/rtc.h
index 7c1a28474d..841d636e2b 100644
--- a/backends/platform/psp/rtc.h
+++ b/backends/platform/psp/rtc.h
@@ -27,7 +27,7 @@
 #define _PSP_RTC_H_
 
 #include "common/singleton.h"
- 
+
 class PspRtc : public Common::Singleton<PspRtc> {
 private:
 	uint32 _startMillis;
@@ -47,4 +47,4 @@ public:
 	uint32 getMicros();
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/backends/platform/psp/tests.cpp b/backends/platform/psp/tests.cpp
index d1bdb9e640..4064ee1d98 100644
--- a/backends/platform/psp/tests.cpp
+++ b/backends/platform/psp/tests.cpp
@@ -23,13 +23,13 @@
  *
  */
 
-// PSP speed and unit tests. Activate in tests.h 
-// You may also want to build without any engines. 
- 
+// PSP speed and unit tests. Activate in tests.h
+// You may also want to build without any engines.
+
 #include "backends/platform/psp/tests.h"
 
-#if defined (PSP_ENABLE_UNIT_TESTS) || defined (PSP_ENABLE_SPEED_TESTS)	
- 
+#if defined (PSP_ENABLE_UNIT_TESTS) || defined (PSP_ENABLE_SPEED_TESTS)
+
 #include "common/scummsys.h"
 #include <pspiofilemgr_fcntl.h>
 #include <pspiofilemgr_stat.h>
@@ -43,20 +43,22 @@
 #include "backends/platform/psp/rtc.h"
 #include "backends/platform/psp/thread.h"
 #include "backends/platform/psp/memory.h"
-
+#include "common/stream.h"
+#include "common/file.h"
+#include "common/fs.h"
 
 #define UNCACHED(x)		((byte *)(((uint32)(x)) | 0x40000000))	/* make an uncached access */
 #define CACHED(x)		((byte *)(((uint32)(x)) & 0xBFFFFFFF))	/* make an uncached access into a cached one */
- 
+
 //#define __PSP_DEBUG_FUNCS__
 //#define __PSP_DEBUG_PRINT__
- 
+
 // Results: (333Mhz/222Mhz)
 // Getting a tick: 1-2 us
 // Getting a time structure: 9/14us
 // ie. using a tick and just dividing by 1000 saves us time.
-  
-#include "backends/platform/psp/trace.h" 
+
+#include "backends/platform/psp/trace.h"
 
 class PspSpeedTests {
 public:
@@ -65,11 +67,11 @@ public:
 	void seekSpeed();
 	void msReadSpeed();
 	void threadFunctionsSpeed();
-	void semaphoreSpeed(); 
+	void semaphoreSpeed();
 	static int threadFunc(SceSize args, void *argp);
 	void semaphoreManyThreadSpeed();
 	void fastCopySpeed();
-	
+
 private:
 	enum {
 		MEMCPY_BUFFER_SIZE = 8192
@@ -93,16 +95,16 @@ void PspSpeedTests::tickSpeed() {
 
 	uint32 currentTicks1[2];
 	uint32 currentTicks2[2];
-	
+
 	sceRtcGetCurrentTick((u64 *)currentTicks1);
 	sceRtcGetCurrentTick((u64 *)currentTicks2);
 	PSP_INFO_PRINT("current tick[%x %x][%u %u]\n", currentTicks1[0], currentTicks1[1], currentTicks1[0], currentTicks1[1]);
 	PSP_INFO_PRINT("current tick[%x %x][%u %u]\n", currentTicks2[0], currentTicks2[1], currentTicks2[0], currentTicks2[1]);
-	
+
 	pspTime time;
 	sceRtcSetTick(&time, (u64 *)currentTicks2);
-	PSP_INFO_PRINT("current tick in time, year[%d] month[%d] day[%d] hour[%d] minutes[%d] seconds[%d] us[%d]\n", time.year, time.month, time.day, time.hour, time.minutes, time.seconds, time.microseconds);	
-	
+	PSP_INFO_PRINT("current tick in time, year[%d] month[%d] day[%d] hour[%d] minutes[%d] seconds[%d] us[%d]\n", time.year, time.month, time.day, time.hour, time.minutes, time.seconds, time.microseconds);
+
 	pspTime time1;
 	pspTime time2;
 	sceRtcGetCurrentClockLocalTime(&time1);
@@ -117,7 +119,7 @@ void PspSpeedTests::getMicrosSpeed() {
 	time2 = PspRtc::instance().getMicros();
 	time3 = PspRtc::instance().getMicros();
 	time4 = PspRtc::instance().getMicros();
-	
+
 	PSP_INFO_PRINT("getMicros() times: %d, %d, %d\n", time4-time3, time3-time2, time2-time1);
 }
 
@@ -126,8 +128,8 @@ void PspSpeedTests::readAndTime(uint32 bytes, char *buffer, FILE *file) {
 	// test minimal read
 	fread(buffer, bytes, 1, file);
 	uint32 time2 = PspRtc::instance().getMicros();
-	
-	PSP_INFO_PRINT("Reading %d byte takes %dus\n", bytes, time2-time1);	
+
+	PSP_INFO_PRINT("Reading %d byte takes %dus\n", bytes, time2-time1);
 }
 
 /*
@@ -156,7 +158,7 @@ void PspSpeedTests::msReadSpeed() {
 	file = fopen("ms0:/psp/music/track1.mp3", "r");
 
 	char *buffer = (char *)malloc(2 * 1024 * 1024);
-	
+
 	readAndTime(1, buffer, file);
 	readAndTime(10, buffer, file);
 	readAndTime(50, buffer, file);
@@ -168,32 +170,32 @@ void PspSpeedTests::msReadSpeed() {
 	readAndTime(6000, buffer, file);
 	readAndTime(7000, buffer, file);
 	readAndTime(8000, buffer, file);
-	readAndTime(9000, buffer, file);	
+	readAndTime(9000, buffer, file);
 	readAndTime(10000, buffer, file);
 	readAndTime(30000, buffer, file);
 	readAndTime(50000, buffer, file);
 	readAndTime(80000, buffer, file);
 	readAndTime(100000, buffer, file);
-	
+
 	fclose(file);
-	free(buffer);	
+	free(buffer);
 }
- 
+
 void PspSpeedTests::seekAndTime(int bytes, int origin, FILE *file) {
 	char buffer[1000];
-	
+
 	uint32 time1 = PspRtc::instance().getMicros();
 	// test minimal read
 	fseek(file, bytes, origin);
 	uint32 time2 = PspRtc::instance().getMicros();
-	
+
 	PSP_INFO_PRINT("Seeking %d byte from %d took %dus\n", bytes, origin, time2-time1);
 
 	time1 = PspRtc::instance().getMicros();
 	// test minimal read
 	fread(buffer, 1000, 1, file);
 	time2 = PspRtc::instance().getMicros();
-	
+
 	PSP_INFO_PRINT("Reading 1000 bytes took %dus\n", time2-time1);
 }
 
@@ -244,9 +246,9 @@ int PspSpeedTests::getThreadIdSpeed() {
 	uint32 time1 = PspRtc::instance().getMicros();
 	int threadId = sceKernelGetThreadId();
 	uint32 time2 = PspRtc::instance().getMicros();
-	
+
 	PSP_INFO_PRINT("Getting thread ID %d took %dus\n", threadId, time2-time1);
-	
+
 	return threadId;
 }
 
@@ -255,7 +257,7 @@ void PspSpeedTests::getPrioritySpeed() {
 	uint32 time1 = PspRtc::instance().getMicros();
 	int priority = sceKernelGetThreadCurrentPriority();
 	uint32 time2 = PspRtc::instance().getMicros();
-	
+
 	PSP_INFO_PRINT("Getting thread priority %d took %dus\n", priority, time2-time1);
 }
 
@@ -264,7 +266,7 @@ void PspSpeedTests::changePrioritySpeed(int id, int priority) {
 	uint32 time1 = PspRtc::instance().getMicros();
 	sceKernelChangeThreadPriority(id, priority);
 	uint32 time2 = PspRtc::instance().getMicros();
-	
+
 	PSP_INFO_PRINT("Changing thread priority to %d for id %d took %dus\n", priority, id, time2-time1);
 }
 
@@ -278,53 +280,53 @@ void PspSpeedTests::threadFunctionsSpeed() {
 	changePrioritySpeed(id, 30);
 	changePrioritySpeed(id, 35);
 	changePrioritySpeed(id, 25);
-	
+
 	// test context switch time
 	for (int i=0; i<10; i++) {
 		uint time1 = PspRtc::instance().getMicros();
 		PspThread::delayMicros(0);
 		uint time2 = PspRtc::instance().getMicros();
-		PSP_INFO_PRINT("poll %d. context switch Time = %dus\n", i, time2-time1);	// 10-15us	
-	}	
+		PSP_INFO_PRINT("poll %d. context switch Time = %dus\n", i, time2-time1);	// 10-15us
+	}
 }
- 
-void PspSpeedTests::semaphoreSpeed() { 
+
+void PspSpeedTests::semaphoreSpeed() {
 	PspSemaphore sem(1);
-	
+
 	uint32 time1 = PspRtc::instance().getMicros();
-	
+
 	sem.take();
-	
+
 	uint32 time2 = PspRtc::instance().getMicros();
-	
+
 	PSP_INFO_PRINT("taking semaphore took %d us\n", time2-time1);	// 10us
-	
+
 	uint32 time3 = PspRtc::instance().getMicros();
-	
+
 	sem.give();
-	
+
 	uint32 time4 = PspRtc::instance().getMicros();
 	PSP_INFO_PRINT("releasing semaphore took %d us\n", time4-time3);	//10us-55us
 }
 
 int PspSpeedTests::threadFunc(SceSize args, void *argp) {
 	PSP_INFO_PRINT("thread %x created.\n", sceKernelGetThreadId());
-	
+
 	_sem.take();
-	
+
 	PSP_INFO_PRINT("grabbed semaphore. Quitting thread\n");
-	
+
 	return 0;
 }
 
-void PspSpeedTests::semaphoreManyThreadSpeed() {	
-	
+void PspSpeedTests::semaphoreManyThreadSpeed() {
+
 	// create 4 threads
 	for (int i=0; i<4; i++) {
 		int thid = sceKernelCreateThread("my_thread", PspSpeedTests::threadFunc, 0x18, 0x10000, THREAD_ATTR_USER, NULL);
 		sceKernelStartThread(thid, 0, 0);
 	}
-		
+
 	PSP_INFO_PRINT("main thread. created threads\n");
 
 	uint32 threads = _sem.numOfWaitingThreads();
@@ -332,10 +334,10 @@ void PspSpeedTests::semaphoreManyThreadSpeed() {
 		threads = _sem.numOfWaitingThreads();
 		PSP_INFO_PRINT("main thread: waiting threads[%d]\n", threads);
 	}
-	
+
 	PSP_INFO_PRINT("main: semaphore value[%d]\n", _sem.getValue());
 	PSP_INFO_PRINT("main thread: waiting threads[%d]\n", _sem.numOfWaitingThreads());
-	
+
 	_sem.give(4);
 }
 
@@ -344,31 +346,31 @@ void PspSpeedTests::fastCopySpecificSize(byte *dst, byte *src, uint32 bytes) {
 	uint32 fastcopyTime, memcpyTime;
 	const int iterations = 2000;
 	int intc;
-	
+
 	intc = pspSdkDisableInterrupts();
-	
+
 	time1 = PspRtc::instance().getMicros();
 	for (int i=0; i<iterations; i++) {
 		PspMemory::fastCopy(dst, src, bytes);
-	}	
+	}
 	time2 = PspRtc::instance().getMicros();
-	
+
 	pspSdkEnableInterrupts(intc);
-	
+
 	fastcopyTime = time2-time1;
-	
+
 	intc = pspSdkDisableInterrupts();
-	
+
 	time1 = PspRtc::instance().getMicros();
 	for (int i=0; i<iterations; i++) {
 		memcpy(dst, src, bytes);
-	}	
+	}
 	time2 = PspRtc::instance().getMicros();
-	
+
 	pspSdkEnableInterrupts(intc);
-	
+
 	memcpyTime = time2-time1;
-	
+
 	PSP_INFO_PRINT("%d bytes. memcpy[%d], fastcopy[%d]\n", bytes, memcpyTime, fastcopyTime);
 }
 
@@ -395,16 +397,16 @@ void PspSpeedTests::fastCopySpeed() {
 
 	uint32 *bufferSrc32 = (uint32 *)memalign(16, MEMCPY_BUFFER_SIZE);
 	uint32 *bufferDst32 = (uint32 *)memalign(16, MEMCPY_BUFFER_SIZE);
-	
+
 	// fill buffer 1
 	for (int i=0; i<MEMCPY_BUFFER_SIZE/4; i++)
 		bufferSrc32[i] = i | (((MEMCPY_BUFFER_SIZE/4)-i)<<16);
-		
+
 	// print buffer
 	for (int i=0; i<50; i++)
 		PSP_INFO_PRINT("%x ", bufferSrc32[i]);
 	PSP_INFO_PRINT("\n");
-	
+
 	byte *bufferSrc = ((byte *)bufferSrc32);
 	byte *bufferDst = ((byte *)bufferDst32);
 
@@ -413,7 +415,7 @@ void PspSpeedTests::fastCopySpeed() {
 	fastCopyDifferentSizes(bufferDst+1, bufferSrc+1);
 	fastCopyDifferentSizes(bufferDst, bufferSrc+1);
 	fastCopyDifferentSizes(bufferDst+1, bufferSrc);
-	
+
 	PSP_INFO_PRINT("\n\ndst cached, src uncached: -----------------\n");
 	bufferSrc = UNCACHED(bufferSrc);
 	fastCopyDifferentSizes(bufferDst, bufferSrc);
@@ -427,7 +429,7 @@ void PspSpeedTests::fastCopySpeed() {
 	fastCopyDifferentSizes(bufferDst+1, bufferSrc+1);
 	fastCopyDifferentSizes(bufferDst, bufferSrc+1);
 	fastCopyDifferentSizes(bufferDst+1, bufferSrc);
-	
+
 	PSP_INFO_PRINT("\n\ndst uncached, src cached: -------------------\n");
 	bufferSrc = CACHED(bufferSrc);
 	fastCopyDifferentSizes(bufferDst, bufferSrc);
@@ -435,7 +437,7 @@ void PspSpeedTests::fastCopySpeed() {
 	fastCopyDifferentSizes(bufferDst, bufferSrc+1);
 	fastCopyDifferentSizes(bufferDst+1, bufferSrc);
 
-	
+
 	free(bufferSrc32);
 	free(bufferDst32);
 }
@@ -445,15 +447,17 @@ void PspSpeedTests::fastCopySpeed() {
 class PspUnitTests {
 public:
 	void testFastCopy();
+	bool testFileSystem();
 
 private:
 	enum {
 		MEMCPY_BUFFER_SIZE = 8192
 	};
-	
+
 	void fastCopySpecificSize(byte *dst, byte *src, uint32 bytes, bool swap = false);
 	void fastCopyDifferentSizes(byte *dst, byte *src, bool swap = false);
-};	
+
+};
 
 void PspUnitTests::testFastCopy() {
 	PSP_INFO_PRINT("running fastcopy unit test ***********\n");
@@ -461,19 +465,19 @@ void PspUnitTests::testFastCopy() {
 
 	uint32 *bufferSrc32 = (uint32 *)memalign(16, MEMCPY_BUFFER_SIZE);
 	uint32 *bufferDst32 = (uint32 *)memalign(16, MEMCPY_BUFFER_SIZE);
-	
+
 	// fill buffer 1
 	for (int i=0; i<MEMCPY_BUFFER_SIZE/4; i++)
 		bufferSrc32[i] = i | (((MEMCPY_BUFFER_SIZE/4)-i)<<16);
-		
+
 	// print buffer
 	for (int i=0; i<50; i++)
 		PSP_INFO_PRINT("%x ", bufferSrc32[i]);
 	PSP_INFO_PRINT("\n");
-	
+
 	byte *bufferSrc = ((byte *)bufferSrc32);
 	byte *bufferDst = ((byte *)bufferDst32);
-	
+
 	fastCopyDifferentSizes(bufferDst, bufferSrc, true);
 	fastCopyDifferentSizes(bufferDst+1, bufferSrc+1);
 	fastCopyDifferentSizes(bufferDst+2, bufferSrc+2, true);
@@ -487,12 +491,12 @@ void PspUnitTests::testFastCopy() {
 	fastCopyDifferentSizes(bufferDst+2, bufferSrc+1);
 	fastCopyDifferentSizes(bufferDst+2, bufferSrc+3);
 	fastCopyDifferentSizes(bufferDst+3, bufferSrc+1);
-	fastCopyDifferentSizes(bufferDst+3, bufferSrc+2);	
-	
+	fastCopyDifferentSizes(bufferDst+3, bufferSrc+2);
+
 	free(bufferSrc32);
 	free(bufferDst32);
 }
-	
+
 void PspUnitTests::fastCopyDifferentSizes(byte *dst, byte *src, bool swap) {
 	fastCopySpecificSize(dst, src, 1);
 	fastCopySpecificSize(dst, src, 2, swap);
@@ -505,7 +509,7 @@ void PspUnitTests::fastCopyDifferentSizes(byte *dst, byte *src, bool swap) {
 	fastCopySpecificSize(dst, src, 12, swap);
 	fastCopySpecificSize(dst, src, 13);
 	fastCopySpecificSize(dst, src, 14, swap);
-	fastCopySpecificSize(dst, src, 15);	
+	fastCopySpecificSize(dst, src, 15);
 	fastCopySpecificSize(dst, src, 16, swap);
 	fastCopySpecificSize(dst, src, 17);
 	fastCopySpecificSize(dst, src, 18, swap);
@@ -525,21 +529,186 @@ void PspUnitTests::fastCopyDifferentSizes(byte *dst, byte *src, bool swap) {
 void PspUnitTests::fastCopySpecificSize(byte *dst, byte *src, uint32 bytes, bool swap) {
 	memset(dst, 0, bytes);
 	PspMemory::fastCopy(dst, src, bytes);
-	
+
 	if (swap) {	// test swap also
 		memset(dst, 0, bytes);
-		
+
 		// pixelformat for swap
 		PSPPixelFormat format;
 		format.set(PSPPixelFormat::Type_4444, true);
-	
+
 		PspMemory::fastSwap(dst, src, bytes, format);
-	}	
+	}
+}
+
+// This function leaks. For now I don't care
+bool PspUnitTests::testFileSystem() {
+	// create memory
+	const uint32 BufSize = 32 * 1024;
+	char* buffer = new char[BufSize];
+	int i;
+	Common::WriteStream *wrStream;
+	Common::SeekableReadStream *rdStream;
+
+	PSP_INFO_PRINT("testing fileSystem...\n");
+
+	// fill buffer
+	for (i=0; i<(int)BufSize; i += 4) {
+		buffer[i] = 'A';
+		buffer[i + 1] = 'B';
+		buffer[i + 2] = 'C';
+		buffer[i + 3] = 'D';
+	}
+
+	// create a file
+	const char *path = "./file.test";
+	Common::FSNode file(path);
+
+	PSP_INFO_PRINT("creating write stream...\n");
+
+	wrStream = file.createWriteStream();
+	if (!wrStream) {
+		PSP_ERROR("%s couldn't be created.\n", path);
+		return false;
+	}
+
+	// write contents
+	char* index = buffer;
+	int32 totalLength = BufSize;
+	int32 curLength = 50;
+
+	PSP_INFO_PRINT("writing...\n");
+
+	while(totalLength - curLength > 0) {
+		if ((int)wrStream->write(index, curLength) != curLength) {
+			PSP_ERROR("couldn't write %d bytes\n", curLength);
+			return false;
+		}
+		totalLength -= curLength;
+		index += curLength;
+		//curLength *= 2;
+		//PSP_INFO_PRINT("write\n");
+	}
+
+	// write the rest
+	if ((int)wrStream->write(index, totalLength) != totalLength) {
+		PSP_ERROR("couldn't write %d bytes\n", curLength);
+		return false;
+	}
+
+	delete wrStream;
+
+	PSP_INFO_PRINT("reading...\n");
+
+	rdStream = file.createReadStream();
+	if (!rdStream) {
+		PSP_ERROR("%s couldn't be created.\n", path);
+		return false;
+	}
+
+	// seek to beginning
+	if (!rdStream->seek(0, SEEK_SET)) {
+		PSP_ERROR("couldn't seek to the beginning after writing the file\n");
+		return false;
+	}
+
+	// read the contents
+	char *readBuffer = new char[BufSize + 4];
+	memset(readBuffer, 0, (BufSize + 4));
+	index = readBuffer;
+	while (rdStream->read(index, 100) == 100) {
+		index += 100;
+	}
+
+	if (!rdStream->eos()) {
+		PSP_ERROR("didn't find EOS at end of stream\n");
+		return false;
+	}
+
+	// compare
+	for (i=0; i<(int)BufSize; i++)
+		if (buffer[i] != readBuffer[i]) {
+			PSP_ERROR("reading/writing mistake at %x. Got %x instead of %x\n", i, readBuffer[i], buffer[i]);
+			return false;
+		}
+
+	// Check for exceeding limit
+	for (i=0; i<4; i++) {
+		if (readBuffer[BufSize + i]) {
+			PSP_ERROR("read exceeded limits. %d = %x\n", BufSize + i, readBuffer[BufSize + i]);
+		}
+	}
+
+	delete rdStream;
+
+	PSP_INFO_PRINT("writing...\n");
+
+	wrStream = file.createWriteStream();
+	if (!wrStream) {
+		PSP_ERROR("%s couldn't be created.\n", path);
+		return false;
+	}
+
+	const char *phrase = "Jello is really fabulous";
+	uint32 phraseLen = strlen(phrase);
+
+	int ret;
+	if ((ret = wrStream->write(phrase, phraseLen)) != (int)phraseLen) {
+		PSP_ERROR("couldn't write phrase. Got %d instead of %d\n", ret, phraseLen);
+		return false;
+	}
+
+	PSP_INFO_PRINT("reading...\n");
+
+	delete wrStream;
+	rdStream = file.createReadStream();
+	if (!rdStream) {
+		PSP_ERROR("%s couldn't be created.\n", path);
+		return false;
+	}
+
+	char *readPhrase = new char[phraseLen + 2];
+	memset(readPhrase, 0, phraseLen + 2);
+
+	if ((ret = rdStream->read(readPhrase, phraseLen) != phraseLen)) {
+		PSP_ERROR("read error on phrase. Got %d instead of %d\n", ret, phraseLen);
+		return false;
+	}
+
+	for (i=0; i<(int)phraseLen; i++) {
+		if (readPhrase[i] != phrase[i]) {
+			PSP_ERROR("bad read/write in phrase. At %d, %x != %x\n", i, readPhrase[i], phrase[i]);
+			return false;
+		}
+	}
+
+	// check for exceeding
+	if (readPhrase[i] != 0) {
+		PSP_ERROR("found excessive copy in phrase. %c at %d\n", readPhrase[i], i);
+		return false;
+	}
+
+	PSP_INFO_PRINT("trying to read end...\n");
+
+	// seek to end
+	if (!rdStream->seek(0, SEEK_END)) {
+		PSP_ERROR("couldn't seek to end for append\n");
+		return false;
+	};
+
+	// try to read
+	if (rdStream->read(readPhrase, 2) || !rdStream->eos()) {
+		PSP_ERROR("was able to read at end of file\n");
+		return false;
+	}
+
+	PSP_INFO_PRINT("ok\n");
+	return true;
 }
 
 void psp_tests() {
 	PSP_INFO_PRINT("in tests\n");
-	
+
 #ifdef PSP_ENABLE_SPEED_TESTS
 	// Speed tests
 	PspSpeedTests speedTests;
@@ -549,17 +718,18 @@ void psp_tests() {
 	speedTests.seekSpeed();
 	speedTests.msReadSpeed();
 	speedTests.threadFunctionsSpeed();
-	speedTests.semaphoreSpeed();	
+	speedTests.semaphoreSpeed();
 	speedTests.semaphoreManyThreadSpeed();
 	speedTests.fastCopySpeed();
-#endif	
-	
+#endif
+
 #ifdef PSP_ENABLE_UNIT_TESTS
 	// Unit tests
 	PspUnitTests unitTests;
-	
-	unitTests.testFastCopy();
-#endif	
-}	
 
-#endif /* (PSP_ENABLE_UNIT_TESTS) || defined (PSP_ENABLE_SPEED_TESTS) */
\ No newline at end of file
+	//unitTests.testFastCopy();
+	unitTests.testFileSystem();
+#endif
+}
+
+#endif /* (PSP_ENABLE_UNIT_TESTS) || defined (PSP_ENABLE_SPEED_TESTS) */
diff --git a/backends/platform/psp/tests.h b/backends/platform/psp/tests.h
index 1518acfb4c..9af7ba8d7d 100644
--- a/backends/platform/psp/tests.h
+++ b/backends/platform/psp/tests.h
@@ -23,14 +23,14 @@
  *
  */
 
-#ifndef _PSP_TESTS_H_ 
+#ifndef _PSP_TESTS_H_
 #define _PSP_TESTS_H_
 
 //#define PSP_ENABLE_UNIT_TESTS		// run unit tests
 //#define PSP_ENABLE_SPEED_TESTS		// run speed tests
 
-#if defined (PSP_ENABLE_UNIT_TESTS) || defined (PSP_ENABLE_SPEED_TESTS)	
+#if defined (PSP_ENABLE_UNIT_TESTS) || defined (PSP_ENABLE_SPEED_TESTS)
 void psp_tests();
 #endif
 
-#endif /* _PSP_TESTS_H_ */
\ No newline at end of file
+#endif /* _PSP_TESTS_H_ */
diff --git a/backends/platform/psp/thread.cpp b/backends/platform/psp/thread.cpp
index 916b1e553b..f9e497a342 100644
--- a/backends/platform/psp/thread.cpp
+++ b/backends/platform/psp/thread.cpp
@@ -23,12 +23,12 @@
  *
  */
 
-#include <pspthreadman.h> 
+#include <pspthreadman.h>
 
 #include "backends/platform/psp/thread.h"
 #include "backends/platform/psp/trace.h"
- 
-// Class PspThreadable -------------------------------------------------- 
+
+// Class PspThreadable --------------------------------------------------
 // Inherit this to create C++ threads easily
 
 bool PspThreadable::threadCreateAndStart(const char *threadName, int priority, int stackSize, bool useVfpu /*= false*/) {
@@ -38,41 +38,41 @@ bool PspThreadable::threadCreateAndStart(const char *threadName, int priority, i
 		PSP_ERROR("thread already created!\n");
 		return false;
 	}
-		
+
 	_threadId = sceKernelCreateThread(threadName, __threadCallback, priority, stackSize, THREAD_ATTR_USER, 0);	// add VFPU support
 
 	if (_threadId < 0) {
 		PSP_ERROR("failed to create %s thread. Error code %d\n", threadName, _threadId);
 		return false;
 	}
-	
+
 	// We want to pass the pointer to this, but we'll have to take address of this so use a little trick
 	PspThreadable *_this = this;
-	
+
 	if (sceKernelStartThread(_threadId, sizeof(uint32 *), &_this) < 0) {
 		PSP_ERROR("failed to start %s thread id[%d]\n", threadName, _threadId);
 		return false;
 	}
-	
-	PSP_DEBUG_PRINT("Started %s thread with id[%x]\n", threadName, _threadId);	
-	
+
+	PSP_DEBUG_PRINT("Started %s thread with id[%x]\n", threadName, _threadId);
+
 	return true;
 }
 
 // Callback function to be called by PSP kernel
 int PspThreadable::__threadCallback(SceSize, void *__this) {
 	DEBUG_ENTER_FUNC();
-	
+
 	PspThreadable *_this = *(PspThreadable **)__this;	// Dereference the copied value which was 'this'
-	
+
 	_this->threadFunction();	// call the virtual function
-	
+
 	return 0;
 }
 
 // PspThread class
 // Utilities to access general thread functions
- 
+
 void PspThread::delayMillis(uint32 ms) {
 	sceKernelDelayThread(ms * 1000);
 }
@@ -90,8 +90,8 @@ void PspThread::delayMicros(uint32 us) {
 PspSemaphore::PspSemaphore(int initialValue, int maxValue/*=255*/) {
 	DEBUG_ENTER_FUNC();
 	_handle = 0;
-	_handle = (uint32)sceKernelCreateSema("ScummVM Sema", 0 /* attr */, 
-								  initialValue, maxValue, 
+	_handle = (uint32)sceKernelCreateSema("ScummVM Sema", 0 /* attr */,
+								  initialValue, maxValue,
 								  0 /*option*/);
 	if (!_handle)
 		PSP_ERROR("failed to create semaphore.\n");
@@ -108,10 +108,10 @@ int PspSemaphore::numOfWaitingThreads() {
 	DEBUG_ENTER_FUNC();
 	SceKernelSemaInfo info;
 	info.numWaitThreads = 0;
-	
+
 	if (sceKernelReferSemaStatus((SceUID)_handle, &info) < 0)
 		PSP_ERROR("failed to retrieve semaphore info for handle %d\n", _handle);
-		
+
 	return info.numWaitThreads;
 }
 
@@ -119,10 +119,10 @@ int PspSemaphore::getValue() {
 	DEBUG_ENTER_FUNC();
 	SceKernelSemaInfo info;
 	info.currentCount = 0;
-	
+
 	if (sceKernelReferSemaStatus((SceUID)_handle, &info) < 0)
 		PSP_ERROR("failed to retrieve semaphore info for handle %d\n", _handle);
-		
+
 	return info.currentCount;
 }
 
@@ -130,18 +130,18 @@ bool PspSemaphore::pollForValue(int value) {
 	DEBUG_ENTER_FUNC();
 	if (sceKernelPollSema((SceUID)_handle, value) < 0)
 		return false;
-	
+
 	return true;
 }
 
 // false: timeout or error
 bool PspSemaphore::takeWithTimeOut(uint32 timeOut) {
 	DEBUG_ENTER_FUNC();
-	
+
 	uint32 *pTimeOut = 0;
-	if (timeOut) 
+	if (timeOut)
 		pTimeOut = &timeOut;
-	
+
 	if (sceKernelWaitSema(_handle, 1, pTimeOut) < 0)	// we always wait for 1
 		return false;
 	return true;
@@ -149,9 +149,9 @@ bool PspSemaphore::takeWithTimeOut(uint32 timeOut) {
 
 bool PspSemaphore::give(int num /*=1*/) {
 	DEBUG_ENTER_FUNC();
-	
+
 	if (sceKernelSignalSema((SceUID)_handle, num) < 0)
-		return false;	
+		return false;
 	return true;
 }
 
@@ -161,7 +161,7 @@ bool PspMutex::lock() {
 	DEBUG_ENTER_FUNC();
 	int threadId = sceKernelGetThreadId();
 	bool ret = true;
-	
+
 	if (_ownerId == threadId) {
 		_recursiveCount++;
 	} else {
@@ -176,19 +176,19 @@ bool PspMutex::unlock() {
 	DEBUG_ENTER_FUNC();
 	int threadId = sceKernelGetThreadId();
 	bool ret = true;
-	
+
 	if (_ownerId != threadId) {
 		PSP_ERROR("attempt to unlock mutex by thread[%x] as opposed to owner[%x]\n",
 			threadId, _ownerId);
 		return false;
 	}
-	
+
 	if (_recursiveCount) {
 		_recursiveCount--;
 	} else {
 		_ownerId = 0;
 		ret = _semaphore.give(1);
-	}	
+	}
 	return ret;
 }
 
@@ -200,7 +200,7 @@ void PspCondition::releaseAll() {
         if (_waitingThreads > _signaledThreads) {	// we have signals to issue
                 int numWaiting = _waitingThreads - _signaledThreads;	// threads we haven't signaled
                 _signaledThreads = _waitingThreads;
-                
+
 				_waitSem.give(numWaiting);
                 _mutex.unlock();
                 for (int i=0; i<numWaiting; i++)	// wait for threads to tell us they're awake
diff --git a/backends/platform/psp/thread.h b/backends/platform/psp/thread.h
index de1c10a2aa..bbad2a9ead 100644
--- a/backends/platform/psp/thread.h
+++ b/backends/platform/psp/thread.h
@@ -34,7 +34,7 @@ class PspThreadable {
 protected:
 	int _threadId;
 	virtual void threadFunction() = 0;	// this function will be called when the thread starts
-public:	
+public:
 	PspThreadable() : _threadId(-1) {}					// constructor
 	virtual ~PspThreadable() {}							// destructor
 	static int __threadCallback(SceSize, void *__this);	// used to get called by sceKernelStartThread() Don't override
@@ -43,7 +43,7 @@ public:
 
 // class for thread utils
 class PspThread {
-public:	
+public:
 	// static functions
 	static void delayMillis(uint32 ms);	// delay the current thread
 	static void delayMicros(uint32 us);
@@ -106,7 +106,7 @@ enum StackSizes {
 	STACK_DISPLAY_THREAD = 2 * 1024,
 	STACK_POWER_THREAD = 4 * 1024
 };
-	
+
 #endif /* PSP_THREADS_H */
 
 
diff --git a/backends/platform/sdl/main.cpp b/backends/platform/sdl/main.cpp
index f917c51048..00ec0b8185 100644
--- a/backends/platform/sdl/main.cpp
+++ b/backends/platform/sdl/main.cpp
@@ -25,7 +25,7 @@
 
 // Several SDL based ports use a custom main, and hence do not want to compile
 // of this file. The following "#if" ensures that.
-#if !defined(UNIX) && !defined(WIN32) && !defined(__MAEMO__) && !defined(__SYMBIAN32__) && !defined(__amigaos4__)
+#if !defined(UNIX) && !defined(WIN32) && !defined(__MAEMO__) && !defined(__SYMBIAN32__) && !defined(__amigaos4__) && !defined(DINGUX) && !defined(CAANOO) && !defined(OPENPANDORA)
 
 #include "backends/platform/sdl/sdl.h"
 #include "backends/plugins/sdl/sdl-provider.h"
diff --git a/backends/platform/symbian/AdaptAllMMPs.pl b/backends/platform/symbian/AdaptAllMMPs.pl
index a4fdd669ca..8e97f469f9 100644
--- a/backends/platform/symbian/AdaptAllMMPs.pl
+++ b/backends/platform/symbian/AdaptAllMMPs.pl
@@ -8,40 +8,41 @@ chdir("../../../");
 @mmp_files = (
 
 	# Engine Project files
-	"mmp/scummvm_agi.mmp", 
-	"mmp/scummvm_agos.mmp", 
-	"mmp/scummvm_cine.mmp", 
-	"mmp/scummvm_cruise.mmp", 
-	"mmp/scummvm_drascula.mmp", 
-	"mmp/scummvm_gob.mmp", 
-	"mmp/scummvm_groovie.mmp", 
-	"mmp/scummvm_kyra.mmp", 
-	"mmp/scummvm_lure.mmp", 
+	"mmp/scummvm_agi.mmp",
+	"mmp/scummvm_agos.mmp",
+	"mmp/scummvm_cine.mmp",
+	"mmp/scummvm_cruise.mmp",
+	"mmp/scummvm_drascula.mmp",
+	"mmp/scummvm_gob.mmp",
+	"mmp/scummvm_groovie.mmp",
+	"mmp/scummvm_kyra.mmp",
+	"mmp/scummvm_lure.mmp",
 	"mmp/scummvm_m4.mmp",
 	"mmp/scummvm_made.mmp",
-	"mmp/scummvm_parallaction.mmp", 
-	"mmp/scummvm_queen.mmp", 
-	"mmp/scummvm_saga.mmp", 
-	"mmp/scummvm_scumm.mmp", 
-	"mmp/scummvm_sky.mmp", 
-	"mmp/scummvm_sword1.mmp", 
+	"mmp/scummvm_parallaction.mmp",
+	"mmp/scummvm_queen.mmp",
+	"mmp/scummvm_saga.mmp",
+	"mmp/scummvm_scumm.mmp",
+	"mmp/scummvm_sky.mmp",
+	"mmp/scummvm_sword1.mmp",
 	"mmp/scummvm_sword2.mmp",
-	"mmp/scummvm_touche.mmp", 
-	"mmp/scummvm_tinsel.mmp", 
-	"mmp/scummvm_tucker.mmp", 
-	"mmp/scummvm_sci.mmp", 
-	"mmp/scummvm_draci.mmp", 
-	"mmp/scummvm_teenagent.mmp", 
-	"mmp/scummvm_mohawk.mmp", 
+	"mmp/scummvm_touche.mmp",
+	"mmp/scummvm_tinsel.mmp",
+	"mmp/scummvm_tucker.mmp",
+	"mmp/scummvm_sci.mmp",
+	"mmp/scummvm_draci.mmp",
+	"mmp/scummvm_teenagent.mmp",
+	"mmp/scummvm_mohawk.mmp",
+	"mmp/scummvm_hugo.mmp",
 	# Target Platform Project Files
-	"S60/ScummVM_S60.mmp",  
-	"S60v3/ScummVM_S60v3.mmp", 
-	"S60v3/ScummVM_A0000658_S60v3.mmp", 
-	"S80/ScummVM_S80.mmp", 
+	"S60/ScummVM_S60.mmp",
+	"S60v3/ScummVM_S60v3.mmp",
+	"S60v3/ScummVM_A0000658_S60v3.mmp",
+	"S80/ScummVM_S80.mmp",
 	"S90/ScummVM_S90.mmp",
-	"UIQ2/ScummVM_UIQ2.mmp", 
+	"UIQ2/ScummVM_UIQ2.mmp",
 	"UIQ3/ScummVM_UIQ3.mmp",
-	"UIQ3/ScummVM_A0000658_UIQ3.mmp" 
+	"UIQ3/ScummVM_A0000658_UIQ3.mmp"
 
 );
 
@@ -74,22 +75,22 @@ my @sections_kyra = ("", "ENABLE_LOL"); # special sections for engine KYRA
 my @sections_agos = ("", "ENABLE_AGOS2"); # special sections for engine AGOS
 
 # files excluded from build, case insensitive, will be matched in filename string only
-my @excludes_snd = ( 
+my @excludes_snd = (
 	"mt32.*",
 	"fluidsynth.cpp",
 	"i386.cpp",
 	"part.*",
-	"synth.cpp",
 	"tables.cpp",
 	"freeverb.cpp",
+	"synth.cpp",
 	"rate.*"			# not really needed, USE_ARM_SOUND_ASM currently not parsed correctly,
 						# "rate[_arm|_arm_asm].(cpp|s)" will be added later based on WINS/ARM build!
 						# These #defines for compile time are set in portdefs.h
-); 
+);
 
-my @excludes_graphics = ( 
+my @excludes_graphics = (
 	"iff.cpp"
-); 
+);
 
 # the USE_ARM_* defines not parsed correctly, exclude manually:
 my @excludes_scumm = (
@@ -133,6 +134,7 @@ ParseModule("_sci",	"sci",		\@section_empty);
 ParseModule("_draci",	"draci",	\@section_empty);
 ParseModule("_teenagent","teenagent",	\@section_empty);
 ParseModule("_mohawk"   ,"mohawk",	\@section_empty);
+ParseModule("_hugo"     ,"hugo",	\@section_empty);
 print "
 =======================================================================================
 Done. Enjoy :P
@@ -142,7 +144,7 @@ Done. Enjoy :P
 ##################################################################################################################
 ##################################################################################################################
 
-# parses multiple sections per mmp/module 
+# parses multiple sections per mmp/module
 sub ParseModule
 {
 	my ($mmp,$module,$sections,$exclusions) = @_;
@@ -167,7 +169,7 @@ sub CheckForModuleMK
 	if (-d $item)
 	{
 		#print "$item\n";
-		
+
 		opendir DIR, $item;
 		#my @Files = readdir DIR;
 		my @Files = grep s/^([^\.].*)$/$1/, readdir DIR;
@@ -186,7 +188,7 @@ sub CheckForModuleMK
 		my $isenable;
 		my $ObjectsSelected = 0;
 		my $ObjectsTotal = 0;
-		
+
 		print "$item for section '$section' ... ";
 
 		open FILE, $item;
@@ -195,14 +197,14 @@ sub CheckForModuleMK
 
 		my $count = @lines;
 		print "$count lines";
-		
+
 		A: foreach $line (@lines)
 		{
 			# all things we need are inside #ifdef sections,
 			# there is nothing we need in #ifndef sections: so ignore these for now
-			
-			# found a section? reset 
-			if ($line =~ /^ifdef (.*)/) 
+
+			# found a section? reset
+			if ($line =~ /^ifdef (.*)/)
 			{
 				$sec = $1;
 				$isenable = 1;
@@ -225,7 +227,7 @@ sub CheckForModuleMK
 					$line =~ s/ \\//; # remove possible trailing ' \'
 					$line =~ s/\//\\/g; # replace / with \
 					chop($line); # remove \n
-					
+
 					# do we need to skip this file? According to our own @exclusions array
 					foreach $exclusion (@exclusions)
 					{
@@ -237,7 +239,7 @@ sub CheckForModuleMK
 							next A;
 						}
 					}
-					
+
 					# do we need to do this file? According to MACROs in .MMPs
 					my $found = 0;
 					foreach $EnableDefine (@EnabledDefines)
@@ -265,7 +267,7 @@ sub CheckForModuleMK
 						$output .= "//SOURCE $line ($reason)\n";
 						next A;
 					}
-										
+
 					$ObjectsSelected++;
 					#print "\n         $line";
 					$output .= "SOURCE $line\n";
@@ -288,7 +290,7 @@ sub UpdateProjectFile
 	my $updated = " Updated @ ".localtime();
 	my $name;
 	my @mmp_files_plus_one = @mmp_files;
-	unshift @mmp_files_plus_one, "mmp/scummvm_base.mmp";	
+	unshift @mmp_files_plus_one, "mmp/scummvm_base.mmp";
 
 	foreach $name (@mmp_files_plus_one)
 	{
@@ -297,23 +299,23 @@ sub UpdateProjectFile
 		open FILE, "$file";
 		my @lines = <FILE>;
 		close FILE;
-		
+
 		my $onestr = join("",@lines);
-		
+
 		if ($onestr =~ /$n/)
 		{
 
 			print "      - $name @ $n updating ... ";
-	
+
 			$onestr =~ s/$a.*$b/$a$updated\n$output$b/s;
 			open FILE, ">$file";
 			print FILE $onestr;
 			close FILE;
-			
+
 			print "done.\n";
 		}
 	}
-		
+
 	$output = "";
 }
 
@@ -323,7 +325,7 @@ sub UpdateSlaveMacros
 {
 	my $updated = " Updated @ ".localtime();
 
-	my $name = "mmp/scummvm_base.mmp";	
+	my $name = "mmp/scummvm_base.mmp";
 	my $file = "$buildDir/$name";
 	print "Reading master MACROS from backends/symbian/$name ... ";
 
@@ -337,7 +339,7 @@ sub UpdateSlaveMacros
 	my $b = "\/\/STOP_$n\/\/";
 	$onestr =~ /$a(.*)$b/s;
 	my $macros = $1;
-	
+
 	my $libs_first = "\n// automagically enabled static libs from macros above\n";
 	my $libs_second = "STATICLIBRARY	scummvm_base.lib // must be above USE_* .libs\n";
 	my $macro_counter = 0;
@@ -350,7 +352,7 @@ sub UpdateSlaveMacros
 		if ($line =~ /^.*MACRO\s*([0-9A-Z_]*)\s*\/\/\s*LIB\:(.*)$/)
 		{
 			my $macro = $1; my $lib = $2;
-			
+
 			# this macro enabled? then also add the .lib
 			if ($line =~ /^\s*MACRO\s*$macro/m)
 			{
@@ -361,7 +363,7 @@ sub UpdateSlaveMacros
 				if ($macro =~ /^ENABLE_/)
 				{
 					$libs_first .= "STATICLIBRARY	$lib\n";
-					
+
 					# add projects for BLD.INF's
 					my $projectname = substr("$lib",0,-4);
 					$projects .= "..\\mmp\\$projectname.mmp\n";
@@ -388,7 +390,7 @@ sub UpdateSlaveMacros
 				push @DisabledDefines, $macro; # used in CheckForModuleMK()!!
 			}
 		}
-	}		
+	}
 
 	print "$macro_counter macro lines.\n";
 
@@ -399,23 +401,23 @@ sub UpdateSlaveMacros
 	$m = "AUTO_PROJECTS";
 	$p = "\/\/START_$m\/\/";
 	$q = "\/\/STOP_$m\/\/";
-	
+
 	foreach $name (@mmp_files)
 	{
 		$file = "$buildDir/$name";
 		$fileBLDINF = $buildDir .'/'. substr($name, 0, rindex($name, "/")) . "/BLD.INF";
 		print "Updating macros   in $file ... ";
 		#print "Updating macros in backends/symbian/$name ... ";
-	
+
 		open FILE, "$file";	@lines = <FILE>; close FILE;
 		$onestr = join("",@lines);
-	
+
 		my $extralibs = ""; # output
 		# slash in name means it's a phone specific build file: add LIBs
 		$extralibs .= "$libs_first$libs_second" if (-e $fileBLDINF);
-		
+
 		$onestr =~ s/$a.*$b/$a$updated$macros2$extralibs$b/s;
-		
+
 		open FILE, ">$file"; print FILE $onestr; close FILE;
 
 		my $count = @lines;
@@ -429,13 +431,13 @@ sub UpdateSlaveMacros
 
 			open FILE, "$fileBLDINF";	@lines = <FILE>; close FILE;
 			$onestr = join("",@lines);
-		
+
 			$onestr =~ s/$p.*$q/$p$updated$projects$q/s;
-			
+
 			open FILE, ">$fileBLDINF"; print FILE $onestr; close FILE;
 		}
 	}
-}		
+}
 
 ##################################################################################################################
 
@@ -443,10 +445,10 @@ sub ResetProjectFiles()
 {
 	my $onestr, @lines;
 	my @mmp_files_plus_one = @mmp_files;
-#	unshift @mmp_files_plus_one, "mmp/scummvm_base.mmp";	
-	
+#	unshift @mmp_files_plus_one, "mmp/scummvm_base.mmp";
+
 	print "Resetting project files: ";
-	
+
 	# we don't need to do mmp/scummvm_base.mmp", it was done in BuildPackageUpload.pl before the call to this script
 	foreach $name (@mmp_files_plus_one)
 	{
@@ -466,7 +468,7 @@ sub ResetProjectFiles()
 			$onestr = join("",@lines);
 			open FILE, ">$fileBLDINF"; print FILE $onestr; close FILE;
 		}
-	}	
+	}
 
 	print "... done.\n";
 }
diff --git a/backends/platform/symbian/BuildPackageUpload_AllVersions.pl b/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
index 62fcef0275..3bdcede76a 100644
--- a/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
+++ b/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
@@ -17,7 +17,7 @@ $SDK_BuildDirs{'S60v3'}	= "S60v3";
 $SDK_BuildDirs{'S80'}	= "S80";
 $SDK_BuildDirs{'S90'}	= "S90";
 
-# the target name inserted here: 'abld BUILD $SDK_TargetName UREL' 
+# the target name inserted here: 'abld BUILD $SDK_TargetName UREL'
 $SDK_TargetName{'UIQ2'}	= "armi";
 $SDK_TargetName{'UIQ3'}	= "gcce";
 $SDK_TargetName{'S60v1'}= "armi";
@@ -117,7 +117,7 @@ foreach $Library (sort keys(%PresentLibs))
 #					push @Packages, sprintf($file_tpl_sis, $version_tpl_sis, $SDK2, $Extra);
 #					$PackagesQueued++;
 #				}
-#			}	
+#			}
 #		}
 #		else
 #		{
@@ -144,7 +144,7 @@ while( ($SDK, $Value) = each(%VariationSets) )
 					push @Packages, sprintf($file_tpl_sis, $version_tpl_sis, $SDK2, $Extra);
 					$PackagesQueued++;
 				}
-			}	
+			}
 		}
 		else
 		{
@@ -170,7 +170,7 @@ Preparing to Build, Package & Upload $PackagesQueued SymbianOS ScummVM variation
 
 	SDKs inst'd  \t$SDKs	".(	%SDK_LibraryDirs ? "
 	LIBs inst'd  \t$LIBs	" : "" )."
-	$PackagesQueued Variations \t$PackagesStr	
+	$PackagesQueued Variations \t$PackagesStr
 	DIR base     \t$base_dir
 	    build    \t$build_dir
 	    output   \t$output_dir
@@ -178,7 +178,7 @@ Preparing to Build, Package & Upload $PackagesQueued SymbianOS ScummVM variation
 	FTP host     \t$FTP_Host
 	    user     \t$FTP_User
 	    pass     \t"."*" x length($FTP_Pass)."
-	    dir      \t$FTP_Dir	
+	    dir      \t$FTP_Dir
 " : "" )."
 =======================================================================================
 Press Ctrl-C to abort or enter to continue Build, Package & Upload $PackagesQueued Variations...
@@ -194,7 +194,7 @@ unlink($build_log_out);
 unlink($build_log_err);
 
 # init _base.mmp now, so we can start changing it without affecting the CVS version _base.mmp.in!
-my $name = "mmp/scummvm_base.mmp";	
+my $name = "mmp/scummvm_base.mmp";
 my $file  = "$build_dir/$name";
 open FILE, "$file.in";	@lines = <FILE>; close FILE;
 my $onestr = join("",@lines);
@@ -219,7 +219,7 @@ while( ($SDK, $Value) = each(%SDK_LibraryDirs) )
 					$LibrariesQueued++;
 					DoLibrary($SDK2, $Library, $Path);
 				}
-			}	
+			}
 		}
 		else
 		{
@@ -252,7 +252,7 @@ while( ($SDK, $VariationsHash) = each(%SDK_Variations) )
 				{
 					DoVariation($SDK2, $Variation, $MacroBlock);
 				}
-			}	
+			}
 		}
 		else
 		{
@@ -277,7 +277,7 @@ while( ($SDK, $VariationsHash) = each(%VariationSets) )
 				{
 					DoVariation($SDK2, $Variation, $MacroBlock);
 				}
-			}	
+			}
 		}
 		else
 		{
@@ -335,7 +335,7 @@ print "       SumthinWicked wishes you a ridiculously good and optimally happy d
 sub MakeMppMacroDefs
 {
 	my ($features) = @_;
-	
+
 	my %EnabledFeatures = ();
 	foreach (split(/\W|\r|\n/, $features))
 	{
@@ -398,14 +398,14 @@ sub MakeMppMacroDefs
 			$MacroDefs .= "//MACRO		ENABLE_$E\n";
 		}
 	}
-	
+
 #print "\n\n'$features' ==> $MacroDefs\n\n\n";
 	return $MacroDefs;
 }
 
 ##################################################################################################################
 
-# Build, Package & Upload a single Variation 
+# Build, Package & Upload a single Variation
 sub DoLibrary
 {
 	my ($SDK, $Library, $Path) = @_;
@@ -435,23 +435,23 @@ my $header = "
 	my $OK = 1;
 
 	PrepSdkPaths($SDK);
-	
+
 	chdir($Path) or $OK=0;
 	PrintErrorMessage("Changing to $Path failed!") if (!$OK);
-	return 0 if (!$OK);	
+	return 0 if (!$OK);
 
 	PrintMessage("Cleaning for $Target") if (!$ReallyQuiet);
 	system("bldmake bldfiles > NUL 2> NUL");
 	PrintErrorMessage("'bldmake bldfiles' exited with value " . ($? >> 8)) if ($? >> 8);
 
 	system("abld MAKEFILE $TargetName > NUL 2> NUL");
-	PrintErrorMessage("'abld MAKEFILE $TargetName' exited with value " . ($? >> 8)) if ($? >> 8);	
+	PrintErrorMessage("'abld MAKEFILE $TargetName' exited with value " . ($? >> 8)) if ($? >> 8);
 
 	system("abld CLEAN $TargetName UREL > NUL 2> NUL");
-	PrintErrorMessage("'abld CLEAN $TargetName urel' exited with value " . ($? >> 8)) if ($? >> 8);	
+	PrintErrorMessage("'abld CLEAN $TargetName urel' exited with value " . ($? >> 8)) if ($? >> 8);
 	# remove file so we are sure that after .lib generation we have a fresh copy!
 	if (-e $TargetFilePath) { unlink($TargetFilePath) or PrintErrorMessage("Removing $TargetFilePath"); }
-	
+
 	my $Redirection = "OUT:file, ERR:".($RedirectSTDERR ? "file" : "screen");
 	my $Message = "Building $Target ($Redirection)";
 	PrintMessage($Message) if (!$ReallyQuiet);
@@ -463,14 +463,14 @@ my $header = "
 	$OK = 0 if ($? >> 8);
 #	print "  STDERR: ".((-s $build_log_err)-$OldSize)." bytes output written to $build_log_err\n+--------------------------------------------------------------------------------------\n" if ($OldSize != (-s $build_log_err));
 	PrintErrorMessage("'abld TARGET $TargetName UREL' exited with value " . ($? >> 8)) if ($? >> 8);
-	return 0 if (!$OK); # ABLD always returns ok :( grr	
+	return 0 if (!$OK); # ABLD always returns ok :( grr
 	PrintMessage("Done.") if (!$ReallyQuiet);
 
 	# did it work? :)
 	if (-e $TargetFilePath)
 	{
 		$LibrariesSucceeded++;
-		
+
 		if ($TargetIntermediatePath ne '' && $TargetIntermediatePath =~ /\\EPOC32\\BUILD\\/i) # make really sure it's a valid path!
 		{
 			system("del /S /Q $TargetIntermediatePath > NUL");
@@ -491,12 +491,12 @@ my $header = "
 
 ##################################################################################################################
 
-# Build, Package & Upload a single Variation 
+# Build, Package & Upload a single Variation
 sub DoVariation
 {
 	my ($SDK, $Variation, $MacroBlock) = @_;
 	my $Extra = ($Variation ne '' ? "_$Variation" : "");
-	my $Package = sprintf($file_tpl_sis, $version_tpl_sis, $SDK, $Extra);	
+	my $Package = sprintf($file_tpl_sis, $version_tpl_sis, $SDK, $Extra);
 
 	if ($SkipExistingPackages && -f "$output_dir/$Package")
 	{
@@ -527,7 +527,7 @@ my $header = "
 	if ($OK)
 	{
 		$OK = BuildVariation($SDK, $Variation, $Package, $MacroBlock);
-	
+
 		if ($OK && $FTP_Host ne '')
 		{
 			UploadVariation($SDK, $Variation, $Package);
@@ -543,17 +543,17 @@ sub PrepVariation()
 	my $OK = 1;
 
 	PrepSdkPaths($SDK);
-	
+
 	chdir($build_dir) or $OK=0;
 	PrintErrorMessage("Changing to $build_dir failed!") if (!$OK);
-	return 0 if (!$OK);	
+	return 0 if (!$OK);
 
 	# insert $MacroBlock into AUTO_MACRO_MASTER in scummvm_base.mmp
 	PrintMessage("Setting new AUTO_MACROS_MASTER in scummvm_base.mmp for '$Variation'") if (!$ReallyQuiet);
 	my $n = "AUTO_MACROS_MASTER";
 	my $a = "\/\/START_$n\/\/";
 	my $b = "\/\/STOP_$n\/\/";
-	my $name = "scummvm_base.mmp";	
+	my $name = "scummvm_base.mmp";
 	my $file = "$build_dir/mmp/$name";
 	my $updated = " Updated @ ".localtime();
 
@@ -562,11 +562,11 @@ sub PrepVariation()
 	return 0 if (!$OK);
 	my @lines = <FILE>;
 	close FILE;
-	
+
 	my $onestr = join("",@lines);
 	$MacroBlock =~ s/^\s*//gm;
 	$onestr =~ s/$a(.*)$b/$a$updated\n$ExtraMacros$MacroBlock$b/s;
-	
+
 	open FILE, ">$file" or $OK=0;
 	PrintErrorMessage("Writing file '$file'") if (!$OK);
 	return 0 if (!$OK);
@@ -579,7 +579,7 @@ sub PrepVariation()
 	$OK = 0 if ($? >> 8);
 	PrintErrorMessage("'AdaptAllMMPs.pl' exited with value " . ($? >> 8)) if ($? >> 8);
 	return 0 if (!$OK);
-	
+
 	# we are here: so all is ok :)
 	return 1;
 }
@@ -592,7 +592,7 @@ sub BuildVariation()
 	my $TargetName = $SDK_TargetName{$SDK};
 	my $TargetDir  = $SDK_TargetDir{$SDK};
 	my $OK = 1;
-	
+
 	my $dir = $build_dir."/".$SDK_BuildDirs{$SDK};
 	$dir =~ s#/#\\#g;
 	chdir($dir);
@@ -617,8 +617,8 @@ sub BuildVariation()
 	PrintErrorMessage("'bldmake bldfiles' exited with value " . ($? >> 8)) if ($? >> 8);
 
 	system("abld CLEAN $TargetName UREL 2> NUL > NUL");
-	PrintErrorMessage("'abld CLEAN $TargetName UREL' exited with value " . ($? >> 8)) if ($? >> 8);	
-	
+	PrintErrorMessage("'abld CLEAN $TargetName UREL' exited with value " . ($? >> 8)) if ($? >> 8);
+
 	my $Redirection = "OUT:file, ERR:".($RedirectSTDERR ? "file" : "screen");
 	my $Message = "Building $Package ($Redirection)";
 	PrintMessage($Message) if (!$ReallyQuiet);
@@ -630,7 +630,7 @@ sub BuildVariation()
 	$OK = 0 if ($? >> 8);
 	print "  STDERR: ".((-s $build_log_err)-$OldSize)." bytes output written to $build_log_err\n+--------------------------------------------------------------------------------------\n" if ($OldSize != (-s $build_log_err) && !$ReallyQuiet);
 	PrintErrorMessage("'abld BUILD $TargetName UREL' exited with value " . ($? >> 8)) if ($? >> 8);
-	return 0 if (!$OK); # ABLD always returns ok :( grr	
+	return 0 if (!$OK); # ABLD always returns ok :( grr
 	PrintMessage("Done.") if (!$ReallyQuiet);
 
 	# do we have an override suffix for the package name?
@@ -654,7 +654,7 @@ sub BuildVariation()
 	if (-e "$output_dir/$Package")
 	{
 		$PackagesCreated++;
-		
+
 		if ($TargetIntermediatePath ne '' && $TargetIntermediatePath =~ /\\EPOC32\\BUILD\\/i) # make really sure it's a valid path!
 		{
 			#PrintMessage("Cleaning $TargetIntermediatePath");
@@ -677,7 +677,7 @@ sub UploadVariation()
 
 	use Net::FTP;
 	my $newerr;
-	
+
 	PrintMessage("Connecting to FTP $FTP_Host") if (!$ReallyQuiet);
 
 	$ftp = Net::FTP->new($FTP_Host,Timeout=>240) or $newerr=1;
@@ -692,7 +692,7 @@ sub UploadVariation()
 			{
 				PrintMessage("Changing to dir $FTP_Dir");
 				$ftp->cwd($FTP_Dir) or $newerr=1;
-				
+
 				if ($newerr)
 				{
 					PrintErrorMessage("Changing to dir $FTP_Dir! Aborting!");
@@ -704,20 +704,20 @@ sub UploadVariation()
 # leave this for possible auto-deletion of old files?
 #			@files = $ftp->dir or $newerr=1;
 #			  push @ERRORS, "Can't get file list $!\n" if $newerr;
-#			print "Got  file list\n";   
+#			print "Got  file list\n";
 #			foreach(@files) {
 #			  print "$_\n";
 #			}
-		
+
 			PrintMessage("Uploading $Package (".(-s "$output_dir/$Package")." bytes)");
-			
+
 			$ftp->binary;
 			$ftp->put("$output_dir/$Package") or $newerr=1;
 			PrintErrorMessage("Uploading package! Aborting!") if $newerr;
 			$PackagesUploaded++ if (!$newerr);
-		}		
+		}
 
-		$ftp->quit;	
+		$ftp->quit;
 	}
 }
 
@@ -758,7 +758,7 @@ sub CleanupPath()
 	{
 		$path =~ s/\"\Q$ECompXL_BinDir\E\";//g;
 	}
-	
+
 	while( ($SDK, $RootDir) = each(%SDK_RootDirs) )
 	{
 		if ($SDK_RootDirs{$SDK} ne '')
@@ -766,8 +766,8 @@ sub CleanupPath()
 			my $path_component = "\"".$SDK_RootDirs{$SDK}."\\epoc32\\";
 			$path =~ s/\Q$path_component\E.*?\";//g;
 		}
-	}	
-	
+	}
+
 	return $path;
 }
 
@@ -798,5 +798,5 @@ sub PrintMessage()
 }
 
 ##################################################################################################################
- 
+
 
diff --git a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
index a9e7aa562a..a0ec338ca0 100644
--- a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
+++ b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
@@ -2,28 +2,25 @@
 ##################################################################################################################
 
 	@WorkingEngines = qw(
-		scumm agos sky queen gob groovie saga drascula 
+		scumm agos sky queen gob groovie saga drascula
 		kyra lure agi touche parallaction cine
-		cruise made m4 tinsel tucker sword1 sword2 draci sci teenagent mohawk
+		cruise made m4 tinsel tucker sword1 sword2 draci sci teenagent mohawk hugo
 	);
-	
+
 	@WorkingEngines_1st = qw(
-		scumm queen groovie saga drascula 
+		scumm queen groovie saga drascula
 		touche parallaction cine
-		cruise made m4 tucker 
+?		cruise made m4 tucker
 	);
-	
+
 	@WorkingEngines_2nd = qw(
-		agos sky gob 
+		agos sky gob
 		kyra lure agi tinsel
-		sword1 sword2 draci teenagent
+		sword1 sword2 draci sci teenagent hugo
 	);
 
 	@TestingEngines = qw(
-		 
-	);
 
-	@BrokenEngines = qw(	
 	);
 
 	@EnablableEngines = (@WorkingEngines, @TestingEngines);
@@ -39,16 +36,16 @@
 	#disabled subengines lol saga2 personal nightmare
 
 	%UseableFeatures = (
-		'zlib'		=> 'zlib.lib', 
-		'mad'		=> 'libmad.lib', 
+		'zlib'		=> 'zlib.lib',
+		'mad'		=> 'libmad.lib',
 		'tremor'	=> 'libtremor.lib',
 		'flac'		=> 'libflac.lib'
 	);
-	
+
 	# these are normally enabled for each variation
 	#$DefaultFeatures = qw(zlib,mad);
-	$DefaultFeatures = qw(zlib,mad,tremor,flac);		
-													
+	$DefaultFeatures = qw(zlib,mad,tremor,flac);
+
 ##################################################################################################################
 	##
 	## General system information, based on $COMPUTERNAME, so this way
@@ -65,13 +62,13 @@
 		$SkipExistingPackages = 0;
 		$ReallyQuiet = 0;
 		$DevBase = "C:\\S";
-		
+
 		# specify an optional FTP server to upload to after each Build+Package (can leave empty)
 		#$FTP_Host = "host.com";
 		$FTP_User = "something";
 		$FTP_Pass = "password";
 		$FTP_Dir  = "cvsbuilds";
-	
+
 		# What Platform SDKs are installed on this machine?
 		# possible SDKs: ("UIQ2", UIQ3", "S60v1", "S60v2", "S60v3", "S80", "S90")
 		# Note1: the \epoc32 directory needs to be in these rootdirs
@@ -96,10 +93,10 @@
 			$SDK_LibraryDirs{'ALL'}{'zlib.lib'}		= "$DevBase\\zlib-1.2.2\\epoc";
 			#$SDK_LibraryDirs{'ALL'}{'libmad.lib'}	= "$DevBase\\libmad-0.15.1b\\group";
 			$SDK_LibraryDirs{'ALL'}{'libtremor.lib'}= "$DevBase\\tremor\\epoc";
-			
+
 			## SDL 1.2.12 / AnotherGuest / Symbian version
 			my $SdlBase = "$DevBase\\SDL-1.2.12-ag\\Symbian";
-			#$SDK_LibraryDirs{'S60v1'}{'esdl.lib'}	= "$SdlBase\\S60"; // unsupported? 
+			#$SDK_LibraryDirs{'S60v1'}{'esdl.lib'}	= "$SdlBase\\S60"; // unsupported?
 			#$SDK_LibraryDirs{'S60v2'}{'esdl.lib'}	= "$SdlBase\\S60v2";
 			$SDK_LibraryDirs{'S60v3'}{'esdl.lib'}	= "$SdlBase\\S60v3";
 			#$SDK_LibraryDirs{'S80'}{'esdl.lib'}	= "$SdlBase\\S80";
@@ -110,7 +107,7 @@
 			## HardlySupported(TM) :P
 			#$SDK_LibraryDirs{'ALL'}{'libmpeg2.lib'} = "$DevBase\\mpeg2dec-0.4.0\\epoc";
 		}
-		
+
 		# now you can add $VariationSets only built on this PC below this line :)
 
 		#$VariationSets{'ALL'}{'scumm'} = "$DefaultFeatures scumm scumm_7_8 he";
@@ -249,7 +246,7 @@
 		$SDK_RootDirs{'S60v3'}= "G:\\S60v3";
 		#$SDK_RootDirs{'S80'}= "D:\\S80";
 		#$SDK_RootDirs{'S90'}= "D:\\S90";
-		$ECompXL_BinDir= "D:\\ECompXL\\";
+		#$ECompXL_BinDir= "D:\\ECompXL\\";
 		if (0) # so we can turn them on/off easily
 		{
 #			$SDK_LibraryDirs{'ALL'}{'zlib.lib'}		= "C:\\S\\zlib-1.2.2\\epoc";
@@ -299,13 +296,14 @@
 	#   scummvm-051101-SymbianS90_queen.sis
 
 	# NOTE: empty $VariationSets{''} string instead of 'ALL' = easy way to disable pkg!
-	
+
 	if (1) # all regular combo's
 	{
 		# the first one includes all SDKs & release-ready engines
-	
+
 			$VariationSets{'ALL'}{'all'} = "$DefaultFeatures @WorkingEngines @EnablableSubEngines";
-	
+			$VariationSets{'ALL'}{'1St'} = "$DefaultFeatures @WorkingEngines_1st @EnablableSubEngines";
+			$VariationSets{'ALL'}{'2nd'} = "$DefaultFeatures @WorkingEngines_2nd @EnablableSubEngines";
 		# now one for each ready-for-release engine
 		if (0)
 		{
@@ -326,16 +324,16 @@
 			}
 		}
 		# below here you could specify weird & experimental combinations, non-ready engines
-	
+
 			# Separate version for the broken sword engines (1&2)
 			#$VariationSets{'ALL'}{'brokensword'} = "$DefaultFeatures sword1 sword2";
-		
+
 			# Separate version for Scumm games (COMI) since memory usage might be high
-			#$VariationSets{'ALL'}{'scumm'} = "$DefaultFeatures scumm scumm_7_8 he";			
-	
+			#$VariationSets{'ALL'}{'scumm'} = "$DefaultFeatures scumm scumm_7_8 he";
+
 			# for mega-fast-testing only plz! Warning: contains to engines!
 			#$VariationSets{'ALL'}{'fast_empty'} = "";
-	
+
 	} # end quick-n-fast if (1|0)
 
 
diff --git a/backends/platform/symbian/README b/backends/platform/symbian/README
index 630b539a5f..ba7099ba32 100644
--- a/backends/platform/symbian/README
+++ b/backends/platform/symbian/README
@@ -24,7 +24,7 @@ About ScummVM
 	The original ports (uptil 0.7.1) were made by Andreas Karlsson and Lars Persson.
 	The main transition to 0.8.0CVS and all relevant changes were done by Jurgen Braam.
 	Jurgen and Lars have successfully transfered all needed changes into CVS/SVN, with additional helpful tools for Symbian OS
-	
+
 Release History:
 	Release version: 1.1.0
 	* Nothing significant in the Symbian port, except SDL improvements.
@@ -33,7 +33,7 @@ Release History:
 	Release version: 1.0.0
 	* Nothing significant in the Symbian port, except SDL improvements.
 	* See main readme for general ScummVM improvements, minor update
-	
+
 	Release version: 0.13.1
 	* Nothing significant in the Symbian port, except SDL improvements.
 	* See main readme for general ScummVM improvements, minor update
diff --git a/backends/platform/symbian/S60/BLD.INF.in b/backends/platform/symbian/S60/BLD.INF.in
index b6cf8bbda6..c3c3decf1a 100644
--- a/backends/platform/symbian/S60/BLD.INF.in
+++ b/backends/platform/symbian/S60/BLD.INF.in
@@ -5,7 +5,7 @@ PRJ_MMPFILES
 //START_AUTO_PROJECTS//
 
 	// empty base file, will be updated by Perl build scripts
-	
+
 //STOP_AUTO_PROJECTS//
 
 .\ScummVM_S60.mmp
diff --git a/backends/platform/symbian/S60v3/BLD.INF.in b/backends/platform/symbian/S60v3/BLD.INF.in
index 10f46ced61..78d130cb08 100644
--- a/backends/platform/symbian/S60v3/BLD.INF.in
+++ b/backends/platform/symbian/S60v3/BLD.INF.in
@@ -5,7 +5,7 @@ PRJ_MMPFILES
 //START_AUTO_PROJECTS//
 
 	// empty base file, will be updated by Perl build scripts
-	
+
 //STOP_AUTO_PROJECTS//
 gnumakefile icons.mk
 .\ScummVM_A0000658_S60v3.mmp
diff --git a/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
index 1c35f7d4cc..12193a8781 100644
--- a/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
+++ b/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
@@ -97,6 +97,9 @@ SYSTEMINCLUDE	\epoc32\include\ESDL
 SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
 SYSTEMINCLUDE   \epoc32\include\libc
 SYSTEMINCLUDE   \epoc32\include
+SYSTEMINCLUDE   \epoc32\include\mw
+SYSTEMINCLUDE   \epoc32\include\platform
+SYSTEMINCLUDE   \epoc32\include\platform\mw
 SYSTEMINCLUDE   ..\src // for portdefs.h
 
 // *** SOURCE files
@@ -125,7 +128,7 @@ SOURCE gui\KeysDialog.cpp
 SOURCE gui\Actions.cpp
 SOURCE gui\Dialog.cpp
 
-// Common error 
+// Common error
 source common\error.cpp
 
 // Special for graphics
@@ -139,4 +142,4 @@ LIBRARY gdi.lib hal.lib bitgdi.lib
 LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
 library avkon.lib bafl.lib
 
-CAPABILITY LocalServices ReadUserData
\ No newline at end of file
+CAPABILITY LocalServices ReadUserData
diff --git a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
index eefdb23382..31c98b90f1 100644
--- a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
+++ b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
@@ -97,6 +97,9 @@ SYSTEMINCLUDE	\epoc32\include\ESDL
 SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
 SYSTEMINCLUDE   \epoc32\include\libc
 SYSTEMINCLUDE   \epoc32\include
+SYSTEMINCLUDE   \epoc32\include\mw
+SYSTEMINCLUDE   \epoc32\include\platform
+SYSTEMINCLUDE   \epoc32\include\platform\mw
 SYSTEMINCLUDE   ..\src // for portdefs.h
 
 // *** SOURCE files
@@ -125,7 +128,7 @@ SOURCE gui\KeysDialog.cpp
 SOURCE gui\Actions.cpp
 SOURCE gui\Dialog.cpp
 
-// Common error 
+// Common error
 source common\error.cpp
 
 // Special for graphics
@@ -139,4 +142,4 @@ LIBRARY gdi.lib hal.lib bitgdi.lib
 LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
 library avkon.lib bafl.lib
 
-CAPABILITY LocalServices ReadUserData
\ No newline at end of file
+CAPABILITY LocalServices ReadUserData
diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
index a2c43d94e6..3f0fbbc5f1 100644
--- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
+++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
@@ -36,7 +36,7 @@
 :"ScummVM"
 
 ; UID is the app's UID
-#{"ScummVM S60v3"},(0xA0000657),1,12,0
+#{"ScummVM S60v3"},(0xA0000657),1,13,0
 
 ;Supports Series 60 v 3.0
 [0x101F7961], 0, 0, 0, {"Series60ProductID"}
@@ -68,6 +68,7 @@
 "..\..\..\..\dists\engine-data\m4.dat"-"c:\data\scummvm\m4.dat"
 "..\..\..\..\dists\engine-data\teenagent.dat"-"c:\data\scummvm\teenagent.dat"
 "..\..\..\vkeybd\packs\vkeybd_default.zip"-"c:\data\scummvm\vkeybd_default.zip"
+"..\..\..\..\gui\themes\translations.dat"-"c:\data\scummvm\translations.dat"
 
 ; Config/log files: 'empty' will automagically be removed on uninstall
 ""-"c:\data\scummvm\scummvm.ini",FILENULL
diff --git a/backends/platform/symbian/S80/BLD.INF.in b/backends/platform/symbian/S80/BLD.INF.in
index 75ef20be12..c25ee43a99 100644
--- a/backends/platform/symbian/S80/BLD.INF.in
+++ b/backends/platform/symbian/S80/BLD.INF.in
@@ -5,7 +5,7 @@ PRJ_MMPFILES
 //START_AUTO_PROJECTS//
 
 	// empty base file, will be updated by Perl build scripts
-	
+
 //STOP_AUTO_PROJECTS//
 
 .\ScummVM_S80.mmp
diff --git a/backends/platform/symbian/S90/BLD.INF.in b/backends/platform/symbian/S90/BLD.INF.in
index d6e1ece012..4e333e5dae 100644
--- a/backends/platform/symbian/S90/BLD.INF.in
+++ b/backends/platform/symbian/S90/BLD.INF.in
@@ -5,7 +5,7 @@ PRJ_MMPFILES
 //START_AUTO_PROJECTS//
 
 	// empty base file, will be updated by Perl build scripts
-	
+
 //STOP_AUTO_PROJECTS//
 
 .\ScummVM_S90.mmp
diff --git a/backends/platform/symbian/UIQ2/BLD.INF.in b/backends/platform/symbian/UIQ2/BLD.INF.in
index b607446a64..b8d8111e87 100644
--- a/backends/platform/symbian/UIQ2/BLD.INF.in
+++ b/backends/platform/symbian/UIQ2/BLD.INF.in
@@ -5,7 +5,7 @@ PRJ_MMPFILES
 //START_AUTO_PROJECTS//
 
 	// empty base file, will be updated by Perl build scripts
-	
+
 //STOP_AUTO_PROJECTS//
 
 .\ScummVM_UIQ2.mmp
diff --git a/backends/platform/symbian/UIQ3/BLD.INF.in b/backends/platform/symbian/UIQ3/BLD.INF.in
index e4b0bb306e..ff12dbdd75 100644
--- a/backends/platform/symbian/UIQ3/BLD.INF.in
+++ b/backends/platform/symbian/UIQ3/BLD.INF.in
@@ -1,11 +1,11 @@
 PRJ_PLATFORMS
-GCCE WINSCW 
+GCCE WINSCW
 
 PRJ_MMPFILES
 //START_AUTO_PROJECTS//
 
 	// empty base file, will be updated by Perl build scripts
-	
+
 //STOP_AUTO_PROJECTS//
 .\ScummVM_A0000658_UIQ3.mmp
 .\ScummVM_UIQ3.mmp
diff --git a/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in b/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in
index 7b28f83aba..2e50c12cc3 100644
--- a/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in
+++ b/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in
@@ -126,7 +126,7 @@ SOURCE gui\KeysDialog.cpp
 SOURCE gui\Actions.cpp
 SOURCE gui\Dialog.cpp
 
-// Common error 
+// Common error
 source common\error.cpp
 
 // Special for graphics
diff --git a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
index 7a68e757cd..b00c848667 100644
--- a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
+++ b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
@@ -127,7 +127,7 @@ SOURCE gui\KeysDialog.cpp
 SOURCE gui\Actions.cpp
 SOURCE gui\Dialog.cpp
 
-// Common error 
+// Common error
 source common\error.cpp
 
 // Special for graphics
diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
index 7e620485d5..a55f4b6e37 100644
--- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
+++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
@@ -35,7 +35,7 @@
 :"ScummVM"
 
 ; UID is the app's UID
-#{"ScummVM UIQ3"},(0xA0000657),1,12,0
+#{"ScummVM UIQ3"},(0xA0000657),1,13,0
 
 ; ProductID for UIQ 3.0
 ; Product/platform version UID, Major, Minor, Build, Product ID
@@ -65,6 +65,8 @@
 "..\..\..\..\dists\engine-data\m4.dat"-"c:\shared\scummvm\m4.dat"
 "..\..\..\..\dists\engine-data\teenagent.dat"-"c:\shared\scummvm\teenagent.dat"
 "..\..\..\vkeybd\packs\vkeybd_default.zip"-"c:\shared\scummvm\vkeybd_default.zip"
+"..\..\..\..\gui\themes\translations.dat"-"c:\shared\scummvm\translations.dat"
+
 ; Config/log files: 'empty' will automagically be removed on uninstall
 ""-"c:\shared\scummvm\scummvm.ini",FILENULL
 ""-"c:\shared\scummvm\scummvm.stdout.txt",FILENULL
diff --git a/backends/platform/symbian/mmp/scummvm_base.mmp.in b/backends/platform/symbian/mmp/scummvm_base.mmp.in
index 44feda064b..e799975385 100644
--- a/backends/platform/symbian/mmp/scummvm_base.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_base.mmp.in
@@ -59,6 +59,9 @@ SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian alr
 SYSTEMINCLUDE   \epoc32\include\libc
 SYSTEMINCLUDE   \epoc32\include\tremor
 SYSTEMINCLUDE   \epoc32\include
+SYSTEMINCLUDE   \epoc32\include\mw
+SYSTEMINCLUDE   \epoc32\include\platform
+SYSTEMINCLUDE   \epoc32\include\platform\mw
 SYSTEMINCLUDE   ..\src // for portdefs.h
 
 // *** SOURCE files
@@ -98,6 +101,8 @@ SOURCEPATH ..\..\..\..\sound
 	// empty base file, will be updated by Perl build scripts
 
 //STOP_AUTO_OBJECTS_SOUND_//
+SOURCE softsynth\fmtowns_pc98\towns_pc98_fmsynth.cpp // Included since its excluded by filter
+
 #if defined (WINS)
 SOURCE rate.cpp			// WINS emulator version: add regular .cpp
 #else
diff --git a/backends/platform/symbian/mmp/scummvm_hugo.mmp.in b/backends/platform/symbian/mmp/scummvm_hugo.mmp.in
new file mode 100644
index 0000000000..4d44ebc944
--- /dev/null
+++ b/backends/platform/symbian/mmp/scummvm_hugo.mmp.in
@@ -0,0 +1,64 @@
+/* ScummVM - Graphic Adventure Engine
+ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
+ * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
+ * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
+ * Copyright (C) 2005-2010 The ScummVM project
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+//
+// EPOC MMP makefile project for ScummVM
+//
+
+// *** Definitions
+
+TARGET          scummvm_hugo.lib
+TARGETTYPE      lib
+OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
+OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
+ALWAYS_BUILD_AS_ARM
+
+//START_AUTO_MACROS_SLAVE//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_MACROS_SLAVE//
+
+// *** SOURCE files
+
+SOURCEPATH ..\..\..\..\engines\hugo
+
+//START_AUTO_OBJECTS_HUGO_//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_OBJECTS_HUGO_//
+
+// *** Include paths
+
+USERINCLUDE     ..\..\..\..\engines
+USERINCLUDE     ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
+SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
+SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\src
diff --git a/backends/platform/symbian/res/scummvm.rss b/backends/platform/symbian/res/scummvm.rss
index 0bb5dff058..f7daf9bfc1 100644
--- a/backends/platform/symbian/res/scummvm.rss
+++ b/backends/platform/symbian/res/scummvm.rss
@@ -35,7 +35,6 @@ NAME SCUM
 #include <eikon.rh>
 #include "..\src\Scummvm.hrh"
 // Include the standard Eikon resource ids
-#include <eikon.rsg>
 
 
 RESOURCE RSS_SIGNATURE
diff --git a/backends/platform/symbian/src/ScummApp.cpp b/backends/platform/symbian/src/ScummApp.cpp
index a3ce692368..01af5e7fd9 100644
--- a/backends/platform/symbian/src/ScummApp.cpp
+++ b/backends/platform/symbian/src/ScummApp.cpp
@@ -27,7 +27,7 @@
 
 #define _PAGESIZE_ 0x1000
 
-#if defined (__WINS__) && !defined (__SERIES60_30__) && !defined (UIQ3)
+#if defined (__WINS__) && !defined (S60V3) && !defined (UIQ3)
 extern "C" int _chkstk(int /*a*/) {
 _asm {
 	push ecx
diff --git a/backends/platform/symbian/src/ScummApp.h b/backends/platform/symbian/src/ScummApp.h
index 8cfdbdb92f..cca8e2a7c9 100644
--- a/backends/platform/symbian/src/ScummApp.h
+++ b/backends/platform/symbian/src/ScummApp.h
@@ -22,8 +22,8 @@
  * $Id$
  */
 
-#ifndef ScummAPPH
-#define ScummAPPH
+#ifndef SCUMMAPP_H
+#define SCUMMAPP_H
 
 #include <eikapp.h>
 #include <e32base.h>
diff --git a/backends/platform/symbian/src/ScummVMApp.h b/backends/platform/symbian/src/ScummVMApp.h
index 6796024e1e..aee098f989 100644
--- a/backends/platform/symbian/src/ScummVMApp.h
+++ b/backends/platform/symbian/src/ScummVMApp.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef ScummVMapph
-#define ScummVMapph
+#ifndef SCUMMVMAPP_H
+#define SCUMMVMAPP_H
 
 #include <eikapp.h>
 #include <e32base.h>
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index 3a0dc318b3..d86adbf354 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -77,9 +77,6 @@ void OSystem_SDL_Symbian::init() {
 }
 
 void OSystem_SDL_Symbian::initBackend() {
-	// First set the extrapath (for installed dat files etc)
-	ConfMan.set("extrapath", Symbian::GetExecutablePath());
-
 	// Calculate the default savepath
 	Common::String savePath;
 	savePath = Symbian::GetExecutablePath();
@@ -133,6 +130,13 @@ void OSystem_SDL_Symbian::initBackend() {
 	actions->loadMapping();
 }
 
+void OSystem_SDL_Symbian::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
+	Common::FSNode pluginsNode(Symbian::GetExecutablePath());
+	if (pluginsNode.exists() && pluginsNode.isDirectory()) {
+			s.add("SYMBIAN_DATAFOLDER", new Common::FSDirectory(Symbian::GetExecutablePath()), priority);
+		}
+}
+
 void OSystem_SDL_Symbian::quitWithErrorMsg(const char * /*aMsg*/) {
 	CEikonEnv::Static()->AlertWin(_L("quitWithErrorMsg()")) ;
 
diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h
index e5f4ea44d0..0142054492 100644
--- a/backends/platform/symbian/src/SymbianOS.h
+++ b/backends/platform/symbian/src/SymbianOS.h
@@ -50,6 +50,8 @@ public:
 
 	void quitWithErrorMsg(const char *msg);
 
+	void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
+
 	// Vibration support
 #ifdef USE_VIBRA_SE_PXXX
 	/**
diff --git a/backends/platform/wii/options.cpp b/backends/platform/wii/options.cpp
index 0a21b45561..2a47958e3b 100644
--- a/backends/platform/wii/options.cpp
+++ b/backends/platform/wii/options.cpp
@@ -183,7 +183,7 @@ void WiiOptionsDialog::handleTickle() {
 			break;
 
 		default:
-			label = String::printf(_("Network not initialsed (%d)"), status);
+			label = String::printf(_("Network not initialised (%d)"), status);
 			break;
 		}
 
diff --git a/backends/platform/wii/osystem.h b/backends/platform/wii/osystem.h
index eaaf616538..ed33b43a81 100644
--- a/backends/platform/wii/osystem.h
+++ b/backends/platform/wii/osystem.h
@@ -117,6 +117,7 @@ private:
 	void deinitGfx();
 	void updateScreenResolution();
 	void switchVideoMode(int mode);
+	bool needsScreenUpdate();
 
 	void initSfx();
 	void deinitSfx();
diff --git a/backends/platform/wii/osystem_events.cpp b/backends/platform/wii/osystem_events.cpp
index 488834fc20..5d0bca453f 100644
--- a/backends/platform/wii/osystem_events.cpp
+++ b/backends/platform/wii/osystem_events.cpp
@@ -300,6 +300,9 @@ bool OSystem_Wii::pollEvent(Common::Event &event) {
 		return true;
 	}
 
+	if (needsScreenUpdate())
+		updateScreen();
+
 	u32 bd = 0, bh = 0, bu = 0;
 
 	if (PAD_ScanPads() & 1) {
diff --git a/backends/platform/wii/osystem_gfx.cpp b/backends/platform/wii/osystem_gfx.cpp
index 3ce6343800..09575bb83d 100644
--- a/backends/platform/wii/osystem_gfx.cpp
+++ b/backends/platform/wii/osystem_gfx.cpp
@@ -441,6 +441,22 @@ void OSystem_Wii::copyRectToScreen(const byte *buf, int pitch, int x, int y,
 	_gameDirty = true;
 }
 
+bool OSystem_Wii::needsScreenUpdate() {
+	if (getMillis() - _lastScreenUpdate < 1000 / MAX_FPS)
+		return false;
+
+	if (_gameRunning && _gameDirty)
+		return true;
+
+	if (_overlayVisible && _overlayDirty)
+		return true;
+
+	if (_mouseVisible && _texMouse.palette && _cursorPaletteDirty)
+		return true;
+
+	return false;
+}
+
 void OSystem_Wii::updateScreen() {
 	static f32 ar;
 	static gfx_screen_coords_t cc;
diff --git a/backends/platform/wii/osystem_sfx.cpp b/backends/platform/wii/osystem_sfx.cpp
index 6efb47ff33..33397f0a93 100644
--- a/backends/platform/wii/osystem_sfx.cpp
+++ b/backends/platform/wii/osystem_sfx.cpp
@@ -25,7 +25,7 @@
 
 #define SFX_THREAD_STACKSIZE (1024 * 128)
 #define SFX_THREAD_PRIO 80
-#define SFX_THREAD_FRAG_SIZE 2048
+#define SFX_THREAD_FRAG_SIZE (1024 * 8)
 #define SFX_BUFFERS 3
 
 static lwpq_t sfx_queue;
@@ -56,9 +56,9 @@ static void * sfx_thread_func(void *arg) {
 		// the hardware uses two buffers: a front and a back buffer
 		// we use 3 buffers here: two are beeing pushed to the DSP,
 		// and the free one is where our mixer writes to
-		// thus the latency of our steam is:
-		// 2048 [frag size] / 48000 / 2 [16bit] / 2 [stereo] * 2 [hw buffers]
-		// -> 21.3ms
+		// thus the latency of our stream is:
+		// 8192 [frag size] / 48000 / 2 [16bit] / 2 [stereo] * 2 [hw buffers]
+		// -> 85.3ms
 		sb_sw = (sb_hw + 1) % SFX_BUFFERS;
 		mixer->mixCallback(sound_buffer[sb_sw], SFX_THREAD_FRAG_SIZE);
 		DCFlushRange(sound_buffer[sb_sw], SFX_THREAD_FRAG_SIZE);
diff --git a/backends/platform/wii/wii.mk b/backends/platform/wii/wii.mk
index c92b9017b6..c1512551d7 100644
--- a/backends/platform/wii/wii.mk
+++ b/backends/platform/wii/wii.mk
@@ -40,6 +40,9 @@ ifneq ($(DIST_FILES_ENGINEDATA),)
 endif
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip wiidist/scummvm/
 
+wiiloaddist: wiidist
+	cd wiidist && zip -9r scummvm.zip scummvm/
+	$(DEVKITPPC)/bin/wiiload wiidist/scummvm.zip
 
-.PHONY: wiiclean wiiload geckoupload wiigdb wiidebug wiidist
+.PHONY: wiiclean wiiload geckoupload wiigdb wiidebug wiidist wiiloaddist
 
diff --git a/backends/platform/wince/CEActionsPocket.h b/backends/platform/wince/CEActionsPocket.h
index ae0ed19975..0fe29a9e86 100644
--- a/backends/platform/wince/CEActionsPocket.h
+++ b/backends/platform/wince/CEActionsPocket.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CEACTIONSPOCKET
-#define CEACTIONSPOCKET
+#ifndef CEACTIONSPOCKET_H
+#define CEACTIONSPOCKET_H
 
 #include "common/scummsys.h"
 #include "common/system.h"
diff --git a/backends/platform/wince/CEActionsSmartphone.h b/backends/platform/wince/CEActionsSmartphone.h
index eacc571a67..36797cd2c8 100644
--- a/backends/platform/wince/CEActionsSmartphone.h
+++ b/backends/platform/wince/CEActionsSmartphone.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CEACTIONSSMARTPHONE
-#define CEACTIONSSMARTPHONE
+#ifndef CEACTIONSSMARTPHONE_H
+#define CEACTIONSSMARTPHONE_H
 
 #include "common/scummsys.h"
 #include "common/system.h"
diff --git a/backends/platform/wince/CEDevice.h b/backends/platform/wince/CEDevice.h
index 9fee8497c2..ca2f908c6d 100644
--- a/backends/platform/wince/CEDevice.h
+++ b/backends/platform/wince/CEDevice.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CEDEVICE
-#define CEDEVICE
+#ifndef CEDEVICE_H
+#define CEDEVICE_H
 
 #include "common/scummsys.h"
 #include "common/system.h"
diff --git a/backends/platform/wince/CELauncherDialog.h b/backends/platform/wince/CELauncherDialog.h
index 7e86f808fc..7755e33dcc 100644
--- a/backends/platform/wince/CELauncherDialog.h
+++ b/backends/platform/wince/CELauncherDialog.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CELAUNCHERDIALOG
-#define CELAUNCHERDIALOG
+#ifndef CELAUNCHERDIALOG_H
+#define CELAUNCHERDIALOG_H
 
 #include "base/plugins.h"
 #include "common/fs.h"
diff --git a/backends/platform/wince/CEScaler.h b/backends/platform/wince/CEScaler.h
index c93e1c66ca..4711f94bba 100644
--- a/backends/platform/wince/CEScaler.h
+++ b/backends/platform/wince/CEScaler.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CESCALER
-#define CESCALER
+#ifndef CESCALER_H
+#define CESCALER_H
 
 #include "common/scummsys.h"
 #include "common/system.h"
diff --git a/backends/platform/wince/CEgui/GUIElement.h b/backends/platform/wince/CEgui/GUIElement.h
index beb9d95047..7e4572d377 100644
--- a/backends/platform/wince/CEgui/GUIElement.h
+++ b/backends/platform/wince/CEgui/GUIElement.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CEGUI_GUIELEMENT
-#define CEGUI_GUIELEMENT
+#ifndef CEGUI_GUIELEMENT_H
+#define CEGUI_GUIELEMENT_H
 
 #include "common/scummsys.h"
 #include "common/system.h"
diff --git a/backends/platform/wince/CEgui/ItemAction.h b/backends/platform/wince/CEgui/ItemAction.h
index e2cd5b2367..74ed6bec4d 100644
--- a/backends/platform/wince/CEgui/ItemAction.h
+++ b/backends/platform/wince/CEgui/ItemAction.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CEGUI_ITEMACTION
-#define CEGUI_ITEMACTION
+#ifndef CEGUI_ITEMACTION_H
+#define CEGUI_ITEMACTION_H
 
 #include "common/scummsys.h"
 #include "common/system.h"
diff --git a/backends/platform/wince/CEgui/ItemSwitch.h b/backends/platform/wince/CEgui/ItemSwitch.h
index 1fa5732b6a..8d03ee77cb 100644
--- a/backends/platform/wince/CEgui/ItemSwitch.h
+++ b/backends/platform/wince/CEgui/ItemSwitch.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CEGUI_ITEMSWITCH
-#define CEGUI_ITEMSWITCH
+#ifndef CEGUI_ITEMSWITCH_H
+#define CEGUI_ITEMSWITCH_H
 
 #include "common/scummsys.h"
 #include "common/system.h"
diff --git a/backends/platform/wince/CEgui/Panel.h b/backends/platform/wince/CEgui/Panel.h
index 0b55c00dee..6626e41866 100644
--- a/backends/platform/wince/CEgui/Panel.h
+++ b/backends/platform/wince/CEgui/Panel.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CEGUI_PANEL
-#define CEGUI_PANEL
+#ifndef CEGUI_PANEL_H
+#define CEGUI_PANEL_H
 
 #include "common/scummsys.h"
 #include "common/system.h"
diff --git a/backends/platform/wince/CEgui/PanelItem.h b/backends/platform/wince/CEgui/PanelItem.h
index 82e9b03e22..55920c304a 100644
--- a/backends/platform/wince/CEgui/PanelItem.h
+++ b/backends/platform/wince/CEgui/PanelItem.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CEGUI_PANELITEM
-#define CEGUI_PANELITEM
+#ifndef CEGUI_PANELITEM_H
+#define CEGUI_PANELITEM_H
 
 #include "common/scummsys.h"
 #include "common/system.h"
diff --git a/backends/platform/wince/CEgui/PanelKeyboard.h b/backends/platform/wince/CEgui/PanelKeyboard.h
index 5ef4adc73e..f441e14771 100644
--- a/backends/platform/wince/CEgui/PanelKeyboard.h
+++ b/backends/platform/wince/CEgui/PanelKeyboard.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CEGUI_PANELKEYBOARD
-#define CEGUI_PANELKEYBOARD
+#ifndef CEGUI_PANELKEYBOARD_H
+#define CEGUI_PANELKEYBOARD_H
 
 #include "common/scummsys.h"
 #include "common/system.h"
diff --git a/backends/platform/wince/CEgui/SDL_ImageResource.h b/backends/platform/wince/CEgui/SDL_ImageResource.h
index 140a11c356..454237dd15 100644
--- a/backends/platform/wince/CEgui/SDL_ImageResource.h
+++ b/backends/platform/wince/CEgui/SDL_ImageResource.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CEGUI_SDL_IMAGERESOURCE
-#define CEGUI_SDL_IMAGERESOURCE
+#ifndef CEGUI_SDL_IMAGERESOURCE_H
+#define CEGUI_SDL_IMAGERESOURCE_H
 
 #include "common/scummsys.h"
 #include "common/system.h"
diff --git a/backends/platform/wince/CEgui/Toolbar.h b/backends/platform/wince/CEgui/Toolbar.h
index c23559d315..3c48e6188a 100644
--- a/backends/platform/wince/CEgui/Toolbar.h
+++ b/backends/platform/wince/CEgui/Toolbar.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CEGUI_TOOLBAR
-#define CEGUI_TOOLBAR
+#ifndef CEGUI_TOOLBAR_H
+#define CEGUI_TOOLBAR_H
 
 #include "common/scummsys.h"
 #include "common/system.h"
diff --git a/backends/platform/wince/CEgui/ToolbarHandler.h b/backends/platform/wince/CEgui/ToolbarHandler.h
index 30a299d153..4a79ed1609 100644
--- a/backends/platform/wince/CEgui/ToolbarHandler.h
+++ b/backends/platform/wince/CEgui/ToolbarHandler.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CEGUI_TOOLBARHANDLER
-#define CEGUI_TOOLBARHANDLER
+#ifndef CEGUI_TOOLBARHANDLER_H
+#define CEGUI_TOOLBARHANDLER_H
 
 #include "common/scummsys.h"
 #include "common/system.h"
diff --git a/backends/platform/wince/CEkeys/EventsBuffer.h b/backends/platform/wince/CEkeys/EventsBuffer.h
index 2e13770d25..44e1c66e47 100644
--- a/backends/platform/wince/CEkeys/EventsBuffer.h
+++ b/backends/platform/wince/CEkeys/EventsBuffer.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CEKEYS_EVENTSBUFFER
-#define CEKEYS_EVENTSBUFFER
+#ifndef CEKEYS_EVENTSBUFFER_H
+#define CEKEYS_EVENTSBUFFER_H
 
 #include "common/scummsys.h"
 #include "common/system.h"
diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp
index aef2117bd7..ac9be5df48 100644
--- a/backends/platform/wince/wince-sdl.cpp
+++ b/backends/platform/wince/wince-sdl.cpp
@@ -429,7 +429,7 @@ void OSystem_WINCE3::initBackend() {
 	GUI::Actions::init();
 	GUI_Actions::Instance()->initInstanceMain(this);
 	if (!GUI_Actions::Instance()->loadMapping()) {	// error during loading means not present/wrong version
-		warning("Setting default action mappings.");
+		warning("Setting default action mappings");
 		GUI_Actions::Instance()->saveMapping();	// write defaults
 	}
 
@@ -987,11 +987,11 @@ void OSystem_WINCE3::check_mappings() {
 
 	// Some games need to map the right click button, signal it here if it wasn't done
 	if (instance->needsRightClickMapping()) {
-		GUI::KeysDialog *keysDialog = new GUI::KeysDialog("Map right click action");
+		GUI::KeysDialog *keysDialog = new GUI::KeysDialog(_("Map right click action"));
 		while (!instance->getMapping(POCKET_ACTION_RIGHTCLICK)) {
 			keysDialog->runModal();
 			if (!instance->getMapping(POCKET_ACTION_RIGHTCLICK)) {
-				GUI::MessageDialog alert("You must map a key to the 'Right Click' action to play this game");
+				GUI::MessageDialog alert(_("You must map a key to the 'Right Click' action to play this game"));
 				alert.runModal();
 			}
 		}
@@ -1000,11 +1000,11 @@ void OSystem_WINCE3::check_mappings() {
 
 	// Map the "hide toolbar" action if needed
 	if (instance->needsHideToolbarMapping()) {
-		GUI::KeysDialog *keysDialog = new GUI::KeysDialog("Map hide toolbar action");
+		GUI::KeysDialog *keysDialog = new GUI::KeysDialog(_("Map hide toolbar action"));
 		while (!instance->getMapping(POCKET_ACTION_HIDE)) {
 			keysDialog->runModal();
 			if (!instance->getMapping(POCKET_ACTION_HIDE)) {
-				GUI::MessageDialog alert("You must map a key to the 'Hide toolbar' action to play this game");
+				GUI::MessageDialog alert(_("You must map a key to the 'Hide toolbar' action to play this game"));
 				alert.runModal();
 			}
 		}
@@ -1013,10 +1013,10 @@ void OSystem_WINCE3::check_mappings() {
 
 	// Map the "zoom" actions if needed
 	if (instance->needsZoomMapping()) {
-		GUI::KeysDialog *keysDialog = new GUI::KeysDialog("Map Zoom Up action (optional)");
+		GUI::KeysDialog *keysDialog = new GUI::KeysDialog(_("Map Zoom Up action (optional)"));
 		keysDialog->runModal();
 		delete keysDialog;
-		keysDialog = new GUI::KeysDialog("Map Zoom Down action (optional)");
+		keysDialog = new GUI::KeysDialog(_("Map Zoom Down action (optional)"));
 		keysDialog->runModal();
 		delete keysDialog;
 	}
@@ -1024,7 +1024,7 @@ void OSystem_WINCE3::check_mappings() {
 	// Extra warning for Zak Mc Kracken
 	if (strncmp(gameid.c_str(), "zak", 3) == 0 &&
 		!GUI_Actions::Instance()->getMapping(POCKET_ACTION_HIDE)) {
-		GUI::MessageDialog alert("Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory");
+		GUI::MessageDialog alert(_("Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory"));
 		alert.runModal();
 	}