diff --git a/public/docs/_examples/architecture/ts/index.html b/public/docs/_examples/architecture/ts/index.html
index 96b68a3ea8..9d2b59a69b 100644
--- a/public/docs/_examples/architecture/ts/index.html
+++ b/public/docs/_examples/architecture/ts/index.html
@@ -2,13 +2,21 @@
 <html>
   <head>
     <title>Intro to Angular 2</title>
+    <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
+    <script src="node_modules/rxjs/bundles/Rx.js"></script>
     <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
     <script>
       System.config({
-        packages: {'app': {defaultExtension: 'js'}}
+        packages: {        
+          app: {
+            format: 'register',
+            defaultExtension: 'js'
+          }
+        }
       });
-      System.import('app/boot');
+      System.import('app/boot')
+            .then(null, console.error.bind(console));
     </script>
   </head>
 
diff --git a/public/docs/_examples/attribute-directives/ts/index.html b/public/docs/_examples/attribute-directives/ts/index.html
index a2013f6e20..fc4454c853 100644
--- a/public/docs/_examples/attribute-directives/ts/index.html
+++ b/public/docs/_examples/attribute-directives/ts/index.html
@@ -4,14 +4,22 @@
 
 <head>
   <title>Attribute Directives</title>
-  <script src="node_modules/systemjs/dist/system.src.js"></script>
-  <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
-  <script>
-    System.config({
-    packages: {'app': {defaultExtension: 'js'}}
-  });
-  System.import('app/boot');
-  </script>
+    <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
+    <script src="node_modules/systemjs/dist/system.src.js"></script>
+    <script src="node_modules/rxjs/bundles/Rx.js"></script>
+    <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
+    <script>
+      System.config({
+        packages: {        
+          app: {
+            format: 'register',
+            defaultExtension: 'js'
+          }
+        }
+      });
+      System.import('app/boot')
+            .then(null, console.error.bind(console));
+    </script>
 </head>
 
 <body>
diff --git a/public/docs/_examples/displaying-data/ts/index.html b/public/docs/_examples/displaying-data/ts/index.html
index a1b14f30e1..8e285be135 100644
--- a/public/docs/_examples/displaying-data/ts/index.html
+++ b/public/docs/_examples/displaying-data/ts/index.html
@@ -3,13 +3,21 @@
 
   <head>
     <title>Displaying Data</title>
+    <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
+    <script src="node_modules/rxjs/bundles/Rx.js"></script>
     <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
     <script>
       System.config({
-        packages: {'app': {defaultExtension: 'js'}}
+        packages: {        
+          app: {
+            format: 'register',
+            defaultExtension: 'js'
+          }
+        }
       });
-      System.import('app/boot');
+      System.import('app/boot')
+            .then(null, console.error.bind(console));
     </script>
   </head>
 
diff --git a/public/docs/_examples/forms/ts/index.html b/public/docs/_examples/forms/ts/index.html
index 70ebfb1b68..397642c822 100644
--- a/public/docs/_examples/forms/ts/index.html
+++ b/public/docs/_examples/forms/ts/index.html
@@ -11,13 +11,21 @@
     <link rel="stylesheet" href="styles.css">
      <!-- #enddocregion styles -->
 
-    <script src="/node_modules/systemjs/dist/system.src.js"></script>
+    <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
+    <script src="node_modules/systemjs/dist/system.src.js"></script>
+    <script src="node_modules/rxjs/bundles/Rx.js"></script>
     <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
     <script>
       System.config({
-        packages: {'app': {defaultExtension: 'js'}}
+        packages: {        
+          app: {
+            format: 'register',
+            defaultExtension: 'js'
+          }
+        }
       });
-      System.import('app/boot');
+      System.import('app/boot')
+            .then(null, console.error.bind(console));
     </script>
   </head>
 
diff --git a/public/docs/_examples/hierarchical-dependency-injection/ts/index.html b/public/docs/_examples/hierarchical-dependency-injection/ts/index.html
index 5875b1e372..da5633055c 100644
--- a/public/docs/_examples/hierarchical-dependency-injection/ts/index.html
+++ b/public/docs/_examples/hierarchical-dependency-injection/ts/index.html
@@ -3,13 +3,21 @@
 
   <head>
     <title>Hierarchical Injectors</title>
+    <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
+    <script src="node_modules/rxjs/bundles/Rx.js"></script>
     <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
     <script>
       System.config({
-        packages: {'app': {defaultExtension: 'js'}}
+        packages: {        
+          app: {
+            format: 'register',
+            defaultExtension: 'js'
+          }
+        }
       });
-      System.import('app/boot');
+      System.import('app/boot')
+            .then(null, console.error.bind(console));
     </script>
   </head>
 
diff --git a/public/docs/_examples/intro/ts/example-config.json b/public/docs/_examples/intro/ts/example-config.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/public/docs/_examples/pipes/ts/index.html b/public/docs/_examples/pipes/ts/index.html
index 9260301954..487e90020f 100644
--- a/public/docs/_examples/pipes/ts/index.html
+++ b/public/docs/_examples/pipes/ts/index.html
@@ -3,13 +3,21 @@
 
   <head>
     <title>Pipes</title>
+    <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
+    <script src="node_modules/rxjs/bundles/Rx.js"></script>
     <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
     <script>
       System.config({
-        packages: {'app': {defaultExtension: 'js'}}
+        packages: {        
+          app: {
+            format: 'register',
+            defaultExtension: 'js'
+          }
+        }
       });
-      System.import('app/boot');
+      System.import('app/boot')
+            .then(null, console.error.bind(console));
     </script>
   </head>
 
diff --git a/public/docs/_examples/quickstart/ts/index.html b/public/docs/_examples/quickstart/ts/index.html
index 7a48efc6fd..2a41a9128e 100644
--- a/public/docs/_examples/quickstart/ts/index.html
+++ b/public/docs/_examples/quickstart/ts/index.html
@@ -17,9 +17,15 @@
     <!-- #docregion systemjs -->
     <script>
       System.config({
-        packages: {'app': {defaultExtension: 'js'}}
+        packages: {        
+          app: {
+            format: 'register',
+            defaultExtension: 'js'
+          }
+        }
       });
-      System.import('app/boot');
+      System.import('app/boot')
+            .then(null, console.error.bind(console));
     </script>
     <!-- #enddocregion systemjs -->
 
diff --git a/public/docs/_examples/router/ts/index.1.html b/public/docs/_examples/router/ts/index.1.html
index 15e87bf35f..6d80ebdf84 100644
--- a/public/docs/_examples/router/ts/index.1.html
+++ b/public/docs/_examples/router/ts/index.1.html
@@ -10,12 +10,25 @@
     <!-- #enddocregion base-href -->
     <title>Router Sample</title>
     <link rel="stylesheet" href="styles.css">
-
+    <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
+    <script src="node_modules/rxjs/bundles/Rx.js"></script>
     <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
     <!-- #docregion router-lib -->
     <script src="node_modules/angular2/bundles/router.dev.js"></script>
     <!-- #enddocregion router-lib -->
+    <script>
+      System.config({
+        packages: {        
+          app: {
+            format: 'register',
+            defaultExtension: 'js'
+          }
+        }
+      });
+      System.import('app/boot')
+            .then(null, console.error.bind(console));
+    </script>
     <script>
       System.config({
         packages: {'app': {defaultExtension: 'js'}}
diff --git a/public/docs/_examples/router/ts/index.html b/public/docs/_examples/router/ts/index.html
index 309ee443f4..ace7433937 100644
--- a/public/docs/_examples/router/ts/index.html
+++ b/public/docs/_examples/router/ts/index.html
@@ -7,17 +7,24 @@
     <!-- #enddocregion base-href -->
     <title>Router Sample</title>
     <link rel="stylesheet" href="styles.css">
-
+    <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
+    <script src="node_modules/rxjs/bundles/Rx.js"></script>
     <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
     <!-- #docregion router-lib -->
     <script src="node_modules/angular2/bundles/router.dev.js"></script>
     <!-- #enddocregion router-lib -->
     <script>
       System.config({
-        packages: {'app': {defaultExtension: 'js'}}
+        packages: {        
+          app: {
+            format: 'register',
+            defaultExtension: 'js'
+          }
+        }
       });
-      System.import('app/boot').catch(console.log.bind(console));
+      System.import('app/boot')
+            .then(null, console.error.bind(console));
     </script>
   </head>
 
diff --git a/public/docs/_examples/structural-directives/ts/index.html b/public/docs/_examples/structural-directives/ts/index.html
index 15ef8d06e9..b1e827f803 100644
--- a/public/docs/_examples/structural-directives/ts/index.html
+++ b/public/docs/_examples/structural-directives/ts/index.html
@@ -4,18 +4,22 @@
 
   <head>
     <title>Angular 2 Structural Directives</title>
-    <!-- #docregion libraries -->
+    <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
+    <script src="node_modules/rxjs/bundles/Rx.js"></script>
     <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
-    <!-- #enddocregion libraries -->
-    <!-- #docregion systemjs -->
     <script>
       System.config({
-        packages: {'app': {defaultExtension: 'js'}}
+        packages: {        
+          app: {
+            format: 'register',
+            defaultExtension: 'js'
+          }
+        }
       });
-      System.import('app/boot');
+      System.import('app/boot')
+            .then(null, console.error.bind(console));
     </script>
-    <!-- #enddocregion systemjs -->
   </head>
 
   <body>
diff --git a/public/docs/_examples/template-syntax/ts/index.html b/public/docs/_examples/template-syntax/ts/index.html
index f3a2e467d7..f34a129144 100644
--- a/public/docs/_examples/template-syntax/ts/index.html
+++ b/public/docs/_examples/template-syntax/ts/index.html
@@ -3,13 +3,21 @@
   <head>
     <title>Template Syntax</title>
     <link rel="stylesheet" href="styles.css">
-    <script src="../node_modules/systemjs/dist/system.src.js"></script>
-    <script src="../node_modules/angular2/bundles/angular2.dev.js"></script>
+    <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
+    <script src="node_modules/systemjs/dist/system.src.js"></script>
+    <script src="node_modules/rxjs/bundles/Rx.js"></script>
+    <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
     <script>
       System.config({
-        packages: {'app': {defaultExtension: 'js'}}
+        packages: {        
+          app: {
+            format: 'register',
+            defaultExtension: 'js'
+          }
+        }
       });
-      System.import('app/boot');
+      System.import('app/boot')
+            .then(null, console.error.bind(console));
     </script>
   </head>
 
diff --git a/public/docs/_examples/user-input/ts/index.html b/public/docs/_examples/user-input/ts/index.html
index 7c22ae280f..646e53503f 100644
--- a/public/docs/_examples/user-input/ts/index.html
+++ b/public/docs/_examples/user-input/ts/index.html
@@ -3,13 +3,21 @@
   <head>
     <title>User Input</title>
     <link rel="stylesheet" href="styles.css">
+    <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
+    <script src="node_modules/rxjs/bundles/Rx.js"></script>
     <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
     <script>
       System.config({
-        packages: {'app': {defaultExtension: 'js'}}
+        packages: {        
+          app: {
+            format: 'register',
+            defaultExtension: 'js'
+          }
+        }
       });
-      System.import('app/boot');
+      System.import('app/boot')
+            .then(null, console.error.bind(console));
     </script>
   </head>
 
diff --git a/tools/plunker-builder/indexHtmlTranslator.js b/tools/plunker-builder/indexHtmlTranslator.js
index 44452a7308..8f70234ff8 100644
--- a/tools/plunker-builder/indexHtmlTranslator.js
+++ b/tools/plunker-builder/indexHtmlTranslator.js
@@ -16,7 +16,7 @@ var _rxRules = {
     to: '<link rel="stylesheet" href="%tag%">'
   },
   config: {
-    from: /\s*System.config\(\{\s*packages:[\s\S]*\}\}\s*\}\);/m,
+    from: /\s*System.config\(\{[\s\S]*\}\);/m,
     to: "\n" +
         "      System.config({\n" +
         "        transpiler: 'typescript', \n" +
