diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b678f1adc..000000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/AndorsTrail/.idea/workspace.xml
diff --git a/AndorsTrail/.gitignore b/AndorsTrail/.gitignore
index 0c4cccb28..bab488364 100644
--- a/AndorsTrail/.gitignore
+++ b/AndorsTrail/.gitignore
@@ -1,32 +1,12 @@
 # Android ignores
 app/src/main/res
 app/src/main/assets
-gen/
-bin/
-target/
-local.properties
-app/build/intermediates/
-build/
-debug/
-release/
-.gradle/
 
-#IntelliJ
+# Directory-based project format: (these get generated by Android Studio on open)
 .idea/
-out/production/
-out/test/
-*.iws
-*.ipr
 
-# Other
-.metadata
-.svn/
-
-
-#copied from  https://github.com/github/gitignore/blob/main/Gradle.gitignore
-.gradle
-**/build/
-!src/**/build/
+# Gradle files
+.gradle/
 
 # Ignore Gradle GUI config
 gradle-app.setting
@@ -37,19 +17,26 @@ gradle-app.setting
 # Avoid ignore Gradle wrappper properties
 !gradle-wrapper.properties
 
-# Cache of project
-.gradletasknamecache
-
-# Eclipse Gradle plugin generated files
-# Eclipse Core
-.project
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
-#copied from  https://github.com/github/gitignore/blob/main/Gradle.gitignore
+# Local configuration file (sdk path, etc)
+local.properties
 
 
-/AndorsTrail/.gradle
-/AndorsTrail/gradle/wrapper
-/AndorsTrail/app/build/
-/AndorsTrail/app/debug/
-/AndorsTrail/app/release/
+# builds
+/app/build/
+/app/debug/
+/app/release/
+
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
+# keystore files
+*.jks
+*.keystore