83 files changed, 1028 insertions, 624 deletions

diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js
index 72adbfa1..1ef6e277 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.js
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.js
@@ -174,21 +174,17 @@ var Icon = exports.Icon = Montage.create(Component, {
         enumerable: true,
         value:{
             "img_root":"images/picker/",
-            ".png":"png_file.png",
-            ".jpg":"jpeg_file.png",
             ".js":"js_file.png",
+            ".json":"json_file.png",
             ".css":"css_file.png",
             ".html":"html_file.png",
             ".xml":"xml_file.png",
             ".php":"php_file.png",
+            ".pl":"pl_file.png",
+            ".py":"py_file.png",
+            ".rb":"rb_file.png",
             ".doc":"doc_file.png",
-            ".docx":"doc_file.png",
-            ".rtf":"rtf_file.png",
-            ".pdf":"pdf_file.png",
-            ".zip":"zip_file.png",
-            ".rar":"zip_file.png",
-            ".app":"executable.png",
-            ".exe":"executable.png",
+            ".txt":"txt_file.png",
             "file_default":"file.png",
             "directory":"folder.png"
         }
diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.js b/js/components/ui/tree-basic/treeItem.reel/treeItem.js
index 4c71cb6b..a67dad43 100755
--- a/js/components/ui/tree-basic/treeItem.reel/treeItem.js
+++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.js
@@ -242,21 +242,17 @@ exports.TreeItem = Montage.create(Component, {
         enumerable: true,
         value:{
             "img_root":"images/picker/",
-            ".png":"png_file.png",
-            ".jpg":"jpeg_file.png",
             ".js":"js_file.png",
+            ".json":"json_file.png",
             ".css":"css_file.png",
             ".html":"html_file.png",
             ".xml":"xml_file.png",
             ".php":"php_file.png",
+            ".pl":"pl_file.png",
+            ".py":"py_file.png",
+            ".rb":"rb_file.png",
             ".doc":"doc_file.png",
-            ".docx":"doc_file.png",
-            ".rtf":"rtf_file.png",
-            ".pdf":"pdf_file.png",
-            ".zip":"zip_file.png",
-            ".rar":"zip_file.png",
-            ".app":"executable.png",
-            ".exe":"executable.png",
+            ".txt":"txt_file.png",
             "file_default":"file.png",
             "directory":"folder.png"
         }
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index a8056519..87e93465 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -60,8 +60,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             this.eventManager.addEventListener("executeSave", this, false);
             this.eventManager.addEventListener("executeSaveAs", this, false);
             this.eventManager.addEventListener("executeSaveAll", this, false);
+            this.eventManager.addEventListener("executeFileClose", this, false);
 
-            this.eventManager.addEventListener("recordStyleChanged", this, false);
+            this.eventManager.addEventListener("styleSheetDirty", this, false);</