diff --git a/build b/build
index 26b73d16..f03d5633 100755
--- a/build
+++ b/build
@@ -145,8 +145,9 @@ files_to_file($thirdPartyDebugFiles, $targetThirdPartyCSS);
 //3rd party JS
 notice("Third Party JS");
 $thirdPartyDebugFiles = array_put_begining($path_debug_assets, $debug::THIRD_PARTY_JS);
+$targetThirdPartyUnminifiedJS = $path_release_assets.$release::THIRD_PARTY_UNMINIFIED_JS;
 $targetThirdPartyJS = $path_release_assets.$release::THIRD_PARTY_JS;
-files_to_file($thirdPartyDebugFiles, $targetThirdPartyJS);
+files_to_file($thirdPartyDebugFiles, $targetThirdPartyUnminifiedJS);
 
 //App CSS
 notice("App CSS");
@@ -157,8 +158,9 @@ files_to_file($appDebugFiles, $targetAppCSS);
 //App JS
 notice("App JS");
 $appDebugFiles = array_put_begining($path_debug_assets, $debug::APP_JS);
+$targetAppUnminifiedJS = $path_release_assets.$release::APP_UNMINIFIED_JS;
 $targetAppJS = $path_release_assets.$release::APP_JS;
-files_to_file($appDebugFiles, $targetAppJS);
+files_to_file($appDebugFiles, $targetAppUnminifiedJS);
 
 
 //Make some adpations on third party files
@@ -166,12 +168,18 @@ $source = file_get_contents($targetThirdPartyCSS);
 $source = str_replace("../fonts/fontawesome", "fontawesome_fonts/fontawesome", $source);
 file_put_contents($targetThirdPartyCSS, $source);
 
+
+//Minify Javascript files
+exec("/usr/bin/uglifyjs '".$targetThirdPartyUnminifiedJS."' -c -o '".$targetThirdPartyJS."'");
+exec("/usr/bin/uglifyjs '".$targetAppUnminifiedJS."' -c -o '".$targetAppJS."'");
+
 //Copy font awesome files and twemojies files + Google Fonts
 rcopy($path_debug_assets."3rdparty/adminLTE/plugins/font-awesome/fonts", $path_release_assets."fontawesome_fonts");
 rcopy($path_debug_assets."3rdparty/twemoji/2/72x72/", $path_release_assets."3rdparty/twemoji/2/72x72/");
 rcopy($path_debug_assets."3rdparty/adminLTE/plugins/googleFonts/googleFonts/", $path_release_assets."googleFonts/");
 rcopy($path_debug_assets."3rdparty/wdt-emoji/sheets/", $path_release_assets."3rdparty/wdt-emoji/sheets/");
 
+
 //Copy images and templates
 rcopy($path_debug_assets."img/", $path_release_assets."img/");
 rcopy($path_debug_assets."templates/", $path_release_assets."templates/");
diff --git a/system/config/offline.config.php b/system/config/offline.config.php
index eddbeec8..777fd6c9 100644
--- a/system/config/offline.config.php
+++ b/system/config/offline.config.php
@@ -45,9 +45,9 @@ class Offline {
 	const THIRD_PARTY_JS = "third_party.js";
 
 	/**
-	 * Third party Javascript files (bundle)
+	 * Third party Javascript files (unminified)
 	 */
-	const THIRD_PARTY_BUNDLE_JS = "third_party.bundle.js";
+	const THIRD_PARTY_UNMINIFIED_JS = "third_party.unminified.js";
 
 	/**
 	 * Application CSS files
@@ -60,9 +60,9 @@ class Offline {
 	const APP_JS = "app.js";
 
 	/**
-	 * Application JS files (bundles)
+	 * Application JS files (unminifieds)
 	 */
-	const APP_BUNDLE_JS = "app.bundle.js";
+	const APP_UNMINIFIED_JS = "app.unminified.js";
 
 	/**
 	 * Language settings