diff --git a/.gitignore b/.gitignore
index 296e96df9c..5a1ac105cb 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,90 +1,80 @@
-# WinMerge temp files
-*.bak
-# Compiled python bytecode
-*.pyc
-# Emacs temp files
-*~
-.*.swp
-#OSX image cache file
+# By extension
 *.DS_Store
+*.bak
+*.diff
 *.orig
+*.pyc
+*.rej
+*.swp
+*~
+
+# Specific paths and/or names
 LICENSES
-scripts/install.cache.*
-indra/newview/res/viewerRes.rc
-indra/llcommon/llversionserver.h
-indra/llcommon/llversionviewer.h
-indra/newview/exoflickrkeys.h
-indra/llcommon/res/llcommon.rc
-indra/newview/Info-SecondLife.plist
-indra/newview/info-Firestorm.plist
-indra/.distcc
-build-linux-*
 build-darwin-*
-build-vc80/
-build-vc100/
-build-vc120/
-build-vc120-32/
-build-vc120-64/
-indra/build-vc[0-9]*
+build-linux-*
+build-stamp
+build-vc120*
+build-vc150*
+configure-stamp
+debian/files
+debian/secondlife-appearance-utility*
+debian/secondlife-viewer*
+indra/.distcc
 indra/CMakeFiles
+indra/build-vc[0-9]*
 indra/lib/mono/1.0/*.dll
 indra/lib/mono/indra/*.dll
 indra/lib/mono/indra/*.exe
 indra/lib/mono/indra/*.pdb
 indra/lib/python/eventlet/
+indra/lib/python/mulib.*
 indra/llwindow/glh/glh_linear.h
 indra/newview/app_settings/dictionaries
 indra/newview/app_settings/mozilla
 indra/newview/app_settings/mozilla-runtime-*
 indra/newview/app_settings/mozilla_debug
 indra/newview/app_settings/static_*.db2
+indra/newview/avatar_icons_cache.txt
+indra/newview/avatar_lad.log
 indra/newview/browser_profile
 indra/newview/character
+indra/newview/dbghelp.dll
+indra/newview/filters.xml
 indra/newview/fmod.dll
 indra/newview/fmod.log
 indra/newview/mozilla-theme
 indra/newview/mozilla-universal-darwin.tgz
-indra/newview/res/ll_icon.*
+indra/newview/pilot.txt
+indra/newview/pilot.xml
 indra/newview/res-sdl/ll_icon.*
+indra/newview/res/ll_icon.*
+indra/newview/search_history.txt
+indra/newview/teleport_history.txt
+indra/newview/typed_locations.txt
 indra/newview/vivox-runtime
-indra/newview/English.lproj/InfoPlist.strings
-indra/newview/Info-Firestorm.plist
 indra/server-linux-*
-indra/newview/res/firestorm_icon.BMP
-indra/newview/res/firestorm_icon.ico
 indra/temp
 indra/test/linden_file.dat
 indra/test_apps/llmediatest/dependencies/i686-win32
 indra/test_apps/terrain_mule/*.dll
 indra/viewer-linux-*
+indra/web/dataservice/lib/shared/vault.*
+indra/web/dataservice/locale.*
+indra/web/dataservice/vendor.*
 indra/web/doc/asset-upload/plugins/lsl_compiler/lslc
 indra/web/doc/asset-upload/plugins/verify-notecard
 indra/web/doc/asset-upload/plugins/verify-texture
 installed.xml
 libraries
-logs
 tarfile_tmp
-debian/secondlife-viewer*
-debian/secondlife-appearance-utility*
-debian/files
-build-stamp
-configure-stamp
-indra/newview/dbghelp.dll
-*Thumbs.db
-*.cpp.orig
-*.cpp.bak
-*.h.bak
-*.h.orig
-indra/newview/typed_locations.txt
-indra/newview/teleport_history.txt
-indra/newview/search_history.txt
-indra/newview/filters.xml
-indra/newview/avatar_icons_cache.txt
-indra/newview/avatar_lad.log
-*.diff
-indra/newview/pilot.txt
-indra/newview/pilot.xml
-#*.rej
-.*\.wixobj
+web/config.*
+web/locale.*
+web/secondlife.com.*
+
+# Firestorm additions
+indra/newview/exoflickrkeys.h
+indra/newview/fsdiscordkey.h
 my_autobuild.xml
-.vscode
\ No newline at end of file
+.vscode
+*Thumbs.db
+logs