diff --git a/gulpfile.js b/gulpfile.js
index 1757a84c1..bd418ebc8 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -86,7 +86,7 @@ gulp.task('js-update', function () {
 // HTML
 // --------------
 
-gulp.task('html', ['html-templates', 'html-views'], function () {
+gulp.task('html', ['html-views', 'html-appstatus'], function () {
     gulp.src('webadmin/src/*.html').pipe(gulp.dest('webadmin/dist'));
     gulp.src(['webadmin/src/update.html']).pipe(gulp.dest('setup/splash/website'));
 });
@@ -95,15 +95,12 @@ gulp.task('html-views', function () {
     gulp.src('webadmin/src/views/**/*.html').pipe(gulp.dest('webadmin/dist/views'));
 });
 
-gulp.task('html-templates', function () {
-    var config = JSON.parse(fs.readFileSync('./webadmin/deploymentConfig.json'));
-
-    gulp.src('webadmin/src/*.ejs')
-        .pipe(ejs(config, { ext: '.html' }))
+gulp.task('html-appstatus', ['css'], function () {
+    return gulp.src('webadmin/src/appstatus.template')
+        .pipe(ejs({}, { ext: '.html' }))
         .pipe(gulp.dest('webadmin/dist'));
 });
 
-
 // --------------
 // CSS
 // --------------
@@ -132,7 +129,7 @@ gulp.task('develop', ['default'], function () {
     gulp.watch(['webadmin/src/theme.scss'], ['css']);
     gulp.watch(['webadmin/src/img/*'], ['images']);
     gulp.watch(['webadmin/src/**/*.html'], ['html']);
-    gulp.watch(['webadmin/src/*.ejs'], ['html-templates']);
+    gulp.watch(['webadmin/src/appstatus.template'], ['html-appstatus']);
     gulp.watch(['webadmin/src/views/*.html'], ['html-views']);
     gulp.watch(['webadmin/src/js/update.js'], ['js-update']);
     gulp.watch(['webadmin/src/js/error.js'], ['js-error']);
diff --git a/webadmin/src/appstatus.html b/webadmin/src/appstatus.template
similarity index 66%
rename from webadmin/src/appstatus.html
rename to webadmin/src/appstatus.template
index 6c1d85d27..d8e260165 100644
--- a/webadmin/src/appstatus.html
+++ b/webadmin/src/appstatus.template
@@ -8,16 +8,12 @@
 
     <!-- Custom Fonts -->
     <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
-    <link href="https://fonts.googleapis.com/css?family=Roboto:300" rel="stylesheet" type="text/css">
-
-    <!-- jQuery-->
-    <script src="3rdparty/js/jquery.min.js"></script>
-
-    <!-- Bootstrap Core JavaScript -->
-    <script src="3rdparty/js/bootstrap.min.js"></script>
+    <link href="//fonts.googleapis.com/css?family=Roboto:300" rel="stylesheet" type="text/css">
 
     <!-- Theme CSS -->
-    <link href="theme.css" rel="stylesheet">
+    <style>
+        <% include ../dist/theme.css %>
+    </style>
 
 </head>