diff --git a/boilerplates/Android.gitignore b/boilerplates/Android.gitignore
index d5713722..39b6783c 100644
--- a/boilerplates/Android.gitignore
+++ b/boilerplates/Android.gitignore
@@ -37,8 +37,10 @@ captures/
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/gradle.xml
+.idea/assetWizardSettings.xml
 .idea/dictionaries
 .idea/libraries
+.idea/caches
 
 # Keystore files
 # Uncomment the following line if you do not want to check your keystore files in.
diff --git a/boilerplates/Anjuta.gitignore b/boilerplates/Anjuta.gitignore
new file mode 100644
index 00000000..20dd42c5
--- /dev/null
+++ b/boilerplates/Anjuta.gitignore
@@ -0,0 +1,3 @@
+# Local configuration folder and symbol database
+/.anjuta/
+/.anjuta_sym_db.db
diff --git a/boilerplates/Ansible.gitignore b/boilerplates/Ansible.gitignore
new file mode 100644
index 00000000..a8b42eb6
--- /dev/null
+++ b/boilerplates/Ansible.gitignore
@@ -0,0 +1 @@
+*.retry
diff --git a/boilerplates/Archives.gitignore b/boilerplates/Archives.gitignore
index e9eda68b..43fd5582 100644
--- a/boilerplates/Archives.gitignore
+++ b/boilerplates/Archives.gitignore
@@ -5,17 +5,18 @@
 *.rar
 *.zip
 *.gz
+*.tgz
 *.bzip
 *.bz2
 *.xz
 *.lzma
 *.cab
 
-#packing-only formats
+# Packing-only formats
 *.iso
 *.tar
 
-#package management formats
+# Package management formats
 *.dmg
 *.xpi
 *.gem
diff --git a/boilerplates/Autotools.gitignore b/boilerplates/Autotools.gitignore
index ffa6ecc3..f4f545c9 100644
--- a/boilerplates/Autotools.gitignore
+++ b/boilerplates/Autotools.gitignore
@@ -9,13 +9,15 @@ Makefile.in
 
 # http://www.gnu.org/software/autoconf
 
-/autom4te.cache
+autom4te.cache
 /autoscan.log
 /autoscan-*.log
 /aclocal.m4
 /compile
 /config.guess
 /config.h.in
+/config.log
+/config.status
 /config.sub
 /configure
 /configure.scan
@@ -39,4 +41,3 @@ m4/ltoptions.m4
 m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
-autom4te.cache
diff --git a/boilerplates/Backup.gitignore b/boilerplates/Backup.gitignore
new file mode 100644
index 00000000..825ce52d
--- /dev/null
+++ b/boilerplates/Backup.gitignore
@@ -0,0 +1,5 @@
+*.bak
+*.gho
+*.ori
+*.orig
+*.tmp
diff --git a/boilerplates/Bazaar.gitignore b/boilerplates/Bazaar.gitignore
new file mode 100644
index 00000000..3cbbcbd1
--- /dev/null
+++ b/boilerplates/Bazaar.gitignore
@@ -0,0 +1,2 @@
+.bzr/
+.bzrignore
diff --git a/boilerplates/CVS.gitignore b/boilerplates/CVS.gitignore
index 01ba8634..1695352e 100644
--- a/boilerplates/CVS.gitignore
+++ b/boilerplates/CVS.gitignore
@@ -1,4 +1,4 @@
 /CVS/*
-*/CVS/*
+**/CVS/*
 .cvsignore
 */.cvsignore
diff --git a/boilerplates/Calabash.gitignore b/boilerplates/Calabash.gitignore
new file mode 100644
index 00000000..8a75b329
--- /dev/null
+++ b/boilerplates/Calabash.gitignore
@@ -0,0 +1,10 @@
+# Calabash / Cucumber
+rerun/
+reports/
+screenshots/
+screenshot*.png
+test-servers/
+
+# bundler
+.bundle
+vendor
diff --git a/boilerplates/Clojure.gitignore b/boilerplates/Clojure.gitignore
index a9fe6fba..a4cb69a3 100644
--- a/boilerplates/Clojure.gitignore
+++ b/boilerplates/Clojure.gitignore
@@ -11,3 +11,4 @@ pom.xml.asc
 .lein-plugins/
 .lein-failures
 .nrepl-port
