diff --git a/.gitignore b/.gitignore
index f7415cf..075830a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,103 @@
+## 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
+
+# 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/jarRepositories.xml
+.idea/modules.xml
+.idea/*.iml
+.idea/modules
*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
+*.ipr
+
+# Misc
+.idea/misc.xml
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# 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
-local.properties
\ No newline at end of file
+
+# 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 3ad4a12..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default ignored files
-/shelf/
-/gradle.xml
-/misc.xml
-/workspace.xml
\ No newline at end of file
diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
deleted file mode 100644
index 371f2e2..0000000
--- a/.idea/appInsightsSettings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/artifacts/desktopApp_desktop.xml b/.idea/artifacts/desktopApp_desktop.xml
deleted file mode 100644
index b035eb2..0000000
--- a/.idea/artifacts/desktopApp_desktop.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- $PROJECT_DIR$/samples/desktopApp/build/libs
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/artifacts/flexi_core_desktop.xml b/.idea/artifacts/flexi_core_desktop.xml
deleted file mode 100644
index 74f7073..0000000
--- a/.idea/artifacts/flexi_core_desktop.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- $PROJECT_DIR$/flexi-core/build/libs
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/artifacts/flexiui_core_desktop.xml b/.idea/artifacts/flexiui_core_desktop.xml
deleted file mode 100644
index 1471f76..0000000
--- a/.idea/artifacts/flexiui_core_desktop.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- $PROJECT_DIR$/flexiui-core/build/libs
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/artifacts/flexiui_resources_desktop.xml b/.idea/artifacts/flexiui_resources_desktop.xml
deleted file mode 100644
index 94102d8..0000000
--- a/.idea/artifacts/flexiui_resources_desktop.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- $PROJECT_DIR$/flexiui-resources/build/libs
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/artifacts/shared_desktop.xml b/.idea/artifacts/shared_desktop.xml
deleted file mode 100644
index 2c3caff..0000000
--- a/.idea/artifacts/shared_desktop.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- $PROJECT_DIR$/samples/shared/build/libs
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index b589d56..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index f255eeb..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/flexiui-core/.gitignore b/flexiui-core/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/flexiui-core/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/flexiui-resources/.gitignore b/flexiui-resources/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/flexiui-resources/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/samples/.gitignore b/samples/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/samples/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/samples/androidApp/.gitignore b/samples/androidApp/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/samples/androidApp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/samples/desktopApp/.gitignore b/samples/desktopApp/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/samples/desktopApp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/samples/shared/.gitignore b/samples/shared/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/samples/shared/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file