diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg
index b37c94073..dd3b1a15a 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=199200
+AppVersionCode=199700
 
 # Application user-visible version name (string)
-AppVersionName="1.9.9.2 Beta"
+AppVersionName="1.9.9.7 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
@@ -215,7 +215,7 @@ CompiledLibraries="sdl_image boost_system crypto ssl curl vorbis ogg"
 CustomBuildScript=n
 
 # Aditional CFLAGS for application
-AppCflags='-frtti -fexceptions -finline-functions -DOGG=1 -DDOWNLOADER=1 -DANDROID=1 -DREFKEEN_VER_KDREAMS -DGRMODE=EGAGR -DREFKEEN_VER_KDREAMS_ANYEGA_ALL -DIOAPI_NO_64  -DBUILD_TYPE=LINUX -DTARGET_LNX=1 -DNOTYPESAVE -Werror=strict-aliasing -Werror=cast-align -Werror=pointer-arith -Werror=address -std=c++11 -Ijni/../jni/application/commandergenius/commandergenius/GsKit -Ijni/vorbis/include/vorbis -Ijni/curl/include'
+AppCflags='-frtti -fexceptions -finline-functions -DOGG=1 -DUSE_FILE32API -DDOWNLOADER=1 -DANDROID=1 -DREFKEEN_VER_KDREAMS -DGRMODE=EGAGR -DREFKEEN_VER_KDREAMS_ANYEGA_ALL -DIOAPI_NO_64 -DBUILD_TYPE=LINUX -DTARGET_LNX=1 -DNOTYPESAVE -Werror=strict-aliasing -Werror=cast-align -Werror=pointer-arith -Werror=address -std=c++11 -Ijni/../jni/application/commandergenius/commandergenius/GsKit -Ijni/vorbis/include/vorbis -Ijni/curl/include'
 
 
 # Additional LDFLAGS for application
@@ -227,7 +227,7 @@ AppLdflags='-lz -lvorbis -logg'
 AppOverlapsSystemHeaders=
 
 # Build only following subdirs (empty will build all dirs, ignored with custom script)
-AppSubdirsBuild='commandergenius/src/* commandergenius/lib/*'
+AppSubdirsBuild='commandergenius/src/* commandergenius/GsKit/*'
 
 # Exclude these files from build
 AppBuildExclude='commandergenius/src/engine/dbfusion'
diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius
index 4381db912..cdf40a57d 160000
--- a/project/jni/application/commandergenius/commandergenius
+++ b/project/jni/application/commandergenius/commandergenius
@@ -1 +1 @@
-Subproject commit 4381db9125e7fa4477ec3240e1afe85b452fd595
+Subproject commit cdf40a57d3c881eeddd68def1fdfe2e265b6843d
diff --git a/project/jni/application/hid-pc-keyboard/src b/project/jni/application/hid-pc-keyboard/src
index 952950773..c35fba36b 160000
--- a/project/jni/application/hid-pc-keyboard/src
+++ b/project/jni/application/hid-pc-keyboard/src
@@ -1 +1 @@
-Subproject commit 95295077355cce146b3af5998bb0b76186a7e7d0
+Subproject commit c35fba36bc858fec359a37d185f926fe7729d30b
diff --git a/project/jni/boost/src b/project/jni/boost/src
index bc9ea9d30..bf7cf6f5f 160000
--- a/project/jni/boost/src
+++ b/project/jni/boost/src
@@ -1 +1 @@
-Subproject commit bc9ea9d3032eb1e2b095484e2052aa2bc2e91767
+Subproject commit bf7cf6f5f2d5a932ac1b7e3fcc4efd2291ba0dcb
diff --git a/project/jni/shmem b/project/jni/shmem
index 5375e8eee..b76e09c26 160000
--- a/project/jni/shmem
+++ b/project/jni/shmem
@@ -1 +1 @@
-Subproject commit 5375e8eeea8bf79663a1c8c0d971bfe989a3c14a
+Subproject commit b76e09c26601613227af2d1346cceb57797ca496
diff --git a/readme.txt b/readme.txt
index d0fcb49ab..d9f7a4895 100644
--- a/readme.txt
+++ b/readme.txt
@@ -11,8 +11,8 @@ Installation
 ============
 
 Install latest Android SDK and NDK from http://developer.android.com/index.html
-Add both to your PATH env variable 0 you sohuld be albe to run commands 'ndk-build' and 'android'.
-You will need to install Java Ant too.
+Add both to your PATH env variable 0 you should be able to run commands 'ndk-build' and 'android'.
+You will need to install Gradle also.
 it is recommended to install OpenJDK and its development files.
 On RPM based distros they are usually called java-x.x.x-openjdk and java-x.x.x-openjdk-devel.
 On Debian or Ubuntu you install them like this: sudo apt-get install openjdk-8-jdk ant
@@ -29,10 +29,12 @@ How to compile demo application
 ===============================
 
 Launch commands
+
 	rm project/jni/application/src
 	ln -s ballfield project/jni/application/src
 	./changeAppSettings.sh -a
 	android update project -p project
+	
 Then edit file build.sh if needed to add NDK dir to your PATH, then launch it.
 It will compile a bunch of libs under project/libs/armeabi,
 create Android package file project/bin/MainActivity-debug.apk,