diff --git a/.gitattributes b/.gitattributes
index 7f4278f..11e34a1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -31,6 +31,12 @@
 *.ma text eol=lf
 *.mb filter=lfs diff=lfs merge=lfs -text
 
+# Substance Painter/Designer
+.sbs   text eol=lf
+.sbsar filter=lfs diff=lfs merge=lfs -text
+.spp   filter=lfs diff=lfs merge=lfs -text
+.spsm  filter=lfs diff=lfs merge=lfs -text
+
 # Filmbox
 # *your mileage may vary, since .fbx can be either in binary or ascii
 # *.fbx text eol=lf
@@ -51,6 +57,7 @@
 *.tga  filter=lfs diff=lfs merge=lfs -text
 *.tif  filter=lfs diff=lfs merge=lfs -text
 *.tiff filter=lfs diff=lfs merge=lfs -text
+*.webp filter=lfs diff=lfs merge=lfs -text
 
 # Videos
 *.avi  filter=lfs diff=lfs merge=lfs -text
diff --git a/.gitignore b/.gitignore
index 70c3fe8..38e10e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,3 +103,15 @@ crashlytics-build.properties
 *.blend[0-9]*
 *.pyc
 __pycache__
+
+# Windows trash
+[Tt]humbs.db
+ehthumbs.db
+[Dd]esktop.ini
+
+# gayOS trash
+.DS_Store
+.DS_Store?
+.Spotlight-V100
+.Trashes
+._*