+.cpcache/
diff --git a/boilerplates/CodeKit.gitignore b/boilerplates/CodeKit.gitignore
new file mode 100644
index 00000000..09b84126
--- /dev/null
+++ b/boilerplates/CodeKit.gitignore
@@ -0,0 +1,4 @@
+# General CodeKit files to ignore
+config.codekit
+config.codekit3
+/min
diff --git a/boilerplates/CraftCMS.gitignore b/boilerplates/CraftCMS.gitignore
index a70d4772..0d81b397 100644
--- a/boilerplates/CraftCMS.gitignore
+++ b/boilerplates/CraftCMS.gitignore
@@ -1,3 +1,4 @@
-# Craft Storage (cache) [http://buildwithcraft.com/help/craft-storage-gitignore]
+# Craft 2 Storage (https://craftcms.com/support/craft-storage-gitignore)
+# not necessary for Craft 3 (https://github.com/craftcms/craft/issues/26)
 /craft/storage/*
-!/craft/storage/logo/*
\ No newline at end of file
+!/craft/storage/rebrand
diff --git a/boilerplates/Dart.gitignore b/boilerplates/Dart.gitignore
index 58950beb..dbef116d 100644
--- a/boilerplates/Dart.gitignore
+++ b/boilerplates/Dart.gitignore
@@ -1,9 +1,8 @@
-# See https://www.dartlang.org/tools/private-files.html
+# See https://www.dartlang.org/guides/libraries/private-files
 
 # Files and directories created by pub
 .dart_tool/
 .packages
-.pub/
 build/
 # If you're building an application, you may want to check-in your pubspec.lock
 pubspec.lock
@@ -11,3 +10,12 @@ pubspec.lock
 # Directory created by dartdoc
 # If you don't generate documentation locally you can remove this line.
 doc/api/
+
+# Avoid committing generated Javascript files:
+*.dart.js
+*.info.json      # Produced by the --dump-info flag.
+*.js             # When generated by dart2js. Don't specify *.js if your
+                 # project includes source files written in JavaScript.
+*.js_
+*.js.deps
+*.js.map
diff --git a/boilerplates/Delphi.gitignore b/boilerplates/Delphi.gitignore
index 19864c6b..000ee5f1 100644
--- a/boilerplates/Delphi.gitignore
+++ b/boilerplates/Delphi.gitignore
@@ -20,7 +20,7 @@
 # Deployment Manager configuration file for your project. Added in Delphi XE2.
 # Uncomment this if it is not mobile development and you do not use remote debug feature.
 #*.deployproj
-# 
+#
 # C++ object files produced when C/C++ Output file generation is configured.
 # Uncomment this if you are not using external objects (zlib library for example).
 #*.obj
diff --git a/boilerplates/Diff.gitignore b/boilerplates/Diff.gitignore
new file mode 100644
index 00000000..59491b44
--- /dev/null
+++ b/boilerplates/Diff.gitignore
@@ -0,0 +1,2 @@
+*.patch
+*.diff
diff --git a/boilerplates/Dreamweaver.gitignore b/boilerplates/Dreamweaver.gitignore
index 6a33373b..0621a3d5 100644
--- a/boilerplates/Dreamweaver.gitignore
+++ b/boilerplates/Dreamweaver.gitignore
@@ -1,3 +1,7 @@
 # DW Dreamweaver added files
 _notes
+_compareTemp
+configs/
 dwsync.xml
+dw_php_codehinting.config
+*.mno
diff --git a/boilerplates/Dropbox.gitignore b/boilerplates/Dropbox.gitignore
new file mode 100644
index 00000000..40f4a469
--- /dev/null
+++ b/boilerplates/Dropbox.gitignore
@@ -0,0 +1,4 @@
+# Dropbox settings and caches
+.dropbox
+.dropbox.attr
+.dropbox.cache
diff --git a/boilerplates/Eagle.gitignore b/boilerplates/Eagle.gitignore
index 9afc324d..28f0b971 100644
--- a/boilerplates/Eagle.gitignore
+++ b/boilerplates/Eagle.gitignore
@@ -35,7 +35,6 @@ eagle.epf
 *.gpi
 *.pls
 *.ger
-*.gpi
 *.xln
 
 *.drd
diff --git a/boilerplates/Eclipse.gitignore b/boilerplates/Eclipse.gitignore
index 984a6eff..a65649a9 100644
--- a/boilerplates/Eclipse.gitignore
+++ b/boilerplates/Eclipse.gitignore
@@ -1,6 +1,5 @@
-*.pydevproject
+
 .metadata
-.gradle
 bin/
 tmp/
 *.tmp
@@ -10,6 +9,7 @@ tmp/
 local.properties
 .settings/
 .loadpath
+.recommenders
 
 # External tool builders
 .externalToolBuilders/
@@ -17,14 +17,40 @@ local.properties
 # Locally stored "Eclipse launch configurations"
 *.launch
 
-# CDT-specific
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
 .cproject
 
-# PDT-specific
+# CDT- autotools
+.autotools
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
 .buildpath
 
-# sbteclipse plugin 
+# sbteclipse plugin
 .target
 
+# Tern plugin
+.tern-project
+
 # TeXlipse plugin
 .texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Annotation Processing
+.apt_generated/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
diff --git a/boilerplates/EiffelStudio.gitignore b/boilerplates/EiffelStudio.gitignore
index a7ba35f8..f41b4f70 100644
--- a/boilerplates/EiffelStudio.gitignore
+++ b/boilerplates/EiffelStudio.gitignore
@@ -1,2 +1,2 @@
-# The compilation directoy
+# The compilation directory
 EIFGENs
diff --git a/boilerplates/Elixir.gitignore b/boilerplates/Elixir.gitignore
index b6d65867..86e4c3f3 100644
--- a/boilerplates/Elixir.gitignore
+++ b/boilerplates/Elixir.gitignore
@@ -6,3 +6,4 @@
 erl_crash.dump
 *.ez
 *.beam
+/config/*.secret.exs
diff --git a/boilerplates/Emacs.gitignore b/boilerplates/Emacs.gitignore
index 1b571c30..3ac7904d 100644
--- a/boilerplates/Emacs.gitignore
+++ b/boilerplates/Emacs.gitignore
@@ -27,3 +27,19 @@ tramp
 
 # AUCTeX auto folder
 /auto/
+
+# cask packages
+.cask/
+dist/
+
+# Flycheck
+flycheck_*.el
+
+# server auth directory
+/server/
+
+# projectiles files
+.projectile
+
+# directory configuration
+.dir-locals.el
diff --git a/boilerplates/Ensime.gitignore b/boilerplates/Ensime.gitignore
index 3772bdfe..f2daebb9 100644
--- a/boilerplates/Ensime.gitignore
+++ b/boilerplates/Ensime.gitignore
@@ -1,3 +1,4 @@
 # Ensime specific
 .ensime
+.ensime_cache/
 .ensime_lucene/
diff --git a/boilerplates/GPG.gitignore b/boilerplates/GPG.gitignore
new file mode 100644
index 00000000..7740a015
--- /dev/null
+++ b/boilerplates/GPG.gitignore
@@ -0,0 +1,2 @@
+secring.*
+
diff --git a/boilerplates/GWT.gitignore b/boilerplates/GWT.gitignore
index 07704e54..a01e7fcd 100644
--- a/boilerplates/GWT.gitignore
+++ b/boilerplates/GWT.gitignore
@@ -18,9 +18,6 @@ war/WEB-INF/classes/
 #compilation logs
 .gwt/
 
-#caching for already compiled files
-gwt-unitCache/
-
 #gwt junit compilation files
 www-test/
 
diff --git a/boilerplates/Godot.gitignore b/boilerplates/Godot.gitignore
new file mode 100644
index 00000000..ba45ca45
--- /dev/null
+++ b/boilerplates/Godot.gitignore
@@ -0,0 +1,8 @@
+
+# Godot-specific ignores
+.import/
+export.cfg
+export_presets.cfg
+
+# Mono-specific ignores
+.mono/
diff --git a/boilerplates/JDeveloper.gitignore b/boilerplates/JDeveloper.gitignore
new file mode 100644
index 00000000..5bba6f37
--- /dev/null
+++ b/boilerplates/JDeveloper.gitignore
@@ -0,0 +1,13 @@
+# default application storage directory used by the IDE Performance Cache feature
+.data/
+
+# used for ADF styles caching
+temp/
+
+# default output directories
+classes/
+deploy/
+javadoc/
+
+# lock file, a part of Oracle Credential Store Framework
+cwallet.sso.lck
\ No newline at end of file
diff --git a/boilerplates/JEnv.gitignore b/boilerplates/JEnv.gitignore
new file mode 100644
index 00000000..d838300a
--- /dev/null
+++ b/boilerplates/JEnv.gitignore
@@ -0,0 +1,5 @@
+# JEnv local Java version configuration file
+.java-version
+
+# Used by previous versions of JEnv
+.jenv-version
diff --git a/boilerplates/Java.gitignore b/boilerplates/Java.gitignore
index 6143e53f..a1c2a238 100644
--- a/boilerplates/Java.gitignore
+++ b/boilerplates/Java.gitignore
@@ -13,6 +13,7 @@
 # Package Files #
 *.jar
 *.war
+*.nar
 *.ear
 *.zip
 *.tar.gz
diff --git a/boilerplates/JetBrains.gitignore b/boilerplates/JetBrains.gitignore
index 1df388bf..343be1a3 100644
--- a/boilerplates/JetBrains.gitignore
+++ b/boilerplates/JetBrains.gitignore
@@ -1,36 +1,46 @@
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
-
-/*.iml
-
-## Directory-based project format:
-.idea/
-# if you remove the above rule, at least ignore the following:
-
-# User-specific stuff:
-# .idea/workspace.xml
-# .idea/tasks.xml
-# .idea/dictionaries
-
-# Sensitive or high-churn files:
-# .idea/dataSources.ids
-# .idea/dataSources.xml
-# .idea/sqlDataSources.xml
-# .idea/dynamic.xml
-# .idea/uiDesigner.xml
-
-# Gradle:
-# .idea/gradle.xml
-# .idea/libraries
-
-# Mongo Explorer plugin:
-# .idea/mongoSettings.xml
-
-## File-based project format:
-*.ipr
+# 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/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# 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
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
 *.iws
 
-## Plugin-specific files:
-
 # IntelliJ
 out/
 
@@ -40,5 +50,14 @@ out/
 # JIRA plugin
 atlassian-ide-plugin.xml
 
+# Cursive Clojure plugin
+.idea/replstate.xml
+
 # 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
diff --git a/boilerplates/Joomla.gitignore b/boilerplates/Joomla.gitignore
index b6bf3a9c..378c158b 100644
--- a/boilerplates/Joomla.gitignore
+++ b/boilerplates/Joomla.gitignore
@@ -1,4 +1,3 @@
-/.gitignore
 /.htaccess
 /administrator/cache/*
 /administrator/components/com_admin/*
diff --git a/boilerplates/KiCad.gitignore b/boilerplates/KiCad.gitignore
index 208bc4fc..198392e5 100644
--- a/boilerplates/KiCad.gitignore
+++ b/boilerplates/KiCad.gitignore
@@ -1,4 +1,5 @@
 # For PCBs designed using KiCad: http://www.kicad-pcb.org/
+# Format documentation: http://kicad-pcb.org/help/file-formats/
 
 # Temporary files
 *.000
@@ -8,6 +9,10 @@
 *~
 _autosave-*
 *.tmp
+*-cache.lib
+*-rescue.lib
+*-save.pro
+*-save.kicad_pcb
 
 # Netlist files (exported from Eeschema)
 *.net
diff --git a/boilerplates/Kotlin.gitignore b/boilerplates/Kotlin.gitignore
index 6143e53f..a1c2a238 100644
--- a/boilerplates/Kotlin.gitignore
+++ b/boilerplates/Kotlin.gitignore
@@ -13,6 +13,7 @@
 # Package Files #
 *.jar
 *.war
+*.nar
 *.ear
 *.zip
 *.tar.gz
diff --git a/boilerplates/LaTeX.gitignore b/boilerplates/LaTeX.gitignore
deleted file mode 100644
index bbaaa01b..00000000
--- a/boilerplates/LaTeX.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-*.acn
-*.acr
-*.alg
-*.aux
-*.bbl
-*.blg
-*.dvi
-*.fdb_latexmk
-*.glg
-*.glo
-*.gls
-*.idx
-*.ilg
-*.ind
-*.ist
-*.lof
-*.log
-*.lot
-*.maf
-*.mtc
-*.mtc0
-*.nav
-*.nlo
-*.out
-*.pdfsync
-*.ps
-*.snm
-*.synctex.gz
-*.toc
-*.vrb
-*.xdy
-*.tdo
diff --git a/boilerplates/LabVIEW.gitignore b/boilerplates/LabVIEW.gitignore
index 12245086..31619f59 100644
--- a/boilerplates/LabVIEW.gitignore
+++ b/boilerplates/LabVIEW.gitignore
@@ -14,3 +14,4 @@
 # Metadata
 *.aliases
 *.lvlps
+.cache/
diff --git a/boilerplates/Laravel.gitignore b/boilerplates/Laravel.gitignore
index a4854bef..67e2146f 100644
--- a/boilerplates/Laravel.gitignore
+++ b/boilerplates/Laravel.gitignore
@@ -1,6 +1,7 @@
 vendor/
 node_modules/
 npm-debug.log
+yarn-error.log
 
 # Laravel 4 specific
 bootstrap/compiled.php
@@ -10,11 +11,7 @@ app/storage/
 public/storage
 public/hot
 storage/*.key
-.env.*.php
-.env.php
 .env
 Homestead.yaml
 Homestead.json
-
-# Rocketeer PHP task runner and deployment package. https://github.com/rocketeers/rocketeer
-.rocketeer/
+/.vagrant
diff --git a/boilerplates/Lazarus.gitignore b/boilerplates/Lazarus.gitignore
index 0ea9e189..b32943f1 100644
--- a/boilerplates/Lazarus.gitignore
+++ b/boilerplates/Lazarus.gitignore
@@ -1,12 +1,30 @@
-#ignore backup files
-backup/
-
-#ignore files generated by the compiler
-lib/
+# Lazarus compiler-generated binaries (safe to delete)
+*.exe
+*.dll
+*.so
+*.dylib
+*.lrs
+*.res
 *.compiled
+*.dbg
+*.ppu
 *.o
 *.or
-*.ppu
+*.a
 
-#exclude executable output in windows
-*.exe
+# Lazarus autogenerated files (duplicated info)
+*.rst
+*.rsj
+*.lrt
+
+# Lazarus local files (user-specific info)
+*.lps
+
+# Lazarus backups and unit output folders.
+# These can be changed by user in Lazarus/project options.
+backup/
+*.bak
+lib/
+
+# Application bundle for Mac OS
+*.app/
diff --git a/boilerplates/Leiningen.gitignore b/boilerplates/Leiningen.gitignore
index a9fe6fba..a4cb69a3 100644
--- a/boilerplates/Leiningen.gitignore
+++ b/boilerplates/Leiningen.gitignore
@@ -11,3 +11,4 @@ pom.xml.asc
 .lein-plugins/
 .lein-failures
 .nrepl-port
+.cpcache/
diff --git a/boilerplates/LibreOffice.gitignore b/boilerplates/LibreOffice.gitignore
new file mode 100644
index 00000000..586beac9
--- /dev/null
+++ b/boilerplates/LibreOffice.gitignore
@@ -0,0 +1,2 @@
+# LibreOffice locks
+.~lock.*#
diff --git a/boilerplates/Linux.gitignore b/boilerplates/Linux.gitignore
index 9911632b..b56bf65d 100644
--- a/boilerplates/Linux.gitignore
+++ b/boilerplates/Linux.gitignore
@@ -1,4 +1,13 @@
 *~
 
+# 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*
diff --git a/boilerplates/Matlab.gitignore b/boilerplates/Matlab.gitignore
index 79bc56cd..46a83d63 100644
--- a/boilerplates/Matlab.gitignore
+++ b/boilerplates/Matlab.gitignore
@@ -1,8 +1,3 @@
-##---------------------------------------------------
-## Remove autosaves generated by the Matlab editor
-## We have git for backups!
-##---------------------------------------------------
-
 # Windows default autosave extension
 *.asv
 
@@ -12,5 +7,22 @@
 # Compiled MEX binaries (all platforms)
 *.mex*
 
-# Simulink Code Generation
+# Packaged app and toolbox files
+*.mlappinstall
+*.mltbx
+
+# Generated helpsearch folders
+helpsearch*/
+
+# Simulink code generation folders
 slprj/
