diff --git a/bower.json b/bower.json
index 054f6574..f3117d16 100644
--- a/bower.json
+++ b/bower.json
@@ -18,7 +18,7 @@
     "angular-gettext": "~1.0.0",
     "angular-ui-ace": "~0.1.1",
     "ui-bootstrap-alerts": "~0.1.5",
-    "requirejs": "~2.1.14",
+    "requirejs": "~2.1.15",
     "stf-graphics": "~0.1.1",
     "angular-bootstrap": "~0.11.0",
     "angular-dialog-service": "~5.1.1",
diff --git a/gulpfile.js b/gulpfile.js
index 56fac8cd..42a8d55f 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -3,7 +3,7 @@ var gutil = require('gulp-util')
 var jshint = require('gulp-jshint')
 var jsonlint = require('gulp-jsonlint')
 var webpack = require('webpack')
-var ngminPlugin = require('ngmin-webpack-plugin')
+var ngAnnotatePlugin = require('ng-annotate-webpack-plugin')
 var webpackConfig = require('./webpack.config').webpack
 var webpackStatusConfig = require('./res/common/status/webpack.config')
 var gettext = require('gulp-angular-gettext')
@@ -100,7 +100,9 @@ gulp.task("webpack:build", function (callback) {
       }
     })
     //new webpack.optimize.DedupePlugin(),
-    //new ngminPlugin(),
+    //new ngAnnotatePlugin({
+    //  add: true,
+    //})
     // TODO: mangle when ngmin works
     //new webpack.optimize.UglifyJsPlugin({mangle: false})
   )
diff --git a/webpack.config.js b/webpack.config.js
index 59dd7354..17e3531c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -41,11 +41,11 @@ module.exports = {
         { test: /\.jpg$/, loader: "url-loader?limit=1000&mimetype=image/jpeg" },
         { test: /\.png$/, loader: "url-loader?limit=1000&mimetype=image/png" },
         { test: /\.gif$/, loader: "url-loader?limit=1000&mimetype=image/gif" },
-        { test: /\.svg$/, loader: "url-loader?limit=1&mimetype=image/svg+xml" },
-        { test: /\.woff$/, loader: "url-loader?limit=1&mimetype=application/font-woff" },
-        { test: /\.otf$/, loader: "url-loader?limit=1&mimetype=application/font-woff" },
-        { test: /\.ttf$/, loader: "url-loader?limit=1&mimetype=application/font-woff" },
-        { test: /\.eot$/, loader: "url-loader?limit=1&mimetype=vnd.ms-fontobject" },
+        { test: /\.svg/, loader: "url-loader?limit=1&mimetype=image/svg+xml" },
+        { test: /\.woff/, loader: "url-loader?limit=1&mimetype=application/font-woff" },
+        { test: /\.otf/, loader: "url-loader?limit=1&mimetype=application/font-woff" },
+        { test: /\.ttf/, loader: "url-loader?limit=1&mimetype=application/font-woff" },
+        { test: /\.eot/, loader: "url-loader?limit=1&mimetype=vnd.ms-fontobject" },
         { test: /\.jade$/, loader: 'template-html-loader' },
         { test: /\.html$/, loader: 'html-loader' },
         { test: /angular\.js$/, loader: 'exports?angular'},