diff --git a/app/library/Assets.php b/app/library/Assets.php
index 6aa1dd54..be3c779b 100644
--- a/app/library/Assets.php
+++ b/app/library/Assets.php
@@ -22,7 +22,7 @@
 
 		public static function styleIncludes($area = 'app') {
 			if (!Config::get("app.debug"))
-				return '<script>document.write(\'<link rel="stylesheet" href="build/styles/' . $area . '.css?' . filemtime("build/styles/" . $area . ".css") . ' />"\');</script>';
+				return '<script>document.write(\'<link rel="stylesheet" href="build/styles/' . $area . '.css?' . filemtime("build/styles/" . $area . ".css") . '" />\');</script>';
 
 			$styles = self::mergeGlobs(self::getStylesForArea($area));
 			$retVal = "";
diff --git a/app/views/shared/_app_layout.blade.php b/app/views/shared/_app_layout.blade.php
index 60aeed37..427190fd 100644
--- a/app/views/shared/_app_layout.blade.php
+++ b/app/views/shared/_app_layout.blade.php
@@ -122,6 +122,10 @@
 
 	{{ Assets::scriptIncludes() }}
 
+    @if (!Config::get("app.debug"))
+        <script src="/build/scripts/templates.js"></script>
+    @endif
+
 	@yield('app_scripts')
 
 @endsection
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index 08f17dd6..45fdfb4f 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -149,6 +149,24 @@ gulp.task("styles-embed", function() {
         .pipe(gulp.dest("public/build/styles"));
 });
 
+gulp.task('copy:templates', function() {
+    gulp.src([
+        'public/templates/**/*.html'
+    ])
+            .pipe(plug.angularTemplatecache({
+            module: "ponyfm",
+            root: "/templates"
+        }))
+        .pipe(gulp.dest('public/build/scripts'));
+});
+
+gulp.task('build', [
+    'scripts-app',
+    'styles-app',
+    'scripts-embed',
+    'styles-embed',
+]);
+
 gulp.task("watch", function() {
     plug.livereload.listen();
     gulp.watch("app/scripts/**/*.{coffee,js}", ["scripts-app"]);
diff --git a/package.json b/package.json
index 8a5fa407..275d9d85 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
   "dependencies": {},
   "devDependencies": {
     "gulp": "^3.8.11",
+    "gulp-angular-templatecache": "^1.6.0",
     "gulp-autoprefixer": "^2.2.0",
     "gulp-cached": "^1.0.4",
     "gulp-coffee": "^2.3.1",