diff --git a/android-support.patch b/android-support.patch
index 37480e825..386a766b5 100644
--- a/android-support.patch
+++ b/android-support.patch
@@ -4,28 +4,31 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 <+>UTF-8
 ===================================================================
 diff --git a/SPD-classes/src/main/java/com/watabou/utils/PlatformSupport.java b/SPD-classes/src/main/java/com/watabou/utils/PlatformSupport.java
---- a/SPD-classes/src/main/java/com/watabou/utils/PlatformSupport.java	(revision b6582d47d264e13a3620c681fa00e905ad51ca62)
-+++ b/SPD-classes/src/main/java/com/watabou/utils/PlatformSupport.java	(revision 5ace1377507fb2e7f6af522a9bf6826710617e32)
+--- a/SPD-classes/src/main/java/com/watabou/utils/PlatformSupport.java	(revision c274e27faa3fd35390f796fc247964f88b9b0c6e)
++++ b/SPD-classes/src/main/java/com/watabou/utils/PlatformSupport.java	(revision d6e59e2599f290a836c97b151918baaea321106c)
 @@ -30,7 +30,12 @@
- 
+
  import java.util.HashMap;
- 
+
 +import com.zrp200.scrollofdebug.PackageTrie;
 +
  public abstract class PlatformSupport {
 +	public PackageTrie findClasses(String pckgname) throws ClassNotFoundException {
 +		return PackageTrie.getClassesForPackage(pckgname);
 +	}
- 	
+
  	public abstract void updateDisplaySize();
- 	
+
 Index: core/src/main/java/com/zrp200/scrollofdebug/PackageTrie.java
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
 ===================================================================
 diff --git a/core/src/main/java/com/zrp200/scrollofdebug/PackageTrie.java b/SPD-classes/src/main/java/com/zrp200/scrollofdebug/PackageTrie.java
 rename from core/src/main/java/com/zrp200/scrollofdebug/PackageTrie.java
 rename to SPD-classes/src/main/java/com/zrp200/scrollofdebug/PackageTrie.java
---- a/core/src/main/java/com/zrp200/scrollofdebug/PackageTrie.java	(revision b6582d47d264e13a3620c681fa00e905ad51ca62)
-+++ b/SPD-classes/src/main/java/com/zrp200/scrollofdebug/PackageTrie.java	(revision 5ace1377507fb2e7f6af522a9bf6826710617e32)
+--- a/core/src/main/java/com/zrp200/scrollofdebug/PackageTrie.java	(revision c274e27faa3fd35390f796fc247964f88b9b0c6e)
++++ b/SPD-classes/src/main/java/com/zrp200/scrollofdebug/PackageTrie.java	(revision d6e59e2599f290a836c97b151918baaea321106c)
 @@ -183,7 +183,7 @@
                          Class cls = Class.forName(pckgname + '.'
                                  + file.substring(0, file.length() - 6));
@@ -41,30 +44,30 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 <+>UTF-8
 ===================================================================
 diff --git a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java
---- a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java	(revision b6582d47d264e13a3620c681fa00e905ad51ca62)
-+++ b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java	(revision 5ace1377507fb2e7f6af522a9bf6826710617e32)
+--- a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java	(revision c274e27faa3fd35390f796fc247964f88b9b0c6e)
++++ b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java	(revision f8c6c7e438826b67e02cdf03a63662c5b542a83f)
 @@ -41,12 +41,41 @@
  import com.watabou.noosa.Game;
  import com.watabou.utils.PlatformSupport;
- 
+
 +import java.io.IOException;
 +import java.util.Enumeration;
  import java.util.HashMap;
  import java.util.regex.Matcher;
  import java.util.regex.Pattern;
- 
+
 +import dalvik.system.DexFile;
 +import com.zrp200.scrollofdebug.PackageTrie;
 +
  public class AndroidPlatformSupport extends PlatformSupport {
--	
+-
 +
 +	@Override
 +	public PackageTrie findClasses(String pkgName) throws ClassNotFoundException {
 +		return new PackageTrie() {
 +			{
 +				try {
-+					Enumeration<String> entries = new DexFile(AndroidGame.instance
++					Enumeration<String> entries = new DexFile(AndroidLauncher.instance
 +							.getContext()
 +							.getPackageCodePath()
 +					).entries();
@@ -85,16 +88,16 @@ diff --git a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/andr
 +
  	public void updateDisplaySize(){
  		if (SPDSettings.landscape() != null) {
- 			AndroidGame.instance.setRequestedOrientation( SPDSettings.landscape() ?
+ 			AndroidLauncher.instance.setRequestedOrientation( SPDSettings.landscape() ?
 Index: core/src/main/java/com/zrp200/scrollofdebug/ScrollOfDebug.java
 IDEA additional info:
 Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 <+>UTF-8
 ===================================================================
 diff --git a/core/src/main/java/com/zrp200/scrollofdebug/ScrollOfDebug.java b/core/src/main/java/com/zrp200/scrollofdebug/ScrollOfDebug.java
---- a/core/src/main/java/com/zrp200/scrollofdebug/ScrollOfDebug.java	(revision b6582d47d264e13a3620c681fa00e905ad51ca62)
-+++ b/core/src/main/java/com/zrp200/scrollofdebug/ScrollOfDebug.java	(revision 5ace1377507fb2e7f6af522a9bf6826710617e32)
-@@ -604,7 +604,7 @@
+--- a/core/src/main/java/com/zrp200/scrollofdebug/ScrollOfDebug.java	(revision c274e27faa3fd35390f796fc247964f88b9b0c6e)
++++ b/core/src/main/java/com/zrp200/scrollofdebug/ScrollOfDebug.java	(revision d6e59e2599f290a836c97b151918baaea321106c)
+@@ -629,7 +629,7 @@
      public static PackageTrie trie = null; // loaded when needed.
      static {
          try {
@@ -102,4 +105,4 @@ diff --git a/core/src/main/java/com/zrp200/scrollofdebug/ScrollOfDebug.java b/co
 +            trie = ShatteredPixelDungeon.platform.findClasses(ROOT);
          } catch (ClassNotFoundException e) { ShatteredPixelDungeon.reportException(e); }
      }
- 
+
diff --git a/restore-compatibility-pre-v1.3.patch b/restore-compatibility-pre-v1.3.patch
new file mode 100644
index 000000000..6707b0003
--- /dev/null
+++ b/restore-compatibility-pre-v1.3.patch
@@ -0,0 +1,26 @@
+Index: core/src/main/java/com/zrp200/scrollofdebug/ScrollOfDebug.java
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/core/src/main/java/com/zrp200/scrollofdebug/ScrollOfDebug.java b/core/src/main/java/com/zrp200/scrollofdebug/ScrollOfDebug.java
+--- a/core/src/main/java/com/zrp200/scrollofdebug/ScrollOfDebug.java	(revision 98d32b0158e31b161ff5aa160f40130f1b4f8adf)
++++ b/core/src/main/java/com/zrp200/scrollofdebug/ScrollOfDebug.java	(revision ffff854ef141991725fe5d20e9d943fa625c1aa6)
+@@ -36,7 +36,7 @@
+ import com.shatteredpixel.shatteredpixeldungeon.ui.ScrollPane;
+ import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
+ // WndTextInput (added in v0.9.4)
+-import com.shatteredpixel.shatteredpixeldungeon.windows.WndTextInput;
++import com.shatteredpixel.shatteredpixeldungeon.ui.WndTextInput;
+ // Output
+ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
+
+@@ -131,7 +131,7 @@
+     @Override
+     public void doRead() {
+         collect(); // you don't lose scroll of debug.
+-        GameScene.show(new WndTextInput("Enter Command:", null, "", 100, false,
++        GameScene.show(new WndTextInput("Enter Command:", "", 100, false,
+                 "Execute", "Cancel") {
+             @Override public void onSelect(boolean positive, String text) {
+                 if(!positive) return;