+sccprj/
+
+# Matlab code generation folders
+codegen/
+
+# Simulink autosave extension
+*.autosave
+
+# Octave session info
+octave-workspace
diff --git a/boilerplates/Maven.gitignore b/boilerplates/Maven.gitignore
index 5f2dbe11..e8d57d08 100644
--- a/boilerplates/Maven.gitignore
+++ b/boilerplates/Maven.gitignore
@@ -7,6 +7,4 @@ release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
-
-# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
-!/.mvn/wrapper/maven-wrapper.jar
+.mvn/wrapper/maven-wrapper.jar
diff --git a/boilerplates/Mercurial.gitignore b/boilerplates/Mercurial.gitignore
index 3173e26f..e65d1137 100644
--- a/boilerplates/Mercurial.gitignore
+++ b/boilerplates/Mercurial.gitignore
@@ -1,3 +1,6 @@
-/.hg/*
-*/.hg/*
+.hg/
 .hgignore
+.hgsigs
+.hgsub
+.hgsubstate
+.hgtags
diff --git a/boilerplates/MicrosoftOffice.gitignore b/boilerplates/MicrosoftOffice.gitignore
new file mode 100644
index 00000000..0c203662
--- /dev/null
+++ b/boilerplates/MicrosoftOffice.gitignore
@@ -0,0 +1,16 @@
+*.tmp
+
+# Word temporary
+~$*.doc*
+
+# Excel temporary
+~$*.xls*
+
+# Excel Backup File
+*.xlk
+
+# PowerPoint temporary
+~$*.ppt*
+
+# Visio autosave temporary files
+*.~vsd*
diff --git a/boilerplates/Momentics.gitignore b/boilerplates/Momentics.gitignore
index 7ebee2be..b14db2d8 100644
--- a/boilerplates/Momentics.gitignore
+++ b/boilerplates/Momentics.gitignore
@@ -3,3 +3,6 @@ x86/
 arm/
 arm-p/
 translations/*.qm
+
+# IDE settings
+.settings/
diff --git a/boilerplates/NetBeans.gitignore b/boilerplates/NetBeans.gitignore
index ab680a8b..254108cd 100644
--- a/boilerplates/NetBeans.gitignore
+++ b/boilerplates/NetBeans.gitignore
@@ -3,5 +3,4 @@ build/
 nbbuild/
 dist/
 nbdist/
-nbactions.xml
-nb-configuration.xml
+.nb-gradle/
diff --git a/boilerplates/Node.gitignore b/boilerplates/Node.gitignore
index d1bed128..3a4c8581 100644
--- a/boilerplates/Node.gitignore
+++ b/boilerplates/Node.gitignore
@@ -36,7 +36,7 @@ build/Release
 node_modules/
 jspm_packages/
 
-# Typescript v1 declaration files
+# TypeScript v1 declaration files
 typings/
 
 # Optional npm cache directory
@@ -57,5 +57,17 @@ typings/
 # dotenv environment variables file
 .env
 
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
 # next.js build output
 .next
+
+# nuxt.js build output
+.nuxt
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless
diff --git a/boilerplates/Objective-C.gitignore b/boilerplates/Objective-C.gitignore
index 09dfede4..a0bd6b45 100644
--- a/boilerplates/Objective-C.gitignore
+++ b/boilerplates/Objective-C.gitignore
@@ -35,6 +35,9 @@ xcuserdata/
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
 # Pods/
+#
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
 
 # Carthage
 #
@@ -52,7 +55,7 @@ Carthage/Build
 
 fastlane/report.xml
 fastlane/Preview.html
-fastlane/screenshots
+fastlane/screenshots/**/*.png
 fastlane/test_output
 
 # Code Injection
