diff --git a/.gitignore b/.gitignore
index d9f7d9c..a0c8dde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,49 @@
+### Add Extra ###
+/.idea/caches
+/build
+app/build/
+/.idea/*
+.idea/*.xml
+!.idea/gradle.xml
+!.idea/runConfigurations/*.xml
+
+!/codeStyleSettings.xml
+!/copyright/*.xml
+!/fileColors.xml
+!/encodings.xml
+!/gradle.xml
+!/inspectionProfiles/*.xml
+/inspectionProfiles/profiles_settings.xml
+!/scopes/*.xml
+/scopes/scope_settings.xml
+!/templateLanguages.xml
+!/vcs.xml
+
+# Windows thumbnail cache files
+ehthumbs_vista.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
 ### Default AndroidStudio ###
-*.iml
 .gradle
 /local.properties
 /.idea/libraries
 /.idea/modules.xml
 /.idea/workspace.xml
-/.idea/caches
-.DS_Store
-/build
 /captures
-.externalNativeBuild
 
 ### Android ###
 # Built application files
@@ -58,47 +92,47 @@
 .idea/dictionaries
 .idea/libraries
 .idea/caches
- 
+
 # Keystore files
 *.jks
- 
+
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
- 
+
 # Google Services (e.g. APIs or Firebase)
 google-services.json
- 
+
 # Freeline
 freeline.py
 freeline/
 freeline_project_description.json
- 
+
 ### Android Patch ###
 gen-external-apklibs
- 
+
 ### AndroidStudio ###
 # Covers files to be ignored for android development using Android Studio.
- 
+
 # Built application files
- 
+
 # Files for the ART/Dalvik VM
- 
+
 # Java class files
- 
+
 # Generated files
- 
+
 # Gradle files
 .gradle
- 
+
 # Signing files
 .signing/
- 
+
 # Local configuration file (sdk path, etc)
- 
+
 # Proguard folder generated by Eclipse
- 
+
 # Log Files
- 
+
 # Android Studio
 /*/build/
 /*/local.properties
@@ -108,18 +142,18 @@
 *.ipr
 *~
 *.swp
- 
+
 # Android Patch
- 
+
 # External native build folder generated in Android Studio 2.2 and later
- 
+
 # NDK
 obj/
- 
+
 # IntelliJ IDEA
 *.iws
 /out/
- 
+
 # User-specific configurations
 .idea/libraries/
 .idea/.name
@@ -136,9 +170,9 @@
 .idea/sqlDataSources.xml
 .idea/dynamic.xml
 .idea/uiDesigner.xml
- 
+
 # Keystore files
- 
+
 # OS-specific files
 .DS_Store
 .DS_Store?
@@ -147,61 +181,61 @@
 .Trashes
 ehthumbs.db
 Thumbs.db
- 
+
 # Legacy Eclipse project files
 .classpath
 .project
- 
+
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
- 
+
 # Package Files #
 *.jar
 *.war
 *.ear
- 
+
 # virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
 hs_err_pid*
- 
+
 ## Plugin-specific files:
- 
+
 # mpeltonen/sbt-idea plugin
 .idea_modules/
- 
+
 # JIRA plugin
 atlassian-ide-plugin.xml
- 
+
 # Mongo Explorer plugin
 .idea/mongoSettings.xml
- 
+
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
- 
+
 ### AndroidStudio Patch ###
 # Google Services plugin
- 
+
 !/gradle/wrapper/gradle-wrapper.jar
- 
+
 ### macOS ###
 *.DS_Store
 .AppleDouble
 .LSOverride
- 
+
 # Icon must end with two \r
 Icon
- 
+
 # Thumbnails
- 
+
 # Files that might appear in the root of a volume
 .DocumentRevisions-V100
 .fseventsd
 .TemporaryItems
 .VolumeIcon.icns
 .com.apple.timemachine.donotpresent
- 
+
 # Directories potentially created on remote AFP share
 .AppleDB
 .AppleDesktop