diff --git a/.gitignore b/.gitignore
index 0e095b075..3d64c9cd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,93 @@
+## Add all gitignores
+!**/.gitignore
+!.gitignore
+## Empty folders which should be kept
+!**/.keep
+!.keep
+
+#### OS
+### Mac OS
+## General
+## macOS system files
 .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
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+## Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+### Linux template
+*~
+## temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+## KDE directory preferences
+.directory
+## Linux trash folder which might appear on any partition or disk
+.Trash-*
+## .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+##### Development
+#### Node
+## Node.js dependencies directory
 node_modules/
+## Build directories
 dist/
 src/public/app-dist/
+## Log files generated
 npm-debug.log
 yarn-error.log
+## Databases
 *.db
+## Keys & Certs
 config.ini
 cert.key
 cert.crt
+## Server-specific package.json
 server-package.json
-.idea/httpRequests/
+#### ESLInt
+## Cache
+.eslintcache
+### Tmp files
+tmp/
+
+##### IDEs
+#### JetBrains
+## Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+## Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+**/.idea/*
+!**/.idea/.gitignore
+#### VisualStudioCode / VSCode / VSCodium
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+## Local History for Visual Studio Code
+.history/
+## Built Visual Studio Code Extensions
+*.vsix
+#### Kate template
+## Swap Files
+.*.kate-swp
+.swp.*
+
+## ---------------------
+
 data/
 data-test/
-tmp/
-.eslintcache
diff --git a/src/.idea/.gitignore b/src/.idea/.gitignore
new file mode 100644
index 000000000..b58b603fe
--- /dev/null
+++ b/src/.idea/.gitignore
@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/