diff --git a/boilerplates/Otto.gitignore b/boilerplates/Otto.gitignore
new file mode 100644
index 00000000..5aa263f9
--- /dev/null
+++ b/boilerplates/Otto.gitignore
@@ -0,0 +1 @@
+.otto/
diff --git a/boilerplates/Patch.gitignore b/boilerplates/Patch.gitignore
new file mode 100644
index 00000000..6ffab9ad
--- /dev/null
+++ b/boilerplates/Patch.gitignore
@@ -0,0 +1,2 @@
+*.orig
+*.rej
diff --git a/boilerplates/Perl6.gitignore b/boilerplates/Perl6.gitignore
new file mode 100644
index 00000000..7b2c018a
--- /dev/null
+++ b/boilerplates/Perl6.gitignore
@@ -0,0 +1,7 @@
+# Gitignore for Perl 6 (http://www.perl6.org)
+# As part of https://github.com/github/gitignore
+
+# precompiled files
+.precomp
+lib/.precomp
+
diff --git a/boilerplates/Python.gitignore b/boilerplates/Python.gitignore
index af2f5375..894a44cc 100644
--- a/boilerplates/Python.gitignore
+++ b/boilerplates/Python.gitignore
@@ -45,6 +45,7 @@ nosetests.xml
 coverage.xml
 *.cover
 .hypothesis/
