diff --git a/app/Album.php b/app/Album.php
index 67d1dd19..40b2757c 100644
--- a/app/Album.php
+++ b/app/Album.php
@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\URL;
-use Traits\SlugTrait;
+use App\Traits\SlugTrait;
 
 class Album extends Model
 {
diff --git a/app/Genre.php b/app/Genre.php
index 573011c5..f9af2769 100644
--- a/app/Genre.php
+++ b/app/Genre.php
@@ -3,7 +3,7 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
-use Traits\SlugTrait;
+use App\Traits\SlugTrait;
 
 class Genre extends Model
 {
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 0c97a3d5..d60410c6 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -1,8 +1,10 @@
 <?php
 
-use App\Http\Controllers\Controller;
+namespace App\Http\Controllers;
+
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Redirect;
+use View;
 
 class AccountController extends Controller
 {
diff --git a/app/Http/Controllers/AlbumsController.php b/app/Http/Controllers/AlbumsController.php
index 7622961c..4a2dacc5 100644
--- a/app/Http/Controllers/AlbumsController.php
+++ b/app/Http/Controllers/AlbumsController.php
@@ -1,9 +1,14 @@
 <?php
 
-use App\Http\Controllers\Controller;
+namespace App\Http\Controllers;
+
+use AlbumDownloader;
+use App;
 use App\Album;
 use App\ResourceLogItem;
 use App\Track;
+use Illuminate\Support\Facades\Redirect;
+use View;
 
 class AlbumsController extends Controller
 {
diff --git a/app/Http/Controllers/Api/Mobile/TracksController.php b/app/Http/Controllers/Api/Mobile/TracksController.php
index 687a348f..781c08d8 100644
--- a/app/Http/Controllers/Api/Mobile/TracksController.php
+++ b/app/Http/Controllers/Api/Mobile/TracksController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api\Mobile;
+namespace App\Http\Controllers\Api\Mobile;
 
 use App\Http\Controllers\Controller;
 use App\Track;
diff --git a/app/Http/Controllers/Api/V1/TracksController.php b/app/Http/Controllers/Api/V1/TracksController.php
index 9b15b9f3..b55bb019 100644
--- a/app/Http/Controllers/Api/V1/TracksController.php
+++ b/app/Http/Controllers/Api/V1/TracksController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api\V1;
+namespace App\Http\Controllers\Api\V1;
 
 use App\Image;
 use App\Track;
diff --git a/app/Http/Controllers/Api/Web/AccountController.php b/app/Http/Controllers/Api/Web/AccountController.php
index 579e03c0..462a71c9 100644
--- a/app/Http/Controllers/Api/Web/AccountController.php
+++ b/app/Http/Controllers/Api/Web/AccountController.php
@@ -1,14 +1,15 @@
 <?php
 
-namespace Api\Web;
+namespace App\Http\Controllers\Api\Web;
 
+use App\Http\Controllers\ApiControllerBase;
 use App\Commands\SaveAccountSettingsCommand;
 use Cover;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Response;
 
-class AccountController extends \ApiControllerBase
+class AccountController extends ApiControllerBase
 {
     public function getSettings()
     {
diff --git a/app/Http/Controllers/Api/Web/AlbumsController.php b/app/Http/Controllers/Api/Web/AlbumsController.php
index e86279cd..961caba6 100644
--- a/app/Http/Controllers/Api/Web/AlbumsController.php
+++ b/app/Http/Controllers/Api/Web/AlbumsController.php
@@ -1,18 +1,19 @@
 <?php
 
-namespace Api\Web;
+namespace App\Http\Controllers\Api\Web;
 
 use App\Album;
 use App\Commands\CreateAlbumCommand;
 use App\Commands\DeleteAlbumCommand;
 use App\Commands\EditAlbumCommand;
+use App\Http\Controllers\ApiControllerBase;
 use App\Image;
 use App\ResourceLogItem;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Response;
 
-class AlbumsController extends \ApiControllerBase
+class AlbumsController extends ApiControllerBase
 {
     public function postCreate()
     {
diff --git a/app/Http/Controllers/Api/Web/ArtistsController.php b/app/Http/Controllers/Api/Web/ArtistsController.php
index 8908cc0d..568674e3 100644
--- a/app/Http/Controllers/Api/Web/ArtistsController.php
+++ b/app/Http/Controllers/Api/Web/ArtistsController.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Api\Web;
+namespace App\Http\Controllers\Api\Web;
 
 use App\Album;
 use App\Comment;
 use App\Favourite;
+use App\Http\Controllers\ApiControllerBase;
 use App\Image;
 use App\Track;
 use App\User;
@@ -13,7 +14,7 @@ use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Response;
 
-class ArtistsController extends \ApiControllerBase
+class ArtistsController extends ApiControllerBase
 {
     public function getFavourites($slug)
     {
diff --git a/app/Http/Controllers/Api/Web/AuthController.php b/app/Http/Controllers/Api/Web/AuthController.php
index c4242377..ce347a04 100644
--- a/app/Http/Controllers/Api/Web/AuthController.php
+++ b/app/Http/Controllers/Api/Web/AuthController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api\Web;
+namespace App\Http\Controllers\Api\Web;
 
 use App\Http\Controllers\Controller;
 
diff --git a/app/Http/Controllers/Api/Web/CommentsController.php b/app/Http/Controllers/Api/Web/CommentsController.php
index 9d42ad51..bf1a2a6d 100644
--- a/app/Http/Controllers/Api/Web/CommentsController.php
+++ b/app/Http/Controllers/Api/Web/CommentsController.php
@@ -1,14 +1,15 @@
 <?php
 
-namespace Api\Web;
+namespace App\Http\Controllers\Api\Web;
 
 use App;
 use App\Commands\CreateCommentCommand;
 use App\Comment;
+use App\Http\Controllers\ApiControllerBase;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Response;
 
-class CommentsController extends \ApiControllerBase
+class CommentsController extends ApiControllerBase
 {
     public function postCreate($type, $id)
     {
diff --git a/app/Http/Controllers/Api/Web/DashboardController.php b/app/Http/Controllers/Api/Web/DashboardController.php
index 3dc57d65..727cacfd 100644
--- a/app/Http/Controllers/Api/Web/DashboardController.php
+++ b/app/Http/Controllers/Api/Web/DashboardController.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Api\Web;
+namespace App\Http\Controllers\Api\Web;
 
+use App\Http\Controllers\ApiControllerBase;
 use App\News;
 use App\Track;
 use Cover;
@@ -9,7 +10,7 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Response;
 
-class DashboardController extends \ApiControllerBase
+class DashboardController extends ApiControllerBase
 {
     public function getIndex()
     {
diff --git a/app/Http/Controllers/Api/Web/FavouritesController.php b/app/Http/Controllers/Api/Web/FavouritesController.php
index e855c3a4..ef7ac6e9 100644
--- a/app/Http/Controllers/Api/Web/FavouritesController.php
+++ b/app/Http/Controllers/Api/Web/FavouritesController.php
@@ -1,17 +1,18 @@
 <?php
 
-namespace Api\Web;
+namespace App\Http\Controllers\Api\Web;
 
 use App\Album;
 use App\Commands\ToggleFavouriteCommand;
 use App\Favourite;
+use App\Http\Controllers\ApiControllerBase;
 use App\Playlist;
 use App\Track;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Response;
 
-class FavouritesController extends \ApiControllerBase
+class FavouritesController extends ApiControllerBase
 {
     public function postToggle()
     {
diff --git a/app/Http/Controllers/Api/Web/FollowController.php b/app/Http/Controllers/Api/Web/FollowController.php
index 133b2122..fa73bff8 100644
--- a/app/Http/Controllers/Api/Web/FollowController.php
+++ b/app/Http/Controllers/Api/Web/FollowController.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace Api\Web;
+namespace App\Http\Controllers\Api\Web;
 
 use App\Commands\ToggleFollowingCommand;
+use App\Http\Controllers\ApiControllerBase;
 use Illuminate\Support\Facades\Input;
 
-class FollowController extends \ApiControllerBase
+class FollowController extends ApiControllerBase
 {
     public function postToggle()
     {
diff --git a/app/Http/Controllers/Api/Web/ImagesController.php b/app/Http/Controllers/Api/Web/ImagesController.php
index 8bdb5050..77b57433 100644
--- a/app/Http/Controllers/Api/Web/ImagesController.php
+++ b/app/Http/Controllers/Api/Web/ImagesController.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace Api\Web;
+namespace App\Http\Controllers\Api\Web;
 
+use App\Http\Controllers\ApiControllerBase;
 use App\Image;
 use Cover;
 use Illuminate\Support\Facades\Response;
 
-class ImagesController extends \ApiControllerBase
+class ImagesController extends ApiControllerBase
 {
     public function getOwned()
     {
diff --git a/app/Http/Controllers/Api/Web/PlaylistsController.php b/app/Http/Controllers/Api/Web/PlaylistsController.php
index 9c47d62c..b9667221 100644
--- a/app/Http/Controllers/Api/Web/PlaylistsController.php
+++ b/app/Http/Controllers/Api/Web/PlaylistsController.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace Api\Web;
+namespace App\Http\Controllers\Api\Web;
 
 use App\Commands\AddTrackToPlaylistCommand;
 use App\Commands\CreatePlaylistCommand;
 use App\Commands\DeletePlaylistCommand;
 use App\Commands\EditPlaylistCommand;
+use App\Http\Controllers\ApiControllerBase;
 use App\Image;
 use App\Playlist;
 use App\ResourceLogItem;
@@ -13,7 +14,7 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Response;
 
-class PlaylistsController extends \ApiControllerBase
+class PlaylistsController extends ApiControllerBase
 {
     public function postCreate()
     {
diff --git a/app/Http/Controllers/Api/Web/ProfilerController.php b/app/Http/Controllers/Api/Web/ProfilerController.php
index 4fa87ef1..1a2c81b2 100644
--- a/app/Http/Controllers/Api/Web/ProfilerController.php
+++ b/app/Http/Controllers/Api/Web/ProfilerController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api\Web;
+namespace App\Http\Controllers\Api\Web;
 
 use App\Http\Controllers\Controller;
 use App\ProfileRequest;
diff --git a/app/Http/Controllers/Api/Web/TaxonomiesController.php b/app/Http/Controllers/Api/Web/TaxonomiesController.php
index 23f3bcf4..1bc6f26d 100644
--- a/app/Http/Controllers/Api/Web/TaxonomiesController.php
+++ b/app/Http/Controllers/Api/Web/TaxonomiesController.php
@@ -1,14 +1,15 @@
 <?php
 
-namespace Api\Web;
+namespace App\Http\Controllers\Api\Web;
 
 use App\Genre;
+use App\Http\Controllers\ApiControllerBase;
 use App\License;
 use App\ShowSong;
 use App\TrackType;
 use Illuminate\Support\Facades\DB;
 
-class TaxonomiesController extends \ApiControllerBase
+class TaxonomiesController extends ApiControllerBase
 {
     public function getAll()
     {
diff --git a/app/Http/Controllers/Api/Web/TracksController.php b/app/Http/Controllers/Api/Web/TracksController.php
index 8c1e8a0a..ebfc334f 100644
--- a/app/Http/Controllers/Api/Web/TracksController.php
+++ b/app/Http/Controllers/Api/Web/TracksController.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Api\Web;
+namespace App\Http\Controllers\Api\Web;
 
 use App\Commands\DeleteTrackCommand;
 use App\Commands\EditTrackCommand;
 use App\Commands\UploadTrackCommand;
+use App\Http\Controllers\ApiControllerBase;
 use App\ResourceLogItem;
 use App\Track;
 use Cover;
@@ -12,7 +13,7 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Response;
 
-class TracksController extends \ApiControllerBase
+class TracksController extends ApiControllerBase
 {
     public function postUpload()
     {
diff --git a/app/Http/Controllers/ApiControllerBase.php b/app/Http/Controllers/ApiControllerBase.php
index a62ead0b..00e62f24 100644
--- a/app/Http/Controllers/ApiControllerBase.php
+++ b/app/Http/Controllers/ApiControllerBase.php
@@ -1,6 +1,8 @@
 <?php
 
-use App\Http\Controllers\Controller;
+namespace App\Http\Controllers;
+
+use Response;
 
 abstract class ApiControllerBase extends Controller
 {
diff --git a/app/Http/Controllers/ArtistsController.php b/app/Http/Controllers/ArtistsController.php
index 5d8da45d..2f29d6b3 100644
--- a/app/Http/Controllers/ArtistsController.php
+++ b/app/Http/Controllers/ArtistsController.php
@@ -1,7 +1,10 @@
 <?php
 
-use App\Http\Controllers\Controller;
+namespace App\Http\Controllers;
+
+use App;
 use App\User;
+use Illuminate\Contracts\View\View;
 
 class ArtistsController extends Controller
 {
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index d120e2ff..dd3a31a2 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -1,7 +1,15 @@
 <?php
 
-use App\Http\Controllers\Controller;
+namespace App\Http\Controllers;
+
 use App\User;
+use Auth;
+use Config;
+use DB;
+use Input;
+use Poniverse;
+use Redirect;
+use URL;
 
 class AuthController extends Controller
 {
diff --git a/app/Http/Controllers/ContentController.php b/app/Http/Controllers/ContentController.php
index 51fa4370..fd7182de 100644
--- a/app/Http/Controllers/ContentController.php
+++ b/app/Http/Controllers/ContentController.php
@@ -1,6 +1,8 @@
 <?php
 
-use App\Http\Controllers\Controller;
+namespace App\Http\Controllers;
+
+use View;
 
 class ContentController extends Controller
 {
diff --git a/app/Http/Controllers/FavouritesController.php b/app/Http/Controllers/FavouritesController.php
index e4995b58..50d048d7 100644
--- a/app/Http/Controllers/FavouritesController.php
+++ b/app/Http/Controllers/FavouritesController.php
@@ -1,6 +1,8 @@
 <?php
 
-use App\Http\Controllers\Controller;
+namespace App\Http\Controllers;
+
+use View;
 
 class FavouritesController extends Controller
 {
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 2fa5fe8e..41a70f38 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -1,6 +1,8 @@
 <?php
 
-use App\Http\Controllers\Controller;
+namespace App\Http\Controllers;
+
+use View;
 
 class HomeController extends Controller
 {
diff --git a/app/Http/Controllers/ImagesController.php b/app/Http/Controllers/ImagesController.php
index c8561a92..429c85a0 100644
--- a/app/Http/Controllers/ImagesController.php
+++ b/app/Http/Controllers/ImagesController.php
@@ -1,9 +1,13 @@
 <?php
 
-use App\Http\Controllers\Controller;
+namespace App\Http\Controllers;
+
 use App\Image;
+use Config;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Redirect;
+use Response;
+use URL;
 
 class ImagesController extends Controller
 {
diff --git a/app/Http/Controllers/PlaylistsController.php b/app/Http/Controllers/PlaylistsController.php
index 58314b16..13ee0dac 100644
--- a/app/Http/Controllers/PlaylistsController.php
+++ b/app/Http/Controllers/PlaylistsController.php
@@ -1,10 +1,14 @@
 <?php
 
-use App\Http\Controllers\Controller;
+namespace App\Http\Controllers;
+
+use App;
 use App\Playlist;
 use App\ResourceLogItem;
 use App\Track;
+use Auth;
 use Illuminate\Support\Facades\Redirect;
+use View;
 
 class PlaylistsController extends Controller
 {
diff --git a/app/Http/Controllers/TracksController.php b/app/Http/Controllers/TracksController.php
index 50c71455..cf5dc384 100644
--- a/app/Http/Controllers/TracksController.php
+++ b/app/Http/Controllers/TracksController.php
@@ -1,10 +1,16 @@
 <?php
 
-use App\Http\Controllers\Controller;
+namespace App\Http\Controllers;
+
 use App\ResourceLogItem;
 use App\Track;
 use App\TrackFile;
+use Auth;
+use Config;
 use Illuminate\Support\Facades\App;
+use Redirect;
+use Response;
+use View;
 
 class TracksController extends Controller
 {
diff --git a/app/Http/Controllers/UploaderController.php b/app/Http/Controllers/UploaderController.php
index 0d4e9a9b..1d2d0089 100644
--- a/app/Http/Controllers/UploaderController.php
+++ b/app/Http/Controllers/UploaderController.php
@@ -1,6 +1,8 @@
 <?php
 
-use App\Http\Controllers\Controller;
+namespace App\Http\Controllers;
+
+use View;
 
 class UploaderController extends Controller
 {
diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
index 6e1137e3..56be19f7 100644
--- a/app/Http/Controllers/UsersController.php
+++ b/app/Http/Controllers/UsersController.php
@@ -1,6 +1,9 @@
 <?php
 
-use App\Http\Controllers\Controller;
+namespace App\Http\Controllers;
+
+use App\User;
+use File;
 use Illuminate\Support\Facades\App;
 
 class UsersController extends Controller
diff --git a/app/Library/Assets.php b/app/Library/Assets.php
index 2b1b44d4..50e55d54 100644
--- a/app/Library/Assets.php
+++ b/app/Library/Assets.php
@@ -52,16 +52,15 @@ class Assets
         $files = [];
         $filesFound = [];
         foreach ($globs as $glob) {
-            foreach (glob("../app/" . $glob, GLOB_BRACE) as $file) {
+            foreach (glob("../resources/assets/" . $glob, GLOB_BRACE) as $file) {
                 if (isset($filesFound[$file])) {
                     continue;
                 }
 
                 $filesFound[$file] = true;
-                $files[] = substr($file, 7); // chop off ../app/
+                $files[] = substr($file, 20); // chop off ../app/
             }
         }
-
         return $files;
     }
 
diff --git a/app/Playlist.php b/app/Playlist.php
index dc8fc21e..e4c037f3 100644
--- a/app/Playlist.php
+++ b/app/Playlist.php
@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\URL;
-use Traits\SlugTrait;
+use App\Traits\SlugTrait;
 
 class Playlist extends Model
 {
diff --git a/composer.json b/composer.json
index 0cb1edad..a5146fc5 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,8 @@
     },
     "autoload": {
         "classmap": [
-            "database"
+            "database",
+            "app/Library"
         ],
         "psr-4": {
             "App\\": "app/"
diff --git a/config/app.php b/config/app.php
index 1d58ba7b..01594c6f 100644
--- a/config/app.php
+++ b/config/app.php
@@ -95,7 +95,7 @@ return [
     |
     */
 
-    'log' => 'single',
+    'log' => 'daily',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/gulpfile.js b/gulpfile.js
index dc6f1ebb..d655858d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,16 +1,178 @@
-var elixir = require('laravel-elixir');
+var gulp = require("gulp"),
+    plug = require("gulp-load-plugins")(),
+    argv = require("yargs").argv;
 
-/*
- |--------------------------------------------------------------------------
- | Elixir Asset Management
- |--------------------------------------------------------------------------
- |
- | Elixir provides a clean, fluent API for defining some basic Gulp tasks
- | for your Laravel application. By default, we are compiling the Sass
- | file for our application, as well as publishing vendor resources.
- |
- */
+var plumberOptions = {
+ errorHandler: plug.notify.onError("Error: <%= error.message %>")
+};
 
-elixir(function(mix) {
-    mix.sass('app.scss');
+gulp.task("scripts-app", function() {
+ var paths = [
+  "resources/assets/scripts/app/**/*.{coffee,js}",
+  "resources/assets/scripts/base/**/*.{coffee,js}",
+  "resources/assets/scripts/shared/**/*.{coffee,js}"
+ ];
+
+ if (!argv.production) {
+  paths.push("resources/assets/scripts/debug/**/*.{coffee,js}");
+
+  // we also want to add the embed stuff, since we're in development mode
+  // we want to watch embed files and re-compile them. However, we want
+  // to leave this path out in production so that embed files are not bloating
+  // the js file
+  paths.push("resources/assets/scripts/embed/**/*.{coffee,js}");
+ }
+
+ return argv.production
+  // Production pipeline
+     ? gulp.src(paths, {base: "resources/assets/scripts"})
+     .pipe(plug.plumber(plumberOptions))
+     .pipe(plug.order([
+      "resources/assets/scripts/base/jquery-2.0.2.js",
+      "resources/assets/scripts/base/angular.js",
+      "resources/assets/scripts/base/*.{coffee,js}",
+      "resources/assets/scripts/shared/*.{coffee,js}",
+      "resources/assets/scripts/app/*.{coffee,js}",
+      "resources/assets/scripts/app/services/*.{coffee,js}",
+      "resources/assets/scripts/app/filters/*.{coffee,js}",
+      "resources/assets/scripts/app/directives/*.{coffee,js}",
+      "resources/assets/scripts/app/controllers/*.{coffee,js}",
+      "resources/assets/scripts/**/*.{coffee,js}"
+     ], {base: "."}))
+     .pipe(plug.if(/\.coffee/, plug.coffee()))
+     .pipe(plug.concat("app.js"))
+     .pipe(plug.uglify())
+     .pipe(gulp.dest("public/build/scripts"))
+  // Development/watch pipeline
+     : gulp.src(paths, {base: "resources/assets/scripts"})
+     .pipe(plug.plumber(plumberOptions))
+     .pipe(plug.cached('scripts'))
+     .pipe(plug.sourcemaps.init())
+     .pipe(plug.if(/\.coffee/, plug.coffee()))
+     .pipe(plug.sourcemaps.write({
+      includeContent: false,
+      sourceRoot: "/dev-scripts/"
+     }))
+     .pipe(gulp.dest("public/build/scripts"));
 });
+
+gulp.task("scripts-embed", function() {
+ // note that this task should really only ever be invoked for production
+ // since development-mode watches and builds include the embed scripts
+ // already
+
+ var includedScripts = [
+  "resources/assets/scripts/base/jquery-2.0.2.js",
+  "resources/assets/scripts/base/jquery.viewport.js",
+  "resources/assets/scripts/base/underscore.js",
+  "resources/assets/scripts/base/moment.js",
+  "resources/assets/scripts/base/jquery.timeago.js",
+  "resources/assets/scripts/base/soundmanager2-nodebug.js",
+  "resources/assets/scripts/embed/*.coffee"
+ ];
+
+ return gulp.src(includedScripts, {base: "resources/assets/scripts"})
+     .pipe(plug.plumber(plumberOptions))
+     .pipe(plug.if(/\.coffee/, plug.coffee()))
+     .pipe(plug.order(includedScripts, {base: "."}))
+     .pipe(plug.concat("embed.js"))
+     .pipe(plug.uglify())
+     .pipe(gulp.dest("public/build/scripts"));
+});
+
+gulp.task("styles-app", function() {
+ var includedStyles = [
+  "resources/assets/styles/base/jquery-ui.css",
+  "resources/assets/styles/base/colorbox.css",
+  "resources/assets/styles/app.less"
+ ];
+
+ if (!argv.production) {
+  includedStyles.push("resources/assets/styles/profiler.less");
+  includedStyles.push("resources/assets/styles/prettify.css");
+
+  // we also want to add the embed stuff, since we're in development mode
+  // we want to watch embed files and re-compile them. However, we want
+  // to leave this path out in production so that embed files are not bloating
+  // the css file
+  includedStyles.push("resources/assets/styles/embed.css");
+
+  // Remove app.less from the cache so that it gets recompiled
+  var styleCache = plug.cached.caches.styles;
+  for (var file in styleCache) {
+   if (!styleCache.hasOwnProperty(file))
+    continue;
+
+   if (!endsWith(file, "app.less"))
+    continue;
+
+   delete styleCache[file];
+  }
+ }
+
+ // note that we're not doing autoprefixer on dev builds for now to shave off roughly 600-700 milliseconds per
+ // build. It's already taking forever to recompile the less
+
+ return argv.production
+  // Production pipeline
+     ? gulp.src(includedStyles, {base: "resources/assets/styles"})
+     .pipe(plug.plumber(plumberOptions))
+     .pipe(plug.if(/\.less/, plug.less()))
+     .pipe(plug.autoprefixer({browsers: ["last 2 versions"], cascade: false}))
+     .pipe(plug.concat("app.css"))
+     .pipe(plug.minifyCss())
+     .pipe(gulp.dest("public/build/styles"))
+  // Development pipeline
+     : gulp.src(includedStyles, {base: "resources/assets/styles"})
+     .pipe(plug.plumber(plumberOptions))
+     .pipe(plug.cached("styles"))
+     .pipe(plug.sourcemaps.init())
+     .pipe(plug.if(/\.less/, plug.less()))
+     .pipe(plug.sourcemaps.write({
+      includeContent: false,
+      sourceRoot: "/dev-styles/"
+     }))
+     .pipe(gulp.dest("public/build/styles"))
+     .pipe(plug.livereload());
+});
+
+gulp.task("styles-embed", function() {
+ // note that this task should really only ever be invoked for production
+ // since development-mode watches and builds include the embed styles
+ // already
+
+ return gulp.src(["resources/assets/styles/embed.less"], {base: "resources/assets/styles"})
+     .pipe(plug.less())
+     .pipe(plug.autoprefixer({browsers: ["last 2 versions"], cascade: false}))
+     .pipe(plug.concat("embed.css"))
+     .pipe(plug.minifyCss())
+     .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("resources/assets/scripts/**/*.{coffee,js}", ["scripts-app"]);
+ gulp.watch("resources/assets/styles/**/*.{css,less}", ["styles-app"]);
+});
+
+function endsWith(str, suffix) {
+ return str.indexOf(suffix, str.length - suffix.length) !== -1;
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index b1b4a6e6..275d9d85 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,30 @@
 {
-  "private": true,
-  "devDependencies": {
-    "gulp": "^3.8.8"
+  "name": "pony.fm",
+  "version": "1.0.0",
+  "repository": {
+    "type": "git",
+    "url": "ssh://git@phabricator.poniverse.net/diffusion/PF/pony-fm.git"
   },
-  "dependencies": {
-    "laravel-elixir": "^2.0.0",
-    "bootstrap-sass": "^3.0.0"
+  "packages": {},
+  "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",
+    "gulp-concat": "^2.5.2",
+    "gulp-if": "^1.2.5",
+    "gulp-less": "^3.0.3",
+    "gulp-livereload": "^3.8.0",
+    "gulp-load-plugins": "^0.10.0",
+    "gulp-minify-css": "^1.1.0",
+    "gulp-notify": "^2.2.0",
+    "gulp-order": "^1.1.1",
+    "gulp-plumber": "^1.0.0",
+    "gulp-sourcemaps": "^1.5.1",
+    "gulp-uglify": "^1.2.0",
+    "gulp-util": "^3.0.4",
+    "yargs": "^3.7.2"
   }
 }
diff --git a/resources/views/shared/_app_layout.blade.php b/resources/views/shared/_app_layout.blade.php
index 1a1cf180..10869add 100644
--- a/resources/views/shared/_app_layout.blade.php
+++ b/resources/views/shared/_app_layout.blade.php
@@ -92,7 +92,7 @@
 @section('styles')
 	<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Josefin+Sans" />
 	<link rel="stylesheet" href="/styles/loader.css" />
-	{{ Assets::styleIncludes() }}
+	{!! Assets::styleIncludes() !!}
 @endsection
 
 @section('scripts')
@@ -123,7 +123,7 @@
 		})();
 	</script>
 
-	{{ Assets::scriptIncludes() }}
+	{!! Assets::scriptIncludes() !!}
 
     @if (!Config::get("app.debug"))
         <script src="/build/scripts/templates.js"></script>
diff --git a/resources/views/tracks/embed.blade.php b/resources/views/tracks/embed.blade.php
index 53e9d4b4..958ef98c 100644
--- a/resources/views/tracks/embed.blade.php
+++ b/resources/views/tracks/embed.blade.php
@@ -12,7 +12,7 @@
 	<meta property="fb:admins" content="1165335382" />
 	<base href="/" />
 
-	{{ Assets::styleIncludes('embed') }}
+	{!! Assets::styleIncludes('embed') !!}
 </head>
 <body>
 	@if($track->explicit && !(Auth::check() && Auth::user()->can_see_explicit_content))
@@ -50,7 +50,7 @@
 		var pfm = {token: '{{ Session::token() }}'}
 	</script>
 
-	{{ Assets::scriptIncludes('embed') }}
+	{!! Assets::scriptIncludes('embed') !!}
 
 	<script type="text/javascript">
 		var _gaq = _gaq || [];