diff --git a/bower.json b/bower.json
index f35182cc..2df05e65 100644
--- a/bower.json
+++ b/bower.json
@@ -2,60 +2,60 @@
   "name": "stf",
   "version": "0.1.0",
   "dependencies": {
-    "angular": "1.4.0-build.3803",
-    "angular-cookies": "1.4.0-build.3803",
-    "angular-route": "1.4.0-build.3803",
-    "angular-sanitize": "1.4.0-build.3803",
-    "angular-animate": "1.4.0-build.3803",
-    "angular-touch": "1.4.0-build.3803",
+    "angular": "1.4.0-build.3855",
+    "angular-cookies": "1.4.0-build.3855",
+    "angular-route": "1.4.0-build.3855",
+    "angular-sanitize": "1.4.0-build.3855",
+    "angular-animate": "1.4.0-build.3855",
+    "angular-touch": "1.4.0-build.3855",
     "se7en-bootstrap-3": "~0.2.1",
     "lodash": "~3.0.0",
-    "oboe": "~2.1.0",
+    "oboe": "~2.1.1",
     "Snap.svg": "~0.3.0",
     "ng-table": "git://github.com/esvit/ng-table.git#bd9ec42172389257fcd312330013302b2696ac2a",
     "jquery.terminal": "~0.8.8",
     "stf-site": "~0.4.1",
     "stf-analytics": "~0.2.3",
     "angular-gettext": "git://github.com/rubenv/angular-gettext.git#6bf6a66d8b4fd6c5e0fddcee050991391977cf87",
-    "angular-ui-ace": "~0.2.1",
+    "angular-ui-ace": "~0.2.3",
     "ui-bootstrap-alerts": "~0.1.5",
-    "requirejs": "~2.1.15",
+    "requirejs": "~2.1.16",
     "stf-graphics": "~0.1.1",
-    "angular-bootstrap": "~0.12.0",
+    "angular-bootstrap": "~0.12.1",
     "angular-dialog-service": "~5.2.6",
     "ng-file-upload": "~2.0.5",
     "angular-growl-v2": "JanStevens/angular-growl-2#~0.7.3",
-    "angular-tree-control": "~0.2.7",
+    "angular-tree-control": "~0.2.8",
     "angular-loading-bar": "~0.6.0",
-    "underscore.string": "~3.0.2",
+    "underscore.string": "~3.0.3",
     "bootstrap": "~3.3.2",
     "font-lato-2-subset": "~0.4.0",
     "packery": "~1.3.2",
-    "draggabilly": "~1.1.1",
+    "draggabilly": "~1.1.2",
     "angular-elastic": "~2.4.2",
     "quick-ng-repeat": "~0.0.1",
     "angular-vs-repeat": "~1.0.0-rc5",
-    "checklist-model": "~0.1.3",
+    "checklist-model": "~0.1.4",
     "angular-hotkeys": "chieffancypants/angular-hotkeys#~1.4.5",
     "angular-borderlayout": "https://github.com/filearts/angular-borderlayout.git#7c9716aebd9260763f798561ca49d6fbfd4a5c67",
-    "angular-ui-bootstrap": "~0.12.0",
-    "angular-ladda": "~0.2.1",
+    "angular-ui-bootstrap": "~0.12.1",
     "ng-context-menu": "~1.0.1",
     "stats.js": "*",
-    "components-font-awesome": "~4.2.0",
+    "components-font-awesome": "~4.3.0",
     "epoch": "~0.6.0",
     "d3": "~3.5.3",
     "ng-epoch": "~1.0.7",
-    "eventEmitter": "~4.2.11"
+    "eventEmitter": "~4.2.11",
+    "angular-ladda": "~0.2.2"
   },
   "private": true,
   "resolutions": {
-    "angular": "1.4.0-build.3803",
-    "angular-sanitize": "1.4.0-build.3803",
-    "d3": "~3.5.2",
-    "angular-bootstrap": "~0.12.0"
+    "angular": "1.4.0-build.3855",
+    "angular-sanitize": "1.4.0-build.3855",
+    "d3": "~3.5.5",
+    "angular-bootstrap": "~0.12.1"
   },
   "devDependencies": {
-    "angular-mocks": "1.4.0-build.3803"
+    "angular-mocks": "1.4.0-build.3855"
   }
 }
diff --git a/lib/units/device/plugins/screen.js b/lib/units/device/plugins/screen.js
index b353218b..3af44a3d 100644
--- a/lib/units/device/plugins/screen.js
+++ b/lib/units/device/plugins/screen.js
@@ -33,7 +33,7 @@ module.exports = syrup.serial()
     )
 
     plugin.publicPort = options.ports.pop()
-    plugin.publicUrl = _.template(options.screenWsUrlPattern, {
+    plugin.publicUrl = _.template(options.screenWsUrlPattern)({
       publicIp: options.publicIp
     , publicPort: plugin.publicPort
     , privatePort: plugin.privatePort
diff --git a/lib/units/device/support/abi.js b/lib/units/device/support/abi.js
index 0533f67c..104f13b0 100644
--- a/lib/units/device/support/abi.js
+++ b/lib/units/device/support/abi.js
@@ -1,5 +1,4 @@
 var syrup = require('stf-syrup')
-var _ = require('lodash')
 
 var logger = require('../../../util/logger')
 
diff --git a/res/web_modules/angular-ladda/index.js b/res/web_modules/angular-ladda/index.js
index 5b20cc80..9e1427ca 100644
--- a/res/web_modules/angular-ladda/index.js
+++ b/res/web_modules/angular-ladda/index.js
@@ -1,8 +1,8 @@
-require('ladda/dist/ladda-themeless.min.css')
-window.Ladda = require('ladda/js/ladda')
+
+//window.Ladda = require('ladda/js/ladda')
 require('angular-ladda/src/angular-ladda')
 
 module.exports = {
-  Ladda: window.Ladda,
+  //Ladda: window.Ladda,
   name: 'angular-ladda'
 }
diff --git a/res/web_modules/ladda/index.js b/res/web_modules/ladda/index.js
new file mode 100644
index 00000000..c6517886
--- /dev/null
+++ b/res/web_modules/ladda/index.js
@@ -0,0 +1,3 @@
+require('ladda/dist/ladda-themeless.min.css')
+require('ladda/dist/spin.min.js')
+require('ladda/dist/ladda.min.js')
diff --git a/res/web_modules/se7en-bootstrap-3/index.js b/res/web_modules/se7en-bootstrap-3/index.js
index d61ea7b8..3c01db5c 100644
--- a/res/web_modules/se7en-bootstrap-3/index.js
+++ b/res/web_modules/se7en-bootstrap-3/index.js
@@ -4,6 +4,6 @@ require('se7en-bootstrap-3/build/stylesheets/bootstrap.min.css')
 require('se7en-bootstrap-3/build/stylesheets/se7en-font.css')
 require('se7en-bootstrap-3/build/stylesheets/style.css')
 
-require('components-font-awesome')
+require('components-font-awesome/css/font-awesome.css')
 
 require('font-lato-2-subset')