+.pytest_cache/
 
 # Translations
 *.mo
@@ -52,9 +53,8 @@ coverage.xml
 
 # Django stuff:
 *.log
-.static_storage/
-.media/
 local_settings.py
+db.sqlite3
 
 # Flask stuff:
 instance/
diff --git a/boilerplates/Qt.gitignore b/boilerplates/Qt.gitignore
index 037a1e75..5291a385 100644
--- a/boilerplates/Qt.gitignore
+++ b/boilerplates/Qt.gitignore
@@ -1,5 +1,4 @@
 # C++ objects and libs
-
 *.slo
 *.lo
 *.o
@@ -11,7 +10,6 @@
 *.dylib
 
 # Qt-es
-
 object_script.*.Release
 object_script.*.Debug
 *_plugin_import.cpp
@@ -35,13 +33,11 @@ Makefile*
 target_wrapper.*
 
 # QtCreator
-
 *.autosave
 
-# QtCtreator Qml
+# QtCreator Qml
 *.qmlproject.user
 *.qmlproject.user.*
 
-# QtCtreator CMake
+# QtCreator CMake
 CMakeLists.txt.user*
-
diff --git a/boilerplates/R.gitignore b/boilerplates/R.gitignore
index fcff087a..26fad6fa 100644
--- a/boilerplates/R.gitignore
+++ b/boilerplates/R.gitignore
@@ -31,3 +31,6 @@ vignettes/*.pdf
 # Temporary files created by R markdown
 *.utf8.md
 *.knit.md
+
+# Shiny token, see https://shiny.rstudio.com/articles/shinyapps.html
+rsconnect/
diff --git a/boilerplates/Rails.gitignore b/boilerplates/Rails.gitignore
index 828ab1d5..e62f78e1 100644
--- a/boilerplates/Rails.gitignore
+++ b/boilerplates/Rails.gitignore
@@ -14,6 +14,7 @@ pickle-email-*.html
 
 # TODO Comment out this rule if you are OK with secrets being uploaded to the repo
 config/initializers/secret_token.rb
+config/master.key
 
 # Only include if you have production secrets in this file, which is no longer a Rails default
 # config/secrets.yml
diff --git a/boilerplates/Redis.gitignore b/boilerplates/Redis.gitignore
new file mode 100644
index 00000000..57c1c230
--- /dev/null
+++ b/boilerplates/Redis.gitignore
@@ -0,0 +1,3 @@
+# Ignore redis binary dump (dump.rdb) files
+
+*.rdb
diff --git a/boilerplates/Rust.gitignore b/boilerplates/Rust.gitignore
index 50281a44..088ba6ba 100644
--- a/boilerplates/Rust.gitignore
+++ b/boilerplates/Rust.gitignore
@@ -3,7 +3,7 @@
 /target/
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
-# More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock
+# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
 Cargo.lock
 
 # These are backup files generated by rustfmt
diff --git a/boilerplates/SASS.gitignore b/boilerplates/SASS.gitignore
deleted file mode 100644
index 0f1905d3..00000000
--- a/boilerplates/SASS.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.sass-cache
-*.css.map
diff --git a/boilerplates/SBT.gitignore b/boilerplates/SBT.gitignore
index 970d897c..5ed6acb6 100644
--- a/boilerplates/SBT.gitignore
+++ b/boilerplates/SBT.gitignore
@@ -1,9 +1,12 @@
 # Simple Build Tool
 # http://www.scala-sbt.org/release/docs/Getting-Started/Directories.html#configuring-version-control
 
+dist/*
 target/
 lib_managed/
 src_managed/
 project/boot/
+project/plugins/project/
 .history
 .cache
+.lib/
diff --git a/boilerplates/Sass.gitignore b/boilerplates/Sass.gitignore
index 486b32ce..159f5151 100644
--- a/boilerplates/Sass.gitignore
+++ b/boilerplates/Sass.gitignore
@@ -1,2 +1,4 @@
 .sass-cache/
 *.css.map
+*.sass.map
+*.scss.map
diff --git a/boilerplates/Stata.gitignore b/boilerplates/Stata.gitignore
new file mode 100644
index 00000000..07997bb1
--- /dev/null
+++ b/boilerplates/Stata.gitignore
@@ -0,0 +1,24 @@
+# .gitignore file for git projects containing Stata files
+# Commercial statistical software: http://www.stata.com
+
+# Stata dataset and output files
+*.dta
+*.gph
+*.log
+*.smcl
+*.stpr
+*.stsem
+
+# Graphic export files from Stata
+# Stata command graph export: http://www.stata.com/manuals14/g-2graphexport.pdf
+#
+# You may add graphic export files to your .gitignore. However you should be
+# aware that this will exclude all image files from this main directory
+# and subdirectories.
+# *.ps
+# *.eps
+# *.wmf
+# *.emf
+# *.pdf
+# *.png
+# *.tif
diff --git a/boilerplates/SublimeText.gitignore b/boilerplates/SublimeText.gitignore
index 1d4e6137..86c3fa45 100644
--- a/boilerplates/SublimeText.gitignore
+++ b/boilerplates/SublimeText.gitignore
@@ -1,14 +1,30 @@
-# cache files for sublime text
+# Cache files for Sublime Text
 *.tmlanguage.cache
 *.tmPreferences.cache
 *.stTheme.cache
 
-# workspace files are user-specific
+# Workspace files are user-specific
 *.sublime-workspace
 
-# project files should be checked into the repository, unless a significant
-# proportion of contributors will probably not be using SublimeText
+# Project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using Sublime Text
 # *.sublime-project
 
-# sftp configuration file
+# SFTP configuration file
 sftp-config.json
+
+# Package control specific files
+Package Control.last-run
+Package Control.ca-list
+Package Control.ca-bundle
+Package Control.system-ca-bundle
+Package Control.cache/
+Package Control.ca-certs/
+Package Control.merged-ca-bundle
+Package Control.user-ca-bundle
+oscrypto-ca-bundle.crt
+bh_unicode_properties.cache
+
+# Sublime-github package stores a github token in this file
+# https://packagecontrol.io/packages/sublime-github
+GitHub.sublime-settings
diff --git a/boilerplates/Swift.gitignore b/boilerplates/Swift.gitignore
index 161179bf..7b0d62bc 100644
--- a/boilerplates/Swift.gitignore
+++ b/boilerplates/Swift.gitignore
@@ -47,6 +47,9 @@ playground.xcworkspace
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
 # Pods/
+#
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
 
 # Carthage
 #
@@ -64,5 +67,12 @@ Carthage/Build
 
 fastlane/report.xml
 fastlane/Preview.html
-fastlane/screenshots
+fastlane/screenshots/**/*.png
 fastlane/test_output
