diff --git a/README.md b/README.md
index f5397aec7..e578f2440 100644
--- a/README.md
+++ b/README.md
@@ -10,13 +10,13 @@ A Minecraft: Java Edition launcher for Android based from Boardwalk. This branch
 - [x] **Temporary removed** ~~JVDroid OpenJDK 11 (32 and 64-bit ARM and x86). Partial, no error `can't lock mutex`, but now exit with none output.~~
 - [x] OpenJDK 9 Mobile port
 - [ ] AWT/Swing for mod installer.Will try own graphics environment~~use `Caciocavallo` project~~.
-- [x] OpenGL in OpenJDK environment. Used Boardwalk 2 method.
-- [ ] OpenAL 64-bit version
-- [ ] Input keyboard and mouse events from ART to OpenJDK environment
+- [x] OpenGL in OpenJDK environment
+- [ ] OpenAL
+- [x] Input keyboard and mouse events from ART to OpenJDK environment
 - [ ] Support Minecraft 1.12 and below. Used GLFW stub.
 - [x] Support Minecraft 1.13 and above. Will make a wrapper LWJGL2 to 3.
 - [ ] More...
 
-## Licenses
+## License
 - PojavLauncher is licensed under GPLv3.
 
diff --git a/app/build.gradle b/app/build.gradle
index f30671a5f..8b0810f79 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,7 +28,7 @@ android {
         multiDexEnabled true //important
 		
 		ndk {
-            abiFilters "armeabi-v7a"
+            abiFilters "armeabi-v7a", "arm64-v8a"
         }
     }
 	
diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk
index dfc08d6a3..fe029c6c3 100644
--- a/app/src/main/jni/Android.mk
+++ b/app/src/main/jni/Android.mk
@@ -13,7 +13,14 @@ LOCAL_SRC_FILES := \
     utils.c
 include $(BUILD_SHARED_LIBRARY)
 
+# Helper to get current thread
+# include $(CLEAR_VARS)
+# LOCAL_MODULE := thread64helper
+# LOCAL_SRC_FILES := thread_helper.cpp
+# include $(BUILD_SHARED_LIBRARY)
+
 # libawt_xawt without X11
+include $(CLEAR_VARS)
 LOCAL_PATH := $(LOCAL_PATH)/awt_xawt
 include $(CLEAR_VARS)
 LOCAL_MODULE := awt_xawt
diff --git a/app/src/main/jni/Application.mk b/app/src/main/jni/Application.mk
index 6c7f3d6a0..ce2ec9f16 100644
--- a/app/src/main/jni/Application.mk
+++ b/app/src/main/jni/Application.mk
@@ -1,5 +1,4 @@
 # NDK_TOOLCHAIN_VERSION := 4.9
 APP_PLATFORM := android-21
 APP_STL := system
-APP_ABI := armeabi-v7a
-# arm64-v8a x86 x86_64
+# APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
diff --git a/app/src/main/jniLibs_disabled/arm64-v8a/libgl04es.so b/app/src/main/jniLibs/arm64-v8a/libgl04es.so
similarity index 100%
rename from app/src/main/jniLibs_disabled/arm64-v8a/libgl04es.so
rename to app/src/main/jniLibs/arm64-v8a/libgl04es.so
diff --git a/app/src/main/jniLibs_disabled/arm64-v8a/liblwjgl.so b/app/src/main/jniLibs/arm64-v8a/liblwjgl.so
similarity index 100%
rename from app/src/main/jniLibs_disabled/arm64-v8a/liblwjgl.so
rename to app/src/main/jniLibs/arm64-v8a/liblwjgl.so
diff --git a/app/src/main/jniLibs_disabled/arm64-v8a/liblwjgl_opengl.so b/app/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so
similarity index 100%
rename from app/src/main/jniLibs_disabled/arm64-v8a/liblwjgl_opengl.so
rename to app/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so
diff --git a/app/src/main/jniLibs_disabled/arm64-v8a/liblwjgl_stb.so b/app/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so
similarity index 100%
rename from app/src/main/jniLibs_disabled/arm64-v8a/liblwjgl_stb.so
rename to app/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so
diff --git a/app/src/main/jniLibs_disabled/x86/libgl04es.so b/app/src/main/jniLibs/x86/libgl04es.so
similarity index 100%
rename from app/src/main/jniLibs_disabled/x86/libgl04es.so
rename to app/src/main/jniLibs/x86/libgl04es.so
diff --git a/app/src/main/jniLibs_disabled/x86/liblwjgl.so b/app/src/main/jniLibs/x86/liblwjgl.so
similarity index 100%
rename from app/src/main/jniLibs_disabled/x86/liblwjgl.so
rename to app/src/main/jniLibs/x86/liblwjgl.so
diff --git a/app/src/main/jniLibs_disabled/x86/liblwjgl_opengl.so b/app/src/main/jniLibs/x86/liblwjgl_opengl.so
similarity index 100%
rename from app/src/main/jniLibs_disabled/x86/liblwjgl_opengl.so
rename to app/src/main/jniLibs/x86/liblwjgl_opengl.so
diff --git a/app/src/main/jniLibs_disabled/x86/liblwjgl_stb.so b/app/src/main/jniLibs/x86/liblwjgl_stb.so
similarity index 100%
rename from app/src/main/jniLibs_disabled/x86/liblwjgl_stb.so
rename to app/src/main/jniLibs/x86/liblwjgl_stb.so
diff --git a/app/src/main/jniLibs_disabled/x86/libopenal.so b/app/src/main/jniLibs/x86/libopenal.so
similarity index 100%
rename from app/src/main/jniLibs_disabled/x86/libopenal.so
rename to app/src/main/jniLibs/x86/libopenal.so
diff --git a/app/src/main/jniLibs_disabled/x86_64/libgl04es.so b/app/src/main/jniLibs/x86_64/libgl04es.so
similarity index 100%
rename from app/src/main/jniLibs_disabled/x86_64/libgl04es.so
rename to app/src/main/jniLibs/x86_64/libgl04es.so
diff --git a/app/src/main/jniLibs_disabled/x86_64/liblwjgl.so b/app/src/main/jniLibs/x86_64/liblwjgl.so
similarity index 100%
rename from app/src/main/jniLibs_disabled/x86_64/liblwjgl.so
rename to app/src/main/jniLibs/x86_64/liblwjgl.so
diff --git a/app/src/main/jniLibs_disabled/x86_64/liblwjgl_opengl.so b/app/src/main/jniLibs/x86_64/liblwjgl_opengl.so
similarity index 100%
rename from app/src/main/jniLibs_disabled/x86_64/liblwjgl_opengl.so
rename to app/src/main/jniLibs/x86_64/liblwjgl_opengl.so
diff --git a/app/src/main/jniLibs_disabled/x86_64/liblwjgl_stb.so b/app/src/main/jniLibs/x86_64/liblwjgl_stb.so
similarity index 100%
rename from app/src/main/jniLibs_disabled/x86_64/liblwjgl_stb.so
rename to app/src/main/jniLibs/x86_64/liblwjgl_stb.so