diff --git a/.gitignore b/.gitignore
index 6ee303ee6b0f..68d1410b5082 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,7 +31,6 @@ tests/proguard-project.txt
 .idea
 *.iml
 build
-/gradle.properties
 .attach_pid*
 fastlane/Fastfile
 *.hprof
diff --git a/.gitmodules b/.gitmodules
index e69de29bb2d1..f1d9d6bfffe5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "nextcloud-android-library"]
+	path = nextcloud-android-library
+	url = git@github.com:JesseWo/android-library.git
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 59ad8e8d5438..54efd32b3cbe 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -64,10 +64,8 @@
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
-    <MarkdownNavigatorCodeStyleSettings>
-      <option name="RIGHT_MARGIN" value="120" />
-    </MarkdownNavigatorCodeStyleSettings>
     <XML>
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
     </XML>
@@ -192,5 +190,8 @@
         </rules>
       </arrangement>
     </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 3e53fcc847ff..78664dc26799 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,14 +10,13 @@ buildscript {
     ext.kotlin_version = '1.3.61'
     repositories {
         google()
-        jcenter()
+        maven { url 'https://maven.aliyun.com/repository/public' }
         maven {
             url 'https://oss.sonatype.org/content/repositories/snapshots/'
         }
         maven {
             url 'https://plugins.gradle.org/m2/'
         }
-        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.3'
@@ -73,7 +72,7 @@ ext {
 
 repositories {
     google()
-    jcenter()
+    maven { url 'https://maven.aliyun.com/repository/public' }
     maven { url "https://jitpack.io" }
     maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
 
@@ -278,11 +277,11 @@ android {
 dependencies {
     // dependencies for app building
     implementation 'androidx.multidex:multidex:2.0.1'
-//    implementation project('nextcloud-android-library')
-    genericImplementation "com.github.nextcloud:android-library:$androidLibraryVersion"
-    gplayImplementation "com.github.nextcloud:android-library:$androidLibraryVersion"
-    versionDevImplementation "com.github.nextcloud:android-library:$androidLibraryVersion"
-    qaImplementation "com.github.nextcloud:android-library:$androidLibraryVersion"
+    implementation project('nextcloud-android-library')
+//    genericImplementation "com.github.nextcloud:android-library:$androidLibraryVersion"
+//    gplayImplementation "com.github.nextcloud:android-library:$androidLibraryVersion"
+//    versionDevImplementation "com.github.nextcloud:android-library:$androidLibraryVersion"
+//    qaImplementation "com.github.nextcloud:android-library:$androidLibraryVersion"
     compileOnly 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2' // remove after entire switch to lib v2
     implementation "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2
     implementation 'org.apache.jackrabbit:jackrabbit-webdav:2.13.1' // remove after entire switch to lib v2
diff --git a/gradle.properties b/gradle.properties
index 9dc90e1aa7c1..cd4319bdeb0f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,50 @@
 NC_TEST_SERVER_BASEURL=http://server
 NC_TEST_SERVER_USERNAME=test
 NC_TEST_SERVER_PASSWORD=test
-android.enableJetifier=true
-android.useAndroidX=true
 android.debug.obsoleteApi=true
 
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+Android.useDeprecatedNdk=true
+
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
+
+
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Settings specified in this file will override any Gradle settings
+# configured through the IDE.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Daemon heap size 1.5GB
+org.gradle.daemon=true
+org.gradle.caching=false
+org.gradle.parallel=true
+
+# Use kapt incremental
+kapt.incremental.apt=true
+
+# Use kapt in parallel
+kapt.use.worker.api=true
diff --git a/nextcloud-android-library b/nextcloud-android-library
new file mode 160000
index 000000000000..2c115c5e3cfb
--- /dev/null
+++ b/nextcloud-android-library
@@ -0,0 +1 @@
+Subproject commit 2c115c5e3cfbd3353acbccb08ededd643fa5c431
diff --git a/settings.gradle b/settings.gradle
index 520b64d902c9..4f7ef2e2f8b8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
 include ':'
-//include ':nextcloud-android-library'
+include ':nextcloud-android-library'