diff --git a/Gruntfile.js b/Gruntfile.js
index de3d09757..aef0f0819 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -11,7 +11,8 @@ module.exports = function(grunt) {
 		bower_concat: {
 			all: {
 				mainFiles: {
-					'bootstrap-table': [ "src/bootstrap-table.js", "src/bootstrap-table.css", "dist/extensions/export/bootstrap-table-export.js", "dist/extensions/mobile/bootstrap-table-mobile.js", "dist/extensions/sticky-header/bootstrap-table-sticky-header.js", "dist/extensions/sticky-header/bootstrap-table-sticky-header.css"]
+					'bootstrap-table': [ "dist/bootstrap-table.min.js", "dist/bootstrap-table.css", "dist/extensions/export/bootstrap-table-export.min.js", "dist/extensions/mobile/bootstrap-table-mobile.min.js", "dist/extensions/sticky-header/bootstrap-table-sticky-header.min.js", "dist/extensions/sticky-header/bootstrap-table-sticky-header.css"],
+					'chartist-plugin-axistitle': [ "./dist/chartist-plugin-axistitle.min.js"]
 				},
 				dest: {
 					'js': 'tmp/opensourcepos_bower.js',
diff --git a/application/views/partial/header.php b/application/views/partial/header.php
index 04d7ba0d0..0598e575f 100644
--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -14,7 +14,7 @@
 		<link rel="stylesheet" href="bower_components/jasny-bootstrap/dist/css/jasny-bootstrap.css" />
 		<link rel="stylesheet" href="bower_components/smalot-bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" />
 		<link rel="stylesheet" href="bower_components/bootstrap-select/dist/css/bootstrap-select.css" />
-		<link rel="stylesheet" href="bower_components/bootstrap-table/src/bootstrap-table.css" />
+		<link rel="stylesheet" href="bower_components/bootstrap-table/dist/bootstrap-table.css" />
 		<link rel="stylesheet" href="bower_components/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.css" />
 		<link rel="stylesheet" href="bower_components/bootstrap-daterangepicker/daterangepicker.css" />
 		<link rel="stylesheet" href="bower_components/chartist/dist/chartist.min.css" />
@@ -42,19 +42,19 @@
 		<script src="bower_components/jasny-bootstrap/dist/js/jasny-bootstrap.js"></script>
 		<script src="bower_components/smalot-bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
 		<script src="bower_components/bootstrap-select/dist/js/bootstrap-select.js"></script>
-		<script src="bower_components/bootstrap-table/src/bootstrap-table.js"></script>
+		<script src="bower_components/bootstrap-table/dist/bootstrap-table.js"></script>
 		<script src="bower_components/bootstrap-table/dist/extensions/export/bootstrap-table-export.js"></script>
 		<script src="bower_components/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile.js"></script>
 		<script src="bower_components/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.js"></script>
 		<script src="bower_components/moment/moment.js"></script>
 		<script src="bower_components/bootstrap-daterangepicker/daterangepicker.js"></script>
-		<script src="bower_components/file-saver.js/FileSaver.js"></script>
+		<script src="bower_components/es6-promise/es6-promise.js"></script>
+		<script src="bower_components/file-saver/dist/FileSaver.min.js"></script>
 		<script src="bower_components/html2canvas/build/html2canvas.js"></script>
-		<script src="bower_components/jspdf/dist/jspdf.min.js"></script>
+		<script src="bower_components/jspdf/dist/jspdf.debug.js"></script>
 		<script src="bower_components/jspdf-autotable/dist/jspdf.plugin.autotable.js"></script>
-		<script src="bower_components/tableExport.jquery.plugin/tableExport.min.js"></script>
+		<script src="bower_components/tableExport.jquery.plugin/tableExport.js"></script>
 		<script src="bower_components/chartist/dist/chartist.min.js"></script>
-		<script src="bower_components/chartist-plugin-axistitle/dist/chartist-plugin-axistitle.min.js"></script>
 		<script src="bower_components/chartist-plugin-pointlabels/dist/chartist-plugin-pointlabels.min.js"></script>
 		<script src="bower_components/chartist-plugin-tooltip/dist/chartist-plugin-tooltip.min.js"></script>
 		<script src="bower_components/chartist-plugin-barlabels/dist/chartist-plugin-barlabels.min.js"></script>
@@ -75,7 +75,7 @@
 		<![endif]-->
 		<!-- start mincss template tags -->
 		<link rel="stylesheet" type="text/css" href="dist/jquery-ui/jquery-ui.min.css"/>
-		<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=b332f7b2a9"/>
+		<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=afbb40b305"/>
 		<!-- end mincss template tags -->
 
 		<!-- Tweaks to the UI for a particular theme should drop here  -->
@@ -84,7 +84,7 @@
 	<?php } ?>
 
 		<!-- start minjs template tags -->
-		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=17ddd92837"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=f4ddaa235e"></script>
 		<!-- end minjs template tags -->
 	<?php endif; ?>
 
diff --git a/bower.json b/bower.json
index 0e80da4fe..1f59164e4 100644
--- a/bower.json
+++ b/bower.json
@@ -33,12 +33,12 @@
     "bootswatch": "3.4.1+1",
     "smalot-bootstrap-datetimepicker": "~2.4.4",
     "bootstrap-select": "~1.13.18",
-    "bootstrap-table": "~1.12.2",
+    "bootstrap-table": "~1.18.0",
     "bootstrap-daterangepicker": "~2.1.27",
-    "tableExport.jquery.plugin": "1.5.1",
-    "jspdf": "~1.0.272",
-    "chartist": "0.9.8",
-    "chartist-plugin-axistitle": "0.0.5",
+    "tableExport.jquery.plugin": "1.10.20",
+    "jspdf": "~1.3.4",
+    "chartist": "0.11.4",
+    "chartist-plugin-axistitle": "0.0.7",
     "chartist-plugin-pointlabels": "0.0.4",
     "chartist-plugin-tooltip": "https://github.com/tmmdata/chartist-plugin-tooltip.git#0.0.18",
     "chartist-plugin-barlabels": "https://github.com/mtgibbs/chartist-plugin-barlabels.git#0.0.5",
@@ -48,7 +48,8 @@
     "bootstrap-toggle": "^2.2.2"
   },
   "resolutions": {
-    "jquery": "~1.12.4"
+    "chartist": "0.9.8",
+    "jspdf": ">=1.3.4"
   },
   "overrides": {
     "jquery-ui": {
@@ -64,16 +65,13 @@
     },
     "bootstrap-table": {
       "main": [
-        "src/bootstrap-table.js",
-        "src/bootstrap-table.css",
+        "dist/bootstrap-table.js",
+        "dist/bootstrap-table.css",
         "dist/extensions/export/bootstrap-table-export.js",
         "dist/extensions/mobile/bootstrap-table-mobile.js",
         "dist/extensions/sticky-header/bootstrap-table-sticky-header.js",
         "dist/extensions/sticky-header/bootstrap-table-sticky-header.css"
       ]
     }
-  },
-  "resolutions": {
-    "chartist": "0.9.8"
   }
 }
diff --git a/package.json b/package.json
index 609094b2a..5ad95e56d 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "grunt-contrib-concat": "~0.5.1",
     "grunt-contrib-cssmin": "^0.14.0",
     "grunt-contrib-jshint": "~0.6.3",
-    "grunt-contrib-uglify": "~0.8.0",
+    "grunt-contrib-uglify-es": "github:opensourcepos/grunt-contrib-uglify#harmony",
     "grunt-contrib-watch": "~0.5.3",
     "grunt-license-bower": "~1.0.1",
     "grunt-mocha-webdriver": "^1.2.2",