diff --git a/configs/client-default.js b/configs/client-default.js
index b3379962..c9e560eb 100644
--- a/configs/client-default.js
+++ b/configs/client-default.js
@@ -164,6 +164,12 @@ module.exports = function(options) {
         "plugins/c9.ide.editors/pane",
         "plugins/c9.ide.editors/undomanager",
         
+        {
+            packagePath: "plugins/c9.ide.restore/restore",
+            staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic",
+            ideBaseUrl: options.ideBaseUrl
+        },
+        
         "plugins/c9.ide.newresource/newresource",
         "plugins/c9.ide.newresource/open",
         "plugins/c9.ide.undo/undo",
diff --git a/configs/standalone.js b/configs/standalone.js
index bb6f596e..500e16b6 100644
--- a/configs/standalone.js
+++ b/configs/standalone.js
@@ -194,6 +194,10 @@ module.exports = function(config, optimist) {
         "./c9.vfs.server/statics",
         "./c9.analytics/mock_analytics",
         "./c9.metrics/mock_metrics",
+        {
+            packagePath: "./c9.graceful-shutdown/graceful-shutdown",
+            shutdown_grace_period: 100
+        },
         "./c9.ide.experiment/mock_experiment",
         {
             packagePath: "./c9.vfs.server/vfs.connect.standalone",
diff --git a/plugins/c9.ide.layout.classic/images/loadingbgrepeat.png b/plugins/c9.ide.layout.classic/images/loadingbgrepeat.png
new file mode 100644
index 00000000..36bf5231
Binary files /dev/null and b/plugins/c9.ide.layout.classic/images/loadingbgrepeat.png differ
diff --git a/plugins/c9.ide.layout.classic/images/loadingbgrepeat_dark.png b/plugins/c9.ide.layout.classic/images/loadingbgrepeat_dark.png
new file mode 100644
index 00000000..59b180f6
Binary files /dev/null and b/plugins/c9.ide.layout.classic/images/loadingbgrepeat_dark.png differ
diff --git a/plugins/c9.ide.layout.classic/loading-flat.css b/plugins/c9.ide.layout.classic/loading-flat.css
index ec126a23..4fda746c 100644
--- a/plugins/c9.ide.layout.classic/loading-flat.css
+++ b/plugins/c9.ide.layout.classic/loading-flat.css
@@ -1,12 +1,10 @@
 BODY.loading{
-    background: -moz-linear-gradient(top,  rgba(255,255,255,1) 0%, rgba(251,251,251,1) 100%); /* FF3.6-15 */
-    background: -webkit-linear-gradient(top,  rgba(255,255,255,1) 0%,rgba(251,251,251,1) 100%); /* Chrome10-25,Safari5.1-6 */
-    background: linear-gradient(to bottom,  rgba(255,255,255,1) 0%,rgba(251,251,251,1) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
+    background: url(images/loadingbgrepeat.png);
+    background-size: 1px 8px;
 }
 BODY.loading.dark{
-    background: -moz-linear-gradient(top,  rgba(37,37,37,1) 0%, rgba(35,35,35,1) 100%); /* FF3.6-15 */
-    background: -webkit-linear-gradient(top,  rgba(37,37,37,1) 0%,rgba(35,35,35,1) 100%); /* Chrome10-25,Safari5.1-6 */
-    background: linear-gradient(to bottom,  rgba(37,37,37,1) 0%,rgba(35,35,35,1) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
+    background: url(images/loadingbgrepeat_dark.png);
+    background-size: 1px 8px;
 }
 
 #loadingide {
@@ -24,7 +22,7 @@ BODY.loading.dark{
     -webkit-font-smoothing: antialiased !important;
     -moz-osx-font-smoothing: grayscale !important;
 }
-#loadingide.dark {
+#loadingide.dark, .dark #loadingide{
     background-image: url(images/c9-logo-white.png);
 }
 
diff --git a/plugins/c9.ide.server/views/flat-load-screen.html b/plugins/c9.ide.server/views/flat-load-screen.html
index f59a85e1..6c361a61 100644
--- a/plugins/c9.ide.server/views/flat-load-screen.html
+++ b/plugins/c9.ide.server/views/flat-load-screen.html
@@ -19,24 +19,12 @@
         "It's better up here.",
         "Happy coding!",
         "Everything as you left it.",
-        "Give some love to your colleague on the left!",
         "Thank you Ada Lovelace!",
-        "Feel the power of a full IDE — in the cloud.",
-        "Code for the cloud, in the cloud",
-        "Out with the old, in with the new",
         "POST /desktop/era",
-        "#OnCloud9",
-        "I ❤ Cloud9",
-        "My life. My code. My Cloud9.",
-        "For the love of code",
-        "Get Your Code On",
-        "Skip the hazing, love the coding",
-        "Stop cursing, start coding",
-        "GET /this/workspace#loaded",
         "Use our Vim mode for extra addictive effect!",
         "Not your grandmother's IDE",
         "Now made with 20% more cloud!",
-        "Literally makes your laptop cooler",
+        "Makes your laptop cooler"
     ];
     
     var idx = Math.floor(Math.random() * messages.length);