diff --git a/.gitignore b/.gitignore
index 4baf7b618..e99d8de1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,33 +1,40 @@
-*.log
+# Files and folders below are ignored
+
 *.aux
+*.bak-mo
+*.dll
+*.DS_Store
+*.exe
+*.exp
+*.fmu
+*.gz
 *.idx
 *.ilg
 *.ind
-*.out
-*.gz
-*.toc
-*.dll
 *.lib
-*.fmu
-*.xml
-*.txt
+*.log
 *.mat
-*.exe
-*.exp
-*.rar
-*.bak-mo
-*.DS_Store
+/*.mm
+*.mof
 *.mos~
+*.out
+*.rar
+*.toc
+*.txt
+*.xml
+systemScript.py
+.idea/
+/IDEAS backup
+/IDEAS/funnel_comp
+/IDEAS/Inputs
+/IDEAS/*.pyc
+/IDEAS/Resources/drawings.pptx
 /Specifications/Specs.synctex
 /Specifications/Specs.tcp
 /Specifications/Specs.tps
-/IDEAS backup
+
+# The files below are not ignored (hence the "!")
 !/Inputs/*.txt
 !/IDEAS/Inputs/*.txt
 !/IDEAS/Resources/strobe/*.txt
-!/IDEAS/Resources/ReferenceResults/Dymola/*txt
-/IDEAS/Resources/drawings.pptx
-/*.mm
-/IDEAS/*.pyc
-systemScript.py
-/IDEAS/Inputs
+!/IDEAS/Resources/ReferenceResults/Dymola/*.txt