diff --git a/.gitignore b/.gitignore
index 9173642252..adf28e291b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,74 @@
-# ignore any files beginning with .
-#\.*
+# assets
+/assets/.thumbs/*
+!/assets/.thumbs/index.html
+!/assets/.thumbs/.htaccess
+
+/assets/backup/*
+!/assets/backup/index.html
+!/assets/backup/.htaccess
 
-# and any files in the cache directory
 /assets/cache/*
+!/assets/cache/.htaccess
+!/assets/cache/index.html
+!/assets/cache/siteManager.php
+!/assets/cache/sitePublishing.idx.php
+!/assets/cache/images/index.html
+!/assets/cache/rss/index.html
+!/assets/cache/updater/index.html
+
+/assets/docs/*
+!/assets/docs/.htaccess
+!/assets/docs/changelog.txt
+!/assets/docs/index.html
+!/assets/docs/license.txt
+
+/assets/export/*
+!/assets/export/index.html
+!/assets/export/.htaccess
+
+/assets/files/*
+!/assets/files/index.html
+!/assets/files/.htaccess
+
+/assets/images/*
+!/assets/images/index.html
+!/assets/images/evo-logo.png
+!/assets/images/.htaccess
 
-# and the config file
+/assets/import/*
+!/assets/import/index.html
+!/assets/import/.htaccess
+
+/assets/site/*
+!/assets/site/index.html
+!/assets/site/.htaccess
+
+# Manager
 /manager/includes/config.inc.php
 
-# Windows and Mac
+# Composer
+/composer.phar
+/vendor/*
+!/vendor/.htaccess
+!/vendor/index.html
+
+# IDE Helper
+modx_evolution.IDEhelper.php
+_ide_helper.php
+.phpstorm.meta.php
+
+#node.JS
+/node_modules
+npm-debug.log
+
+# System
+ftpsync.settings
 Thumbs.db
 Desktop.ini
 .DS_Store
+.idea
+.vagrant
+.rocketeer
 
 # except do not ignore .gitignore
 !.gitignore
diff --git a/assets/.thumbs/.htaccess b/assets/.thumbs/.htaccess
new file mode 100644
index 0000000000..6c1cc6e2da
--- /dev/null
+++ b/assets/.thumbs/.htaccess
@@ -0,0 +1,5 @@
+IndexIgnore */*
+<Files *.php>
+    Order Deny,Allow
+    Deny from all
+</Files>
diff --git a/assets/cache/images/.htaccess b/assets/backup/.htaccess
similarity index 100%
rename from assets/cache/images/.htaccess
rename to assets/backup/.htaccess
diff --git a/assets/cache/updater/.htaccess b/assets/cache/.htaccess
similarity index 100%
rename from assets/cache/updater/.htaccess
rename to assets/cache/.htaccess
diff --git a/assets/cache/updater/ht.access b/assets/cache/updater/ht.access
deleted file mode 100644
index 8f91d28b69..0000000000
--- a/assets/cache/updater/ht.access
+++ /dev/null
@@ -1,2 +0,0 @@
-order deny,allow
-allow from all
\ No newline at end of file
diff --git a/assets/docs/.htaccess b/assets/docs/.htaccess
index 7ec3cfae9a..1fce156e5a 100644
--- a/assets/docs/.htaccess
+++ b/assets/docs/.htaccess
@@ -2,4 +2,8 @@ IndexIgnore */*
 <Files "changelog.txt">
     Order Allow,Deny
     Deny from all
-</Files>
\ No newline at end of file
+</Files>
+<Files *.php>
+    Order Deny,Allow
+    Deny from all
+</Files>
diff --git a/assets/export/.htaccess b/assets/export/.htaccess
new file mode 100644
index 0000000000..6c1cc6e2da
--- /dev/null
+++ b/assets/export/.htaccess
@@ -0,0 +1,5 @@
+IndexIgnore */*
+<Files *.php>
+    Order Deny,Allow
+    Deny from all
+</Files>
diff --git a/assets/files/.htaccess b/assets/files/.htaccess
new file mode 100644
index 0000000000..6c1cc6e2da
--- /dev/null
+++ b/assets/files/.htaccess
@@ -0,0 +1,5 @@
+IndexIgnore */*
+<Files *.php>
+    Order Deny,Allow
+    Deny from all
+</Files>
diff --git a/assets/images/.htaccess b/assets/images/.htaccess
new file mode 100644
index 0000000000..6c1cc6e2da
--- /dev/null
+++ b/assets/images/.htaccess
@@ -0,0 +1,5 @@
+IndexIgnore */*
+<Files *.php>
+    Order Deny,Allow
+    Deny from all
+</Files>
diff --git a/assets/import/.htaccess b/assets/import/.htaccess
new file mode 100644
index 0000000000..6c1cc6e2da
--- /dev/null
+++ b/assets/import/.htaccess
@@ -0,0 +1,5 @@
+IndexIgnore */*
+<Files *.php>
+    Order Deny,Allow
+    Deny from all
+</Files>
diff --git a/assets/site/.htaccess b/assets/site/.htaccess
new file mode 100644
index 0000000000..6c1cc6e2da
--- /dev/null
+++ b/assets/site/.htaccess
@@ -0,0 +1,5 @@
+IndexIgnore */*
+<Files *.php>
+    Order Deny,Allow
+    Deny from all
+</Files>
diff --git a/vendor/.gitignore b/vendor/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/assets/cache/images/ht.access b/vendor/.htaccess
similarity index 53%
rename from assets/cache/images/ht.access
rename to vendor/.htaccess
index 8f91d28b69..83c6d382fb 100644
--- a/assets/cache/images/ht.access
+++ b/vendor/.htaccess
@@ -1,2 +1,2 @@
 order deny,allow
-allow from all
\ No newline at end of file
+allow from all
diff --git a/vendor/index.html b/vendor/index.html
new file mode 100644
index 0000000000..cfb7d0fe18
--- /dev/null
+++ b/vendor/index.html
@@ -0,0 +1,2 @@
+<h2>Unauthorized access</h2>
+You're not allowed to access file folder
\ No newline at end of file