+
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
diff --git a/boilerplates/Symfony.gitignore b/boilerplates/Symfony.gitignore
index d098259f..3dab634c 100644
--- a/boilerplates/Symfony.gitignore
+++ b/boilerplates/Symfony.gitignore
@@ -15,6 +15,10 @@
 !var/logs/.gitkeep
 !var/sessions/.gitkeep
 
+# Logs (Symfony4)
+/var/log/*
+!var/log/.gitkeep
+
 # Parameters
 /app/config/parameters.yml
 /app/config/parameters.ini
diff --git a/boilerplates/Symfony2.gitignore b/boilerplates/Symfony2.gitignore
deleted file mode 100644
index f4a95cb4..00000000
--- a/boilerplates/Symfony2.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-# Bootstrap
-app/bootstrap*
-
-# Symfony directories
-vendor/*
-*/logs/*
-*/cache/*
-web/uploads/*
-web/bundles/*
-
-# Configuration files
-app/config/parameters.ini
-app/config/parameters.yml
-
-# Composer
-composer.phar
\ No newline at end of file
diff --git a/boilerplates/SynopsysVCS.gitignore b/boilerplates/SynopsysVCS.gitignore
new file mode 100644
index 00000000..ad751f6b
--- /dev/null
+++ b/boilerplates/SynopsysVCS.gitignore
@@ -0,0 +1,36 @@
+# Waveform formats
+*.vcd
+*.vpd
+*.evcd
+*.fsdb
+
+# Default name of the simulation executable.  A different name can be
+# specified with this switch (the associated daidir database name is
+# also taken from here):  -o <path>/<filename>
+simv
+
+# Generated for Verilog and VHDL top configs
+simv.daidir/
+simv.db.dir/
+
+# Infrastructure necessary to co-simulate SystemC models with
+# Verilog/VHDL models.  An alternate directory may be specified with this
+# switch:  -Mdir=<directory_path>
+csrc/
+
+# Log file - the following switch allows to specify the file that will be
+# used to write all messages from simulation:  -l <filename>
+*.log
+
+# Coverage results (generated with urg) and database location.  The
+# following switch can also be used:  urg -dir <coverage_directory>.vdb
+simv.vdb/
+urgReport/
+
+# DVE and UCLI related files.
+DVEfiles/
+ucli.key
+
+# When the design is elaborated for DirectC, the following file is created
+# with declarations for C/C++ functions.
+vc_hdrs.h
diff --git a/boilerplates/Tags.gitignore b/boilerplates/Tags.gitignore
index 45922ec1..91927af4 100644
--- a/boilerplates/Tags.gitignore
+++ b/boilerplates/Tags.gitignore
@@ -1,12 +1,15 @@
 # Ignore tags created by etags, ctags, gtags (GNU global) and cscope
 TAGS
+.TAGS
 !TAGS/
 tags
+.tags
 !tags/
 gtags.files
 GTAGS
 GRTAGS
 GPATH
+GSYMS
 cscope.files
 cscope.out
 cscope.in.out
diff --git a/boilerplates/TeX.gitignore b/boilerplates/TeX.gitignore
index 5359e544..79a66f9e 100644
--- a/boilerplates/TeX.gitignore
+++ b/boilerplates/TeX.gitignore
@@ -40,6 +40,10 @@
 *.synctex.gz(busy)
 *.pdfsync
 
+## Build tool directories for auxiliary files
+# latexrun
+latex.out/
+
 ## Auxiliary and intermediate files from other packages:
 # algorithms
 *.alg
@@ -110,6 +114,14 @@ acs-*.bib
 *.gaux
 *.gtex
 
+# htlatex
+*.4ct
+*.4tc
+*.idv
+*.lg
+*.trc
+*.xref
+
 # hyperref
 *.brf
 
@@ -145,7 +157,9 @@ _minted*
 *.mw
 
 # nomencl
+*.nlg
 *.nlo
+*.nls
 
 # pax
 *.pax
@@ -188,6 +202,9 @@ pythontex-files-*/
 # easy-todo
 *.lod
 
