diff --git a/app/frontend/packs/application.js b/app/frontend/packs/application.js
index 224b2b983..1c52fcabd 100644
--- a/app/frontend/packs/application.js
+++ b/app/frontend/packs/application.js
@@ -68,14 +68,13 @@ import 'tether/dist/js/tether';
 import 'angular-bind-html-compile/angular-bind-html-compile';
 import 'angular-ui-tour/dist/angular-ui-tour';
 
-import '../src/app.js';
-import '../src/router.js.erb';
-import '../src/controllers/*';
-import '../src/services/*';
-import '../src/directives/*';
-import '../src/filters/*';
+import '../src/javascript/app.js';
+import '../src/javascript/router.js.erb';
+import '../src/javascript/controllers/*';
+import '../src/javascript/services/*';
+import '../src/javascript/directives/*';
+import '../src/javascript/filters/*';
+import '../src/javascript/plugins.js.erb';
 
-import '../stylesheets/application.scss.erb';
-
-const images = require.context('../images', true);
-const imagePath = (name) => images(name, true);
+require.context('../images', true);
+require.context('../templates', true);
diff --git a/app/frontend/packs/application.scss b/app/frontend/packs/application.scss
index e69de29bb..f24c3331e 100644
--- a/app/frontend/packs/application.scss
+++ b/app/frontend/packs/application.scss
@@ -0,0 +1,18 @@
+
+@import '~ui-select/dist/select';
+@import '~fullcalendar/dist/fullcalendar';
+@import '~jasny-bootstrap/dist/css/jasny-bootstrap';
+@import '~angular-growl-v2/build/angular-growl';
+@import '~angular-xeditable/dist/css/xeditable';
+@import '~angular-loading-bar/build/loading-bar';
+@import '~nvd3/build/nv.d3';
+@import '~font-awesome';
+@import '~medium-editor/dist/css/medium-editor';
+@import '~medium-editor/dist/css/themes/default';
+@import '~bootstrap-switch/dist/css/bootstrap3/bootstrap-switch';
+@import '~summernote/dist/summernote';
+@import '~jquery-minicolors/jquery.minicolors.css';
+@import '~angular-aside/dist/css/angular-aside';
+@import '~codemirror/lib/codemirror';
+
+@import '../src/stylesheets/application.scss.erb';
diff --git a/app/frontend/packs/printer.scss b/app/frontend/packs/printer.scss
index e69de29bb..3217d3129 100644
--- a/app/frontend/packs/printer.scss
+++ b/app/frontend/packs/printer.scss
@@ -0,0 +1,2 @@
+
+@import '../src/stylesheets/app.printer';
diff --git a/app/frontend/src/javascript/controllers/admin/authentications.js.erb b/app/frontend/src/javascript/controllers/admin/authentications.js.erb
index 9736b265d..dc5f39361 100644
--- a/app/frontend/src/javascript/controllers/admin/authentications.js.erb
+++ b/app/frontend/src/javascript/controllers/admin/authentications.js.erb
@@ -87,7 +87,7 @@ class AuthenticationController {
      */
     $scope.defineDataMapping = function (mapping) {
       $uibModal.open({
-        templateUrl: '<%= asset_path "admin/authentications/_data_mapping.html" %>',
+        templateUrl: '<%= asset_pack_path "admin/authentications/_data_mapping.html" %>',
         size: 'md',
         resolve: {
           field () { return mapping; },
diff --git a/app/frontend/src/javascript/controllers/admin/calendar.js.erb b/app/frontend/src/javascript/controllers/admin/calendar.js.erb
index 012f497eb..d04904536 100644
--- a/app/frontend/src/javascript/controllers/admin/calendar.js.erb
+++ b/app/frontend/src/javascript/controllers/admin/calendar.js.erb
@@ -273,7 +273,7 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state
       // open a confirmation dialog
       const modalInstance = $uibModal.open({
         animation: true,
-        templateUrl: '<%= asset_path "admin/calendar/deleteRecurrent.html" %>',
+        templateUrl: '<%= asset_pack_path "admin/calendar/deleteRecurrent.html" %>',
         size: 'md',
         controller: 'DeleteRecurrentAvailabilityController',
         resolve: {
@@ -419,7 +419,7 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state
 
       // then we open a modal window to let the admin specify the slot type
       const modalInstance = $uibModal.open({
-        templateUrl: '<%= asset_path "admin/calendar/eventModal.html" %>',
+        templateUrl: '<%= asset_pack_path "admin/calendar/eventModal.html" %>',
         controller: 'CreateEventModalController',
         backdrop: 'static',
         keyboard: false,
diff --git a/app/frontend/src/javascript/controllers/admin/events.js.erb b/app/frontend/src/javascript/controllers/admin/events.js.erb
index b57151086..4e4442176 100644
--- a/app/frontend/src/javascript/controllers/admin/events.js.erb
+++ b/app/frontend/src/javascript/controllers/admin/events.js.erb
@@ -279,7 +279,7 @@ Application.Controllers.controller('AdminEventsController', ['$scope', '$state',
      */
     $scope.newPriceCategory = function () {
       $uibModal.open({
-        templateUrl: '<%= asset_path "admin/events/price_form.html" %>',
+        templateUrl: '<%= asset_pack_path "admin/events/price_form.html" %>',
         size: 'md',
         resolve: {
           category () { return {}; }
@@ -307,7 +307,7 @@ Application.Controllers.controller('AdminEventsController', ['$scope', '$state',
         return growl.error(_t('app.admin.events.unexpected_error_occurred_please_refresh'));
       } else {
         return $uibModal.open({
-          templateUrl: '<%= asset_path "admin/events/price_form.html" %>',
+          templateUrl: '<%= asset_pack_path "admin/events/price_form.html" %>',
           size: 'md',
           resolve: {
             category () { return $scope.priceCategories[index]; }
@@ -645,7 +645,7 @@ Application.Controllers.controller('EditEventController', ['$scope', '$state', '
         // open a choice edit-mode dialog
         const modalInstance = $uibModal.open({
           animation: true,
-          templateUrl: '<%= asset_path "events/editRecurrent.html" %>',
+          templateUrl: '<%= asset_pack_path "events/editRecurrent.html" %>',
           size: 'md',
           controller: 'EditRecurrentEventController',
           resolve: {
diff --git a/app/frontend/src/javascript/controllers/admin/invoices.js.erb b/app/frontend/src/javascript/controllers/admin/invoices.js.erb
index ecbc2017b..31ed3b71b 100644
--- a/app/frontend/src/javascript/controllers/admin/invoices.js.erb
+++ b/app/frontend/src/javascript/controllers/admin/invoices.js.erb
@@ -220,7 +220,7 @@ Application.Controllers.controller('InvoicesController', ['$scope', '$state', 'I
     $scope.generateAvoirForInvoice = function (invoice) {
       // open modal
       const modalInstance = $uibModal.open({
-        templateUrl: '<%= asset_path "admin/invoices/avoirModal.html" %>',
+        templateUrl: '<%= asset_pack_path "admin/invoices/avoirModal.html" %>',
         controller: 'AvoirModalController',
         resolve: {
           invoice () { return invoice; },
@@ -579,7 +579,7 @@ Application.Controllers.controller('InvoicesController', ['$scope', '$state', 'I
     $scope.closeAnAccountingPeriod = function() {
       // open modal
       $uibModal.open({
-        templateUrl: '<%= asset_path "admin/invoices/closePeriodModal.html" %>',
+        templateUrl: '<%= asset_pack_path "admin/invoices/closePeriodModal.html" %>',
         controller: 'ClosePeriodModalController',
         backdrop: 'static',
         keyboard: false,
@@ -593,7 +593,7 @@ Application.Controllers.controller('InvoicesController', ['$scope', '$state', 'I
 
     $scope.toggleExportModal = function() {
       $uibModal.open({
-        templateUrl: '<%= asset_path "admin/invoices/accountingExportModal.html" %>',
+        templateUrl: '<%= asset_pack_path "admin/invoices/accountingExportModal.html" %>',
         controller: 'AccountingExportModalController',
         size: 'xl'
       });
diff --git a/app/frontend/src/javascript/controllers/admin/members.js.erb b/app/frontend/src/javascript/controllers/admin/members.js.erb
index b4dbd8333..add9bf212 100644
--- a/app/frontend/src/javascript/controllers/admin/members.js.erb
+++ b/app/frontend/src/javascript/controllers/admin/members.js.erb
@@ -236,7 +236,7 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce',
     $scope.openPartnerNewModal = function () {
       const modalInstance = $uibModal.open({
         animation: true,
-        templateUrl: '<%= asset_path "shared/_partner_new_modal.html" %>',
+        templateUrl: '<%= asset_pack_path "shared/_partner_new_modal.html" %>',
         size: 'lg',
         controller: ['$scope', '$uibModalInstance', 'User', function ($scope, $uibModalInstance, User) {
           $scope.partner = {};
@@ -702,7 +702,7 @@ Application.Controllers.controller('EditMemberController', ['$scope', '$state',
     $scope.changeUserRole = function() {
       const modalInstance = $uibModal.open({
         animation: true,
-        templateUrl: '<%= asset_path "admin/members/change_role_modal.html" %>',
+        templateUrl: '<%= asset_pack_path "admin/members/change_role_modal.html" %>',
         size: 'lg',
         resolve: {
           user() { return $scope.user; }
@@ -750,7 +750,7 @@ Application.Controllers.controller('EditMemberController', ['$scope', '$state',
     $scope.updateSubscriptionModal = function (subscription, free) {
       const modalInstance = $uibModal.open({
         animation: true,
-        templateUrl: '<%= asset_path "admin/subscriptions/expired_at_modal.html" %>',
+        templateUrl: '<%= asset_pack_path "admin/subscriptions/expired_at_modal.html" %>',
         size: 'lg',
         controller: ['$scope', '$uibModalInstance', 'Subscription', function ($scope, $uibModalInstance, Subscription) {
           $scope.new_expired_at = angular.copy(subscription.expired_at);
@@ -797,7 +797,7 @@ Application.Controllers.controller('EditMemberController', ['$scope', '$state',
     $scope.createSubscriptionModal = function (user, plans) {
       const modalInstance = $uibModal.open({
         animation: true,
-        templateUrl: '<%= asset_path "admin/subscriptions/create_modal.html" %>',
+        templateUrl: '<%= asset_pack_path "admin/subscriptions/create_modal.html" %>',
         size: 'lg',
         controller: ['$scope', '$uibModalInstance', 'Subscription', 'Group', function ($scope, $uibModalInstance, Subscription, Group) {
         // selected user
@@ -845,7 +845,7 @@ Application.Controllers.controller('EditMemberController', ['$scope', '$state',
     $scope.createWalletCreditModal = function (user, wallet) {
       const modalInstance = $uibModal.open({
         animation: true,
-        templateUrl: '<%= asset_path "wallet/credit_modal.html" %>',
+        templateUrl: '<%= asset_pack_path "wallet/credit_modal.html" %>',
         controller: ['$scope', '$uibModalInstance', 'Wallet', function ($scope, $uibModalInstance, Wallet) {
         // default: do not generate a refund invoice
           $scope.generate_avoir = false;
diff --git a/app/frontend/src/javascript/controllers/admin/plans.js.erb b/app/frontend/src/javascript/controllers/admin/plans.js.erb
index a86ab8da8..d7c88a57c 100644
--- a/app/frontend/src/javascript/controllers/admin/plans.js.erb
+++ b/app/frontend/src/javascript/controllers/admin/plans.js.erb
@@ -106,7 +106,7 @@ Application.Controllers.controller('NewPlanController', ['$scope', '$uibModal',
     $scope.openPartnerNewModal = function (subscription) {
       const modalInstance = $uibModal.open({
         animation: true,
-        templateUrl: '<%= asset_path "shared/_partner_new_modal.html" %>',
+        templateUrl: '<%= asset_pack_path "shared/_partner_new_modal.html" %>',
         size: 'lg',
         controller: ['$scope', '$uibModalInstance', 'User', function ($scope, $uibModalInstance, User) {
           $scope.partner = {};
diff --git a/app/frontend/src/javascript/controllers/admin/pricing.js.erb b/app/frontend/src/javascript/controllers/admin/pricing.js.erb
index c9dfebbb5..ba95a990a 100644
--- a/app/frontend/src/javascript/controllers/admin/pricing.js.erb
+++ b/app/frontend/src/javascript/controllers/admin/pricing.js.erb
@@ -570,7 +570,7 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
      */
     $scope.sendCouponToUser = function (coupon) {
       $uibModal.open({
-        templateUrl: '<%= asset_path "admin/pricing/sendCoupon.html" %>',
+        templateUrl: '<%= asset_pack_path "admin/pricing/sendCoupon.html" %>',
         resolve: {
           coupon () { return coupon; }
         },
diff --git a/app/frontend/src/javascript/controllers/admin/settings.js.erb b/app/frontend/src/javascript/controllers/admin/settings.js.erb
index 4ad80dfe2..2b7aefc48 100644
--- a/app/frontend/src/javascript/controllers/admin/settings.js.erb
+++ b/app/frontend/src/javascript/controllers/admin/settings.js.erb
@@ -173,7 +173,7 @@ Application.Controllers.controller('SettingsController', ['$scope', '$rootScope'
     $scope.savePrivacyPolicy = function () {
       // open modal
       const modalInstance = $uibModal.open({
-        templateUrl: '<%= asset_path "admin/settings/save_policy.html" %>',
+        templateUrl: '<%= asset_pack_path "admin/settings/save_policy.html" %>',
         controller: 'SavePolicyController',
         resolve: {
           saveCb () { return $scope.save; },
@@ -274,7 +274,7 @@ Application.Controllers.controller('SettingsController', ['$scope', '$rootScope'
      */
     $scope.analyticsModal = function() {
       $uibModal.open({
-        templateUrl: '<%= asset_path "admin/settings/analyticsModal.html" %>',
+        templateUrl: '<%= asset_pack_path "admin/settings/analyticsModal.html" %>',
         controller: 'AnalyticsModalController',
         size: 'lg',
         resolve: {
diff --git a/app/frontend/src/javascript/controllers/admin/statistics.js.erb b/app/frontend/src/javascript/controllers/admin/statistics.js.erb
index 5f7f55cf0..0841ea68f 100644
--- a/app/frontend/src/javascript/controllers/admin/statistics.js.erb
+++ b/app/frontend/src/javascript/controllers/admin/statistics.js.erb
@@ -311,7 +311,7 @@ Application.Controllers.controller('StatisticsController', ['$scope', '$state',
      */
     $scope.exportToExcel = function () {
       const options = {
-        templateUrl: '<%= asset_path "admin/statistics/export.html" %>',
+        templateUrl: '<%= asset_pack_path "admin/statistics/export.html" %>',
         size: 'sm',
         controller: 'ExportStatisticsController',
         resolve: {
diff --git a/app/frontend/src/javascript/controllers/admin/trainings.js.erb b/app/frontend/src/javascript/controllers/admin/trainings.js.erb
index 5bc65349d..385897b36 100644
--- a/app/frontend/src/javascript/controllers/admin/trainings.js.erb
+++ b/app/frontend/src/javascript/controllers/admin/trainings.js.erb
@@ -221,7 +221,7 @@ Application.Controllers.controller('TrainingsAdminController', ['$scope', '$stat
      */
     $scope.showReservations = function (training, availability) {
       $uibModal.open({
-        templateUrl: '<%= asset_path "admin/trainings/validTrainingModal.html" %>',
+        templateUrl: '<%= asset_pack_path "admin/trainings/validTrainingModal.html" %>',
         controller: ['$scope', '$uibModalInstance', function ($scope, $uibModalInstance) {
           $scope.availability = availability;
 
diff --git a/app/frontend/src/javascript/controllers/application.js.erb b/app/frontend/src/javascript/controllers/application.js.erb
index 206e74a09..d76e085fa 100644
--- a/app/frontend/src/javascript/controllers/application.js.erb
+++ b/app/frontend/src/javascript/controllers/application.js.erb
@@ -89,7 +89,7 @@ Application.Controllers.controller('ApplicationController', ['$rootScope', '$sco
       <% else %>
 
       return $uibModal.open({
-        templateUrl: '<%= asset_path "shared/signupModal.html" %>',
+        templateUrl: '<%= asset_pack_path "shared/signupModal.html" %>',
         size: 'md',
         resolve: {
           settingsPromise: ['Setting', function (Setting) { return Setting.query({ names: "['phone_required', 'recaptcha_site_key', 'confirmation_required']" }).$promise; }]
@@ -192,7 +192,7 @@ Application.Controllers.controller('ApplicationController', ['$rootScope', '$sco
      */
     $scope.editPassword = function (token) {
       $uibModal.open({
-        templateUrl: '<%= asset_path "shared/passwordEditModal.html" %>',
+        templateUrl: '<%= asset_pack_path "shared/passwordEditModal.html" %>',
         size: 'md',
         controller: ['$scope', '$uibModalInstance', '$http', function ($scope, $uibModalInstance, $http) {
           $scope.user = { reset_password_token: token };
@@ -282,7 +282,7 @@ Application.Controllers.controller('ApplicationController', ['$rootScope', '$sco
       if ($rootScope.currentUser.role !== 'admin') return;
 
       $uibModal.open({
-        templateUrl: '<%= asset_path "admin/versions/upgradeModal.html" %>',
+        templateUrl: '<%= asset_pack_path "admin/versions/upgradeModal.html" %>',
         controller: 'VersionModalController',
         resolve: {
           version() { return $scope.version; }
@@ -407,7 +407,7 @@ Application.Controllers.controller('ApplicationController', ['$rootScope', '$sco
       $window.location.href = '/sso-redirect';
       <% else %>
       return $uibModal.open({
-        templateUrl: '<%= asset_path "shared/deviseModal.html" %>',
+        templateUrl: '<%= asset_pack_path "shared/deviseModal.html" %>',
         size: 'sm',
         resolve: {
           settingsPromise: ['Setting', function (Setting) { return Setting.query({ names: "['confirmation_required']" }).$promise; }]
@@ -470,7 +470,7 @@ Application.Controllers.controller('ApplicationController', ['$rootScope', '$sco
         } else if (reason === 'resetPassword') {
           // open the 'reset password' modal
           return $uibModal.open({
-            templateUrl: '<%= asset_path "shared/passwordNewModal.html" %>',
+            templateUrl: '<%= asset_pack_path "shared/passwordNewModal.html" %>',
             size: 'sm',
             controller: ['$scope', '$uibModalInstance', '$http', function ($scope, $uibModalInstance, $http) {
               $scope.user = { email: '' };
@@ -488,7 +488,7 @@ Application.Controllers.controller('ApplicationController', ['$rootScope', '$sco
         } else if (reason === 'confirmationNew') {
           // open the 'reset password' modal
           return $uibModal.open({
-            templateUrl: '<%= asset_path "shared/ConfirmationNewModal.html" %>',
+            templateUrl: '<%= asset_pack_path "shared/ConfirmationNewModal.html" %>',
             size: 'sm',
             controller: ['$scope', '$uibModalInstance', '$http', function ($scope, $uibModalInstance, $http) {
               $scope.user = { email: '' };
diff --git a/app/frontend/src/javascript/controllers/events.js.erb b/app/frontend/src/javascript/controllers/events.js.erb
index 42c140a05..089c02f4b 100644
--- a/app/frontend/src/javascript/controllers/events.js.erb
+++ b/app/frontend/src/javascript/controllers/events.js.erb
@@ -186,7 +186,7 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', '
       // open a confirmation dialog
       const modalInstance = $uibModal.open({
         animation: true,
-        templateUrl: '<%= asset_path "events/deleteRecurrent.html" %>',
+        templateUrl: '<%= asset_pack_path "events/deleteRecurrent.html" %>',
         size: 'md',
         controller: 'DeleteRecurrentEventController',
         resolve: {
@@ -416,7 +416,7 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', '
     $scope.modifyReservation = function (reservation) {
       const index = $scope.reservations.indexOf(reservation);
       return $uibModal.open({
-        templateUrl: '<%= asset_path "events/modify_event_reservation_modal.html" %>',
+        templateUrl: '<%= asset_pack_path "events/modify_event_reservation_modal.html" %>',
         resolve: {
           event () { return $scope.event; },
           reservation () { return reservation; }
@@ -671,7 +671,7 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', '
      */
     const payByStripe = function (reservation) {
       $uibModal.open({
-        templateUrl: '<%= asset_path "stripe/payment_modal.html" %>',
+        templateUrl: '<%= asset_pack_path "stripe/payment_modal.html" %>',
         size: 'md',
         resolve: {
           reservation () {
@@ -739,7 +739,7 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', '
      */
     const payOnSite = function (reservation) {
       $uibModal.open({
-        templateUrl: '<%= asset_path "shared/valid_reservation_modal.html" %>',
+        templateUrl: '<%= asset_pack_path "shared/valid_reservation_modal.html" %>',
         size: 'sm',
         resolve: {
           reservation () {
@@ -858,7 +858,7 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', '
     const showReserveSlotSameTimeModal = function(sameTimeReservations, callback) {
       const modalInstance = $uibModal.open({
         animation: true,
-        templateUrl: '<%= asset_path "shared/_reserve_slot_same_time.html" %>',
+        templateUrl: '<%= asset_pack_path "shared/_reserve_slot_same_time.html" %>',
         size: 'md',
         controller: 'ReserveSlotSameTimeController',
         resolve: {
diff --git a/app/frontend/src/javascript/controllers/machines.js.erb b/app/frontend/src/javascript/controllers/machines.js.erb
index 831d891c1..dec6560c2 100644
--- a/app/frontend/src/javascript/controllers/machines.js.erb
+++ b/app/frontend/src/javascript/controllers/machines.js.erb
@@ -121,7 +121,7 @@ const _reserveMachine = function (machine, e) {
         // the training before he can book the reservation
         if (machine.current_user_training_reservation) {
           return _this.$uibModal.open({
-            templateUrl: '<%= asset_path "machines/training_reservation_modal.html" %>',
+            templateUrl: '<%= asset_pack_path "machines/training_reservation_modal.html" %>',
             controller: ['$scope', '$uibModalInstance', function ($scope, $uibModalInstance) {
               $scope.machine = machine;
               return $scope.cancel = function () { $uibModalInstance.dismiss('cancel'); };
@@ -136,7 +136,7 @@ const _reserveMachine = function (machine, e) {
           // otherwise open the information modal
           } else {
             return _this.$uibModal.open({
-              templateUrl: '<%= asset_path "machines/request_training_modal.html" %>',
+              templateUrl: '<%= asset_pack_path "machines/request_training_modal.html" %>',
               controller: ['$scope', '$uibModalInstance', '$state', function ($scope, $uibModalInstance, $state) {
                 $scope.machine = machine;
                 $scope.member = _this.$scope.currentUser;
diff --git a/app/frontend/src/javascript/controllers/plans.js.erb b/app/frontend/src/javascript/controllers/plans.js.erb
index 2033d2ad4..21a1384f2 100644
--- a/app/frontend/src/javascript/controllers/plans.js.erb
+++ b/app/frontend/src/javascript/controllers/plans.js.erb
@@ -235,7 +235,7 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop
      */
     const payByStripe = function () {
       $uibModal.open({
-        templateUrl: '<%= asset_path "stripe/payment_modal.html" %>',
+        templateUrl: '<%= asset_pack_path "stripe/payment_modal.html" %>',
         size: 'md',
         resolve: {
           selectedPlan () { return $scope.selectedPlan; },
@@ -299,7 +299,7 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop
      */
     const payOnSite = function () {
       $uibModal.open({
-        templateUrl: '<%= asset_path "plans/payment_modal.html" %>',
+        templateUrl: '<%= asset_pack_path "plans/payment_modal.html" %>',
         size: 'sm',
         resolve: {
           selectedPlan () { return $scope.selectedPlan; },
diff --git a/app/frontend/src/javascript/controllers/profile.js.erb b/app/frontend/src/javascript/controllers/profile.js.erb
index df7f6ea78..4a772c343 100644
--- a/app/frontend/src/javascript/controllers/profile.js.erb
+++ b/app/frontend/src/javascript/controllers/profile.js.erb
@@ -167,7 +167,7 @@ Application.Controllers.controller('CompleteProfileController', ['$scope', '$roo
       event.stopPropagation();
       dialogs.confirm(
         {
-          templateUrl: '<%= asset_path "profile/resend_code_modal.html" %>',
+          templateUrl: '<%= asset_pack_path "profile/resend_code_modal.html" %>',
           resolve: {
             object () {
               return { email: memberPromise.email };
diff --git a/app/frontend/src/javascript/controllers/projects.js.erb b/app/frontend/src/javascript/controllers/projects.js.erb
index 3a6946276..2edb41754 100644
--- a/app/frontend/src/javascript/controllers/projects.js.erb
+++ b/app/frontend/src/javascript/controllers/projects.js.erb
@@ -587,7 +587,7 @@ Application.Controllers.controller('ShowProjectController', ['$scope', '$state',
       if (e) { e.preventDefault(); }
 
       $uibModal.open({
-        templateUrl: '<%= asset_path "shared/signalAbuseModal.html" %>',
+        templateUrl: '<%= asset_pack_path "shared/signalAbuseModal.html" %>',
         size: 'md',
         resolve: {
           project () { return $scope.project; }
diff --git a/app/frontend/src/javascript/directives/cart.js.erb b/app/frontend/src/javascript/directives/cart.js.erb
index f3085bb84..ae6010a17 100644
--- a/app/frontend/src/javascript/directives/cart.js.erb
+++ b/app/frontend/src/javascript/directives/cart.js.erb
@@ -39,7 +39,7 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
         reservableName: '@',
         limitToOneSlot: '@'
       },
-      templateUrl: '<%= asset_path "shared/_cart.html" %>',
+      templateUrl: '<%= asset_pack_path "shared/_cart.html" %>',
       link ($scope, element, attributes) {
       // will store the user's plan if he choosed to buy one
         $scope.selectedPlan = null;
@@ -174,7 +174,7 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
               } else {
                 const modalInstance = $uibModal.open({
                   animation: true,
-                  templateUrl: '<%= asset_path "shared/_reserve_slot_without_plan.html" %>',
+                  templateUrl: '<%= asset_pack_path "shared/_reserve_slot_without_plan.html" %>',
                   size: 'md',
                   controller: 'ReserveSlotWithoutPlanController',
                   resolve: {
@@ -318,7 +318,7 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
             // ask confirmation
             const modalInstance = $uibModal.open({
               animation: true,
-              templateUrl: '<%= asset_path "shared/_reserve_slot_tags_mismatch.html" %>',
+              templateUrl: '<%= asset_pack_path "shared/_reserve_slot_tags_mismatch.html" %>',
               size: 'md',
               controller: 'ReserveSlotTagsMismatchController',
               resolve: {
@@ -357,7 +357,7 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
           if (sameTimeReservations.length > 0) {
             const modalInstance = $uibModal.open({
               animation: true,
-              templateUrl: '<%= asset_path "shared/_reserve_slot_same_time.html" %>',
+              templateUrl: '<%= asset_pack_path "shared/_reserve_slot_same_time.html" %>',
               size: 'md',
               controller: 'ReserveSlotSameTimeController',
               resolve: {
@@ -447,7 +447,7 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
               $scope.slot.cancelable = slotCanBeCanceled($scope.slot);
               // -> then, we open a dialog to ask to the user to choose an action
               return dialogs.confirm({
-                templateUrl: '<%= asset_path "shared/confirm_modify_slot_modal.html" %>',
+                templateUrl: '<%= asset_pack_path "shared/confirm_modify_slot_modal.html" %>',
                 resolve: {
                   object () { return $scope.slot; }
                 }
@@ -612,7 +612,7 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
          */
         const payByStripe = function (reservation) {
           $uibModal.open({
-            templateUrl: '<%= asset_path "stripe/payment_modal.html" %>',
+            templateUrl: '<%= asset_pack_path "stripe/payment_modal.html" %>',
             size: 'md',
             resolve: {
               reservation () {
@@ -673,7 +673,7 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
          */
         const payOnSite = function (reservation) {
           $uibModal.open({
-            templateUrl: '<%= asset_path "shared/valid_reservation_modal.html" %>',
+            templateUrl: '<%= asset_pack_path "shared/valid_reservation_modal.html" %>',
             size: 'sm',
             resolve: {
               reservation () {
diff --git a/app/frontend/src/javascript/directives/coupon.js.erb b/app/frontend/src/javascript/directives/coupon.js.erb
index 0d8e6316a..958889b34 100644
--- a/app/frontend/src/javascript/directives/coupon.js.erb
+++ b/app/frontend/src/javascript/directives/coupon.js.erb
@@ -18,7 +18,7 @@ Application.Directives.directive('coupon', [ '$rootScope', 'Coupon', '_t', funct
       total: '=',
       userId: '@'
     },
-    templateUrl: '<%= asset_path "shared/_coupon.html" %>',
+    templateUrl: '<%= asset_pack_path "shared/_coupon.html" %>',
     link ($scope, element, attributes) {
       // Whether code input is shown or not (ie. the link 'I have a coupon' is shown)
       $scope.code =
diff --git a/app/frontend/src/javascript/directives/fab_user_avatar.js.erb b/app/frontend/src/javascript/directives/fab_user_avatar.js.erb
index 4fdac5c1e..9adcff5a7 100644
--- a/app/frontend/src/javascript/directives/fab_user_avatar.js.erb
+++ b/app/frontend/src/javascript/directives/fab_user_avatar.js.erb
@@ -15,6 +15,6 @@ Application.Directives.directive('fabUserAvatar', [ function () {
       userAvatar: '=ngModel',
       avatarClass: '@'
     },
-    templateUrl: '<%= asset_path "shared/_user_avatar.html" %>'
+    templateUrl: '<%= asset_pack_path "shared/_user_avatar.html" %>'
   });
 }]);
diff --git a/app/frontend/src/javascript/directives/home/events.js.erb b/app/frontend/src/javascript/directives/home/events.js.erb
index aca43325a..2557efa62 100644
--- a/app/frontend/src/javascript/directives/home/events.js.erb
+++ b/app/frontend/src/javascript/directives/home/events.js.erb
@@ -2,7 +2,7 @@ Application.Directives.directive('events', [ 'Event',
   function (Event) {
     return ({
       restrict: 'E',
-      templateUrl: '<%= asset_path "home/events.html" %>',
+      templateUrl: '<%= asset_pack_path "home/events.html" %>',
       link ($scope, element, attributes) {
         // The closest upcoming events
         $scope.upcomingEvents = null;
diff --git a/app/frontend/src/javascript/directives/home/news.js.erb b/app/frontend/src/javascript/directives/home/news.js.erb
index 06b8f56d7..c72e291ab 100644
--- a/app/frontend/src/javascript/directives/home/news.js.erb
+++ b/app/frontend/src/javascript/directives/home/news.js.erb
@@ -2,7 +2,7 @@ Application.Directives.directive('news', [ 'Setting',
   function (Setting) {
     return ({
       restrict: 'E',
-      templateUrl: '<%= asset_path "home/news.html" %>',
+      templateUrl: '<%= asset_pack_path "home/news.html" %>',
       link ($scope, element, attributes) {
         // The admin blogpost
         $scope.homeBlogpost = null;
diff --git a/app/frontend/src/javascript/directives/home/projects.js.erb b/app/frontend/src/javascript/directives/home/projects.js.erb
index 1b7812dc1..4b5b4d066 100644
--- a/app/frontend/src/javascript/directives/home/projects.js.erb
+++ b/app/frontend/src/javascript/directives/home/projects.js.erb
@@ -2,7 +2,7 @@ Application.Directives.directive('projects', [ 'Project',
   function (Project) {
     return ({
       restrict: 'E',
-      templateUrl: '<%= asset_path "home/projects.html" %>',
+      templateUrl: '<%= asset_pack_path "home/projects.html" %>',
       link ($scope, element, attributes) {
         // The last projects published/documented on the platform
         $scope.lastProjects = null;
diff --git a/app/frontend/src/javascript/directives/home/twitter.js.erb b/app/frontend/src/javascript/directives/home/twitter.js.erb
index 914852e7b..b9ee48b0c 100644
--- a/app/frontend/src/javascript/directives/home/twitter.js.erb
+++ b/app/frontend/src/javascript/directives/home/twitter.js.erb
@@ -8,7 +8,7 @@ Application.Directives.directive('twitter', ['Setting',
   function (Setting) {
     return ({
       restrict: 'E',
-      templateUrl: '<%= asset_path "home/twitter.html" %>',
+      templateUrl: '<%= asset_pack_path "home/twitter.html" %>',
       link ($scope, element, attributes) {
         // Twitter username
         $scope.twitterName = null;
diff --git a/app/frontend/src/javascript/directives/members.js.erb b/app/frontend/src/javascript/directives/members.js.erb
index 24b195efd..c0e7ffafa 100644
--- a/app/frontend/src/javascript/directives/members.js.erb
+++ b/app/frontend/src/javascript/directives/members.js.erb
@@ -2,7 +2,7 @@ Application.Directives.directive('members', [ 'Member',
   function (Member) {
     return ({
       restrict: 'E',
-      templateUrl: '<%= asset_path "home/members.html" %>',
+      templateUrl: '<%= asset_pack_path "home/members.html" %>',
       link ($scope, element, attributes) {
         // The last registered members who confirmed their addresses
         $scope.lastMembers = null;
diff --git a/app/frontend/src/javascript/directives/selectMember.js.erb b/app/frontend/src/javascript/directives/selectMember.js.erb
index 760b2874c..86714c82b 100644
--- a/app/frontend/src/javascript/directives/selectMember.js.erb
+++ b/app/frontend/src/javascript/directives/selectMember.js.erb
@@ -11,7 +11,7 @@
 Application.Directives.directive('selectMember', [ 'Diacritics', 'Member', function (Diacritics, Member) {
   return ({
     restrict: 'E',
-    templateUrl: '<%= asset_path "shared/_member_select.html" %>',
+    templateUrl: '<%= asset_pack_path "shared/_member_select.html" %>',
     link (scope, element, attributes) {
       return scope.autoCompleteName = function (nameLookup) {
         if (!nameLookup) {
diff --git a/app/frontend/src/javascript/directives/settings/boolean-setting.js.erb b/app/frontend/src/javascript/directives/settings/boolean-setting.js.erb
index 942d9d8ab..80a50e26e 100644
--- a/app/frontend/src/javascript/directives/settings/boolean-setting.js.erb
+++ b/app/frontend/src/javascript/directives/settings/boolean-setting.js.erb
@@ -11,7 +11,7 @@ Application.Directives.directive('booleanSetting', ['Setting', 'growl', '_t',
         classes: '@',
         onBeforeSave: '='
       },
-      templateUrl: '<%= asset_path "admin/settings/boolean.html" %>',
+      templateUrl: '<%= asset_pack_path "admin/settings/boolean.html" %>',
       link ($scope, element, attributes) {
         // The setting
         $scope.setting = {
diff --git a/app/frontend/src/javascript/directives/settings/number-setting.js.erb b/app/frontend/src/javascript/directives/settings/number-setting.js.erb
index 0c5940bce..cb20dc34b 100644
--- a/app/frontend/src/javascript/directives/settings/number-setting.js.erb
+++ b/app/frontend/src/javascript/directives/settings/number-setting.js.erb
@@ -12,7 +12,7 @@ Application.Directives.directive('numberSetting', ['Setting', 'growl', '_t',
         min: '@',
         required: '<'
       },
-      templateUrl: '<%= asset_path "admin/settings/number.html" %>',
+      templateUrl: '<%= asset_pack_path "admin/settings/number.html" %>',
       link ($scope, element, attributes) {
         // The setting
         $scope.setting = {
diff --git a/app/frontend/src/javascript/directives/settings/select-multiple-setting.js.erb b/app/frontend/src/javascript/directives/settings/select-multiple-setting.js.erb
index b28b0a89f..0e2a67fd0 100644
--- a/app/frontend/src/javascript/directives/settings/select-multiple-setting.js.erb
+++ b/app/frontend/src/javascript/directives/settings/select-multiple-setting.js.erb
@@ -12,7 +12,7 @@ Application.Directives.directive('selectMultipleSetting', ['Setting', 'growl', '
         descriptionNew: '@',
         beforeAdd: '='
       },
-      templateUrl: '<%= asset_path "admin/settings/select-multiple.html" %>',
+      templateUrl: '<%= asset_pack_path "admin/settings/select-multiple.html" %>',
       link ($scope, element, attributes) {
         // The setting
         $scope.setting = {
diff --git a/app/frontend/src/javascript/directives/settings/select-setting.js.erb b/app/frontend/src/javascript/directives/settings/select-setting.js.erb
index 2c0d2ba91..4286116ab 100644
--- a/app/frontend/src/javascript/directives/settings/select-setting.js.erb
+++ b/app/frontend/src/javascript/directives/settings/select-setting.js.erb
@@ -14,7 +14,7 @@ Application.Directives.directive('selectSetting', ['Setting', 'growl', '_t',
         option4: '<',
         option5: '<'
       },
-      templateUrl: '<%= asset_path "admin/settings/select.html" %>',
+      templateUrl: '<%= asset_pack_path "admin/settings/select.html" %>',
       link ($scope, element, attributes) {
         // The setting
         $scope.setting = {
diff --git a/app/frontend/src/javascript/directives/settings/text-setting.js.erb b/app/frontend/src/javascript/directives/settings/text-setting.js.erb
index 2631863f9..b9f4d967e 100644
--- a/app/frontend/src/javascript/directives/settings/text-setting.js.erb
+++ b/app/frontend/src/javascript/directives/settings/text-setting.js.erb
@@ -15,7 +15,7 @@ Application.Directives.directive('textSetting', ['Setting', 'growl', '_t',
         minLength: '@',
         readOnly: '<'
       },
-      templateUrl: '<%= asset_path "admin/settings/text.html" %>',
+      templateUrl: '<%= asset_pack_path "admin/settings/text.html" %>',
       link ($scope, element, attributes) {
         // if type is not specified, use text as default
         if (typeof $scope.type === 'undefined') {
diff --git a/app/frontend/src/javascript/directives/socialLink.js.erb b/app/frontend/src/javascript/directives/socialLink.js.erb
index 3d656ef28..c2a7f26b5 100644
--- a/app/frontend/src/javascript/directives/socialLink.js.erb
+++ b/app/frontend/src/javascript/directives/socialLink.js.erb
@@ -16,7 +16,7 @@ Application.Directives.directive('socialLink', [ function () {
       network: '@?',
       user: '='
     },
-    templateUrl: '<%= asset_path "shared/_social_link.html" %>',
+    templateUrl: '<%= asset_pack_path "shared/_social_link.html" %>',
     link (scope, element, attributes) {
       if (scope.network === 'dailymotion') {
         scope.image = "<%= asset_pack_path('social/dailymotion.png') %>";
diff --git a/app/frontend/src/javascript/plugins.js.erb b/app/frontend/src/javascript/plugins.js.erb
index e69de29bb..479d2cfdc 100644
--- a/app/frontend/src/javascript/plugins.js.erb
+++ b/app/frontend/src/javascript/plugins.js.erb
@@ -0,0 +1,3 @@
+<%
+PluginRegistry.javascripts.each { |js| require_asset(js) }
+%>
diff --git a/app/frontend/src/javascript/router.js.erb b/app/frontend/src/javascript/router.js.erb
index fe3e7aa14..1a7eddc70 100644
--- a/app/frontend/src/javascript/router.js.erb
+++ b/app/frontend/src/javascript/router.js.erb
@@ -21,14 +21,14 @@ angular.module('application.router', ['ui.router'])
         abstract: true,
         views: {
           'header': {
-            templateUrl: '<%= asset_path "shared/header.html" %>'
+            templateUrl: '<%= asset_pack_path "shared/header.html" %>'
           },
           'leftnav': {
-            templateUrl: '<%= asset_path "shared/leftnav.html" %>',
+            templateUrl: '<%= asset_pack_path "shared/leftnav.html" %>',
             controller: 'MainNavController'
           },
           'cookies': {
-            templateUrl: '<%= asset_path "shared/cookies.html" %>',
+            templateUrl: '<%= asset_pack_path "shared/cookies.html" %>',
             controller: 'CookiesController'
           },
           'main': {}
@@ -92,7 +92,7 @@ angular.module('application.router', ['ui.router'])
         url: '/about',
         views: {
           'content@': {
-            templateUrl: '<%= asset_path "shared/about.html" %>',
+            templateUrl: '<%= asset_pack_path "shared/about.html" %>',
             controller: 'AboutController'
           }
         }
@@ -101,7 +101,7 @@ angular.module('application.router', ['ui.router'])
         url: '/?reset_password_token',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "home.html" %>',
+            templateUrl: '<%= asset_pack_path "home.html" %>',
             controller: 'HomeController'
           }
         },
@@ -113,7 +113,7 @@ angular.module('application.router', ['ui.router'])
         url: '/privacy-policy',
         views: {
           'content@': {
-            templateUrl: '<%= asset_path "shared/privacy.html" %>',
+            templateUrl: '<%= asset_pack_path "shared/privacy.html" %>',
             controller: 'PrivacyController'
           }
         }
@@ -124,7 +124,7 @@ angular.module('application.router', ['ui.router'])
         url: '/profile_completion',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "profile/complete.html"%>',
+            templateUrl: '<%= asset_pack_path "profile/complete.html"%>',
             controller: 'CompleteProfileController'
           }
         },
@@ -150,7 +150,7 @@ angular.module('application.router', ['ui.router'])
         url: '/profile',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "dashboard/profile.html" %>',
+            templateUrl: '<%= asset_pack_path "dashboard/profile.html" %>',
             controller: 'DashboardController'
           }
         }
@@ -159,7 +159,7 @@ angular.module('application.router', ['ui.router'])
         url: '/settings',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "dashboard/settings.html" %>',
+            templateUrl: '<%= asset_pack_path "dashboard/settings.html" %>',
             controller: 'EditProfileController'
           }
         },
@@ -173,7 +173,7 @@ angular.module('application.router', ['ui.router'])
         url: '/projects',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "dashboard/projects.html" %>',
+            templateUrl: '<%= asset_pack_path "dashboard/projects.html" %>',
             controller: 'DashboardController'
           }
         }
@@ -182,7 +182,7 @@ angular.module('application.router', ['ui.router'])
         url: '/trainings',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "dashboard/trainings.html" %>',
+            templateUrl: '<%= asset_pack_path "dashboard/trainings.html" %>',
             controller: 'DashboardController'
           }
         }
@@ -191,7 +191,7 @@ angular.module('application.router', ['ui.router'])
         url: '/events',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "dashboard/events.html" %>',
+            templateUrl: '<%= asset_pack_path "dashboard/events.html" %>',
             controller: 'DashboardController'
           }
         }
@@ -200,7 +200,7 @@ angular.module('application.router', ['ui.router'])
         url: '/invoices',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "dashboard/invoices.html" %>',
+            templateUrl: '<%= asset_pack_path "dashboard/invoices.html" %>',
             controller: 'DashboardController'
           }
         }
@@ -210,7 +210,7 @@ angular.module('application.router', ['ui.router'])
         abstract: !Fablab.walletModule,
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "dashboard/wallet.html" %>',
+            templateUrl: '<%= asset_pack_path "dashboard/wallet.html" %>',
             controller: 'WalletController'
           }
         },
@@ -225,7 +225,7 @@ angular.module('application.router', ['ui.router'])
         url: '/members/:id',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "members/show.html" %>',
+            templateUrl: '<%= asset_pack_path "members/show.html" %>',
             controller: 'ShowProfileController'
           }
         },
@@ -237,7 +237,7 @@ angular.module('application.router', ['ui.router'])
         url: '/members',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "members/index.html" %>',
+            templateUrl: '<%= asset_pack_path "members/index.html" %>',
             controller: 'MembersController'
           }
         },
@@ -251,7 +251,7 @@ angular.module('application.router', ['ui.router'])
         url: '/projects?q&page&theme_id&component_id&machine_id&from&whole_network',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "projects/index.html.erb" %>',
+            templateUrl: '<%= asset_pack_path "projects/index.html.erb" %>',
             controller: 'ProjectsController'
           }
         },
@@ -267,7 +267,7 @@ angular.module('application.router', ['ui.router'])
         url: '/projects/new',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "projects/new.html" %>',
+            templateUrl: '<%= asset_pack_path "projects/new.html" %>',
             controller: 'NewProjectController'
           }
         },
@@ -279,7 +279,7 @@ angular.module('application.router', ['ui.router'])
         url: '/projects/:id',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "projects/show.html" %>',
+            templateUrl: '<%= asset_pack_path "projects/show.html" %>',
             controller: 'ShowProjectController'
           }
         },
@@ -292,7 +292,7 @@ angular.module('application.router', ['ui.router'])
         url: '/projects/:id/edit',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "projects/edit.html" %>',
+            templateUrl: '<%= asset_pack_path "projects/edit.html" %>',
             controller: 'EditProjectController'
           }
         },
@@ -307,7 +307,7 @@ angular.module('application.router', ['ui.router'])
         url: '/machines',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "machines/index.html.erb" %>',
+            templateUrl: '<%= asset_pack_path "machines/index.html.erb" %>',
             controller: 'MachinesController'
           }
         },
@@ -320,7 +320,7 @@ angular.module('application.router', ['ui.router'])
         url: '/machines/new',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "machines/new.html" %>',
+            templateUrl: '<%= asset_pack_path "machines/new.html" %>',
             controller: 'NewMachineController'
           }
         }
@@ -329,7 +329,7 @@ angular.module('application.router', ['ui.router'])
         url: '/machines/:id',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "machines/show.html" %>',
+            templateUrl: '<%= asset_pack_path "machines/show.html" %>',
             controller: 'ShowMachineController'
           }
         },
@@ -341,7 +341,7 @@ angular.module('application.router', ['ui.router'])
         url: '/machines/:id/reserve',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "machines/reserve.html" %>',
+            templateUrl: '<%= asset_pack_path "machines/reserve.html" %>',
             controller: 'ReserveMachineController'
           }
         },
@@ -362,7 +362,7 @@ angular.module('application.router', ['ui.router'])
         url: '/machines/:id/edit',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "machines/edit.html" %>',
+            templateUrl: '<%= asset_pack_path "machines/edit.html" %>',
             controller: 'EditMachineController'
           }
         },
@@ -377,7 +377,7 @@ angular.module('application.router', ['ui.router'])
         abstract: !Fablab.spacesModule,
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "spaces/index.html" %>',
+            templateUrl: '<%= asset_pack_path "spaces/index.html" %>',
             controller: 'SpacesController'
           }
         },
@@ -391,7 +391,7 @@ angular.module('application.router', ['ui.router'])
         abstract: !Fablab.spacesModule,
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "spaces/new.html" %>',
+            templateUrl: '<%= asset_pack_path "spaces/new.html" %>',
             controller: 'NewSpaceController'
           }
         }
@@ -401,7 +401,7 @@ angular.module('application.router', ['ui.router'])
         abstract: !Fablab.spacesModule,
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "spaces/show.html" %>',
+            templateUrl: '<%= asset_pack_path "spaces/show.html" %>',
             controller: 'ShowSpaceController'
           }
         },
@@ -414,7 +414,7 @@ angular.module('application.router', ['ui.router'])
         abstract: !Fablab.spacesModule,
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "spaces/edit.html" %>',
+            templateUrl: '<%= asset_pack_path "spaces/edit.html" %>',
             controller: 'EditSpaceController'
           }
         },
@@ -427,7 +427,7 @@ angular.module('application.router', ['ui.router'])
         abstract: !Fablab.spacesModule,
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "spaces/reserve.html" %>',
+            templateUrl: '<%= asset_pack_path "spaces/reserve.html" %>',
             controller: 'ReserveSpaceController'
           }
         },
@@ -450,7 +450,7 @@ angular.module('application.router', ['ui.router'])
         url: '/trainings',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "trainings/index.html.erb" %>',
+            templateUrl: '<%= asset_pack_path "trainings/index.html.erb" %>',
             controller: 'TrainingsController'
           }
         },
@@ -462,7 +462,7 @@ angular.module('application.router', ['ui.router'])
         url: '/trainings/:id',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "trainings/show.html" %>',
+            templateUrl: '<%= asset_pack_path "trainings/show.html" %>',
             controller: 'ShowTrainingController'
           }
         },
@@ -474,7 +474,7 @@ angular.module('application.router', ['ui.router'])
         url: '/trainings/:id/reserve',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "trainings/reserve.html" %>',
+            templateUrl: '<%= asset_pack_path "trainings/reserve.html" %>',
             controller: 'ReserveTrainingController'
           }
         },
@@ -499,7 +499,7 @@ angular.module('application.router', ['ui.router'])
         url: '/notifications',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "notifications/index.html.erb" %>',
+            templateUrl: '<%= asset_pack_path "notifications/index.html.erb" %>',
             controller: 'NotificationsController'
           }
         }
@@ -511,7 +511,7 @@ angular.module('application.router', ['ui.router'])
         abstract: !Fablab.plansModule,
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "plans/index.html.erb" %>',
+            templateUrl: '<%= asset_pack_path "plans/index.html.erb" %>',
             controller: 'PlansIndexController'
           }
         },
@@ -528,7 +528,7 @@ angular.module('application.router', ['ui.router'])
         url: '/events',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "events/index.html.erb" %>',
+            templateUrl: '<%= asset_pack_path "events/index.html.erb" %>',
             controller: 'EventsController'
           }
         },
@@ -543,7 +543,7 @@ angular.module('application.router', ['ui.router'])
         url: '/events/:id',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "events/show.html" %>',
+            templateUrl: '<%= asset_pack_path "events/show.html" %>',
             controller: 'ShowEventController'
           }
         },
@@ -559,7 +559,7 @@ angular.module('application.router', ['ui.router'])
         url: '/calendar',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "calendar/calendar.html" %>',
+            templateUrl: '<%= asset_pack_path "calendar/calendar.html" %>',
             controller: 'CalendarController'
           }
         },
@@ -579,7 +579,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/calendar',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/calendar/calendar.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/calendar/calendar.html" %>',
             controller: 'AdminCalendarController'
           }
         },
@@ -596,7 +596,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/calendar/icalendar',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/calendar/icalendar.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/calendar/icalendar.html" %>',
             controller: 'AdminICalendarController'
           }
         },
@@ -610,7 +610,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/projects',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/projects/index.html.erb" %>',
+            templateUrl: '<%= asset_pack_path "admin/projects/index.html.erb" %>',
             controller: 'AdminProjectsController'
           }
         },
@@ -628,7 +628,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/abuses',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/abuses/index.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/abuses/index.html" %>',
             controller: 'AbusesController'
           }
         },
@@ -642,7 +642,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/trainings',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/trainings/index.html.erb" %>',
+            templateUrl: '<%= asset_pack_path "admin/trainings/index.html.erb" %>',
             controller: 'TrainingsAdminController'
           }
         },
@@ -656,7 +656,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/trainings/new',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/trainings/new.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/trainings/new.html" %>',
             controller: 'NewTrainingController'
           }
         },
@@ -668,7 +668,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/trainings/:id/edit',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/trainings/edit.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/trainings/edit.html" %>',
             controller: 'EditTrainingController'
           }
         },
@@ -682,7 +682,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/events',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/events/index.html.erb" %>',
+            templateUrl: '<%= asset_pack_path "admin/events/index.html.erb" %>',
             controller: 'AdminEventsController'
           }
         },
@@ -699,7 +699,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/events/new',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "events/new.html" %>',
+            templateUrl: '<%= asset_pack_path "events/new.html" %>',
             controller: 'NewEventController'
           }
         },
@@ -714,7 +714,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/events/:id/edit',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "events/edit.html" %>',
+            templateUrl: '<%= asset_pack_path "events/edit.html" %>',
             controller: 'EditEventController'
           }
         },
@@ -730,7 +730,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/events/:id/reservations',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/events/reservations.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/events/reservations.html" %>',
             controller: 'ShowEventReservationsController'
           }
         },
@@ -745,7 +745,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/pricing',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/pricing/index.html.erb" %>',
+            templateUrl: '<%= asset_pack_path "admin/pricing/index.html.erb" %>',
             controller: 'EditPricingController'
           }
         },
@@ -779,7 +779,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/plans/new',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/plans/new.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/plans/new.html" %>',
             controller: 'NewPlanController'
           }
         }
@@ -788,7 +788,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/plans/:id/edit',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/plans/edit.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/plans/edit.html" %>',
             controller: 'EditPlanController'
           }
         },
@@ -805,7 +805,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/coupons/new',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/coupons/new.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/coupons/new.html" %>',
             controller: 'NewCouponController'
           }
         }
@@ -814,7 +814,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/coupons/:id/edit',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/coupons/edit.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/coupons/edit.html" %>',
             controller: 'EditCouponController'
           }
         },
@@ -828,7 +828,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/invoices',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/invoices/index.html.erb" %>',
+            templateUrl: '<%= asset_pack_path "admin/invoices/index.html.erb" %>',
             controller: 'InvoicesController'
           }
         },
@@ -860,19 +860,19 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/members',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/members/index.html.erb" %>',
+            templateUrl: '<%= asset_pack_path "admin/members/index.html.erb" %>',
             controller: 'AdminMembersController'
           },
           'groups@app.admin.members': {
-            templateUrl: '<%= asset_path "admin/groups/index.html.erb" %>',
+            templateUrl: '<%= asset_pack_path "admin/groups/index.html.erb" %>',
             controller: 'GroupsController'
           },
           'tags@app.admin.members': {
-            templateUrl: '<%= asset_path "admin/tags/index.html.erb" %>',
+            templateUrl: '<%= asset_pack_path "admin/tags/index.html.erb" %>',
             controller: 'TagsController'
           },
           'authentification@app.admin.members': {
-            templateUrl: '<%= asset_path "admin/authentications/index.html.erb" %>',
+            templateUrl: '<%= asset_pack_path "admin/authentications/index.html.erb" %>',
             controller: 'AuthentificationController'
           }
         },
@@ -891,7 +891,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/members/new',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/members/new.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/members/new.html" %>',
             controller: 'NewMemberController'
           }
         },
@@ -903,7 +903,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/members/import',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/members/import.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/members/import.html" %>',
             controller: 'ImportMembersController'
           }
         },
@@ -915,7 +915,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/members/import/:id/results',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/members/import_result.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/members/import_result.html" %>',
             controller: 'ImportMembersResultController'
           }
         },
@@ -927,7 +927,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/members/:id/edit',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/members/edit.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/members/edit.html" %>',
             controller: 'EditMemberController'
           }
         },
@@ -944,7 +944,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/admins/new',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/admins/new.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/admins/new.html" %>',
             controller: 'NewAdminController'
           }
         },
@@ -956,7 +956,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/managers/new',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/managers/new.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/managers/new.html" %>',
             controller: 'NewManagerController'
           }
         },
@@ -971,7 +971,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/authentications/new',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/authentications/new.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/authentications/new.html" %>',
             controller: 'NewAuthenticationController'
           }
         },
@@ -984,7 +984,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/authentications/:id/edit',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/authentications/edit.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/authentications/edit.html" %>',
             controller: 'EditAuthenticationController'
           }
         },
@@ -1000,7 +1000,7 @@ angular.module('application.router', ['ui.router'])
         abstract: !Fablab.statisticsModule,
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/statistics/index.html.erb" %>',
+            templateUrl: '<%= asset_pack_path "admin/statistics/index.html.erb" %>',
             controller: 'StatisticsController'
           }
         },
@@ -1015,7 +1015,7 @@ angular.module('application.router', ['ui.router'])
         abstract: !Fablab.statisticsModule,
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/statistics/graphs.html" %>',
+            templateUrl: '<%= asset_pack_path "admin/statistics/graphs.html" %>',
             controller: 'GraphsController'
           }
         }
@@ -1026,7 +1026,7 @@ angular.module('application.router', ['ui.router'])
         url: '/admin/settings',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/settings/index.html.erb" %>',
+            templateUrl: '<%= asset_pack_path "admin/settings/index.html.erb" %>',
             controller: 'SettingsController'
           }
         },
@@ -1058,7 +1058,7 @@ angular.module('application.router', ['ui.router'])
         url: '/open_api_clients',
         views: {
           'main@': {
-            templateUrl: '<%= asset_path "admin/open_api_clients/index.html.erb" %>',
+            templateUrl: '<%= asset_pack_path "admin/open_api_clients/index.html.erb" %>',
             controller: 'OpenAPIClientsController'
           }
         },
diff --git a/app/frontend/src/javascript/services/dialogs.js.erb b/app/frontend/src/javascript/services/dialogs.js.erb
index a35eb5a85..a0669951f 100644
--- a/app/frontend/src/javascript/services/dialogs.js.erb
+++ b/app/frontend/src/javascript/services/dialogs.js.erb
@@ -4,7 +4,7 @@ Application.Services.factory('dialogs', ['$uibModal', function ($uibModal) {
   return ({
     confirm (options, success, error) {
       const defaultOpts = {
-        templateUrl: '<%= asset_path "shared/confirm_modal.html" %>',
+        templateUrl: '<%= asset_pack_path "shared/confirm_modal.html" %>',
         size: 'sm',
         resolve: {
           object () {
diff --git a/app/frontend/src/javascript/services/help.js.erb b/app/frontend/src/javascript/services/help.js.erb
index 15be24121..3013a2178 100644
--- a/app/frontend/src/javascript/services/help.js.erb
+++ b/app/frontend/src/javascript/services/help.js.erb
@@ -34,7 +34,7 @@ Application.Services.factory('Help', ['$rootScope', '$uibModal', '$state', 'Auth
 
       $uibModal.open({
         animation: true,
-        templateUrl: '<%= asset_path "shared/help_modal.html" %>',
+        templateUrl: '<%= asset_pack_path "shared/help_modal.html" %>',
         resolve: {
           tourName: function () { return tourName; }
         },
diff --git a/app/frontend/src/stylesheets/application.scss.erb b/app/frontend/src/stylesheets/application.scss.erb
index 96b307415..20c094b16 100644
--- a/app/frontend/src/stylesheets/application.scss.erb
+++ b/app/frontend/src/stylesheets/application.scss.erb
@@ -1,22 +1,3 @@
-/*
- *= require_self
- *= require ui-select/dist/select
- *= require fullcalendar/dist/fullcalendar
- *= require jasny-bootstrap/dist/css/jasny-bootstrap
- *= require angular-growl-v2/build/angular-growl
- *= require angular-xeditable/dist/css/xeditable
- *= require angular-loading-bar/build/loading-bar
- *= require nvd3/build/nv.d3
- *= require font-awesome
- *= require medium-editor/dist/css/medium-editor
- *= require medium-editor/dist/css/themes/default
- *= require bootstrap-switch/dist/css/bootstrap3/bootstrap-switch
- *= require summernote/dist/summernote
- *= require jquery-minicolors/jquery.minicolors.css
- *= require angular-aside/dist/css/angular-aside
- *= require codemirror/lib/codemirror
- */
-
 @import "app.functions";
 @import "bootstrap-compass";
 @import "bootstrap-sprockets";
diff --git a/app/frontend/templates/admin/admins/new.html.erb b/app/frontend/templates/admin/admins/new.html.erb
index 4164626ab..1116ea647 100644
--- a/app/frontend/templates/admin/admins/new.html.erb
+++ b/app/frontend/templates/admin/admins/new.html.erb
@@ -20,7 +20,7 @@
     <form role="form" name="adminForm" class="form-horizontal" novalidate>
       <section class="panel panel-default bg-light m-lg">
         <div class="panel-body m-r">
-          <ng-include src="'<%= asset_path "shared/_admin_form.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "shared/_admin_form.html" %>'"></ng-include>
         </div>
 
 
diff --git a/app/frontend/templates/admin/authentications/_oauth2.html.erb b/app/frontend/templates/admin/authentications/_oauth2.html.erb
index af830d6a8..9a29fb5ea 100644
--- a/app/frontend/templates/admin/authentications/_oauth2.html.erb
+++ b/app/frontend/templates/admin/authentications/_oauth2.html.erb
@@ -90,4 +90,4 @@
     </div>
 </div>
 
-<ng-include src="'<%= asset_path "admin/authentications/_oauth2_mapping.html" %>'"></ng-include>
+<ng-include src="'<%= asset_pack_path "admin/authentications/_oauth2_mapping.html" %>'"></ng-include>
diff --git a/app/frontend/templates/admin/authentications/edit.html.erb b/app/frontend/templates/admin/authentications/edit.html.erb
index b57d6a020..da04b7402 100644
--- a/app/frontend/templates/admin/authentications/edit.html.erb
+++ b/app/frontend/templates/admin/authentications/edit.html.erb
@@ -35,8 +35,8 @@
 
                 <section class="panel panel-default bg-light m-lg">
                     <div class="panel-body m-r">
-                        <ng-include src="'<%= asset_path "admin/authentications/_form.html" %>'"></ng-include>
-                        <ng-include src="'<%= asset_path "admin/authentications/_oauth2.html"%>'" ng-if="provider.providable_type == 'OAuth2Provider'"></ng-include>
+                        <ng-include src="'<%= asset_pack_path "admin/authentications/_form.html" %>'"></ng-include>
+                        <ng-include src="'<%= asset_pack_path "admin/authentications/_oauth2.html"%>'" ng-if="provider.providable_type == 'OAuth2Provider'"></ng-include>
                     </div>   <!-- ./panel-body  -->
 
 
diff --git a/app/frontend/templates/admin/authentications/new.html.erb b/app/frontend/templates/admin/authentications/new.html.erb
index 635474d24..59e16344e 100644
--- a/app/frontend/templates/admin/authentications/new.html.erb
+++ b/app/frontend/templates/admin/authentications/new.html.erb
@@ -36,8 +36,8 @@
                 <section class="panel panel-default bg-light m-lg">
                     <div class="panel-body m-r">
 
-                        <ng-include src="'<%= asset_path "admin/authentications/_form.html" %>'"></ng-include>
-                        <ng-include src="'<%= asset_path "admin/authentications/_oauth2.html" %>'" ng-if="provider.providable_type == 'OAuth2Provider'"></ng-include>
+                        <ng-include src="'<%= asset_pack_path "admin/authentications/_form.html" %>'"></ng-include>
+                        <ng-include src="'<%= asset_pack_path "admin/authentications/_oauth2.html" %>'" ng-if="provider.providable_type == 'OAuth2Provider'"></ng-include>
                     </div>   <!-- ./panel-body  -->
 
 
diff --git a/app/frontend/templates/admin/calendar/calendar.html.erb b/app/frontend/templates/admin/calendar/calendar.html.erb
index 0d9b85507..e88defd30 100644
--- a/app/frontend/templates/admin/calendar/calendar.html.erb
+++ b/app/frontend/templates/admin/calendar/calendar.html.erb
@@ -26,7 +26,7 @@
 <section class="row no-gutter admin-calendar"
          ui-tour="calendar"
          ui-tour-backdrop="true"
-         ui-tour-template-url="'<%= asset_path "shared/tour-step-template.html" %>'"
+         ui-tour-template-url="'<%= asset_pack_path "shared/tour-step-template.html" %>'"
          ui-tour-use-hotkeys="true"
          ui-tour-scroll-parent-id="content-main"
          post-render="setupCalendarTour">
diff --git a/app/frontend/templates/admin/coupons/edit.html.erb b/app/frontend/templates/admin/coupons/edit.html.erb
index 2450ceb78..fb039b724 100644
--- a/app/frontend/templates/admin/coupons/edit.html.erb
+++ b/app/frontend/templates/admin/coupons/edit.html.erb
@@ -28,7 +28,7 @@
     <div id="couponForm">
       <form name="couponForm" novalidate="novalidate" class="col-lg-7 col-lg-offset-2 m-t-lg form-group">
 
-        <ng-include src="'<%= asset_path "admin/coupons/_form.html" %>'"></ng-include>
+        <ng-include src="'<%= asset_pack_path "admin/coupons/_form.html" %>'"></ng-include>
 
         <div class="panel-footer no-padder">
           <input type="button" value="{{ 'app.shared.buttons.confirm_changes' | translate }}" class="r-b btn-valid btn btn-warning btn-block p-lg btn-lg text-u-c" ng-disabled="couponForm.$invalid" ng-click="updateCoupon()"/>
diff --git a/app/frontend/templates/admin/coupons/new.html.erb b/app/frontend/templates/admin/coupons/new.html.erb
index 234fa3485..97bdc0fc4 100644
--- a/app/frontend/templates/admin/coupons/new.html.erb
+++ b/app/frontend/templates/admin/coupons/new.html.erb
@@ -20,7 +20,7 @@
     <div id="couponForm">
       <form name="couponForm" novalidate="novalidate" class="col-lg-10 col-lg-offset-2 m-t-lg form-group">
 
-        <ng-include src="'<%= asset_path "admin/coupons/_form.html" %>'"></ng-include>
+        <ng-include src="'<%= asset_pack_path "admin/coupons/_form.html" %>'"></ng-include>
 
         <div class="panel-footer no-padder">
           <input type="button" value="{{ 'app.shared.buttons.save' | translate }}" class="r-b btn-valid btn btn-warning btn-block p-lg btn-lg text-u-c" ng-disabled="couponForm.$invalid" ng-click="saveCoupon()"/>
diff --git a/app/frontend/templates/admin/events/index.html.erb b/app/frontend/templates/admin/events/index.html.erb
index 140bfd854..53c25e3b7 100644
--- a/app/frontend/templates/admin/events/index.html.erb
+++ b/app/frontend/templates/admin/events/index.html.erb
@@ -21,7 +21,7 @@
   <section class="m-lg events-management"
            ui-tour="events"
            ui-tour-backdrop="true"
-           ui-tour-template-url="'<%= asset_path "shared/tour-step-template.html" %>'"
+           ui-tour-template-url="'<%= asset_pack_path "shared/tour-step-template.html" %>'"
            ui-tour-use-hotkeys="true"
            ui-tour-scroll-parent-id="content-main"
            post-render="setupEventsTour">
@@ -29,20 +29,20 @@
       <div class="col-md-12" ng-if="isAuthorized('admin')">
         <uib-tabset justified="true" active="tabs.active">
           <uib-tab heading="{{ 'app.admin.events.events_monitoring' | translate }}" index="0">
-            <ng-include src="'<%= asset_path "admin/events/monitoring.html" %>'"></ng-include>
+            <ng-include src="'<%= asset_pack_path "admin/events/monitoring.html" %>'"></ng-include>
           </uib-tab>
 
           <uib-tab heading="{{ 'app.admin.events.manage_filters' | translate }}" index="1">
-            <ng-include src="'<%= asset_path "admin/events/filters.html" %>'"></ng-include>
+            <ng-include src="'<%= asset_pack_path "admin/events/filters.html" %>'"></ng-include>
           </uib-tab>
 
           <uib-tab heading="{{ 'app.admin.events.manage_prices_categories' | translate }}" index="2" class="prices-tab">
-            <ng-include src="'<%= asset_path "admin/events/prices.html" %>'"></ng-include>
+            <ng-include src="'<%= asset_pack_path "admin/events/prices.html" %>'"></ng-include>
           </uib-tab>
         </uib-tabset>
       </div>
       <div class="col-md-12" ng-if="isAuthorized('manager')">
-        <ng-include src="'<%= asset_path "admin/events/monitoring.html" %>'"></ng-include>
+        <ng-include src="'<%= asset_pack_path "admin/events/monitoring.html" %>'"></ng-include>
       </div>
     </div>
   </section>
diff --git a/app/frontend/templates/admin/invoices/closePeriodModal.html.erb b/app/frontend/templates/admin/invoices/closePeriodModal.html.erb
index 7c909bd2c..590c8d772 100644
--- a/app/frontend/templates/admin/invoices/closePeriodModal.html.erb
+++ b/app/frontend/templates/admin/invoices/closePeriodModal.html.erb
@@ -65,7 +65,7 @@
           <td>{{period.start_at | amDateFormat:'L'}}</td>
           <td>{{period.end_at | amDateFormat:'L'}}</td>
           <td class="actions">
-            <span class="show-more" uib-popover-template="'<%= asset_path 'admin/invoices/_period.html' %>'"><i class="fa fa-info-circle"></i></span>
+            <span class="show-more" uib-popover-template="'<%= asset_pack_path 'admin/invoices/_period.html' %>'"><i class="fa fa-info-circle"></i></span>
             <span class="download-archive" ng-click="downloadArchive(period)" ng-show="period.archive_ready"><i class="fa fa-archive"></i></span>
             <span class="no-pointer" ng-hide="period.archive_ready"><i class="fa fa-spinner fa-pulse"></i></span>
           </td>
diff --git a/app/frontend/templates/admin/invoices/index.html.erb b/app/frontend/templates/admin/invoices/index.html.erb
index d1da8db7c..b869800c7 100644
--- a/app/frontend/templates/admin/invoices/index.html.erb
+++ b/app/frontend/templates/admin/invoices/index.html.erb
@@ -23,7 +23,7 @@
 <section class="m-lg invoices-management"
          ui-tour="invoices"
          ui-tour-backdrop="true"
-         ui-tour-template-url="'<%= asset_path "shared/tour-step-template.html" %>'"
+         ui-tour-template-url="'<%= asset_pack_path "shared/tour-step-template.html" %>'"
          ui-tour-use-hotkeys="true"
          ui-tour-scroll-parent-id="content-main"
          post-render="setupInvoicesTour">
@@ -31,25 +31,25 @@
     <div class="col-md-12" ng-if="isAuthorized('admin')">
       <uib-tabset justified="true" active="tabs.active">
         <uib-tab heading="{{ 'app.admin.invoices.invoices_list' | translate }}" ng-show="modules.invoicing" index="0">
-          <ng-include src="'<%= asset_path "admin/invoices/list.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/invoices/list.html" %>'"></ng-include>
 	      </uib-tab>
 
         <uib-tab heading="{{ 'app.admin.invoices.invoicing_settings' | translate }}" index="1" class="invoices-settings">
-          <ng-include src="'<%= asset_path "admin/invoices/settings.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/invoices/settings.html" %>'"></ng-include>
         </uib-tab>
 
         <uib-tab heading="{{ 'app.admin.invoices.accounting_codes' | translate }}" index="2" class="accounting-codes-tab">
-          <ng-include src="'<%= asset_path "admin/invoices/codes.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/invoices/codes.html" %>'"></ng-include>
         </uib-tab>
 
         <uib-tab heading="{{ 'app.admin.invoices.payment.payment_settings' | translate }}" index="3" class="payment-settings">
-          <ng-include src="'<%= asset_path "admin/invoices/payment.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/invoices/payment.html" %>'"></ng-include>
         </uib-tab>
 	    </uib-tabset>
 	  </div>
 
     <div class="col-md-12" ng-if="isAuthorized('manager')">
-      <ng-include src="'<%= asset_path "admin/invoices/list.html" %>'"></ng-include>
+      <ng-include src="'<%= asset_pack_path "admin/invoices/list.html" %>'"></ng-include>
     </div>
   </div>
 </section>
diff --git a/app/frontend/templates/admin/managers/new.html.erb b/app/frontend/templates/admin/managers/new.html.erb
index ddcb029e9..553453cfc 100644
--- a/app/frontend/templates/admin/managers/new.html.erb
+++ b/app/frontend/templates/admin/managers/new.html.erb
@@ -20,7 +20,7 @@
     <form role="form" name="managerForm" class="form-horizontal" novalidate>
       <section class="panel panel-default bg-light m-lg">
         <div class="panel-body m-r">
-          <ng-include src="'<%= asset_path "shared/_manager_form.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "shared/_manager_form.html" %>'"></ng-include>
         </div>
 
 
diff --git a/app/frontend/templates/admin/members/edit.html.erb b/app/frontend/templates/admin/members/edit.html.erb
index 16eef7b58..e37e4a813 100644
--- a/app/frontend/templates/admin/members/edit.html.erb
+++ b/app/frontend/templates/admin/members/edit.html.erb
@@ -46,9 +46,9 @@
 
             <section class="panel panel-default bg-light m-lg">
               <div class="panel-body m-r">
-                <ng-include src="'<%= asset_path "shared/_member_form.html" %>'"></ng-include>
+                <ng-include src="'<%= asset_pack_path "shared/_member_form.html" %>'"></ng-include>
 
-                <ng-include src="'<%= asset_path "admin/members/_form.html" %>'"></ng-include>
+                <ng-include src="'<%= asset_pack_path "admin/members/_form.html" %>'"></ng-include>
 
               </div>   <!-- ./panel-body  -->
 
@@ -231,7 +231,7 @@
 
         <uib-tab heading="{{ 'app.admin.members_edit.wallet' | translate }}" ng-show="modules.wallet">
           <div class="col-md-12 m m-t-lg">
-            <ng-include src="'<%= asset_path "wallet/show.html" %>'"></ng-include>
+            <ng-include src="'<%= asset_pack_path "wallet/show.html" %>'"></ng-include>
 
             <div class="clearfix"></div>
             <div class="col-sm-4 text-center" ng-hide="user.id === currentUser.id">
@@ -244,7 +244,7 @@
           </div>
 
           <div class="col-md-12 m m-t-lg">
-            <ng-include src="'<%= asset_path "wallet/transactions.html" %>'"></ng-include>
+            <ng-include src="'<%= asset_pack_path "wallet/transactions.html" %>'"></ng-include>
           </div>
         </uib-tab>
       </uib-tabset>
diff --git a/app/frontend/templates/admin/members/index.html.erb b/app/frontend/templates/admin/members/index.html.erb
index 753088ef1..bbad0b973 100644
--- a/app/frontend/templates/admin/members/index.html.erb
+++ b/app/frontend/templates/admin/members/index.html.erb
@@ -24,7 +24,7 @@
 <section class="m-lg members-management"
          ui-tour="members"
          ui-tour-backdrop="true"
-         ui-tour-template-url="'<%= asset_path "shared/tour-step-template.html" %>'"
+         ui-tour-template-url="'<%= asset_pack_path "shared/tour-step-template.html" %>'"
          ui-tour-use-hotkeys="true"
          ui-tour-scroll-parent-id="content-main"
          post-render="setupMembersTour">
@@ -33,7 +33,7 @@
       <uib-tabset justified="true" active="tabs.active" ng-if="isAuthorized('admin')">
 
         <uib-tab heading="{{ 'app.admin.members.users' | translate }}" index="0">
-          <ng-include src="'<%= asset_path "admin/members/users.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/members/users.html" %>'"></ng-include>
         </uib-tab>
 
         <uib-tab heading="{{ 'app.admin.members.groups' | translate }}" class="groups-tab" index="1">
@@ -50,7 +50,7 @@
       </uib-tabset>
 
       <div ng-if="isAuthorized('manager')">
-        <ng-include src="'<%= asset_path "admin/members/users.html" %>'"></ng-include>
+        <ng-include src="'<%= asset_pack_path "admin/members/users.html" %>'"></ng-include>
       </div>
     </div>
   </div>
diff --git a/app/frontend/templates/admin/members/new.html.erb b/app/frontend/templates/admin/members/new.html.erb
index 4c01fae74..32419fc1a 100644
--- a/app/frontend/templates/admin/members/new.html.erb
+++ b/app/frontend/templates/admin/members/new.html.erb
@@ -50,9 +50,9 @@
               </div>
             </div>
 
-            <ng-include src="'<%= asset_path "shared/_member_form.html" %>'"></ng-include>
+            <ng-include src="'<%= asset_pack_path "shared/_member_form.html" %>'"></ng-include>
 
-            <ng-include src="'<%= asset_path "admin/members/_form.html" %>'"></ng-include>
+            <ng-include src="'<%= asset_pack_path "admin/members/_form.html" %>'"></ng-include>
           </div>   <!-- ./panel-body  -->
 
 
diff --git a/app/frontend/templates/admin/members/users.html.erb b/app/frontend/templates/admin/members/users.html.erb
index 7e5d45f9e..d42c69dcd 100644
--- a/app/frontend/templates/admin/members/users.html.erb
+++ b/app/frontend/templates/admin/members/users.html.erb
@@ -1,19 +1,19 @@
 <uib-tabset justified="true" active="tabs.sub" class="m-t">
 
     <uib-tab classes="{{isAuthorized('admin') ? 'level-2-tab' : ''}}" heading="{{ 'app.admin.members.members' | translate }}" index="0">
-      <ng-include src="'<%= asset_path "admin/members/members.html" %>'"></ng-include>
+      <ng-include src="'<%= asset_pack_path "admin/members/members.html" %>'"></ng-include>
     </uib-tab>
 
     <uib-tab classes="{{isAuthorized('admin') ? 'level-2-tab' : ''}}" heading="{{ 'app.admin.members.administrators' | translate }}" class="admins-tab" index="1">
-      <ng-include src="'<%= asset_path "admin/members/administrators.html" %>'"></ng-include>
+      <ng-include src="'<%= asset_pack_path "admin/members/administrators.html" %>'"></ng-include>
     </uib-tab>
 
     <uib-tab classes="{{isAuthorized('admin') ? 'level-2-tab' : ''}}" heading="{{ 'app.admin.members.managers' | translate }}" class="admins-tab" index="2">
-      <ng-include src="'<%= asset_path "admin/members/managers.html" %>'"></ng-include>
+      <ng-include src="'<%= asset_pack_path "admin/members/managers.html" %>'"></ng-include>
     </uib-tab>
 
   <uib-tab classes="{{isAuthorized('admin') ? 'level-2-tab' : ''}}" heading="{{ 'app.admin.members.partners' | translate }}" class="admins-tab" index="3" ng-show="isAuthorized('admin')">
-    <ng-include src="'<%= asset_path "admin/members/partners.html" %>'"></ng-include>
+    <ng-include src="'<%= asset_pack_path "admin/members/partners.html" %>'"></ng-include>
   </uib-tab>
 
-</uib-tabset>
\ No newline at end of file
+</uib-tabset>
diff --git a/app/frontend/templates/admin/open_api_clients/index.html.erb b/app/frontend/templates/admin/open_api_clients/index.html.erb
index 73ff4df84..d4628db2d 100644
--- a/app/frontend/templates/admin/open_api_clients/index.html.erb
+++ b/app/frontend/templates/admin/open_api_clients/index.html.erb
@@ -26,7 +26,7 @@
 <section class="m-lg open-api-clients"
          ui-tour="open-api"
          ui-tour-backdrop="true"
-         ui-tour-template-url="'<%= asset_path "shared/tour-step-template.html" %>'"
+         ui-tour-template-url="'<%= asset_pack_path "shared/tour-step-template.html" %>'"
          ui-tour-use-hotkeys="true"
          ui-tour-scroll-parent-id="content-main"
          post-render="setupOpenAPITour">
diff --git a/app/frontend/templates/admin/plans/edit.html.erb b/app/frontend/templates/admin/plans/edit.html.erb
index 324f892bf..b2e34e46e 100644
--- a/app/frontend/templates/admin/plans/edit.html.erb
+++ b/app/frontend/templates/admin/plans/edit.html.erb
@@ -26,7 +26,7 @@
         <div id="planForm">
             <form name="planForm" novalidate="novalidate" class="col-lg-7 col-lg-offset-2 m-t-lg form-group" action="{{ actionUrl }}" ng-upload="afterSubmit(content)" upload-options-enable-rails-csrf="true">
 
-              <ng-include src="'<%= asset_path "admin/plans/_form.html" %>'"></ng-include>
+              <ng-include src="'<%= asset_pack_path "admin/plans/_form.html" %>'"></ng-include>
 
               <div class="input-group m-t-md">
                 <label for="plan[disabled]" class="control-label m-r-md">{{ 'app.shared.plan.disabled' | translate }}</label>
diff --git a/app/frontend/templates/admin/plans/new.html.erb b/app/frontend/templates/admin/plans/new.html.erb
index 12ad2d12f..ea53fdc65 100644
--- a/app/frontend/templates/admin/plans/new.html.erb
+++ b/app/frontend/templates/admin/plans/new.html.erb
@@ -20,7 +20,7 @@
         <div id="planForm">
             <form name="planForm" novalidate="novalidate" class="col-lg-10 col-lg-offset-2 m-t-lg form-group" action="{{ actionUrl }}" ng-upload="afterSubmit(content)" upload-options-enable-rails-csrf="true">
 
-                <ng-include src="'<%= asset_path "admin/plans/_form.html" %>'"></ng-include>
+                <ng-include src="'<%= asset_pack_path "admin/plans/_form.html" %>'"></ng-include>
 
                 <div class="panel-footer no-padder">
                     <input type="submit" value="{{ 'app.shared.buttons.save' | translate }}" class="r-b btn-valid btn btn-warning btn-block p-lg btn-lg text-u-c" ng-disabled="planForm.$invalid || !partnerIsValid()"/>
diff --git a/app/frontend/templates/admin/pricing/index.html.erb b/app/frontend/templates/admin/pricing/index.html.erb
index da08f4068..36aae0767 100644
--- a/app/frontend/templates/admin/pricing/index.html.erb
+++ b/app/frontend/templates/admin/pricing/index.html.erb
@@ -18,7 +18,7 @@
 <section class="m-lg plans-pricing"
          ui-tour="pricing"
          ui-tour-backdrop="true"
-         ui-tour-template-url="'<%= asset_path "shared/tour-step-template.html" %>'"
+         ui-tour-template-url="'<%= asset_pack_path "shared/tour-step-template.html" %>'"
          ui-tour-use-hotkeys="true"
          ui-tour-scroll-parent-id="content-main"
          post-render="setupPricingTour">
@@ -28,27 +28,27 @@
       <uib-tabset justified="true" active="tabs.active">
 
         <uib-tab heading="{{ 'app.admin.pricing.subscriptions' | translate }}" index="0">
-          <ng-include src="'<%= asset_path "admin/pricing/subscriptions.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/pricing/subscriptions.html" %>'"></ng-include>
         </uib-tab>
 
         <uib-tab heading="{{ 'app.admin.pricing.trainings' | translate }}" index="1" class="trainings-tab">
-          <ng-include src="'<%= asset_path "admin/pricing/trainings.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/pricing/trainings.html" %>'"></ng-include>
         </uib-tab>
 
         <uib-tab heading="{{ 'app.admin.pricing.machine_hours' | translate }}" index="2" class="machines-tab">
-          <ng-include src="'<%= asset_path "admin/pricing/machine_hours.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/pricing/machine_hours.html" %>'"></ng-include>
         </uib-tab>
 
         <uib-tab heading="{{ 'app.admin.pricing.spaces' | translate }}" ng-show="modules.spaces" index="3" class="spaces-tab">
-          <ng-include src="'<%= asset_path "admin/pricing/spaces.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/pricing/spaces.html" %>'"></ng-include>
         </uib-tab>
 
         <uib-tab heading="{{ 'app.admin.pricing.credits' | translate }}" index="4" class="credits-tab">
-          <ng-include src="'<%= asset_path "admin/pricing/credits.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/pricing/credits.html" %>'"></ng-include>
         </uib-tab>
 
         <uib-tab heading="{{ 'app.admin.pricing.coupons' | translate }}" index="5" class="coupons-tab">
-          <ng-include src="'<%= asset_path "admin/pricing/coupons.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/pricing/coupons.html" %>'"></ng-include>
         </uib-tab>
       </uib-tabset>
     </div>
diff --git a/app/frontend/templates/admin/projects/index.html.erb b/app/frontend/templates/admin/projects/index.html.erb
index 7e03eb9cc..7148ebbd3 100644
--- a/app/frontend/templates/admin/projects/index.html.erb
+++ b/app/frontend/templates/admin/projects/index.html.erb
@@ -22,7 +22,7 @@
 <section class="m-lg projects"
          ui-tour="projects"
          ui-tour-backdrop="true"
-         ui-tour-template-url="'<%= asset_path "shared/tour-step-template.html" %>'"
+         ui-tour-template-url="'<%= asset_pack_path "shared/tour-step-template.html" %>'"
          ui-tour-use-hotkeys="true"
          ui-tour-scroll-parent-id="content-main"
          post-render="setupProjectElementsTour">
@@ -31,16 +31,16 @@
     <div class="col-md-12">
       <uib-tabset justified="true" active="tabs.active">
         <uib-tab heading="{{ 'app.admin.projects.materials' | translate }}" index="0">
-          <ng-include src="'<%= asset_path "admin/projects/materials.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/projects/materials.html" %>'"></ng-include>
         </uib-tab>
         <uib-tab heading="{{ 'app.admin.projects.themes' | translate }}" index="1">
-          <ng-include src="'<%= asset_path "admin/projects/themes.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/projects/themes.html" %>'"></ng-include>
         </uib-tab>
         <uib-tab heading="{{ 'app.admin.projects.licences' | translate }}" index="2">
-          <ng-include src="'<%= asset_path "admin/projects/licences.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/projects/licences.html" %>'"></ng-include>
         </uib-tab>
         <uib-tab heading="{{ 'app.admin.projects.settings.title' | translate }}" index="3" class="settings-tab">
-          <ng-include src="'<%= asset_path "admin/projects/settings.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/projects/settings.html" %>'"></ng-include>
         </uib-tab>
       </uib-tabset>
     </div>
diff --git a/app/frontend/templates/admin/settings/index.html.erb b/app/frontend/templates/admin/settings/index.html.erb
index 3bf9be7ee..83ba93042 100644
--- a/app/frontend/templates/admin/settings/index.html.erb
+++ b/app/frontend/templates/admin/settings/index.html.erb
@@ -17,7 +17,7 @@
 <section class="m-lg admin-settings"
          ui-tour="settings"
          ui-tour-backdrop="true"
-         ui-tour-template-url="'<%= asset_path "shared/tour-step-template.html" %>'"
+         ui-tour-template-url="'<%= asset_pack_path "shared/tour-step-template.html" %>'"
          ui-tour-use-hotkeys="true"
          ui-tour-scroll-parent-id="content-main"
          post-render="setupSettingsTour">
@@ -27,23 +27,23 @@
       <uib-tabset justified="true" active="tabs.active">
 
         <uib-tab heading="{{ 'app.admin.settings.general.general' | translate }}" index="0" class="general-page-tab">
-          <ng-include src="'<%= asset_path "admin/settings/general.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/settings/general.html" %>'"></ng-include>
         </uib-tab>
 
         <uib-tab heading="{{ 'app.admin.settings.home_page' | translate }}" index="1">
-          <ng-include src="'<%= asset_path "admin/settings/home_page.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/settings/home_page.html" %>'"></ng-include>
         </uib-tab>
 
         <uib-tab heading="{{ 'app.admin.settings.about' | translate }}" index="2" class="about-page-tab">
-          <ng-include src="'<%= asset_path "admin/settings/about.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/settings/about.html" %>'"></ng-include>
         </uib-tab>
 
         <uib-tab heading="{{ 'app.admin.settings.privacy.title' | translate }}" index="3" class="privacy-page-tab">
-          <ng-include src="'<%= asset_path "admin/settings/privacy.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/settings/privacy.html" %>'"></ng-include>
         </uib-tab>
 
         <uib-tab heading="{{ 'app.admin.settings.reservations' | translate }}" index="4" class="reservations-page-tab">
-          <ng-include src="'<%= asset_path "admin/settings/reservations.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "admin/settings/reservations.html" %>'"></ng-include>
         </uib-tab>
       </uib-tabset>
     </div>
diff --git a/app/frontend/templates/admin/statistics/index.html.erb b/app/frontend/templates/admin/statistics/index.html.erb
index 030ffbf50..a5fe69b8a 100644
--- a/app/frontend/templates/admin/statistics/index.html.erb
+++ b/app/frontend/templates/admin/statistics/index.html.erb
@@ -24,7 +24,7 @@
 <section class="m-lg statistics"
          ui-tour="statistics"
          ui-tour-backdrop="true"
-         ui-tour-template-url="'<%= asset_path "shared/tour-step-template.html" %>'"
+         ui-tour-template-url="'<%= asset_pack_path "shared/tour-step-template.html" %>'"
          ui-tour-use-hotkeys="true"
          ui-tour-scroll-parent-id="content-main"
          post-render="setupStatisticsTour">
diff --git a/app/frontend/templates/admin/trainings/edit.html.erb b/app/frontend/templates/admin/trainings/edit.html.erb
index d7d7a46ea..ed06e3f32 100644
--- a/app/frontend/templates/admin/trainings/edit.html.erb
+++ b/app/frontend/templates/admin/trainings/edit.html.erb
@@ -22,6 +22,6 @@
 
 <div class="row no-gutter">
   <div class="col-sm-12 col-md-12 col-lg-9 b-r-lg nopadding">
-    <ng-include src="'<%= asset_path "admin/trainings/_form.html" %>'"></ng-include>
+    <ng-include src="'<%= asset_pack_path "admin/trainings/_form.html" %>'"></ng-include>
   </div>
 </div>
diff --git a/app/frontend/templates/admin/trainings/index.html.erb b/app/frontend/templates/admin/trainings/index.html.erb
index 40040b47f..9e90b19af 100644
--- a/app/frontend/templates/admin/trainings/index.html.erb
+++ b/app/frontend/templates/admin/trainings/index.html.erb
@@ -25,7 +25,7 @@
 <section class="m-lg trainings-monitoring"
          ui-tour="trainings"
          ui-tour-backdrop="true"
-         ui-tour-template-url="'<%= asset_path "shared/tour-step-template.html" %>'"
+         ui-tour-template-url="'<%= asset_pack_path "shared/tour-step-template.html" %>'"
          ui-tour-use-hotkeys="true"
          ui-tour-scroll-parent-id="content-main"
          post-render="setupTrainingsTour">
diff --git a/app/frontend/templates/admin/trainings/new.html.erb b/app/frontend/templates/admin/trainings/new.html.erb
index c144bb421..015478541 100644
--- a/app/frontend/templates/admin/trainings/new.html.erb
+++ b/app/frontend/templates/admin/trainings/new.html.erb
@@ -26,7 +26,7 @@
       {{ 'app.admin.trainings_new.dont_forget_to_change_them_before_creating_slots_for_this_training' | translate }}
     </div>
 
-    <ng-include src="'<%= asset_path "admin/trainings/_form.html" %>'"></ng-include>
+    <ng-include src="'<%= asset_pack_path "admin/trainings/_form.html" %>'"></ng-include>
   </div>
 
   <div class="col-md-3">
diff --git a/app/frontend/templates/calendar/calendar.html.erb b/app/frontend/templates/calendar/calendar.html.erb
index b918bbc70..2c45c3144 100644
--- a/app/frontend/templates/calendar/calendar.html.erb
+++ b/app/frontend/templates/calendar/calendar.html.erb
@@ -41,7 +41,7 @@
         <h3 translate>{{ 'app.public.calendar.filter_calendar' }}</h3>
       </div>
       <div class="widget-content no-bg auto wrapper calendar-filter">
-        <ng-include src="'<%= asset_path "calendar/filter.html" %>'"></ng-include>
+        <ng-include src="'<%= asset_pack_path "calendar/filter.html" %>'"></ng-include>
       </div>
     </div>
   </div>
@@ -56,7 +56,7 @@
       <h1 class="modal-title" translate>{{ 'app.public.calendar.filter_calendar' }}</h1>
     </div>
     <div class="modal-body widget-content calendar-filter calendar-filter-aside">
-      <ng-include src="'<%= asset_path "calendar/filter.html" %>'"></ng-include>
+      <ng-include src="'<%= asset_pack_path "calendar/filter.html" %>'"></ng-include>
     </div>
   </div>
 </script>
diff --git a/app/frontend/templates/dashboard/events.html.erb b/app/frontend/templates/dashboard/events.html.erb
index 4880e632c..ca329913c 100644
--- a/app/frontend/templates/dashboard/events.html.erb
+++ b/app/frontend/templates/dashboard/events.html.erb
@@ -2,7 +2,7 @@
 
   <section class="heading">
     <div class="row no-gutter">
-      <ng-include src="'<%= asset_path "dashboard/nav.html" %>'"></ng-include>
+      <ng-include src="'<%= asset_pack_path "dashboard/nav.html" %>'"></ng-include>
     </div>
 
   </section>
diff --git a/app/frontend/templates/dashboard/invoices.html.erb b/app/frontend/templates/dashboard/invoices.html.erb
index 7f81dc5ea..00d4c068e 100644
--- a/app/frontend/templates/dashboard/invoices.html.erb
+++ b/app/frontend/templates/dashboard/invoices.html.erb
@@ -2,7 +2,7 @@
 
   <section class="heading">
     <div class="row no-gutter">
-      <ng-include src="'<%= asset_path "dashboard/nav.html" %>'"></ng-include>
+      <ng-include src="'<%= asset_pack_path "dashboard/nav.html" %>'"></ng-include>
     </div>
 
   </section>
diff --git a/app/frontend/templates/dashboard/profile.html.erb b/app/frontend/templates/dashboard/profile.html.erb
index 6610ff6d4..3abbe3bf0 100644
--- a/app/frontend/templates/dashboard/profile.html.erb
+++ b/app/frontend/templates/dashboard/profile.html.erb
@@ -2,7 +2,7 @@
 
   <section class="heading">
     <div class="row no-gutter">
-      <ng-include src="'<%= asset_path "dashboard/nav.html" %>'"></ng-include>
+      <ng-include src="'<%= asset_pack_path "dashboard/nav.html" %>'"></ng-include>
     </div>
 
   </section>
@@ -10,7 +10,7 @@
 
   <div class="row no-gutter">
     <div class="col-md-12 m m-t-lg">
-      <ng-include src="'<%= asset_path "shared/publicProfile.html" %>'"></ng-include>
+      <ng-include src="'<%= asset_pack_path "shared/publicProfile.html" %>'"></ng-include>
     </div>
   </div>
 </div>
diff --git a/app/frontend/templates/dashboard/projects.html.erb b/app/frontend/templates/dashboard/projects.html.erb
index d6ec103a4..ebac558c1 100644
--- a/app/frontend/templates/dashboard/projects.html.erb
+++ b/app/frontend/templates/dashboard/projects.html.erb
@@ -2,7 +2,7 @@
 
   <section class="heading">
     <div class="row no-gutter">
-      <ng-include src="'<%= asset_path "dashboard/nav.html" %>'"></ng-include>
+      <ng-include src="'<%= asset_pack_path "dashboard/nav.html" %>'"></ng-include>
     </div>
   </section>
 
diff --git a/app/frontend/templates/dashboard/settings.html.erb b/app/frontend/templates/dashboard/settings.html.erb
index 1cecc89f3..59a559aee 100644
--- a/app/frontend/templates/dashboard/settings.html.erb
+++ b/app/frontend/templates/dashboard/settings.html.erb
@@ -1,6 +1,6 @@
 <div>
 
-  <ng-include src="'<%= asset_path "dashboard/nav.html" %>'"></ng-include>
+  <ng-include src="'<%= asset_pack_path "dashboard/nav.html" %>'"></ng-include>
 
 
 
@@ -121,7 +121,7 @@
               </section>
               <section class="panel panel-default bg-light m">
                 <div class="panel-body m-r">
-                  <ng-include src="'<%= asset_path "shared/_member_form.html" %>'"></ng-include>
+                  <ng-include src="'<%= asset_pack_path "shared/_member_form.html" %>'"></ng-include>
                 </div>   <!-- ./panel-body  -->
               </section>
           </div>
diff --git a/app/frontend/templates/dashboard/trainings.html.erb b/app/frontend/templates/dashboard/trainings.html.erb
index de757fff1..b11909828 100644
--- a/app/frontend/templates/dashboard/trainings.html.erb
+++ b/app/frontend/templates/dashboard/trainings.html.erb
@@ -2,7 +2,7 @@
 
   <section class="heading">
     <div class="row no-gutter">
-      <ng-include src="'<%= asset_path "dashboard/nav.html" %>'"></ng-include>
+      <ng-include src="'<%= asset_pack_path "dashboard/nav.html" %>'"></ng-include>
     </div>
 
   </section>
diff --git a/app/frontend/templates/dashboard/wallet.html.erb b/app/frontend/templates/dashboard/wallet.html.erb
index ed228bb59..f8c470d63 100644
--- a/app/frontend/templates/dashboard/wallet.html.erb
+++ b/app/frontend/templates/dashboard/wallet.html.erb
@@ -1,18 +1,18 @@
 <div>
   <section class="heading">
     <div class="row no-gutter">
-      <ng-include src="'<%= asset_path "dashboard/nav.html" %>'"></ng-include>
+      <ng-include src="'<%= asset_pack_path "dashboard/nav.html" %>'"></ng-include>
     </div>
 
   </section>
 
   <div class="row no-gutter">
     <div class="col-md-12 m m-t-lg">
-      <ng-include src="'<%= asset_path "wallet/show.html" %>'"></ng-include>
+      <ng-include src="'<%= asset_pack_path "wallet/show.html" %>'"></ng-include>
     </div>
 
     <div class="col-md-12 m m-t-lg">
-      <ng-include src="'<%= asset_path "wallet/transactions.html" %>'"></ng-include>
+      <ng-include src="'<%= asset_pack_path "wallet/transactions.html" %>'"></ng-include>
     </div>
   </div>
 </div>
diff --git a/app/frontend/templates/events/edit.html.erb b/app/frontend/templates/events/edit.html.erb
index 9e902c0fc..67a4d9127 100644
--- a/app/frontend/templates/events/edit.html.erb
+++ b/app/frontend/templates/events/edit.html.erb
@@ -18,7 +18,7 @@
 
   <form role="form" name="eventForm" class="form-horizontal" novalidate action="{{ actionUrl }}" ng-upload="submited(content)" upload-options-enable-rails-csrf="true" upload-options-convert-hidden="true">
 
-    <ng-include src="'<%= asset_path "events/_form.html" %>'"></ng-include>
+    <ng-include src="'<%= asset_pack_path "events/_form.html" %>'"></ng-include>
 
   </form>
 
diff --git a/app/frontend/templates/events/new.html.erb b/app/frontend/templates/events/new.html.erb
index 7b1d0ac18..22c8b067b 100644
--- a/app/frontend/templates/events/new.html.erb
+++ b/app/frontend/templates/events/new.html.erb
@@ -18,7 +18,7 @@
 
   <form role="form" name="eventForm" class="form-horizontal" novalidate action="{{ actionUrl }}" ng-upload="submited(content)" upload-options-enable-rails-csrf="true">
 
-    <ng-include src="'<%= asset_path "events/_form.html" %>'"></ng-include>
+    <ng-include src="'<%= asset_pack_path "events/_form.html" %>'"></ng-include>
 
   </form>
 
diff --git a/app/frontend/templates/home.html.erb b/app/frontend/templates/home.html.erb
index 6e758acf7..32bb64e09 100644
--- a/app/frontend/templates/home.html.erb
+++ b/app/frontend/templates/home.html.erb
@@ -1,6 +1,6 @@
 <div ui-tour="welcome"
      ui-tour-backdrop="true"
-     ui-tour-template-url="'<%= asset_path "shared/tour-step-template.html" %>'"
+     ui-tour-template-url="'<%= asset_pack_path "shared/tour-step-template.html" %>'"
      ui-tour-use-hotkeys="true"
      ui-tour-scroll-parent-id="content-main"
      post-render="setupHomeTour">
diff --git a/app/frontend/templates/machines/edit.html.erb b/app/frontend/templates/machines/edit.html.erb
index 66ef5339a..29333446c 100644
--- a/app/frontend/templates/machines/edit.html.erb
+++ b/app/frontend/templates/machines/edit.html.erb
@@ -24,7 +24,7 @@
 
 <div class="row no-gutter">
   <div class="col-sm-12 col-md-12 col-lg-9 b-r-lg nopadding">
-    <ng-include src="'<%= asset_path "machines/_form.html" %>'"></ng-include>
+    <ng-include src="'<%= asset_pack_path "machines/_form.html" %>'"></ng-include>
   </div>
 </div>
 </div>
diff --git a/app/frontend/templates/machines/index.html.erb b/app/frontend/templates/machines/index.html.erb
index ae9273229..fa72dac0b 100644
--- a/app/frontend/templates/machines/index.html.erb
+++ b/app/frontend/templates/machines/index.html.erb
@@ -23,7 +23,7 @@
 <section class="m-lg machines-list"
          ui-tour="machines"
          ui-tour-backdrop="true"
-         ui-tour-template-url="'<%= asset_path "shared/tour-step-template.html" %>'"
+         ui-tour-template-url="'<%= asset_pack_path "shared/tour-step-template.html" %>'"
          ui-tour-use-hotkeys="true"
          ui-tour-scroll-parent-id="content-main"
          post-render="setupMachinesTour">
diff --git a/app/frontend/templates/machines/new.html.erb b/app/frontend/templates/machines/new.html.erb
index 911668277..f5a8163eb 100644
--- a/app/frontend/templates/machines/new.html.erb
+++ b/app/frontend/templates/machines/new.html.erb
@@ -26,6 +26,6 @@
       {{ 'app.admin.machines_new.consider_changing_them_before_creating_any_reservation_slot' | translate }}
     </div>
 
-    <ng-include src="'<%= asset_path "machines/_form.html" %>'"></ng-include>
+    <ng-include src="'<%= asset_pack_path "machines/_form.html" %>'"></ng-include>
   </div>
 </div>
diff --git a/app/frontend/templates/machines/reserve.html.erb b/app/frontend/templates/machines/reserve.html.erb
index 7bc1cd279..8aef6abaf 100644
--- a/app/frontend/templates/machines/reserve.html.erb
+++ b/app/frontend/templates/machines/reserve.html.erb
@@ -19,7 +19,7 @@
 <div class="row no-gutter machine-reserve">
   <div class="col-sm-12 col-md-12 col-lg-9">
     <div ui-calendar="calendarConfig" ng-model="eventSources" calendar="calendar" class="wrapper-lg" ng-show="!plansAreShown"></div>
-    <ng-include ng-if="modules.plans" src="'<%= asset_path "plans/_plan.html" %>'"></ng-include>
+    <ng-include ng-if="modules.plans" src="'<%= asset_pack_path "plans/_plan.html" %>'"></ng-include>
   </div>
 
 
diff --git a/app/frontend/templates/members/show.html.erb b/app/frontend/templates/members/show.html.erb
index 7205b8424..2eb1fd90c 100644
--- a/app/frontend/templates/members/show.html.erb
+++ b/app/frontend/templates/members/show.html.erb
@@ -21,5 +21,5 @@
 
     </div>
   </section>
-  <ng-include src="'<%= asset_path "shared/publicProfile.html" %>'"></ng-include>
+  <ng-include src="'<%= asset_pack_path "shared/publicProfile.html" %>'"></ng-include>
 </div>
diff --git a/app/frontend/templates/plans/payment_modal.html.erb b/app/frontend/templates/plans/payment_modal.html.erb
index db6145684..773d4af05 100644
--- a/app/frontend/templates/plans/payment_modal.html.erb
+++ b/app/frontend/templates/plans/payment_modal.html.erb
@@ -4,7 +4,7 @@
 </div>
 <div class="modal-body">
   <uib-alert ng-repeat="alert in alerts" type="{{alert.type}}" close="closeAlert($index)">{{alert.msg}}</uib-alert>
-  <ng-include src="'<%= asset_path "shared/_wallet_amount_info.html" %>'"></ng-include>
+  <ng-include src="'<%= asset_pack_path "shared/_wallet_amount_info.html" %>'"></ng-include>
 
   <p>{{ 'app.public.plans.here_is_the_NAME_subscription_summary' | translate:{NAME:member.name} }}</p>
   <p>{{ plan | humanReadablePlanName }}</p>
diff --git a/app/frontend/templates/profile/complete.html.erb b/app/frontend/templates/profile/complete.html.erb
index 8cda8c11b..6544a7afd 100644
--- a/app/frontend/templates/profile/complete.html.erb
+++ b/app/frontend/templates/profile/complete.html.erb
@@ -63,7 +63,7 @@
 
                                     <div class="panel-body m-r">
                                         <!-- common fields -->
-                                        <ng-include src="'<%= asset_path "shared/_member_form.html" %>'"></ng-include>
+                                        <ng-include src="'<%= asset_pack_path "shared/_member_form.html" %>'"></ng-include>
 
                                         <div class="row">
                                             <div class="col-sm-3 col-sm-offset-1"></div>
@@ -151,7 +151,7 @@
                 </p>
               </div>
                 <div class="col-md-6 m-t-3xl-on-md" ng-hide="user.merged_at">
-                    <ng-include src="'<%= asset_path "profile/_token.html" %>'"></ng-include>
+                    <ng-include src="'<%= asset_pack_path "profile/_token.html" %>'"></ng-include>
                 </div>
             </div>
         </div>
diff --git a/app/frontend/templates/projects/edit.html.erb b/app/frontend/templates/projects/edit.html.erb
index d01e8eff7..11cb9be0e 100644
--- a/app/frontend/templates/projects/edit.html.erb
+++ b/app/frontend/templates/projects/edit.html.erb
@@ -29,7 +29,7 @@
 
 
 
-    <ng-include src="'<%= asset_path "projects/_form.html" %>'"></ng-include>
+    <ng-include src="'<%= asset_pack_path "projects/_form.html" %>'"></ng-include>
   </form>
 
 
diff --git a/app/frontend/templates/projects/new.html.erb b/app/frontend/templates/projects/new.html.erb
index 933cf918c..9ec8ccc87 100644
--- a/app/frontend/templates/projects/new.html.erb
+++ b/app/frontend/templates/projects/new.html.erb
@@ -18,7 +18,7 @@
 
   <form role="form" name="projectForm" class="form-horizontal" novalidate action="{{ actionUrl }}" ng-upload="submited(content)" upload-options-enable-rails-csrf="true" unsaved-warning-form>
 
-    <ng-include src="'<%= asset_path "projects/_form.html" %>'"></ng-include>
+    <ng-include src="'<%= asset_pack_path "projects/_form.html" %>'"></ng-include>
 
   </form>
 
diff --git a/app/frontend/templates/shared/valid_reservation_modal.html.erb b/app/frontend/templates/shared/valid_reservation_modal.html.erb
index b74fb1ce1..80184f3f1 100644
--- a/app/frontend/templates/shared/valid_reservation_modal.html.erb
+++ b/app/frontend/templates/shared/valid_reservation_modal.html.erb
@@ -4,7 +4,7 @@
 </div>
 <div class="modal-body">
   <uib-alert ng-repeat="alert in alerts" type="{{alert.type}}" close="closeAlert($index)">{{alert.msg}}</uib-alert>
-  <ng-include src="'<%= asset_path "shared/_wallet_amount_info.html" %>'"></ng-include>
+  <ng-include src="'<%= asset_pack_path "shared/_wallet_amount_info.html" %>'"></ng-include>
 
   <p translate>{{ 'app.shared.valid_reservation_modal.here_is_the_summary_of_the_slots_to_book_for_the_current_user' }}</p>
   <ul ng-repeat="slot in reservation.slots_attributes">
diff --git a/app/frontend/templates/spaces/edit.html.erb b/app/frontend/templates/spaces/edit.html.erb
index e66de325f..70a037286 100644
--- a/app/frontend/templates/spaces/edit.html.erb
+++ b/app/frontend/templates/spaces/edit.html.erb
@@ -33,7 +33,7 @@
 
       <section class="panel panel-default bg-light m-lg">
         <div class="panel-body m-r">
-          <ng-include src="'<%= asset_path "spaces/_form.html" %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path "spaces/_form.html" %>'"></ng-include>
         </div>
 
         <div class="panel-footer no-padder">
diff --git a/app/frontend/templates/spaces/index.html.erb b/app/frontend/templates/spaces/index.html.erb
index 7d8e14bc6..0a82a1d81 100644
--- a/app/frontend/templates/spaces/index.html.erb
+++ b/app/frontend/templates/spaces/index.html.erb
@@ -23,7 +23,7 @@
 <section class="m-lg spaces-list"
          ui-tour="spaces"
          ui-tour-backdrop="true"
-         ui-tour-template-url="'<%= asset_path "shared/tour-step-template.html" %>'"
+         ui-tour-template-url="'<%= asset_pack_path "shared/tour-step-template.html" %>'"
          ui-tour-use-hotkeys="true"
          ui-tour-scroll-parent-id="content-main"
          post-render="setupSpacesTour">
diff --git a/app/frontend/templates/spaces/new.html.erb b/app/frontend/templates/spaces/new.html.erb
index de8f9b079..f2e32a287 100644
--- a/app/frontend/templates/spaces/new.html.erb
+++ b/app/frontend/templates/spaces/new.html.erb
@@ -39,7 +39,7 @@
 
       <section class="panel panel-default bg-light m-lg">
         <div class="panel-body m-r">
-          <ng-include src="'<%= asset_path 'spaces/_form.html' %>'"></ng-include>
+          <ng-include src="'<%= asset_pack_path 'spaces/_form.html' %>'"></ng-include>
         </div>
 
         <div class="panel-footer no-padder">
diff --git a/app/frontend/templates/spaces/reserve.html.erb b/app/frontend/templates/spaces/reserve.html.erb
index f663c79fb..5b0b3edbf 100644
--- a/app/frontend/templates/spaces/reserve.html.erb
+++ b/app/frontend/templates/spaces/reserve.html.erb
@@ -17,7 +17,7 @@
 <div class="row no-gutter training-reserve">
   <div class="col-sm-12 col-md-12 col-lg-9">
     <div ui-calendar="calendarConfig" ng-model="eventSources" calendar="calendar" class="wrapper-lg" ng-show="!plansAreShown"></div>
-    <ng-include ng-if="modules.plans" src="'<%= asset_path "plans/_plan.html" %>'"></ng-include>
+    <ng-include ng-if="modules.plans" src="'<%= asset_pack_path "plans/_plan.html" %>'"></ng-include>
   </div>
 
 
diff --git a/app/frontend/templates/trainings/reserve.html.erb b/app/frontend/templates/trainings/reserve.html.erb
index 6fd078261..d6b12389c 100644
--- a/app/frontend/templates/trainings/reserve.html.erb
+++ b/app/frontend/templates/trainings/reserve.html.erb
@@ -27,7 +27,7 @@
 <div class="row no-gutter training-reserve">
   <div class="col-sm-12 col-md-12 col-lg-9">
     <div ui-calendar="calendarConfig" ng-model="eventSources" calendar="calendar" class="wrapper-lg" ng-show="!plansAreShown"></div>
-    <ng-include ng-if="modules.plans" src="'<%= asset_path "plans/_plan.html" %>'"></ng-include>
+    <ng-include ng-if="modules.plans" src="'<%= asset_pack_path "plans/_plan.html" %>'"></ng-include>
   </div>
 
 
diff --git a/app/uploaders/custom_assets_uploader.rb b/app/uploaders/custom_assets_uploader.rb
index eaf71585f..5d61d91cd 100644
--- a/app/uploaders/custom_assets_uploader.rb
+++ b/app/uploaders/custom_assets_uploader.rb
@@ -28,7 +28,7 @@ class CustomAssetsUploader < CarrierWave::Uploader::Base
   # Provide a default URL as a default if there hasn't been a file uploaded:
   # def default_url
   #   # For Rails 3.1+ asset pipeline compatibility:
-  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #   # ActionController::Base.helpers.asset_pack_path("fallback/" + [version_name, "default.png"].compact.join('_'))
   #
   #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
   # end
diff --git a/app/uploaders/event_file_uploader.rb b/app/uploaders/event_file_uploader.rb
index a3ee56493..97a74a01e 100644
--- a/app/uploaders/event_file_uploader.rb
+++ b/app/uploaders/event_file_uploader.rb
@@ -25,7 +25,7 @@ class EventFileUploader < CarrierWave::Uploader::Base
   # Provide a default URL as a default if there hasn't been a file uploaded:
   # def default_url
   #   # For Rails 3.1+ asset pipeline compatibility:
-  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #   # ActionController::Base.helpers.asset_pack_path("fallback/" + [version_name, "default.png"].compact.join('_'))
   #
   #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
   # end
diff --git a/app/uploaders/event_image_uploader.rb b/app/uploaders/event_image_uploader.rb
index fc9a07104..479ede225 100644
--- a/app/uploaders/event_image_uploader.rb
+++ b/app/uploaders/event_image_uploader.rb
@@ -27,7 +27,7 @@ class EventImageUploader < CarrierWave::Uploader::Base
   # Provide a default URL as a default if there hasn't been a file uploaded:
   # def default_url
   #   # For Rails 3.1+ asset pipeline compatibility:
-  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #   # ActionController::Base.helpers.asset_pack_path("fallback/" + [version_name, "default.png"].compact.join('_'))
   #
   #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
   # end
diff --git a/app/uploaders/machine_file_uploader.rb b/app/uploaders/machine_file_uploader.rb
index 2f58bc1ff..8fc055c86 100644
--- a/app/uploaders/machine_file_uploader.rb
+++ b/app/uploaders/machine_file_uploader.rb
@@ -25,7 +25,7 @@ class MachineFileUploader < CarrierWave::Uploader::Base
   # Provide a default URL as a default if there hasn't been a file uploaded:
   # def default_url
   #   # For Rails 3.1+ asset pipeline compatibility:
-  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #   # ActionController::Base.helpers.asset_pack_path("fallback/" + [version_name, "default.png"].compact.join('_'))
   #
   #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
   # end
diff --git a/app/uploaders/machine_image_uploader.rb b/app/uploaders/machine_image_uploader.rb
index a4243da35..549254390 100644
--- a/app/uploaders/machine_image_uploader.rb
+++ b/app/uploaders/machine_image_uploader.rb
@@ -27,7 +27,7 @@ class MachineImageUploader < CarrierWave::Uploader::Base
   # Provide a default URL as a default if there hasn't been a file uploaded:
   # def default_url
   #   # For Rails 3.1+ asset pipeline compatibility:
-  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #   # ActionController::Base.helpers.asset_pack_path("fallback/" + [version_name, "default.png"].compact.join('_'))
   #
   #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
   # end
diff --git a/app/uploaders/plan_file_uploader.rb b/app/uploaders/plan_file_uploader.rb
index 77f834ac6..3b3210d67 100644
--- a/app/uploaders/plan_file_uploader.rb
+++ b/app/uploaders/plan_file_uploader.rb
@@ -25,7 +25,7 @@ class PlanFileUploader < CarrierWave::Uploader::Base
   # Provide a default URL as a default if there hasn't been a file uploaded:
   # def default_url
   #   # For Rails 3.1+ asset pipeline compatibility:
-  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #   # ActionController::Base.helpers.asset_pack_path("fallback/" + [version_name, "default.png"].compact.join('_'))
   #
   #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
   # end
diff --git a/app/uploaders/profil_image_uploader.rb b/app/uploaders/profil_image_uploader.rb
index bc14af25a..3494b6186 100644
--- a/app/uploaders/profil_image_uploader.rb
+++ b/app/uploaders/profil_image_uploader.rb
@@ -27,7 +27,7 @@ class ProfilImageUploader < CarrierWave::Uploader::Base
   # Provide a default URL as a default if there hasn't been a file uploaded:
   # def default_url
   #   # For Rails 3.1+ asset pipeline compatibility:
-  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #   # ActionController::Base.helpers.asset_pack_path("fallback/" + [version_name, "default.png"].compact.join('_'))
   #
   #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
   # end
diff --git a/app/uploaders/space_file_uploader.rb b/app/uploaders/space_file_uploader.rb
index ba732df9a..afecfaf50 100644
--- a/app/uploaders/space_file_uploader.rb
+++ b/app/uploaders/space_file_uploader.rb
@@ -25,7 +25,7 @@ class SpaceFileUploader < CarrierWave::Uploader::Base
   # Provide a default URL as a default if there hasn't been a file uploaded:
   # def default_url
   #   # For Rails 3.1+ asset pipeline compatibility:
-  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #   # ActionController::Base.helpers.asset_pack_path("fallback/" + [version_name, "default.png"].compact.join('_'))
   #
   #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
   # end
diff --git a/app/uploaders/space_image_uploader.rb b/app/uploaders/space_image_uploader.rb
index dd77c38fc..5913d0a57 100644
--- a/app/uploaders/space_image_uploader.rb
+++ b/app/uploaders/space_image_uploader.rb
@@ -27,7 +27,7 @@ class SpaceImageUploader < CarrierWave::Uploader::Base
   # Provide a default URL as a default if there hasn't been a file uploaded:
   # def default_url
   #   # For Rails 3.1+ asset pipeline compatibility:
-  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #   # ActionController::Base.helpers.asset_pack_path("fallback/" + [version_name, "default.png"].compact.join('_'))
   #
   #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
   # end
diff --git a/app/uploaders/training_image_uploader.rb b/app/uploaders/training_image_uploader.rb
index 9e06ab500..321b7f8e4 100644
--- a/app/uploaders/training_image_uploader.rb
+++ b/app/uploaders/training_image_uploader.rb
@@ -27,7 +27,7 @@ class TrainingImageUploader < CarrierWave::Uploader::Base
   # Provide a default URL as a default if there hasn't been a file uploaded:
   # def default_url
   #   # For Rails 3.1+ asset pipeline compatibility:
-  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #   # ActionController::Base.helpers.asset_pack_path("fallback/" + [version_name, "default.png"].compact.join('_'))
   #
   #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
   # end
diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb
index 7e00618c8..4d688e79c 100644
--- a/app/views/application/index.html.erb
+++ b/app/views/application/index.html.erb
@@ -54,8 +54,8 @@
       Fablab.sessionTours = [];
   </script>
 
-  <%= stylesheet_link_tag 'application', media: 'all' %>
-  <%= stylesheet_link_tag 'app.printer', media: 'print' %>
+  <%= stylesheet_pack_tag 'application', media: 'all' %>
+  <%= stylesheet_pack_tag 'printer', media: 'print' %>
   <% unless Stylesheet.theme.nil? %>
   <link rel="stylesheet" media="all" href="<%= stylesheet_path(Stylesheet.theme.id) %>-<%= Stylesheet.theme.updated_at.to_i.to_s %>.css" />
   <%  end %>
@@ -120,13 +120,13 @@
     <span class="text-sm">Powered by <a href="http://www.fab-manager.com" target="_blank">Fab-manager</a></span>
   </div>
 
-<%= javascript_include_tag 'application' %>
+<%= javascript_pack_tag 'application' %>
 
 <!-- i18n of external libraries -->
-<script type="text/javascript" src="<%= asset_path "angular-i18n/angular-locale_#{Rails.application.secrets.angular_locale}.js" %>"></script>
+<script type="text/javascript" src="<%= asset_pack_path "angular-i18n/angular-locale_#{Rails.application.secrets.angular_locale}.js" %>"></script>
 <!-- if required locale does not exist, use the default "en" -->
 <% if asset_available?("moment/locale/#{Rails.application.secrets.moment_locale}.js") %>
-  <script type="text/javascript" src="<%= asset_path "moment/locale/#{Rails.application.secrets.moment_locale}.js" %>"></script>
+  <script type="text/javascript" src="<%= asset_pack_path "moment/locale/#{Rails.application.secrets.moment_locale}.js" %>"></script>
 <%
   elsif Rails.application.secrets.moment_locale != 'en'
     raise LoadError, "moment/locale/#{Rails.application.secrets.moment_locale}.js does not exists"
@@ -134,7 +134,7 @@
 %>
 <!-- if required locale does not exist, use the default "en-US" -->
 <% if asset_available?("summernote/lang/summernote-#{Rails.application.secrets.summernote_locale}.js") %>
-  <script type="text/javascript" src="<%= asset_path "summernote/lang/summernote-#{Rails.application.secrets.summernote_locale}.js" %>"></script>
+  <script type="text/javascript" src="<%= asset_pack_path "summernote/lang/summernote-#{Rails.application.secrets.summernote_locale}.js" %>"></script>
 <%
   elsif Rails.application.secrets.summernote_locale != 'en-US'
     raise LoadError, "summernote/lang/summernote-#{Rails.application.secrets.summernote_locale}.js does not exists"
@@ -142,7 +142,7 @@
 %>
 <!-- if required locale does not exist, use the default "en" -->
 <% if asset_available?("fullcalendar/dist/lang/#{Rails.application.secrets.fullcalendar_locale}.js") %>
-  <script type="text/javascript" src="<%= asset_path "fullcalendar/dist/lang/#{Rails.application.secrets.fullcalendar_locale}.js" %>"></script>
+  <script type="text/javascript" src="<%= asset_pack_path "fullcalendar/dist/lang/#{Rails.application.secrets.fullcalendar_locale}.js" %>"></script>
 <%
   elsif Rails.application.secrets.fullcalendar_locale != 'en'
     raise LoadError, "fullcalendar/dist/lang/#{Rails.application.secrets.fullcalendar_locale}.js does not exists"
diff --git a/config/webpack/development.js b/config/webpack/development.js
index c5edff94a..89d35d938 100644
--- a/config/webpack/development.js
+++ b/config/webpack/development.js
@@ -1,5 +1,5 @@
-process.env.NODE_ENV = process.env.NODE_ENV || 'development'
+process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
-const environment = require('./environment')
+const environment = require('./environment');
 
-module.exports = environment.toWebpackConfig()
+module.exports = environment.toWebpackConfig();
diff --git a/config/webpack/environment.js b/config/webpack/environment.js
index d16d9af74..927ec2617 100644
--- a/config/webpack/environment.js
+++ b/config/webpack/environment.js
@@ -1,3 +1,8 @@
-const { environment } = require('@rails/webpacker')
+const { environment } = require('@rails/webpacker');
 
-module.exports = environment
+environment.plugins.append('Provide', new webpack.ProvidePlugin({
+  $: 'jquery',
+  jQuery: 'jquery'
+}));
+
+module.exports = environment;
diff --git a/config/webpack/production.js b/config/webpack/production.js
index be0f53aac..7684a100b 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -1,5 +1,5 @@
-process.env.NODE_ENV = process.env.NODE_ENV || 'production'
+process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 
-const environment = require('./environment')
+const environment = require('./environment');
 
-module.exports = environment.toWebpackConfig()
+module.exports = environment.toWebpackConfig();
diff --git a/config/webpack/test.js b/config/webpack/test.js
index c5edff94a..89d35d938 100644
--- a/config/webpack/test.js
+++ b/config/webpack/test.js
@@ -1,5 +1,5 @@
-process.env.NODE_ENV = process.env.NODE_ENV || 'development'
+process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
-const environment = require('./environment')
+const environment = require('./environment');
 
-module.exports = environment.toWebpackConfig()
+module.exports = environment.toWebpackConfig();
diff --git a/config/webpacker.yml b/config/webpacker.yml
index a6b146566..4706cd893 100644
--- a/config/webpacker.yml
+++ b/config/webpacker.yml
@@ -1,7 +1,7 @@
 # Note: You must restart bin/webpack-dev-server for changes to take effect
 
 default: &default
-  source_path: app/javascript
+  source_path: app/frontend
   source_entry_path: packs
   public_root_path: public
   public_output_path: packs