diff --git a/.gitignore b/.gitignore
index 596842b..1eda48c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,34 +5,23 @@ admin/
 cache/
 !/cache/.htaccess
 
-# PhpStorm
-.idea/
-*.iws
-.idea_modules/
-
 
-# Created by https://www.gitignore.io/api/windows,osx,linux
-
-### Windows ###
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
+# Created by https://www.gitignore.io/api/osx,linux,windows,phpstorm,sublimetext
 
-# Folder config file
-Desktop.ini
+### Linux ###
+*~
 
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
 
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
+# KDE directory preferences
+.directory
 
-# Windows shortcuts
-*.lnk
+# 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*
 
 ### OSX ###
 *.DS_Store
@@ -42,7 +31,6 @@ $RECYCLE.BIN/
 # Icon must end with two \r
 Icon
 
-
 # Thumbnails
 ._*
 
@@ -62,15 +50,122 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
+### PhpStorm ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-### Linux ###
-*~
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
 
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
 
-# KDE directory preferences
-.directory
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
 
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Ruby plugin and RubyMine
+/.rakeTasks
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### PhpStorm Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
+
+### SublimeText ###
+# cache files for sublime text
+*.tmlanguage.cache
+*.tmPreferences.cache
+*.stTheme.cache
+
+# 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
+# *.sublime-project
+
+# 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
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# End of https://www.gitignore.io/api/osx,linux,windows,phpstorm,sublimetext