+# xmpincl
+*.xmpi
+
 # xindy
 *.xdy
 
@@ -209,6 +226,9 @@ TSWLatexianTemp*
 # Texpad
 .texpadtmp
 
+# LyX
+*.lyx~
+
 # Kile
 *.backup
 
diff --git a/boilerplates/Terraform.gitignore b/boilerplates/Terraform.gitignore
index 1fef4ab9..d9397e2d 100644
--- a/boilerplates/Terraform.gitignore
+++ b/boilerplates/Terraform.gitignore
@@ -1,9 +1,15 @@
-#  Local .terraform directories
+# Local .terraform directories
 **/.terraform/*
 
 # .tfstate files
 *.tfstate
 *.tfstate.*
 
-# .tfvars files
-*.tfvars
+# Crash log files
+crash.log
+
+# Ignore any .tfvars files that are generated automatically for each Terraform run. Most
+# .tfvars files are managed as part of configuration and so should be included in
+# version control.
+#
+# example.tfvars
diff --git a/boilerplates/TortoiseGit.gitignore b/boilerplates/TortoiseGit.gitignore
new file mode 100644
index 00000000..db89590a
--- /dev/null
+++ b/boilerplates/TortoiseGit.gitignore
@@ -0,0 +1,2 @@
+# Project-level settings
+/.tgitconfig
diff --git a/boilerplates/Typo3.gitignore b/boilerplates/Typo3.gitignore
index cb024fef..200c2a2b 100644
--- a/boilerplates/Typo3.gitignore
+++ b/boilerplates/Typo3.gitignore
@@ -8,12 +8,15 @@
 /typo3conf/temp_CACHED*
 /typo3conf/temp_fieldInfo.php
 /typo3conf/deprecation_*.log
-/typo3conf/AdditionalConfiguration.php
+/typo3conf/ENABLE_INSTALL_TOOL
+/typo3conf/realurl_autoconf.php
+/FIRST_INSTALL
 # Ignore system folders, you should have them symlinked.
 # If not comment out the following entries.
 /typo3
 /typo3_src
 /typo3_src-*
+/Packages
 /.htaccess
 /index.php
 # Ignore temp directory.
diff --git a/boilerplates/Umbraco.gitignore b/boilerplates/Umbraco.gitignore
index 10fc2b4d..cd90af30 100644
--- a/boilerplates/Umbraco.gitignore
+++ b/boilerplates/Umbraco.gitignore
@@ -19,7 +19,7 @@
 !**/App_Data/[Pp]ackages/*
 !**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages/*
 
-# ImageProcessor DiskCache 
+# ImageProcessor DiskCache
 **/App_Data/cache/
 
 # Ignore the Models Builder models out of date flag
diff --git a/boilerplates/Unity.gitignore b/boilerplates/Unity.gitignore
index 75e5b140..0210746b 100644
--- a/boilerplates/Unity.gitignore
+++ b/boilerplates/Unity.gitignore
@@ -5,8 +5,8 @@
 [Bb]uilds/
 Assets/AssetStoreTools*
 
-# Visual Studio 2015 cache directory
-/.vs/
+# Visual Studio cache directory
+.vs/
 
 # Autogenerated VS/MD/Consulo solution and project files
 ExportedObj/
@@ -22,6 +22,7 @@ ExportedObj/
 *.booproj
 *.svd
 *.pdb
+*.opendb
 
 # Unity3D generated meta files
 *.pidb.meta
diff --git a/boilerplates/UnrealEngine.gitignore b/boilerplates/UnrealEngine.gitignore
index 1daca8b5..6582eaf9 100644
--- a/boilerplates/UnrealEngine.gitignore
+++ b/boilerplates/UnrealEngine.gitignore
@@ -1,9 +1,6 @@
 # Visual Studio 2015 user specific files
 .vs/
 
-# Visual Studio 2015 database file
-*.VC.db
-
 # Compiled Object files
 *.slo
 *.lo
diff --git a/boilerplates/Vagrant.gitignore b/boilerplates/Vagrant.gitignore
index a977916f..93987ca0 100644
--- a/boilerplates/Vagrant.gitignore
+++ b/boilerplates/Vagrant.gitignore
@@ -1 +1,5 @@
+# General
 .vagrant/
+
+# Log files (if you are creating logs in debug mode, uncomment this)
+# *.logs
diff --git a/boilerplates/Vim.gitignore b/boilerplates/Vim.gitignore
new file mode 100644
index 00000000..741518ff
--- /dev/null
+++ b/boilerplates/Vim.gitignore
@@ -0,0 +1,17 @@
+# Swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
+
+# Session
+Session.vim
+
+# Temporary
+.netrwhist
+*~
+# Auto-generated tag files
+tags
+# Persistent undo
+[._]*.un~
diff --git a/boilerplates/VirtualEnv.gitignore b/boilerplates/VirtualEnv.gitignore
index 3fab25b5..b2c22f2a 100644
--- a/boilerplates/VirtualEnv.gitignore
+++ b/boilerplates/VirtualEnv.gitignore
@@ -4,5 +4,9 @@
 [Bb]in
 [Ii]nclude
 [Ll]ib
+[Ll]ib64
+[Ll]ocal
 [Ss]cripts
 pyvenv.cfg
+.venv
+pip-selfcheck.json
diff --git a/boilerplates/VisualStudio.gitignore b/boilerplates/VisualStudio.gitignore
index c49041ff..94b41b91 100644
--- a/boilerplates/VisualStudio.gitignore
+++ b/boilerplates/VisualStudio.gitignore
@@ -52,7 +52,6 @@ BenchmarkDotNet.Artifacts/
 project.lock.json
 project.fragment.lock.json
 artifacts/
