diff --git a/Assets/Plugins/Android/Pojlib-debug.aar b/Assets/Plugins/Android/Pojlib-debug.aar
index 3069c5f8..1f0a9564 100644
Binary files a/Assets/Plugins/Android/Pojlib-debug.aar and b/Assets/Plugins/Android/Pojlib-debug.aar differ
diff --git a/Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED b/Assets/Plugins/Android/baseProjectTemplate.gradle
similarity index 92%
rename from Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED
rename to Assets/Plugins/Android/baseProjectTemplate.gradle
index b46ea5a3..41578186 100644
--- a/Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED
+++ b/Assets/Plugins/Android/baseProjectTemplate.gradle
@@ -3,6 +3,7 @@ allprojects {
         repositories {**ARTIFACTORYREPOSITORY**
             google()
             jcenter()
+            mavenCentral()
         }
 
         dependencies {
@@ -18,6 +19,9 @@ allprojects {
     repositories {**ARTIFACTORYREPOSITORY**
         google()
         jcenter()
+        maven {
+            url = uri("https://jitpack.io")
+        }
         flatDir {
             dirs "${project(':unityLibrary').projectDir}/libs"
         }
diff --git a/Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED.meta b/Assets/Plugins/Android/baseProjectTemplate.gradle.meta
similarity index 100%
rename from Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED.meta
rename to Assets/Plugins/Android/baseProjectTemplate.gradle.meta
diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle
index 70901eb1..2e3b0845 100644
--- a/Assets/Plugins/Android/mainTemplate.gradle
+++ b/Assets/Plugins/Android/mainTemplate.gradle
@@ -4,6 +4,7 @@ apply plugin: 'com.android.library'
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 	implementation("com.google.guava:guava:31.0.1-jre")
+    implementation("com.github.Mathias-Boulay:android_gamepad_remapper:2.0.3")
 	implementation("commons-io:commons-io:2.11.0")
 	implementation("commons-codec:commons-codec:1.15")
 	implementation("com.microsoft.azure:msal4j:1.13.9")
diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
index a90c2ba7..22be3d2b 100644
--- a/Assets/Scenes/Main.unity
+++ b/Assets/Scenes/Main.unity
@@ -29444,7 +29444,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_FirstSelected: {fileID: 0}
+  m_FirstSelected: {fileID: 432457115}
   m_sendNavigationEvents: 1
   m_DragThreshold: 10
 --- !u!4 &1460469778
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 9618c1aa..0fee7cd9 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -152,6 +152,8 @@ PlayerSettings:
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}
+  - {fileID: 6154349898728414384, guid: d659781fbeb3ee24a850529d00b6529e, type: 2}
+  - {fileID: 4742369749144153844, guid: 7b5da002d83fb8f42ac49c354e6f6d31, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -258,7 +260,7 @@ PlayerSettings:
   useCustomLauncherManifest: 0
   useCustomMainGradleTemplate: 1
   useCustomLauncherGradleManifest: 1
-  useCustomBaseGradleTemplate: 0
+  useCustomBaseGradleTemplate: 1
   useCustomGradlePropertiesTemplate: 0
   useCustomProguardFile: 0
   AndroidTargetArchitectures: 2