diff --git a/.gitignore b/.gitignore
index b63da45..075830a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,42 +1,103 @@
-.gradle
-build/
-!gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
-!**/src/test/**/build/
+## Fully .gtignore for IntelliJ, Android Studio and Gradle based Java projects
+## References:
+## - https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+## - https://github.com/android/platform-samples/blob/main/.gitignore
 
-### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+.idea/artifacts
 .idea/compiler.xml
-.idea/libraries/
-*.iws
+.idea/jarRepositories.xml
+.idea/modules.xml
+.idea/*.iml
+.idea/modules
 *.iml
 *.ipr
+
+# Misc
+.idea/misc.xml
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
 out/
-!**/src/main/**/out/
-!**/src/test/**/out/
 
-### Eclipse ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
+# mpeltonen/sbt-idea plugin
+.idea_modules/
 
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
+# JIRA plugin
+atlassian-ide-plugin.xml
 
-### VS Code ###
-.vscode/
+# Cursive Clojure plugin
+.idea/replstate.xml
 
-### Mac OS ###
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+# Android studio 3.1+ additional
+.idea/deployment*.xml
+.idea/assetWizardSettings.xml
+.idea/androidTestResultsUserPreferences.xml
+
+# Android projects
+**/local.properties
+/captures
+.externalNativeBuild
+.cxx
+
+# Gradle projects
+.gradle
+build/
+
+# Mkdocs temporary serving folder
+docs-gen
+site
+*.bak
+.idea/appInsightsSettings.xml
+
+# Mac OS
 .DS_Store
\ No newline at end of file
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index d649463..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-/gradle.xml
-/misc.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
\ No newline at end of file
diff --git a/flexilocale-gradle-plugin/.gitignore b/flexilocale-gradle-plugin/.gitignore
deleted file mode 100644
index 66eaea9..0000000
--- a/flexilocale-gradle-plugin/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.gradle
-/build
\ No newline at end of file