diff --git a/.gitignore b/.gitignore
index 73c05be2..893acfa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,18 @@
-# static html
-*.html
+# static html and json
+/*/*.html
+/*/*.json
+/*/res
+/*/src
+/*/thumb
+/*/config.php
+/*.html
+
+# include some files though
+!/templates/*.html
+!/inc/config.php
+
+# minify
+/inc/lib/minify
 
 # instance-config
 /inc/instance-config.php
@@ -15,6 +28,16 @@
 
 # other stuff
 .DS_Store
+.htaccess
 thumbs.db
 Icon?
 Thumbs.db
+*.patch
+*.diff
+*.rej
+*.orig
+*~
+
+#vichan custom
+favicon.ico
+/static/spoiler.png