diff --git a/.gitignore b/.gitignore
index 9626a75f0..d2dc01467 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ src/**/[Oo]bj/
 *.user
 *.sln.docstates
 .vs/
+.vscode/
 
 # Build results
 *_i.c
@@ -126,6 +127,11 @@ coverage*.json
 setup/Output/
 *.~is
 
+# VS outout folders
+bin
+obj
+output/*
+
 # .NET Core
 project.lock.json
 project.fragment.lock.json
@@ -138,13 +144,52 @@ obj
 output/*
 
 
-#OS X metadata files
+# macOS metadata files
 ._*
 .DS_Store
 
 _start
 _temp_*/**/*
 
-## Merge any idea folder
-*/**/.idea
-*.iml
+# Windows thumbnail cache files
+Thumbs.db
+
+# AppVeyor
+/tools/cake/
+/_artifacts/
+
+# Cake
+/tools/Addins/*
+packages.config.md5sum
+
+
+# Common IntelliJ Platform excludes
+
+# User specific
+**/.idea/**/workspace.xml
+**/.idea/**/tasks.xml
+**/.idea/shelf/*
+**/.idea/dictionaries
+**/.idea/.idea.Radarr.Posix
+**/.idea/.idea.Radarr.Windows
+
+# Sensitive or high-churn files
+**/.idea/**/dataSources/
+**/.idea/**/dataSources.ids
+**/.idea/**/dataSources.xml
+**/.idea/**/dataSources.local.xml
+**/.idea/**/sqlDataSources.xml
+**/.idea/**/dynamic.xml
+
+# Rider
+# Rider auto-generates .iml files, and contentModel.xml
+**/.idea/**/*.iml
+**/.idea/**/contentModel.xml
+**/.idea/**/modules.xml
+
+# ignore node_modules symlink
+node_modules
+node_modules.nosync
+
+# API doc generation
+.config/