-**/Properties/launchSettings.json
 
 # StyleCop
 StyleCopReport.xml
@@ -60,12 +59,14 @@ StyleCopReport.xml
 # Files built by Visual Studio
 *_i.c
 *_p.c
-*_i.h
+*_h.h
 *.ilk
 *.meta
 *.obj
+*.iobj
 *.pch
 *.pdb
+*.ipdb
 *.pgc
 *.pgd
 *.rsp
@@ -219,7 +220,7 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
 
-# Including strong name files can present a security risk 
+# Including strong name files can present a security risk
 # (https://github.com/github/gitignore/pull/2483#issue-259490424)
 #*.snk
 
@@ -238,6 +239,7 @@ Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
 ServiceFabricBackup/
+*.rptproj.bak
 
 # SQL Server files
 *.mdf
@@ -248,6 +250,7 @@ ServiceFabricBackup/
 *.rdl.data
 *.bim.layout
 *.bim_*.settings
+*.rptproj.rsuser
 
 # Microsoft Fakes
 FakesAssemblies/
@@ -259,9 +262,6 @@ FakesAssemblies/
 .ntvs_analysis.dat
 node_modules/
 
-# TypeScript v1 declaration files
-typings/
-
 # Visual Studio 6 build log
 *.plg
 
@@ -316,9 +316,17 @@ __pycache__/
 # OpenCover UI analysis results
 OpenCover/
 
-# Azure Stream Analytics local run output 
+# Azure Stream Analytics local run output
 ASALocalRun/
 
 # MSBuild Binary and Structured Log
 *.binlog
 
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
diff --git a/boilerplates/VisualStudioCode.gitignore b/boilerplates/VisualStudioCode.gitignore
new file mode 100644
index 00000000..0511e2b5
--- /dev/null
+++ b/boilerplates/VisualStudioCode.gitignore
@@ -0,0 +1,5 @@
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
diff --git a/boilerplates/Windows.gitignore b/boilerplates/Windows.gitignore
index a0d31452..0251dd21 100644
--- a/boilerplates/Windows.gitignore
+++ b/boilerplates/Windows.gitignore
@@ -1,9 +1,13 @@
-# Windows image file caches
+# Windows thumbnail cache files
 Thumbs.db
 ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
 
 # Folder config file
-Desktop.ini
+[Dd]esktop.ini
 
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
@@ -11,6 +15,7 @@ $RECYCLE.BIN/
 # Windows Installer files
 *.cab
 *.msi
+*.msix
 *.msm
 *.msp
 
diff --git a/boilerplates/Wordpress.gitignore b/boilerplates/Wordpress.gitignore
deleted file mode 100644
index 052e56ab..00000000
--- a/boilerplates/Wordpress.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.log
-.htaccess
-sitemap.xml
-sitemap.xml.gz
-wp-config.php
-wp-content/advanced-cache.php
-wp-content/backup-db/
-wp-content/backups/
-wp-content/blogs.dir/
-wp-content/cache/
-wp-content/upgrade/
-wp-content/uploads/
-wp-content/wp-cache-config.php
diff --git a/boilerplates/Xcode.gitignore b/boilerplates/Xcode.gitignore
index 1b81d249..cd0c7d3e 100644
--- a/boilerplates/Xcode.gitignore
+++ b/boilerplates/Xcode.gitignore
@@ -1,4 +1,18 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## User settings
+xcuserdata/
+
+## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
+*.xcscmblueprint
+*.xccheckout
+
+## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
 build/
+DerivedData/
+*.moved-aside
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -7,8 +21,3 @@ build/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
-*.xccheckout
-*.moved-aside
-DerivedData
-*.xcuserstate
diff --git a/boilerplates/XilinxISE.gitignore b/boilerplates/XilinxISE.gitignore
index e041f51b..4475f843 100644
--- a/boilerplates/XilinxISE.gitignore
+++ b/boilerplates/XilinxISE.gitignore
@@ -42,6 +42,16 @@
 *_usage.xml
 *_xst.xrpt
 
+# iMPACT generated files
+_impactbatch.log
+impact.xsl
+impact_impact.xwbt
+ise_impact.cmd
+webtalk_impact.xml
+
+# Core Generator generated files
+xaw2verilog.log
+
 # project-wide generated files
 *.gise
 par_usage_statistics.html
diff --git a/boilerplates/OSX.gitignore b/boilerplates/macOS.gitignore
similarity index 58%
rename from boilerplates/OSX.gitignore
rename to boilerplates/macOS.gitignore
index 5e410368..135767fc 100644
--- a/boilerplates/OSX.gitignore
+++ b/boilerplates/macOS.gitignore
@@ -1,3 +1,4 @@
+# General
 .DS_Store
 .AppleDouble
 .LSOverride
@@ -8,9 +9,14 @@ Icon
 # Thumbnails
 ._*
 
-# Files that might appear on external disk
+# 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
diff --git a/boilerplates/nanoc.gitignore b/boilerplates/nanoc.gitignore
deleted file mode 100644
index abc21828..00000000
--- a/boilerplates/nanoc.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-# For projects using nanoc (http://nanoc.ws/)
-
-# Default location for output, needs to match output_dir's value found in config.yaml
-output/
-
-# Temporary file directory
-tmp/
-
-# Crash Log
-crash.log
diff --git a/boilerplates/opencart.gitignore b/boilerplates/opencart.gitignore
deleted file mode 100644
index cc937674..00000000
--- a/boilerplates/opencart.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.htaccess
-/config.php
-admin/config.php
-
-!index.html
-
-download/
-image/data/
-image/cache/
-system/cache/
-system/logs/
diff --git a/boilerplates/vim.gitignore b/boilerplates/vim.gitignore
deleted file mode 100644
index 6c5ee8df..00000000
--- a/boilerplates/vim.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-[._]*.s[a-w][a-z]
-[._]s[a-w][a-z]
-*.un~
-Session.vim
-.netrwhist
-*~