diff --git a/.gitignore b/.gitignore
index d4670af..f5d9e60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,13 +5,11 @@
 bin/
 gen/
 out/
-obj/
-app/src/*/libs/
-app/src/*/obj/
 
 # Gradle files
-.gradle/
-build/
+.gradle
+**/build/
+!src/**/build/
 # Ignore Gradle GUI config
 gradle-app.setting
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
@@ -22,16 +20,16 @@
 # Local configuration file (sdk path, etc)
 local.properties
 
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
 # Eclipse project files
 .classpath
 .project
 
-# OSX files
-.DS_Store
-
-# Windows thumbnail db
-Thumbs.db
-
 # IntelliJ
 *.iml
 .idea/workspace.xml
@@ -46,12 +44,16 @@
 # Comment next line if keeping position of elements in Navigation Editor is relevant for you
 .idea/navEditor.xml
 
-# Old-style IDEA project files
-*.ipr
-*.iws
-
-# Sandbox stuff
-_sandbox
-
 # Emacs stuff
 prj.el
+
+# macOS
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Windows
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db