3 files changed, 14 insertions, 4 deletions
diff --git a/backends/PalmOS/Src/app.cpp b/backends/PalmOS/Src/app.cpp
index 9fc8349bf3..6f76946246 100644
--- a/backends/PalmOS/Src/app.cpp
+++ b/backends/PalmOS/Src/app.cpp
@@ -274,9 +274,11 @@ Err AppStart(void) {
 	Boolean color;
 	Err error;
 
+#ifndef _DEBUG_ENGINE
 	// delete old databases
  	ModDelete();
- 
+#endif
+
 	// allocate global variables space
 	dataSize = sizeof(GlobalsDataType);
 	gVars = (GlobalsDataType *)MemPtrNew(dataSize);
diff --git a/backends/PalmOS/Src/compile.h b/backends/PalmOS/Src/compile.h
index 4cd5d8f8ec..93020aaed9 100644
--- a/backends/PalmOS/Src/compile.h
+++ b/backends/PalmOS/Src/compile.h
@@ -1,11 +1,11 @@
 #ifndef __COMPILE_H__
 #define __COMPILE_H__
 
-// Engines
+// Engines, please define only one engine at a time
 #define DISABLE_SCUMM
-#define DISABLE_SIMON
+//#define DISABLE_SIMON
 #define DISABLE_SKY
-//#define DISABLE_SWORD1
+#define DISABLE_SWORD1
 #define DISABLE_SWORD2
 #define DISABLE_QUEEN
 #define DISABLE_SAGA
@@ -13,11 +13,15 @@
 #define DISABLE_AWE
 
 // PalmOS
+#define __PALM_OS__
 //#define DISABLE_LIGHTSPEED
 //#define DISABLE_TAPWAVE
+//#define DISABLE_ARM
 //#define REDUCE_MEMORY_USAGE
 
+//#define DEBUG_ARM
 //#define _DEBUG
 //#define _DEBUG_STDIO
+//#define _DEBUG_ENGINE
 
 #endif
diff --git a/backends/PalmOS/Src/start.cpp b/backends/PalmOS/Src/start.cpp
index ece8e3d4eb..d3b6c0a6fe 100644
--- a/backends/PalmOS/Src/start.cpp
+++ b/backends/PalmOS/Src/start.cpp
@@ -28,6 +28,7 @@
 #include "games.h"
 #include "globals.h"
 #include "modules.h"
+#include "skin.h"
 
 #include "forms.h"
 /***********************************************************************
@@ -317,6 +318,7 @@ static void AppLaunchCmdNotify(UInt16 LaunchFlags, SysNotifyParamType * pData)
 					resizing = true;
 					PINGetScreenDimensions();
 					WinScreenGetPitch();
+					SknApplySkin();
 					resizing = false;
 				}
 			}
@@ -343,7 +345,9 @@ static UInt32 ScummVMPalmMain(UInt16 cmd, MemPtr cmdPBP, UInt16 launchFlags)
 
 
 		case sysAppLaunchCustomDeleteEngine:
+#ifndef _DEBUG_ENGINE
 			ModDelete();
+#endif
 			break;
 
 		case sysAppLaunchCmdNormalLaunch: