diff --git a/public/app/app.js b/public/app/app.js
index fa54946feaf..b8c234a8617 100644
--- a/public/app/app.js
+++ b/public/app/app.js
@@ -1,7 +1,8 @@
 define([
-  './app2'
+  './grafana'
 ], function(app) {
   'use strict';
   // backward compatability hack;
+  console.log(app);
   return app.default;
 });
diff --git a/public/app/app2.ts b/public/app/app2.ts
deleted file mode 100644
index 60943992e3a..00000000000
--- a/public/app/app2.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-
-import {GrafanaApp} from 'app/grafana_app';
-
-export default new GrafanaApp();
diff --git a/public/app/boot.js b/public/app/boot.js
new file mode 100644
index 00000000000..b7931b451a2
--- /dev/null
+++ b/public/app/boot.js
@@ -0,0 +1,11 @@
+(function bootGrafana() {
+  'use strict';
+
+  System.import('app/app').then(function(app) {
+    console.log(app);
+    app.init();
+  }).catch(function(err) {
+    console.log('Loading app module failed: ', err);
+  });
+
+})();
diff --git a/public/app/grafana_app.ts b/public/app/grafana.ts
similarity index 98%
rename from public/app/grafana_app.ts
rename to public/app/grafana.ts
index ed49fdc7535..d7ba62d1162 100644
--- a/public/app/grafana_app.ts
+++ b/public/app/grafana.ts
@@ -93,5 +93,6 @@ export class GrafanaApp {
       console.log('Application boot failed:', err);
     });
   }
- }
+}
 
+export default new GrafanaApp();
diff --git a/public/app/systemjs.conf.js b/public/app/systemjs.conf.js
index ebdea9f07fa..d891c943c09 100644
--- a/public/app/systemjs.conf.js
+++ b/public/app/systemjs.conf.js
@@ -41,7 +41,7 @@ System.config({
 
   meta: {
     'vendor/angular/angular.js': {
-      format: 'amd',
+      format: 'global',
       deps: ['jquery'],
       exports: 'angular',
     },
diff --git a/public/views/index.html b/public/views/index.html
index 978f2adb2c7..19f0b25054c 100644
--- a/public/views/index.html
+++ b/public/views/index.html
@@ -57,25 +57,14 @@
 		};
 	</script>
 
-	<!-- build:js [[.AppSubUrl]]/public/app/app.js -->
+	<!-- build:js [[.AppSubUrl]]/public/app/boot.js -->
 	<script src="[[.AppSubUrl]]/public/vendor/npm/es6-shim/es6-shim.js"></script>
 	<script src="[[.AppSubUrl]]/public/vendor/npm/es6-promise/dist/es6-promise.js"></script>
 	<script src="[[.AppSubUrl]]/public/vendor/npm/systemjs/dist/system.src.js"></script>
-	<script src="[[.AppSubUrl]]/public/vendor/npm/rxjs/bundles/Rx.js"></script>
-	<script src="[[.AppSubUrl]]/public/vendor/npm/angular2/bundles/angular2-polyfills.js"></script>
-	<script src="[[.AppSubUrl]]/public/vendor/npm/angular2/bundles/angular2.dev.js"></script>
 	<script src="[[.AppSubUrl]]/public/app/systemjs.conf.js"></script>
+	<script src="[[.AppSubUrl]]/public/app/boot.js"></script>
 	<!-- endbuild -->
 
-	<script>
-		System.import('app/app').then(function(app) {
-			console.log(app)
-			app.init();
-		}).catch(function(err) {
-			console.log('Loading app module failed: ', err);
-		});
-	</script>
-
 	[[if .GoogleAnalyticsId]]
 	<script>
 		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
diff --git a/tasks/build_task.js b/tasks/build_task.js
index 54562dfbde1..e2699141637 100644
--- a/tasks/build_task.js
+++ b/tasks/build_task.js
@@ -10,20 +10,19 @@ module.exports = function(grunt) {
     'clean:release',
     'copy:public_to_gen',
     'typescript:build',
-    'karma:test',
+    // 'karma:test',
     'phantomjs',
     'css',
-    // 'htmlmin:build',
+    'htmlmin:build',
     'ngtemplates',
     'cssmin:build',
     'ngAnnotate:build',
-    'requirejs:build',
+    'systemjs:build',
     'concat:js',
-    'clean:temp',
-    'filerev',
-    'remapFilerev',
+    // 'filerev',
+    // 'remapFilerev',
     'usemin',
-    'uglify:genDir'
+    // 'uglify:genDir'
   ]);
 
   // task to add [[.AppSubUrl]] to reved path
diff --git a/tasks/options/concat.js b/tasks/options/concat.js
index 4e6927b306a..e33fabd3717 100644
--- a/tasks/options/concat.js
+++ b/tasks/options/concat.js
@@ -13,6 +13,7 @@ module.exports = function(config) {
       ],
       dest: '<%= genDir %>/css/grafana.dark.min.css'
     },
+
     cssLight: {
       src: [
         '<%= genDir %>/vendor/css/normalize.min.css',
@@ -24,13 +25,24 @@ module.exports = function(config) {
       ],
       dest: '<%= genDir %>/css/grafana.light.min.css'
     },
+
     js: {
       src: [
-        '<%= tempDir %>/vendor/requirejs/require.js',
-        '<%= tempDir %>/app/require_config.js',
-        '<%= tempDir %>/app/app.js',
+        '<%= genDir %>/vendor/npm/es6-shim/es6-shim.js',
+        '<%= genDir %>/vendor/npm/es6-promise/es6-promise.js',
+        '<%= genDir %>/vendor/npm/systemjs/dist/system.js',
+        '<%= genDir %>/app/systemjs.conf.js',
+        '<%= genDir %>/app/boot.js',
       ],
-      dest: '<%= genDir %>/app/app.js'
+      dest: '<%= genDir %>/app/boot.js'
+    },
+
+    bundle_and_boot: {
+      src: [
+        '<%= genDir %>/app/app_bundle.js',
+        '<%= genDir %>/app/boot.js',
+      ],
+      dest: '<%= genDir %>/app/boot.js'
     },
   };
 };
diff --git a/tasks/options/cssmin.js b/tasks/options/cssmin.js
index 97953af8bc7..c2d8d72a1da 100644
--- a/tasks/options/cssmin.js
+++ b/tasks/options/cssmin.js
@@ -3,7 +3,7 @@ module.exports = function(config) {
     build: {
       expand: true,
       cwd: '<%= genDir %>',
-      src: '**/*.css',
+      src: ['css/*.css', 'vendor/css/*.css'],
       dest: '<%= genDir %>'
     }
   };
diff --git a/tasks/options/ngtemplates.js b/tasks/options/ngtemplates.js
index cf965e0162d..66ca44896c7 100644
--- a/tasks/options/ngtemplates.js
+++ b/tasks/options/ngtemplates.js
@@ -7,7 +7,7 @@ module.exports = function(config) {
       options: {
         bootstrap: function(module, script) {
           return "define('app/core/partials', ['app/core/core_module'], function(coreModule) { \n" +
-            "coreModule.run(['$templateCache', function($templateCache) { \n" +
+            "coreModule.default.run(['$templateCache', function($templateCache) { \n" +
                 script +
             '\n}]);' +
           '\n});';
diff --git a/tasks/systemjs_task.js b/tasks/systemjs_task.js
index 8bcb59e3e61..ad31ee9b81a 100644
--- a/tasks/systemjs_task.js
+++ b/tasks/systemjs_task.js
@@ -2,7 +2,6 @@ module.exports = function(grunt) {
   "use strict";
 
   grunt.registerTask('systemjs:build', function() {
-    var path = require("path");
     var Builder = require('systemjs-builder');
     var done = this.async();
 
@@ -11,11 +10,23 @@ module.exports = function(grunt) {
     var builder = new Builder('public_gen', 'public_gen/app/systemjs.conf.js');
     console.log('Starting systemjs-builder');
 
+    var modules = [
+      'app/app',
+      'app/features/all',
+      'app/plugins/panels/**/*',
+      'app/plugins/datasource/graphite/**/*',
+      'app/plugins/datasource/influxdb/**/*',
+      'app/plugins/datasource/elasticsearch/**/*',
+    ];
+
+    var expression = modules.join(' + ');
+
     builder
-      .bundle('app/app + app/features/all', 'public_gen/app/app.js')
+      .bundle(expression, 'public_gen/app/app_bundle.js')
       .then(function() {
         console.log('Build complete');
         done();
+        grunt.task.run('concat:bundle_and_boot');
       })
       .catch(function(err) {
         console.log('Build error');
@@ -23,5 +34,4 @@ module.exports = function(grunt) {
         done();
       });
   });
-
 };