diff --git a/local/index.html b/local/index.html
index 35c9e6fc..7a262984 100644
--- a/local/index.html
+++ b/local/index.html
@@ -428,7 +428,11 @@
                         fatalError(err);
                     });
                     
-                    app.on("service", function(name, plugin){
+                    app.on("service", function(name, plugin) {
+                        if (name == "plugin.loader" || name == "plugin.installer" || name == "plugin.debug" || name == "plugin.manager")
+                            plugin.architect = app; // TODO why we rename app to architect?
+                        if (name == "c9")
+                            plugin.startLoadTime = start;
                         if (!plugin.name)
                             plugin.name = name;
                     });
diff --git a/package.json b/package.json
index 31590b2f..107997a8 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
         "c9.ide.run.build": "#915e48b363",
         "c9.ide.save": "#a32a8f4346",
         "c9.ide.terminal.monitor": "#b0b4d03280",
-        "c9.ide.theme.flat": "#5c7c27ab74",
+        "c9.ide.theme.flat": "#b1d65fa9bb",
         "c9.ide.threewaymerge": "#229382aa0b",
         "c9.ide.undo": "#b028bcb4d5",
         "c9.ide.upload": "#0bd010d3dc",