diff --git a/project/java/Keycodes.java b/project/java/Keycodes.java
index 5c35342c2..6bfc56024 100644
--- a/project/java/Keycodes.java
+++ b/project/java/Keycodes.java
@@ -566,6 +566,10 @@ class SDL_Keys
 		try {
 			for(Field f: fields)
 			{
+				if( !f.getName().startsWith("SDLK_") )
+				{
+					continue;
+				}
 				Values.add(f.getInt(null));
 				Names.add(f.getName().substring(5).toUpperCase());
 			}
diff --git a/project/java/Settings.java b/project/java/Settings.java
index 39df48471..df9eed248 100644
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -78,7 +78,7 @@ import android.content.Intent;
 
 
 // TODO: too much code here, split into multiple files, possibly auto-generated menus?
-class Settings
+public class Settings
 {
 	static String SettingsFileName = "libsdl-settings.cfg";
 
diff --git a/project/jni/application/bochs/bochs b/project/jni/application/bochs/bochs
index b8c3ab277..cdc6b9a6f 160000
--- a/project/jni/application/bochs/bochs
+++ b/project/jni/application/bochs/bochs
@@ -1 +1 @@
-Subproject commit b8c3ab2779e8e29ce5156eae589070a56d100a0c
+Subproject commit cdc6b9a6f842d6ceed9c2dd07d5d2bfb3a23cce1
diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg
index 830e476da..281201b52 100644
--- a/project/jni/application/commandergenius/AndroidAppSettings.cfg
+++ b/project/jni/application/commandergenius/AndroidAppSettings.cfg
@@ -7,10 +7,10 @@ AppName="Commander Genius"
 AppFullName=net.sourceforge.clonekeenplus
 
 # Application version code (integer)
-AppVersionCode=195300
+AppVersionCode=198001
 
 # Application user-visible version name (string)
-AppVersionName="1.9.5.3 Beta"
+AppVersionName="1.9.8.0 Beta"
 
 # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...'
 # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu
diff --git a/project/jni/application/commandergenius/AndroidData/gamecatalogue.zip b/project/jni/application/commandergenius/AndroidData/gamecatalogue.zip
new file mode 100644
index 000000000..796d15030
Binary files /dev/null and b/project/jni/application/commandergenius/AndroidData/gamecatalogue.zip differ
diff --git a/project/jni/application/commandergenius/AndroidData/keen1.zip b/project/jni/application/commandergenius/AndroidData/keen1.zip
index 5a134dfee..c64cee758 100644
Binary files a/project/jni/application/commandergenius/AndroidData/keen1.zip and b/project/jni/application/commandergenius/AndroidData/keen1.zip differ
diff --git a/project/jni/application/commandergenius/AndroidData/keen4.zip b/project/jni/application/commandergenius/AndroidData/keen4.zip
index cf81305e1..c5e59c039 100644
Binary files a/project/jni/application/commandergenius/AndroidData/keen4.zip and b/project/jni/application/commandergenius/AndroidData/keen4.zip differ
diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius
index d4dfb2189..2d267fa5e 160000
--- a/project/jni/application/commandergenius/commandergenius
+++ b/project/jni/application/commandergenius/commandergenius
@@ -1 +1 @@
-Subproject commit d4dfb21891a786cdc137cfc4901c1ad6982c10be
+Subproject commit 2d267fa5e197aa1842c5353045599fdd3d6e4a96
diff --git a/project/jni/application/vice/vice b/project/jni/application/vice/vice
index 9f2803c7a..0b817c357 160000
--- a/project/jni/application/vice/vice
+++ b/project/jni/application/vice/vice
@@ -1 +1 @@
-Subproject commit 9f2803c7abdb760845c2fa64cba0fd1b206d25a5
+Subproject commit 0b817c357e5a25d37df98d97930469bd485ebb4c
diff --git a/project/jni/boost/src b/project/jni/boost/src
index bc9ea9d30..5824acb45 160000
--- a/project/jni/boost/src
+++ b/project/jni/boost/src
@@ -1 +1 @@
-Subproject commit bc9ea9d3032eb1e2b095484e2052aa2bc2e91767
+Subproject commit 5824acb451e671205afeb188576be1dd9a2674bd
diff --git a/project/jni/openssl/include/openssl/opensslconf.h b/project/jni/openssl/include/openssl/opensslconf.h
index b7704fb7f..d6b328bc3 100644
--- a/project/jni/openssl/include/openssl/opensslconf.h
+++ b/project/jni/openssl/include/openssl/opensslconf.h
@@ -118,8 +118,8 @@ extern "C" {
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/home/gerstrong/workspace/SDLAndroid/project/jni/openssl/build/armeabi-v7a/dist/lib/engines"
-#define OPENSSLDIR "/home/gerstrong/workspace/SDLAndroid/project/jni/openssl/build/armeabi-v7a/dist/ssl"
+#define ENGINESDIR "/home/pelya/src/endless_space/bochs/sdl/project/jni/openssl/build/armeabi-v7a/dist/lib/engines"
+#define OPENSSLDIR "/home/pelya/src/endless_space/bochs/sdl/project/jni/openssl/build/armeabi-v7a/dist/ssl"
 #endif
 #endif
 
diff --git a/project/jni/shmem b/project/jni/shmem
index f6b49516c..c2a28f528 160000
--- a/project/jni/shmem
+++ b/project/jni/shmem
@@ -1 +1 @@
-Subproject commit f6b49516cf4b13f455a19ec989626be5472830c5
+Subproject commit c2a28f528d0b1b2528dda125e8fe8018609e7e9a