diff --git a/gulpfile.js b/gulpfile.js
index 8a1607b5..b6982707 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -56,6 +56,7 @@ var config = {
 var constants = {
     BASE_URL: (function () { var baseUrl = process.env.ONION_BASE_URL || '/'; return baseUrl + (baseUrl.match(/\/$/) ? '' : '/'); })(),
     API_ENDPOINT: process.env.ONION_API_ENDPOINT || 'http://staging.ascribe.io/api/',
+    SERVER_URL: process.env.ONION_SERVER_URL || 'http://staging.ascribe.io/',
     DEBUG: !argv.production,
     CREDENTIALS: 'ZGltaUBtYWlsaW5hdG9yLmNvbTowMDAwMDAwMDAw' // dimi@mailinator:0000000000
 };
@@ -172,14 +173,21 @@ function bundle(watch) {
         return bundler.bundle()
             .on('error', notify.onError('Error: <%= error.message %>'))
             .pipe(source('app.js'))
+            .on('error', notify.onError('Error: <%= error.message %>'))
             .pipe(buffer())
+            .on('error', notify.onError('Error: <%= error.message %>'))
             .pipe(gulpif(!argv.production, sourcemaps.init({
                 loadMaps: true
             }))) // loads map from browserify file
+            .on('error', notify.onError('Error: <%= error.message %>'))
             .pipe(gulpif(!argv.production, sourcemaps.write())) // writes .map file
+            .on('error', notify.onError('Error: <%= error.message %>'))
             .pipe(gulpif(argv.production, uglify()))
+            .on('error', notify.onError('Error: <%= error.message %>'))
             .pipe(gulp.dest('./build/js'))
-            .pipe(browserSync.stream());
+            .on('error', notify.onError('Error: <%= error.message %>'))
+            .pipe(browserSync.stream())
+            .on('error', notify.onError('Error: <%= error.message %>'));
     }
 
     return rebundle(bro);
diff --git a/js/components/register_piece.js b/js/components/register_piece.js
index 78c6c783..8d788d6d 100644
--- a/js/components/register_piece.js
+++ b/js/components/register_piece.js
@@ -9,11 +9,12 @@ import ReactS3FineUploader from 'ReactS3FineUploader';
 
 let RegisterPiece = React.createClass( {
     render() {
+
         return (
             <div>
                 <ReactS3FineUploader
                     keyRoutine={{
-                        url: AppConstants.apiEndpoint + '/s3/key/',
+                        url: AppConstants.serverUrl + 's3/key/',
                         fileClass: 'digitalwork'
                     }}
                     autoUpload={true}
@@ -27,7 +28,7 @@ let RegisterPiece = React.createClass( {
                         accessKey: 'AKIAIVCZJ33WSCBQ3QDA'
                     }}
                     signature={{
-                        endpoint: AppConstants.apiEndpoint + '/s3/signature/'
+                        endpoint: AppConstants.serverUrl + 's3/signature/'
                     }}
                     uploadSuccess={{
                         params: {
@@ -49,7 +50,7 @@ let RegisterPiece = React.createClass( {
                     deleteFile={{
                         enabled: true,
                         method: 'DELETE',
-                        endpoint: AppConstants.apiEndpoint + '/s3/delete'
+                        endpoint: AppConstants.serverUrl + 's3/delete'
                     }}
                     validation={{
                         itemLimit: 100000,
diff --git a/js/constants/application_constants.js b/js/constants/application_constants.js
index b3fe92b2..0c7a5893 100644
--- a/js/constants/application_constants.js
+++ b/js/constants/application_constants.js
@@ -7,6 +7,7 @@ let constants = {
     //       super pro. What if we render stuff on the server?
     //'baseUrl': window.BASE_URL,
     'apiEndpoint': window.API_ENDPOINT,
+    'serverUrl': window.SERVER_URL,
     'baseUrl': window.BASE_URL,
     'aclList': ['edit', 'consign', 'consign_request', 'unconsign', 'unconsign_request', 'transfer',
                 'loan', 'loan_request', 'share', 'download', 'view', 'delete', 'del_from_collection', 'add_to_collection']
diff --git a/package.json b/package.json
index 2d0f4257..46bcc0ec 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "Onion",
   "version": "0.0.1",
-  "description": "Das neue web client for Ascribe",
+  "description": "Das neue web client for Ascribe. Onions make you cry",
   "main": "js/app.js",
   "engines": {
     "node": "0.10.x"
@@ -14,7 +14,7 @@
   },
   "browser": {
     "fineUploader": "./node_modules/react-s3-fineuploader/vendor/s3.fine-uploader.js",
-    "ReactS3FineUploader": "./node_modules/react-s3-fineuploader/react_s3_fineuploader.js"
+    "ReactS3FineUploader": "./node_modules/react-s3-fineuploader/react_s3_fine_uploader.js"
   },
   "browserify-shim": {
     "fineUploader": "qq"
diff --git a/sass/main.scss b/sass/main.scss
index f82ae94d..d6a6681b 100644
--- a/sass/main.scss
+++ b/sass/main.scss
@@ -19,6 +19,7 @@ $BASE_URL: '<%= BASE_URL %>';
 @import 'ascribe-global-notification';
 @import 'offset_right';
 @import 'ascribe_settings';
+@import '../node_modules/react-s3-fineuploader/scss/ascribe-theme';
 
 body {
     background-color: #FDFDFD;