diff --git a/package.json b/package.json
index 1b8ca12c..54d368b8 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#7a354bbd17",
+        "c9.ide.installer": "#e7a08d2cc0",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",
diff --git a/plugins/c9.ide.dialog/dialog.js b/plugins/c9.ide.dialog/dialog.js
index 600bb7c7..7cfbb603 100644
--- a/plugins/c9.ide.dialog/dialog.js
+++ b/plugins/c9.ide.dialog/dialog.js
@@ -130,6 +130,9 @@ define(function(require, module, exports) {
                     if (allowClose && e.keyCode == 27)
                         dialog.hide();
                 });
+                dialog.on("resize", function(){
+                    emit("resize");
+                });
                 
                 commands.addCommand({
                     name: plugin.name,
diff --git a/plugins/c9.ide.ui/lib_apf.js b/plugins/c9.ide.ui/lib_apf.js
index 4d12f382..617b89bb 100644
--- a/plugins/c9.ide.ui/lib_apf.js
+++ b/plugins/c9.ide.ui/lib_apf.js
@@ -20275,6 +20275,9 @@ apf.Interactive = function(){
         
         doResize(e);
         
+        if (_self.dispatchEvent)
+            _self.dispatchEvent("resize");
+        
         //overThreshold = true;
     }
     
diff --git a/plugins/c9.ide.ui/widgets.terminal.js b/plugins/c9.ide.ui/widgets.terminal.js
index db58fa81..4c7b1c2e 100644
--- a/plugins/c9.ide.ui/widgets.terminal.js
+++ b/plugins/c9.ide.ui/widgets.terminal.js
@@ -105,14 +105,7 @@ define(function(require, exports, module) {
                 if (drawn) return;
                 drawn = true;
                 
-                aceterm = Aceterm.createEditor(null, "ace/theme/idle_fingers");
-                aceterm.container.style.position = "absolute";
-                aceterm.container.style.left = "0px";
-                aceterm.container.style.right = "0px";
-                aceterm.container.style.top = "0px";
-                aceterm.container.style.bottom = "0px";
-                
-                htmlNode.appendChild(aceterm.container);
+                aceterm = Aceterm.createEditor(htmlNode, "ace/theme/idle_fingers");
                 
                 terminal = new Aceterm(cols, rows, send);
                 aceterm.setSession(terminal.aceSession);
@@ -269,6 +262,11 @@ define(function(require, exports, module) {
                  */
                 get theme(){ return aceterm.renderer.theme.cssClass; },
                 set theme(value){ aceterm.renderer.setTheme({cssClass: value}); },
+                /**
+                 * 
+                 */
+                get convertEol(){ return terminal.convertEol || false; },
+                set convertEol(value){ terminal.convertEol = value; },
                 
                  // Events
                 _events: [