diff --git a/.gitmodules b/.gitmodules
index dd1673082..b514e468b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -62,3 +62,6 @@
 [submodule "project/jni/application/uae4all2"]
 	path = project/jni/application/uae4all2
 	url = git@github.com:lubomyr/uae4all2.git
+[submodule "project/jni/application/basiliskii/basiliskii"]
+	path = project/jni/application/basiliskii/basiliskii
+	url = git@github.com:pelya/BasiliskII-android.git
diff --git a/project/jni/application/basiliskii/basiliskii b/project/jni/application/basiliskii/basiliskii
new file mode 160000
index 000000000..e4c2f6fef
--- /dev/null
+++ b/project/jni/application/basiliskii/basiliskii
@@ -0,0 +1 @@
+Subproject commit e4c2f6fef979cb84dfd638838c71a5467adc9d66
diff --git a/project/jni/application/xserver-debian/AndroidData/postinstall2.sh b/project/jni/application/xserver-debian/AndroidData/postinstall2.sh
index 9fcaeccc2..8d03a6d81 100755
--- a/project/jni/application/xserver-debian/AndroidData/postinstall2.sh
+++ b/project/jni/application/xserver-debian/AndroidData/postinstall2.sh
@@ -6,4 +6,5 @@ cd $SECURE_STORAGE_DIR
 rm -f $UNSECURE_STORAGE_DIR/data-1.tar.gz
 cd $SECURE_STORAGE_DIR/img
 echo "Installation path: $SECURE_STORAGE_DIR/img"
+ls -l $SECURE_STORAGE_DIR/img
 ./postinstall.sh
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1.png
new file mode 100644
index 000000000..b3396cc9c
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1Auto.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1Auto.png
new file mode 100644
index 000000000..0917ea7f0
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1Auto.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1AutoAnim.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1AutoAnim.png
new file mode 100644
index 000000000..73b7dfa3e
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1AutoAnim.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1Pressed.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1Pressed.png
new file mode 100644
index 000000000..75d3def1c
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton1Pressed.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2.png
new file mode 100644
index 000000000..9f4c32555
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2Auto.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2Auto.png
new file mode 100644
index 000000000..bad6d3684
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2Auto.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2AutoAnim.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2AutoAnim.png
new file mode 100644
index 000000000..01f9992c1
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2AutoAnim.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2Pressed.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2Pressed.png
new file mode 100644
index 000000000..ec98dcd26
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton2Pressed.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton3.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton3.png
new file mode 100644
index 000000000..084c41198
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton3.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton3Pressed.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton3Pressed.png
new file mode 100644
index 000000000..bb3c4a27c
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton3Pressed.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton4.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton4.png
new file mode 100644
index 000000000..85c5654df
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton4.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton4Pressed.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton4Pressed.png
new file mode 100644
index 000000000..b76f78f41
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton4Pressed.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton5.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton5.png
new file mode 100644
index 000000000..ced26a5de
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton5.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton5Pressed.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton5Pressed.png
new file mode 100644
index 000000000..9b09786e7
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton5Pressed.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton6.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton6.png
new file mode 100644
index 000000000..6edbb311b
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton6.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton6Pressed.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton6Pressed.png
new file mode 100644
index 000000000..d2c064054
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton6Pressed.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton7.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton7.png
new file mode 100644
index 000000000..3af73b0c2
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidButton7.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidDPadButton.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidDPadButton.png
new file mode 100644
index 000000000..4f093c0ec
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidDPadButton.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidDownButtonPressed.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidDownButtonPressed.png
new file mode 100644
index 000000000..820588641
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidDownButtonPressed.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidLeftButtonPressed.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidLeftButtonPressed.png
new file mode 100644
index 000000000..661542e3a
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidLeftButtonPressed.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidRightButtonPressed.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidRightButtonPressed.png
new file mode 100644
index 000000000..14ec6ab70
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidRightButtonPressed.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidUpButtonPressed.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidUpButtonPressed.png
new file mode 100644
index 000000000..8d67065c7
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidUpButtonPressed.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/UltimateDroidmouse_pointer.png b/project/jni/application/xserver-gimp/keyboard/UltimateDroidmouse_pointer.png
new file mode 100644
index 000000000..7ebc9f07d
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/UltimateDroidmouse_pointer.png differ
diff --git a/project/jni/application/xserver-gimp/keyboard/key.xcf b/project/jni/application/xserver-gimp/keyboard/key.xcf
new file mode 100644
index 000000000..dd434730d
Binary files /dev/null and b/project/jni/application/xserver-gimp/keyboard/key.xcf differ
diff --git a/project/jni/guichan/src/contrib/sdl/sdltruetypefont.cpp b/project/jni/guichan/src/contrib/sdl/sdltruetypefont.cpp
index 150a192f8..5a0005b51 100644
--- a/project/jni/guichan/src/contrib/sdl/sdltruetypefont.cpp
+++ b/project/jni/guichan/src/contrib/sdl/sdltruetypefont.cpp
@@ -83,6 +83,11 @@ namespace gcn
         int SDLTrueTypeFont::getWidth(const std::string& text) const
         {
             int w, h;
+            if (text.size() == 0)
+            {
+                __android_log_print(ANDROID_LOG_INFO, "GUICHAN", "SDLTrueTypeFont::getWidth(): empty text string");
+                return 0;
+            }
             TTF_SizeText(mFont, text.c_str(), &w, &h);
         
             return w;
@@ -95,8 +100,9 @@ namespace gcn
     
         void SDLTrueTypeFont::drawString(gcn::Graphics* graphics, const std::string& text, const int x, const int y)
         {
-            if (text == "")
+            if (text.size() == 0 || getWidth(text) == 0)
             {
+                __android_log_print(ANDROID_LOG_INFO, "GUICHAN", "SDLTrueTypeFont::drawString(): empty text string: '%s'", text.c_str());
                 return;
             }
         
@@ -104,6 +110,7 @@ namespace gcn
 
             if (sdlGraphics == NULL)
             {
+                __android_log_print(ANDROID_LOG_INFO, "GUICHAN", "SDLTrueTypeFont::drawString(): Graphics object not an SDL graphics object!");
                 throw GCN_EXCEPTION("SDLTrueTypeFont::drawString. Graphics object not an SDL graphics object!");
                 return;
             }