diff --git a/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js b/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js
index 69290a67c..227876ba7 100644
--- a/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js
+++ b/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js
@@ -187,10 +187,8 @@ import { OHIF } from 'meteor/ohif:core';
 
         var color;
         var lineWidth = cornerstoneTools.toolStyle.getToolWidth();
-        var font = cornerstoneTools.textStyle.getFont();
         var config = cornerstoneTools.nonTarget.getConfiguration();
 
-        context.font = font;
         for (var i = 0; i < toolData.data.length; i++) {
             var data = toolData.data[i];
 
@@ -198,9 +196,9 @@ import { OHIF } from 'meteor/ohif:core';
 
             // configurable shadow from CornerstoneTools
             if (config && config.shadow) {
-                context.shadowColor = '#000000';
-                context.shadowOffsetX = 1;
-                context.shadowOffsetY = 1;
+                context.shadowColor = config.shadowColor || '#000000';
+                context.shadowOffsetX = config.shadowOffsetX || 1;
+                context.shadowOffsetY = config.shadowOffsetY || 1;
             }
 
             if (data.active) {
diff --git a/Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js b/Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js
index 7cd9bc60c..4f16a6976 100644
--- a/Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js
+++ b/Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js
@@ -249,10 +249,8 @@
 
             var color;
             var lineWidth = cornerstoneTools.toolStyle.getToolWidth();
-            var font = cornerstoneTools.textStyle.getFont();
             var config = cornerstoneTools[toolType].getConfiguration();
 
-            context.font = font;
             for (var i = 0; i < toolData.data.length; i++) {
                 var data = toolData.data[i];
 
@@ -260,9 +258,9 @@
 
                 // configurable shadow from CornerstoneTools
                 if (config && config.shadow) {
-                    context.shadowColor = '#000000';
-                    context.shadowOffsetX = 1;
-                    context.shadowOffsetY = 1;
+                    context.shadowColor = config.shadowColor || '#000000';
+                    context.shadowOffsetX = config.shadowOffsetX || 1;
+                    context.shadowOffsetY = config.shadowOffsetY || 1;
                 }
 
                 if (data.active) {
diff --git a/Packages/ohif-lesiontracker/client/components/measurementLocationDialog/measurementLocationDialog.js b/Packages/ohif-lesiontracker/client/components/measurementLocationDialog/measurementLocationDialog.js
index 4e98dbff2..10719c5fa 100644
--- a/Packages/ohif-lesiontracker/client/components/measurementLocationDialog/measurementLocationDialog.js
+++ b/Packages/ohif-lesiontracker/client/components/measurementLocationDialog/measurementLocationDialog.js
@@ -50,13 +50,22 @@ Template.measurementLocationDialog.onCreated(() => {
         });
     };
 
-    const config = {
+    const callbackConfig = {
         setMeasurementNumberCallback: getSetMeasurementNumberCallbackFunction(measurementTypeId, measurementApi, timepointApi),
         // TODO: Check the position for these, the Add Label button position seems very awkward
         getMeasurementLocationCallback: toggleLabel,
         changeMeasurementLocationCallback: toggleLabel,
     };
 
+
+    // TODO: Reconcile this with the configuration in toolManager
+    // it would be better to have this all in one place.
+    const bidirectionalConfig = cornerstoneTools.bidirectional.getConfiguration();
+    const config = {
+        ...bidirectionalConfig,
+        ...callbackConfig
+    };
+
     cornerstoneTools.bidirectional.setConfiguration(config);
 
     // Set CR-Tool, UN-Tool, EX-Tool configurations
diff --git a/Packages/ohif-viewerbase/lib/WLPresets.js b/Packages/ohif-viewerbase/client/lib/WLPresets.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/WLPresets.js
rename to Packages/ohif-viewerbase/client/lib/WLPresets.js
diff --git a/Packages/ohif-viewerbase/lib/createStacks.js b/Packages/ohif-viewerbase/client/lib/createStacks.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/createStacks.js
rename to Packages/ohif-viewerbase/client/lib/createStacks.js
diff --git a/Packages/ohif-viewerbase/lib/debugReactivity.js b/Packages/ohif-viewerbase/client/lib/debugReactivity.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/debugReactivity.js
rename to Packages/ohif-viewerbase/client/lib/debugReactivity.js
diff --git a/Packages/ohif-viewerbase/lib/displayReferenceLines.js b/Packages/ohif-viewerbase/client/lib/displayReferenceLines.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/displayReferenceLines.js
rename to Packages/ohif-viewerbase/client/lib/displayReferenceLines.js
diff --git a/Packages/ohif-viewerbase/lib/enableHotkeys.js b/Packages/ohif-viewerbase/client/lib/enableHotkeys.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/enableHotkeys.js
rename to Packages/ohif-viewerbase/client/lib/enableHotkeys.js
diff --git a/Packages/ohif-viewerbase/lib/enablePrefetchOnElement.js b/Packages/ohif-viewerbase/client/lib/enablePrefetchOnElement.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/enablePrefetchOnElement.js
rename to Packages/ohif-viewerbase/client/lib/enablePrefetchOnElement.js
diff --git a/Packages/ohif-viewerbase/lib/getImageId.js b/Packages/ohif-viewerbase/client/lib/getImageId.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/getImageId.js
rename to Packages/ohif-viewerbase/client/lib/getImageId.js
diff --git a/Packages/ohif-viewerbase/lib/getWADORSImageId.js b/Packages/ohif-viewerbase/client/lib/getWADORSImageId.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/getWADORSImageId.js
rename to Packages/ohif-viewerbase/client/lib/getWADORSImageId.js
diff --git a/Packages/ohif-viewerbase/lib/helpers/capitalizeFirstLetter.js b/Packages/ohif-viewerbase/client/lib/helpers/capitalizeFirstLetter.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/helpers/capitalizeFirstLetter.js
rename to Packages/ohif-viewerbase/client/lib/helpers/capitalizeFirstLetter.js
diff --git a/Packages/ohif-viewerbase/lib/helpers/formatDA.js b/Packages/ohif-viewerbase/client/lib/helpers/formatDA.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/helpers/formatDA.js
rename to Packages/ohif-viewerbase/client/lib/helpers/formatDA.js
diff --git a/Packages/ohif-viewerbase/lib/helpers/formatJSDate.js b/Packages/ohif-viewerbase/client/lib/helpers/formatJSDate.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/helpers/formatJSDate.js
rename to Packages/ohif-viewerbase/client/lib/helpers/formatJSDate.js
diff --git a/Packages/ohif-viewerbase/lib/helpers/formatNumberPrecision.js b/Packages/ohif-viewerbase/client/lib/helpers/formatNumberPrecision.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/helpers/formatNumberPrecision.js
rename to Packages/ohif-viewerbase/client/lib/helpers/formatNumberPrecision.js
diff --git a/Packages/ohif-viewerbase/lib/helpers/formatPN.js b/Packages/ohif-viewerbase/client/lib/helpers/formatPN.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/helpers/formatPN.js
rename to Packages/ohif-viewerbase/client/lib/helpers/formatPN.js
diff --git a/Packages/ohif-viewerbase/lib/helpers/formatTM.js b/Packages/ohif-viewerbase/client/lib/helpers/formatTM.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/helpers/formatTM.js
rename to Packages/ohif-viewerbase/client/lib/helpers/formatTM.js
diff --git a/Packages/ohif-viewerbase/lib/helpers/getUsername.js b/Packages/ohif-viewerbase/client/lib/helpers/getUsername.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/helpers/getUsername.js
rename to Packages/ohif-viewerbase/client/lib/helpers/getUsername.js
diff --git a/Packages/ohif-viewerbase/lib/helpers/ifTypeIs.js b/Packages/ohif-viewerbase/client/lib/helpers/ifTypeIs.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/helpers/ifTypeIs.js
rename to Packages/ohif-viewerbase/client/lib/helpers/ifTypeIs.js
diff --git a/Packages/ohif-viewerbase/lib/helpers/inc.js b/Packages/ohif-viewerbase/client/lib/helpers/inc.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/helpers/inc.js
rename to Packages/ohif-viewerbase/client/lib/helpers/inc.js
diff --git a/Packages/ohif-viewerbase/lib/helpers/isDisplaySetActive.js b/Packages/ohif-viewerbase/client/lib/helpers/isDisplaySetActive.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/helpers/isDisplaySetActive.js
rename to Packages/ohif-viewerbase/client/lib/helpers/isDisplaySetActive.js
diff --git a/Packages/ohif-viewerbase/lib/helpers/isTouchDevice.js b/Packages/ohif-viewerbase/client/lib/helpers/isTouchDevice.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/helpers/isTouchDevice.js
rename to Packages/ohif-viewerbase/client/lib/helpers/isTouchDevice.js
diff --git a/Packages/ohif-viewerbase/lib/helpers/jsDateFromNow.js b/Packages/ohif-viewerbase/client/lib/helpers/jsDateFromNow.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/helpers/jsDateFromNow.js
rename to Packages/ohif-viewerbase/client/lib/helpers/jsDateFromNow.js
diff --git a/Packages/ohif-viewerbase/lib/helpers/objectEach.js b/Packages/ohif-viewerbase/client/lib/helpers/objectEach.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/helpers/objectEach.js
rename to Packages/ohif-viewerbase/client/lib/helpers/objectEach.js
diff --git a/Packages/ohif-viewerbase/lib/helpers/objectToPairs.js b/Packages/ohif-viewerbase/client/lib/helpers/objectToPairs.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/helpers/objectToPairs.js
rename to Packages/ohif-viewerbase/client/lib/helpers/objectToPairs.js
diff --git a/Packages/ohif-viewerbase/lib/helpers/prettyPrintStringify.js b/Packages/ohif-viewerbase/client/lib/helpers/prettyPrintStringify.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/helpers/prettyPrintStringify.js
rename to Packages/ohif-viewerbase/client/lib/helpers/prettyPrintStringify.js
diff --git a/Packages/ohif-viewerbase/lib/helpers/sorting.js b/Packages/ohif-viewerbase/client/lib/helpers/sorting.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/helpers/sorting.js
rename to Packages/ohif-viewerbase/client/lib/helpers/sorting.js
diff --git a/Packages/ohif-viewerbase/lib/helpers/studyThumbnails.js b/Packages/ohif-viewerbase/client/lib/helpers/studyThumbnails.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/helpers/studyThumbnails.js
rename to Packages/ohif-viewerbase/client/lib/helpers/studyThumbnails.js
diff --git a/Packages/ohif-viewerbase/lib/instanceClassSpecificViewport.js b/Packages/ohif-viewerbase/client/lib/instanceClassSpecificViewport.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/instanceClassSpecificViewport.js
rename to Packages/ohif-viewerbase/client/lib/instanceClassSpecificViewport.js
diff --git a/Packages/ohif-viewerbase/lib/isImage.js b/Packages/ohif-viewerbase/client/lib/isImage.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/isImage.js
rename to Packages/ohif-viewerbase/client/lib/isImage.js
diff --git a/Packages/ohif-viewerbase/lib/layoutManager.js b/Packages/ohif-viewerbase/client/lib/layoutManager.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/layoutManager.js
rename to Packages/ohif-viewerbase/client/lib/layoutManager.js
diff --git a/Packages/ohif-viewerbase/lib/metaDataProvider.js b/Packages/ohif-viewerbase/client/lib/metaDataProvider.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/metaDataProvider.js
rename to Packages/ohif-viewerbase/client/lib/metaDataProvider.js
diff --git a/Packages/ohif-viewerbase/lib/parsingUtils.js b/Packages/ohif-viewerbase/client/lib/parsingUtils.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/parsingUtils.js
rename to Packages/ohif-viewerbase/client/lib/parsingUtils.js
diff --git a/Packages/ohif-viewerbase/lib/resizeViewportElements.js b/Packages/ohif-viewerbase/client/lib/resizeViewportElements.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/resizeViewportElements.js
rename to Packages/ohif-viewerbase/client/lib/resizeViewportElements.js
diff --git a/Packages/ohif-viewerbase/lib/setActiveViewport.js b/Packages/ohif-viewerbase/client/lib/setActiveViewport.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/setActiveViewport.js
rename to Packages/ohif-viewerbase/client/lib/setActiveViewport.js
diff --git a/Packages/ohif-viewerbase/lib/setFocusToActiveViewport.js b/Packages/ohif-viewerbase/client/lib/setFocusToActiveViewport.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/setFocusToActiveViewport.js
rename to Packages/ohif-viewerbase/client/lib/setFocusToActiveViewport.js
diff --git a/Packages/ohif-viewerbase/lib/setMammogramViewportAlignment.js b/Packages/ohif-viewerbase/client/lib/setMammogramViewportAlignment.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/setMammogramViewportAlignment.js
rename to Packages/ohif-viewerbase/client/lib/setMammogramViewportAlignment.js
diff --git a/Packages/ohif-viewerbase/lib/sopClassDictionary.js b/Packages/ohif-viewerbase/client/lib/sopClassDictionary.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/sopClassDictionary.js
rename to Packages/ohif-viewerbase/client/lib/sopClassDictionary.js
diff --git a/Packages/ohif-viewerbase/lib/sortStudy.js b/Packages/ohif-viewerbase/client/lib/sortStudy.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/sortStudy.js
rename to Packages/ohif-viewerbase/client/lib/sortStudy.js
diff --git a/Packages/ohif-viewerbase/lib/switchToImageByIndex.js b/Packages/ohif-viewerbase/client/lib/switchToImageByIndex.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/switchToImageByIndex.js
rename to Packages/ohif-viewerbase/client/lib/switchToImageByIndex.js
diff --git a/Packages/ohif-viewerbase/lib/switchToImageRelative.js b/Packages/ohif-viewerbase/client/lib/switchToImageRelative.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/switchToImageRelative.js
rename to Packages/ohif-viewerbase/client/lib/switchToImageRelative.js
diff --git a/Packages/ohif-viewerbase/lib/toggleDialog.js b/Packages/ohif-viewerbase/client/lib/toggleDialog.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/toggleDialog.js
rename to Packages/ohif-viewerbase/client/lib/toggleDialog.js
diff --git a/Packages/ohif-viewerbase/lib/toolManager.js b/Packages/ohif-viewerbase/client/lib/toolManager.js
similarity index 94%
rename from Packages/ohif-viewerbase/lib/toolManager.js
rename to Packages/ohif-viewerbase/client/lib/toolManager.js
index a39bced7e..e76032e29 100644
--- a/Packages/ohif-viewerbase/lib/toolManager.js
+++ b/Packages/ohif-viewerbase/client/lib/toolManager.js
@@ -32,25 +32,30 @@ function configureTools() {
     // Set text box background color
     textStyle.setBackgroundColor('transparent');
 
+    // Set the tool font and font size
+    // context.font = "[style] [variant] [weight] [size]/[line height] [font family]";
+    const fontFamily = 'Roboto, OpenSans, HelveticaNeue-Light, Helvetica Neue Light, Helvetica Neue, Helvetica, Arial, Lucida Grande, sans-serif';
+    textStyle.setFont('15px ' + fontFamily);
+
     // Set the tool width
     toolStyle.setToolWidth(2);
 
     // Set color for inactive tools
-    toolColors.setToolColor('#ff00ff'); //rgb(255, 255, 0)');
+    toolColors.setToolColor('rgb(255, 255, 0)');
 
     // Set color for active tools
-    toolColors.setActiveColor('#00ffff'); //rgb(0, 255, 0)'
+    toolColors.setActiveColor('rgb(0, 255, 0)');
 
     // Set shadow configuration for length and bidirectional text boxes
     const shadowConfig = {
         shadow: true,
-        shadowColor: '#000',
+        shadowColor: '#000000',
         shadowOffsetX: 1,
         shadowOffsetY: 1
     };
 
     // Get some tools config to not override them
-    /*const lengthConfig = length.getConfiguration();
+    const lengthConfig = length.getConfiguration();
     const bidirectionalConfig = bidirectional.getConfiguration();
     const ellipticalRoiConfig = ellipticalRoi.getConfiguration();
     const nonTargetConfig = nonTarget.getConfiguration();
@@ -77,7 +82,7 @@ function configureTools() {
     nonTarget.setConfiguration({
         ...nonTargetConfig,
         ...shadowConfig
-    });*/
+    });
 
     // Set the configuration values for the text annotation (Arrow) tool
     const annotateConfig = {
diff --git a/Packages/ohif-viewerbase/lib/updateAllViewports.js b/Packages/ohif-viewerbase/client/lib/updateAllViewports.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/updateAllViewports.js
rename to Packages/ohif-viewerbase/client/lib/updateAllViewports.js
diff --git a/Packages/ohif-viewerbase/lib/viewportFunctions.js b/Packages/ohif-viewerbase/client/lib/viewportFunctions.js
similarity index 100%
rename from Packages/ohif-viewerbase/lib/viewportFunctions.js
rename to Packages/ohif-viewerbase/client/lib/viewportFunctions.js
diff --git a/Packages/ohif-viewerbase/package.js b/Packages/ohif-viewerbase/package.js
index 62efbaa81..a7bfc8955 100644
--- a/Packages/ohif-viewerbase/package.js
+++ b/Packages/ohif-viewerbase/package.js
@@ -141,31 +141,31 @@ Package.onUse(function(api) {
 
 
     // Library functions
-    api.addFiles('lib/layoutManager.js', 'client');
-    api.addFiles('lib/createStacks.js', 'client');
-    api.addFiles('lib/getImageId.js', 'client');
-    api.addFiles('lib/getWADORSImageId.js', 'client');
-    api.addFiles('lib/metaDataProvider.js', 'client');
-    api.addFiles('lib/sortStudy.js', 'client');
-    api.addFiles('lib/toolManager.js', 'client');
-    api.addFiles('lib/enablePrefetchOnElement.js', 'client');
-    api.addFiles('lib/displayReferenceLines.js', 'client');
-    api.addFiles('lib/toggleDialog.js', 'client');
-    api.addFiles('lib/setActiveViewport.js', 'client');
-    api.addFiles('lib/switchToImageByIndex.js', 'client');
-    api.addFiles('lib/switchToImageRelative.js', 'client');
-    api.addFiles('lib/enableHotkeys.js', 'client');
-    api.addFiles('lib/viewportFunctions.js', 'client');
-    api.addFiles('lib/WLPresets.js', 'client');
-    api.addFiles('lib/resizeViewportElements.js', 'client');
-    api.addFiles('lib/setFocusToActiveViewport.js', 'client');
-    api.addFiles('lib/updateAllViewports.js', 'client');
+    api.addFiles('client/lib/layoutManager.js', 'client');
+    api.addFiles('client/lib/createStacks.js', 'client');
+    api.addFiles('client/lib/getImageId.js', 'client');
+    api.addFiles('client/lib/getWADORSImageId.js', 'client');
+    api.addFiles('client/lib/metaDataProvider.js', 'client');
+    api.addFiles('client/lib/sortStudy.js', 'client');
+    api.addFiles('client/lib/toolManager.js', 'client');
+    api.addFiles('client/lib/enablePrefetchOnElement.js', 'client');
+    api.addFiles('client/lib/displayReferenceLines.js', 'client');
+    api.addFiles('client/lib/toggleDialog.js', 'client');
+    api.addFiles('client/lib/setActiveViewport.js', 'client');
+    api.addFiles('client/lib/switchToImageByIndex.js', 'client');
+    api.addFiles('client/lib/switchToImageRelative.js', 'client');
+    api.addFiles('client/lib/enableHotkeys.js', 'client');
+    api.addFiles('client/lib/viewportFunctions.js', 'client');
+    api.addFiles('client/lib/WLPresets.js', 'client');
+    api.addFiles('client/lib/resizeViewportElements.js', 'client');
+    api.addFiles('client/lib/setFocusToActiveViewport.js', 'client');
+    api.addFiles('client/lib/updateAllViewports.js', 'client');
 
-    api.addFiles('lib/instanceClassSpecificViewport.js', 'client');
-    api.addFiles('lib/setMammogramViewportAlignment.js', 'client');
-    api.addFiles('lib/isImage.js', 'client');
-    api.addFiles('lib/sopClassDictionary.js', 'client');
-    api.addFiles('lib/debugReactivity.js', 'client');
+    api.addFiles('client/lib/instanceClassSpecificViewport.js', 'client');
+    api.addFiles('client/lib/setMammogramViewportAlignment.js', 'client');
+    api.addFiles('client/lib/isImage.js', 'client');
+    api.addFiles('client/lib/sopClassDictionary.js', 'client');
+    api.addFiles('client/lib/debugReactivity.js', 'client');
 
     api.export('resizeViewportElements', 'client');
     api.export('handleResize', 'client');
@@ -203,26 +203,26 @@ Package.onUse(function(api) {
 
     // UI Helpers
     api.addFiles([
-        'lib/helpers/formatDA.js',
-        'lib/helpers/formatJSDate.js',
-        'lib/helpers/jsDateFromNow.js',
-        'lib/helpers/formatNumberPrecision.js',
-        'lib/helpers/formatTM.js',
-        'lib/helpers/inc.js',
-        'lib/helpers/isDisplaySetActive.js',
-        'lib/helpers/getUsername.js',
-        'lib/helpers/capitalizeFirstLetter.js',
-        'lib/helpers/objectToPairs.js',
-        'lib/helpers/objectEach.js',
-        'lib/helpers/ifTypeIs.js',
-        'lib/helpers/prettyPrintStringify.js',
-        'lib/helpers/sorting.js',
-        'lib/helpers/studyThumbnails.js',
-        'lib/helpers/formatPN.js'
+        'client/lib/helpers/formatDA.js',
+        'client/lib/helpers/formatJSDate.js',
+        'client/lib/helpers/jsDateFromNow.js',
+        'client/lib/helpers/formatNumberPrecision.js',
+        'client/lib/helpers/formatTM.js',
+        'client/lib/helpers/inc.js',
+        'client/lib/helpers/isDisplaySetActive.js',
+        'client/lib/helpers/getUsername.js',
+        'client/lib/helpers/capitalizeFirstLetter.js',
+        'client/lib/helpers/objectToPairs.js',
+        'client/lib/helpers/objectEach.js',
+        'client/lib/helpers/ifTypeIs.js',
+        'client/lib/helpers/prettyPrintStringify.js',
+        'client/lib/helpers/sorting.js',
+        'client/lib/helpers/studyThumbnails.js',
+        'client/lib/helpers/formatPN.js'
     ], 'client');
     api.export('formatPN', 'client');
 
-    api.addFiles('lib/helpers/isTouchDevice.js', 'client');
+    api.addFiles('client/lib/helpers/isTouchDevice.js', 'client');
     api.export('isTouchDevice', 'client');
 
     // TODO: Clean this up later, no real need to export these