diff --git a/.gitignore b/.gitignore
index 225f7d4..f56ceaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,9 +7,6 @@
 Homestead.json
 Homestead.yaml
 .env
-/plugins
-/themes
-/base
 composer.lock
 /config/webed-*.php
 /public/admin
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 289d402..9ae62ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 #Change log
 
+##3.0.8 - 2017-02-24
+- Fix bugs
+- Refactor criterias
+- Refactor repository caching
+
 ##3.0.2 - 2017-02-11
 - Set auth configs globally
 - Use '--force' publish data when install themes
diff --git a/composer.json b/composer.json
index b5964f6..2c84f1f 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,13 @@
             "WebEd\\Plugins\\CustomFields\\": "plugins/custom-fields/src",
             "WebEd\\Plugins\\Backup\\": "plugins/backup/src",
             "WebEd\\Plugins\\Blocks\\": "plugins/blocks/src",
-            "WebEd\\Themes\\NongDanViet\\": "themes/nongdanviet/src"
+            "WebEd\\Plugins\\Ecommerce\\": "plugins/ecommerce/src",
+            "WebEd\\Plugins\\DashboardStyleGuide\\": "plugins/dashboard-style-guide/src",
+            "WebEd\\Plugins\\IDE\\": "plugins/ide/src",
+            "WebEd\\Themes\\Cosmetics\\": "themes/cosmetics/src",
+            "WebEd\\Plugins\\Ecommerce\\Addons\\Coupons\\": "plugins/ecommerce-coupons/src",
+            "WebEd\\Plugins\\Ecommerce\\Addons\\Customers\\": "plugins/ecommerce-customers/src",
+            "WebEd\\Plugins\\Ecommerce\\Addons\\ProductAttributes\\": "plugins/ecommerce-product-attributes/src"
         }
     },
     "scripts": {
@@ -65,4 +71,4 @@
         "preferred-install": "dist",
         "sort-packages": true
     }
-}
+}
\ No newline at end of file
diff --git a/plugins/.gitignore b/plugins/.gitignore
new file mode 100644
index 0000000..cb2f530
--- /dev/null
+++ b/plugins/.gitignore
@@ -0,0 +1,3 @@
+# Created by .ignore support plugin (hsz.mobi)
+
+!.gitignore
diff --git a/themes/.gitignore b/themes/.gitignore
new file mode 100644
index 0000000..cb2f530
--- /dev/null
+++ b/themes/.gitignore
@@ -0,0 +1,3 @@
+# Created by .ignore support plugin (hsz.mobi)
+
+!.gitignore