diff --git a/.gitignore b/.gitignore
index c7cbbc6f..73f14ae3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,10 +10,11 @@ __pycache__
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# User-specific stuff:
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/dictionaries
+# All idea files, with execptions
+.idea
+!.idea/codeStyles/*
+!.idea/codeStyleSettings.xml
+
 
 # Sensitive or high-churn files:
 .idea/**/dataSources/
@@ -64,7 +65,6 @@ fabric.properties
 # Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
 
 *.iml
-modules.xml
 .idea/misc.xml
 *.ipr