diff --git a/app/build.gradle b/app/build.gradle
index 5c8f449..a2f5a3b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,6 +64,7 @@ android {
 
 dependencies {
     def lifecycle_version = "2.2.0"
+    def arch_version = "2.1.0"
     def room_version = "2.2.6"
     def rx_bindings_version = '3.0.0'
     def version_coroutine = '1.4.1'
@@ -125,7 +126,7 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:core:1.3.0'
 
-    androidTestImplementation "androidx.arch.core:core-testing:$lifecycle_version"
+    androidTestImplementation "androidx.arch.core:core-testing:$arch_version"
     androidTestImplementation "androidx.room:room-testing:$room_version"
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
diff --git a/build.gradle b/build.gradle
index 55afc9a..ab576f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,8 @@ buildscript {
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        maven { url 'https://plugins.gradle.org/m2/' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
@@ -26,11 +27,21 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
-        maven {
-            url 'https://maven.google.com/'
+        mavenCentral()
+        maven { url 'https://plugins.gradle.org/m2/' }
+        // Limit which libraries can be obtained from JCenter to these ones specified below
+        jcenter() {
+            content {
+                includeModule("com.amitshekhar.android", "debug-db")
+                includeModule("com.amitshekhar.android", "debug-db-base")
+                includeModule("com.moldedbits.r2d2", "r2d2")
+                includeModule("me.dm7.barcodescanner", "zxing")
+                includeModule("me.dm7.barcodescanner", "core")
+                includeModule("com.andrognito.patternlockview", "patternlockview")
+                includeModule("com.jraska.livedata", "testing-ktx")
+                includeModule("com.jraska.livedata", "testing")
+            }
         }
-
     }
 }
 
diff --git a/graphenejlib b/graphenejlib
index e587eb1..38c0f16 160000
--- a/graphenejlib
+++ b/graphenejlib
@@ -1 +1 @@
-Subproject commit e587eb18ed9326151779fd998e49148c605faec1
+Subproject commit 38c0f168db7bdfdc8b5c6bfb98e82825806dee5d