diff --git a/src/boot/kdk.js b/src/boot/kdk.js
index 78c76518..c2ac91f2 100644
--- a/src/boot/kdk.js
+++ b/src/boot/kdk.js
@@ -62,14 +62,24 @@ export default async ({ app }) => {
   app.component('KStamp', await kdkCoreUtils.loadComponent('frame/KStamp'))
   app.component('KPanel', await kdkCoreUtils.loadComponent('frame/KPanel'))
   app.component('KSpot', await kdkCoreUtils.loadComponent('frame/KSpot'))
+  app.component('KTextArea', await kdkCoreUtils.loadComponent('frame/KTextArea'))
+  app.component('KChipsPane', await kdkCoreUtils.loadComponent('frame/KChipsPane'))
+  app.component('KAvatar', await kdkCoreUtils.loadComponent('frame/KAvatar'))
+  app.component('KUploader', await kdkCoreUtils.loadComponent('input/KUploader'))
   app.component('KModal', await kdkCoreUtils.loadComponent('frame/KModal'))
   app.component('KForm', await kdkCoreUtils.loadComponent('form/KForm'))
+  app.component('KList', await kdkCoreUtils.loadComponent('collection/Klist'))
   app.component('KGrid', await kdkCoreUtils.loadComponent('collection/KGrid'))
+  app.component('KBoard', await kdkCoreUtils.loadComponent('collection/KBoard'))
+  app.component('KHistory', await kdkCoreUtils.loadComponent('collection/KHistory'))
+  app.component('KItem', await kdkCoreUtils.loadComponent('collection/KItem'))  
   app.component('KCard', await kdkCoreUtils.loadComponent('collection/KCard'))
   app.component('KCardSection', await kdkCoreUtils.loadComponent('collection/KCardSection'))
+  app.component('KMediaBrowser', await kdkCoreUtils.loadComponent('media/KMediaBrowser'))
+  app.component('KStatisticsChart', await kdkCoreUtils.loadComponent('chart/KStatisticsChart'))
   app.component('KLocationMap', await kdkCoreUtils.loadComponent('KLocationMap'))
-  app.component('KList', await kdkCoreUtils.loadComponent('collection/KList'))
-  app.component('KItem', await kdkCoreUtils.loadComponent('collection/KItem'))  
+  app.component('KLayersPanel', await kdkCoreUtils.loadComponent('KLayersPanel'))
+  app.component('KColorLegend', await kdkCoreUtils.loadComponent('KColorLegend'))
   app.component('KPage', await kdkCoreUtils.loadComponent('layout/KPage'))
 
   // Register global properties
diff --git a/src/components/AlertForm.vue b/src/components/AlertForm.vue
index b1be9def..59271188 100644
--- a/src/components/AlertForm.vue
+++ b/src/components/AlertForm.vue
@@ -50,7 +50,7 @@
       </q-list>
     </q-expansion-item>
     <q-expansion-item ref="event" icon="las la-bell" :label="$t('AlertForm.EVENT')" group="group">
-      <k-item-field ref="eventTemplate" :properties="eventTemplateFieldProperties" />
+      <KItem-field ref="eventTemplate" :properties="eventTemplateFieldProperties" />
       <k-toggle-field ref="closeEvent" :properties="closeEventFieldProperties" />
     </q-expansion-item>
     <q-list v-show="hasError" dense class="row items-center justify-around q-pa-md">
@@ -357,7 +357,7 @@ export default {
   },
   async created () {
     // Load the required components
-    this.$options.components['k-item-field'] = this.$load('form/KItemField')
+    this.$options.components['KItem-field'] = this.$load('form/KItemField')
     this.$options.components['k-toggle-field'] = this.$load('form/KToggleField')
 
     await this.build()
diff --git a/src/components/ArchivedEventCard.vue b/src/components/ArchivedEventCard.vue
index fbfbda7e..cb36b45f 100644
--- a/src/components/ArchivedEventCard.vue
+++ b/src/components/ArchivedEventCard.vue
@@ -15,7 +15,7 @@
        -->
       <template v-slot:card-content>
         <!-- Plan section is only visible in event logbook -->
-        <k-card-section
+        <KCardSection
           v-if="planName"
           :title="$t('ArchivedEventCard.PLAN_SECTION')"
           :hideHeader="!isExpanded"
@@ -32,31 +32,31 @@
           </q-badge>
           <q-space />
           <k-panel v-if="!isExpanded" :content="planActions" :context="$props" />
-          <k-stamp v-if="!planName" :text="'ArchivedEventCard.UNDEFINED_PLAN_LABEL'" direction="horizontal" />
+          <KStamp v-if="!planName" :text="'ArchivedEventCard.UNDEFINED_PLAN_LABEL'" direction="horizontal" />
           </div>
-        </k-card-section>
+        </KCardSection>
         <!-- Objective section is only visible in plan logbook -->
-        <k-card-section
+        <KCardSection
           v-if="plan && !planName && (isExpanded || objective)"
           :title="$t('ArchivedEventCard.OBJECTIVE_SECTION')"
           :hideHeader="!isExpanded"
           :dense="dense"
         >
           <q-badge v-if="objective" :label="objective" color="grey-7" :multi-line="true"/>
-          <k-stamp v-else text="ArchivedEventCard.UNDEFINED_OBJECTIVE_LABEL" direction="horizontal" />
-        </k-card-section>
+          <KStamp v-else text="ArchivedEventCard.UNDEFINED_OBJECTIVE_LABEL" direction="horizontal" />
+        </KCardSection>
         <!-- Location section -->
-        <k-card-section
+        <KCardSection
           v-if="isExpanded"
           :title="$t('ArchivedEventCard.LOCATION_SECTION')"
           :context="$props"
           :dense="dense"
         >
-          <k-location-map v-if="item.location" v-model="item.location" :editable="false" style="min-height: 220px;" />
-          <k-stamp v-else text="ArchivedEventCard.UNDEFINED_LOCATION_LABEL" direction="horizontal" />
-        </k-card-section>
+          <KLocationMap v-if="item.location" v-model="item.location" :editable="false" style="min-height: 220px;" />
+          <KStamp v-else text="ArchivedEventCard.UNDEFINED_LOCATION_LABEL" direction="horizontal" />
+        </KCardSection>
         <!-- Participants section -->
-        <k-card-section v-if="isExpanded"
+        <KCardSection v-if="isExpanded"
           :title="$t('ArchivedEventCard.PARTICIPANTS_SECTION')"
           :context="$props"
           :dense="dense"
@@ -67,18 +67,18 @@
           <div v-else>
             {{ $t('ArchivedEventCard.NO_PARTICIPANTS_LABEL')}}
           </div>
-        </k-card-section>
+        </KCardSection>
         <!-- Coordinators section -->
-        <k-card-section v-if="isExpanded"
+        <KCardSection v-if="isExpanded"
           :key="item + '-coordinators'"
           :title="$t('ArchivedEventCard.COORDINATORS_SECTION')"
           :context="$props"
           :dense="dense"
         >
           <k-chips-pane class="q-pl-sm" :chips="item.coordinators" :value-path="['profile.name', 'value', 'name']" />
-        </k-card-section>
+        </KCardSection>
         <!-- Timestamps section -->
-        <k-card-section
+        <KCardSection
           v-if="isExpanded"
           :dense="dense">
           <div v-if="createdAt || updatedAt || deletedAt">
@@ -93,7 +93,7 @@
               <small>{{ $t('ArchivedEventCard.UPDATED_AT_LABEL') }} {{ updatedAt.toLocaleString() }}</small>
             </cite>
           </div>
-        </k-card-section>
+        </KCardSection>
       </template>
     </k-card>
     <k-media-browser ref="mediaBrowser" :options="mediaBrowserOptions()" />
@@ -247,18 +247,6 @@ export default {
       }
     }
   },
-  beforeCreate () {
-    // Load the required components
-    this.$options.components['k-stamp'] = this.$load('frame/KStamp')
-    this.$options.components['k-card'] = this.$load('collection/KCard')
-    this.$options.components['k-card-section'] = this.$load('collection/KCardSection')
-    this.$options.components['k-panel'] = this.$load('frame/KPanel')
-    this.$options.components['k-modal'] = this.$load('frame/KModal')
-    this.$options.components['k-text-area'] = this.$load('frame/KTextArea')
-    this.$options.components['k-chips-pane'] = this.$load('frame/KChipsPane')
-    this.$options.components['k-media-browser'] = this.$load('media/KMediaBrowser')
-    this.$options.components['k-location-map'] = this.$load('KLocationMap')
-  },
   created () {
     // Required alias for the event logs mixin
     this.event = this.item
diff --git a/src/components/ArchivedEventsActivity.vue b/src/components/ArchivedEventsActivity.vue
index 9a739195..04aaeb6c 100644
--- a/src/components/ArchivedEventsActivity.vue
+++ b/src/components/ArchivedEventsActivity.vue
@@ -1,5 +1,5 @@
 <template>
-  <k-page :padding="false" @content-resized="onPageContentResized">
+  <KPage :padding="false" @content-resized="onPageContentResized">
     <template v-slot:page-content>
       <q-page-sticky v-show="showMap && heatmap" position="bottom" :offset="[0, 16]" style="z-index: 1">
         <div class="row">
@@ -16,7 +16,7 @@
         Events history: switch append-items on to activate infinite scroll
       -->
       <div v-if="showHistory && height" class="row justify-center q-pl-lg q-pr-none">
-        <k-history
+        <KHistory
           style="padding-top: 80px;"
           id="history"
           service="archived-events"
@@ -30,10 +30,10 @@
           :height="height - 124">
           <template v-slot:empty-history>
             <div class="absolute-center">
-              <k-stamp icon="las la-exclamation-circle" icon-size="3rem" :text="$t('KHistory.EMPTY_HISTORY')" />
+              <KStamp icon="las la-exclamation-circle" icon-size="3rem" :text="$t('KHistory.EMPTY_HISTORY')" />
             </div>
           </template>
-        </k-history>
+        </KHistory>
       </div>
       <!--
         Events map
@@ -48,14 +48,14 @@
       -->
       <div v-show="showChart" class="row justify-center text-center q-ma-none q-pa-none" >
         <q-page-sticky position="top" :offset="[0, 60]">
-        <k-stats-chart ref="chart" :style="chartStyle" />
+        <KStatisticsChart ref="chart" :style="chartStyle" />
         </q-page-sticky>
         <q-btn v-show="currentChart > 1" size="1rem" flat round color="primary"
           icon="las la-chevron-left" class="absolute-left" @click="onPreviousChart"/>
         <q-btn v-show="currentChart < nbCharts" size="1rem" flat round color="primary"
           icon="las la-chevron-right" class="absolute-right" @click="onNextChart" />
       </div>
-      <k-modal
+      <KModal
         id="chart-settings-modal"
         :title="$t('ArchivedEventsActivity.CHART_SETTINGS_MODAL_TITLE')"
         :buttons="getChartSettingsModalButtons()"
@@ -69,13 +69,13 @@
           <q-select id="chart-render" v-model="render" :label="$t('ArchivedEventsActivity.RENDER_LABEL')"
             :options="renderOptions" @input="refreshChart"/>
         </div>
-      </k-modal>
+      </KModal>
       <!--
         Router view to enable routing to modals
       -->
       <router-view service="archived-events"></router-view>
     </template>
-  </k-page>
+  </KPage>
 </template>
 
 <script>
@@ -584,13 +584,6 @@ export default {
       ]
     }
   },
-  beforeCreate () {
-    this.$options.components['k-page'] = this.$load('layout/KPage')
-    this.$options.components['k-modal'] = this.$load('frame/KModal')
-    this.$options.components['k-history'] = this.$load('collection/KHistory')
-    this.$options.components['k-stamp'] = this.$load('frame/KStamp')
-    this.$options.components['k-stats-chart'] = this.$load('chart/KStatsChart')
-  },
   async created () {
     // Resgister map styles
     this.registerStyle('tooltip', this.getEventTooltip)
diff --git a/src/components/ArchivedPlanCard.vue b/src/components/ArchivedPlanCard.vue
index 4c6fd92c..36c5deb7 100644
--- a/src/components/ArchivedPlanCard.vue
+++ b/src/components/ArchivedPlanCard.vue
@@ -14,34 +14,34 @@
      -->
     <template v-slot:card-content>
       <!-- Objectives section -->
-      <k-card-section
+      <KCardSection
         v-if="isExpanded"
         :title="$t('ArchivedPlanCard.OBJECTIVES_SECTION')"
         :context="$props"
         :dense="dense"
       >
         <k-chips-pane v-if="item.objectives" class="q-pl-sm" :chips="item.objectives" :value-path="'name'" />
-        <k-stamp v-else :text="'ArchivedPlanCard.NO_OBJECTIVES_LABEL'" direction="horizontal" />
-      </k-card-section>
+        <KStamp v-else :text="'ArchivedPlanCard.NO_OBJECTIVES_LABEL'" direction="horizontal" />
+      </KCardSection>
       <!-- location section -->
-      <k-card-section
+      <KCardSection
         v-if="isExpanded"
         :title="$t('ArchivedPlanCard.LOCATION_SECTION')"
         :context="$props"
         :dense="dense"
       >
-        <k-location-map v-if="item.location" v-model="item.location" :editable="false" style="min-height: 220px;" />
-        <k-stamp v-else :text="'ArchivedPlanCard.NO_LOCATION_LABEL'" direction="horizontal" />
-      </k-card-section>
+        <KLocationMap v-if="item.location" v-model="item.location" :editable="false" style="min-height: 220px;" />
+        <KStamp v-else :text="'ArchivedPlanCard.NO_LOCATION_LABEL'" direction="horizontal" />
+      </KCardSection>
       <!-- coordinators section -->
-      <k-card-section
+      <KCardSection
         v-if="isExpanded"
         :title="$t('ArchivedPlanCard.COORDINATORS_SECTION')"
         :context="$props">
         <k-chips-pane class="q-pl-sm" :chips="item.coordinators" :valuePath="['profile.name', 'value', 'name']" />
-      </k-card-section>
+      </KCardSection>
       <!-- Timestamps section -->
-      <k-card-section
+      <KCardSection
         v-if="isExpanded"
         :dense="dense">
         <div v-if="createdAt || updatedAt || deletedAt">
@@ -56,7 +56,7 @@
             <small>{{ $t('ArchivedPlanCard.UPDATED_AT_LABEL') }} {{ updatedAt.toLocaleString() }}</small>
           </cite>
         </div>
-      </k-card-section>
+      </KCardSection>
     </template>
   </k-card>
 </template>
@@ -110,15 +110,6 @@ export default {
         style: 'min-width: 360px; max-width: 360px; min-height: 360px; max-height: 360px;'
       }
     }
-  },
-  beforeCreate () {
-    // Load the required components
-    this.$options.components['k-stamp'] = this.$load('frame/KStamp')
-    this.$options.components['k-card'] = this.$load('collection/KCard')
-    this.$options.components['k-card-section'] = this.$load('collection/KCardSection')
-    this.$options.components['k-text-area'] = this.$load('frame/KTextArea')
-    this.$options.components['k-chips-pane'] = this.$load('frame/KChipsPane')
-    this.$options.components['k-location-map'] = this.$load('KLocationMap')
   }
 }
 </script>
diff --git a/src/components/ArchivedPlansActivity.vue b/src/components/ArchivedPlansActivity.vue
index 0371f2b0..bda0214a 100644
--- a/src/components/ArchivedPlansActivity.vue
+++ b/src/components/ArchivedPlansActivity.vue
@@ -1,11 +1,11 @@
 <template>
-  <k-page padding @content-resized="onPageContentResized">
+  <KPage padding @content-resized="onPageContentResized">
     <template v-slot:page-content>
       <!--
         Page content
        -->
       <div class="row justify-center q-pa-lg">
-        <k-history
+        <KHistory
           v-if="height"
           id="history"
           service="archived-plans"
@@ -18,17 +18,17 @@
           :height="height">
           <template v-slot:empty-history>
             <div class="absolute-center">
-              <k-stamp icon="las la-exclamation-circle" icon-size="3rem" :text="$t('KHistory.EMPTY_HISTORY')" />
+              <KStamp icon="las la-exclamation-circle" icon-size="3rem" :text="$t('KHistory.EMPTY_HISTORY')" />
             </div>
           </template>
-        </k-history>
+        </KHistory>
       </div>
       <!--
         Router view to enable routing to modals
       -->
       <router-view service="archived-plans"></router-view>
     </template>
-  </k-page>
+  </KPage>
 </template>
 
 <script>
@@ -84,12 +84,6 @@ export default {
       this.height = size.height - 110
     }
   },
-  beforeCreate () {
-    // Load the required components
-    this.$options.components['k-page'] = this.$load('layout/KPage')
-    this.$options.components['k-history'] = this.$load('collection/KHistory')
-    this.$options.components['k-stamp'] = this.$load('frame/KStamp')
-  },
   async created () {
     // Setup current time to now
     this.currentTime = Time.getCurrentTime()
diff --git a/src/components/BillingEditor.vue b/src/components/BillingEditor.vue
index 0286c60e..da0e87c7 100644
--- a/src/components/BillingEditor.vue
+++ b/src/components/BillingEditor.vue
@@ -1,5 +1,5 @@
 <template>
-  <k-modal
+  <KModal
     :title="title"
     :buttons="getButtons()"
     :maximized="true"
@@ -9,20 +9,22 @@
       <!--
         Customer information section
       -->
-      <k-block
+      <KBlock
         id="customer-block"
         :color="customerBlockColor"
         :title="$t('BillingEditor.CUSTOMER_BLOCK_TITLE')"
         :text="customerBlockText"
         :action="$t('BillingEditor.CUSTOMER_BLOCK_ACTION')"
         :disabled="!isUserVerified"
-        @action-triggered="onUpdateCustomer" />
-      <customer-editor
+        @action-triggered="onUpdateCustomer"
+      />
+      <CustomerEditor
         id="customer-editor"
         ref="customerEditor"
         @customer-updated="onCustomerUpdated"
         :billingObjectId="objectId"
-        billingObjectService="organisations" />
+        billingObjectService="organisations" 
+      />
       <q-card>
         <q-card-section class="text-grey bg-grey-2">
           {{$t('BillingEditor.OPTIONS_BLOCK_TITLE')}}
@@ -32,38 +34,46 @@
         -->
         <q-expansion-item id="basic-plan" header-class="text-primary" group="billing"
         :label="$t('BillingEditor.PLAN_TITLE')" default-opened>
-          <billing-subscription-chooser
+          <BillingSubscriptionChooser
             :billingObjectId="objectId"
             billingObjectService="organisations"
             :quotas="quotas"
             :plans="plans"
             v-model="currentPlan"
-            :hasCustomer="customer !== undefined" />
+            :hasCustomer="customer !== undefined" 
+          />
         </q-expansion-item>
         <!--
           Options information secion
         -->
         <q-expansion-item id="optional-plans" header-class="text-primary" group="billing"
           :label="$t('BillingEditor.OPTIONS_TITLE')">
-          <billing-options-chooser
-          :billingObjectId="objectId"
-          billingObjectService="organisations"
-          :quotas="quotas"
-          :options="options"
-          v-model="currentOptions"
-          :hasCustomer="customer !== undefined" />
+          <BillingOptionsChooser
+            :billingObjectId="objectId"
+            billingObjectService="organisations"
+            :quotas="quotas"
+            :options="options"
+            v-model="currentOptions"
+            :hasCustomer="customer !== undefined" 
+          />
         </q-expansion-item>
       </q-card>
     </div>
-  </k-modal>
+  </KModal>
 </template>
 
 <script>
 import _ from 'lodash'
-import { mixins as kCoreMixins } from '@kalisio/kdk/core.client'
+import { mixins as kCoreMixins, utils as kdkCoreUtils } from '@kalisio/kdk/core.client'
 
 export default {
   name: 'billing-editor',
+  components: {
+    KBlock: kdkCoreUtils.loadComponent('frame/KBlock'),
+    CustomerEditor: kdkCoreUtils.loadComponent('CustomerEditor'),
+    BillingSubscriptionChooser: kdkCoreUtils.loadComponent('BillingSubscriptionChooser'),
+    BillingOptionsChooser: kdkCoreUtils.loadComponent('BillingOptionsChooser')
+  },
   mixins: [
     kCoreMixins.baseModal,
     kCoreMixins.objectProxy
@@ -140,14 +150,6 @@ export default {
       this.customer = customer
     }
   },
-  beforeCreate () {
-    // Load the required components
-    this.$options.components['k-modal'] = this.$load('frame/KModal')
-    this.$options.components['k-block'] = this.$load('frame/KBlock')
-    this.$options.components['customer-editor'] = this.$load('CustomerEditor')
-    this.$options.components['billing-subscription-chooser'] = this.$load('BillingSubscriptionChooser')
-    this.$options.components['billing-options-chooser'] = this.$load('BillingOptionsChooser')
-  },
   async created () {
     // Load available plans and Whenever the cabilities are updated, update plans as well
     this.refreshPlans()
diff --git a/src/components/CatalogActivity.vue b/src/components/CatalogActivity.vue
index 57dde191..c44a5449 100644
--- a/src/components/CatalogActivity.vue
+++ b/src/components/CatalogActivity.vue
@@ -1,5 +1,5 @@
 <template>
-  <k-page :padding="false">
+  <KPage :padding="false">
     <template v-slot:page-content>
       <!-- Map -->
       <div ref="map" :style="viewStyle">
@@ -26,7 +26,7 @@
       <!-- Child views -->
       <router-view />
     </template>
-  </k-page>
+  </KPage>
 </template>
 
 <script>
diff --git a/src/components/CustomerEditor.vue b/src/components/CustomerEditor.vue
index f2219e7f..604f37b5 100644
--- a/src/components/CustomerEditor.vue
+++ b/src/components/CustomerEditor.vue
@@ -1,14 +1,13 @@
 <template>
-  <k-modal
+  <KModal
     :title="$t('CustomerEditor.TITLE')"
     v-model="isModalOpened"
-    @opened="$emit('opened')"
-    @closed="$emit('closed')"
+    :routerMode="false"
     :buttons="getButtons()"
   >
     <div class="column">
       <div>
-        <k-form ref="form" :schema="getSchema()" @form-ready="onFormReady"/>
+        <KForm ref="form" :schema="getSchema()" @form-ready="onFormReady"/>
       </div>
       <div>
         <div>&nbsp;</div>
@@ -41,7 +40,7 @@
         </div>
       </div>
     </div>
-  </k-modal>
+  </KModal>
 </template>
 
 <script>
@@ -50,7 +49,6 @@ import _ from 'lodash'
 import { mixins as kCoreMixins } from '@kalisio/kdk/core.client'
 
 export default {
-  name: 'customer-editor',
   components: {
     // TODO Card
   },
diff --git a/src/components/EventActivity.vue b/src/components/EventActivity.vue
index 9c7597b8..bb6367e9 100644
--- a/src/components/EventActivity.vue
+++ b/src/components/EventActivity.vue
@@ -1,24 +1,25 @@
 <template>
-  <k-page :padding="false">
+  <KPage :padding="false">
     <template v-slot:page-content>
       <!-- Map -->
       <div ref="map" :style="viewStyle">
         <q-resize-observer @resize="onMapResized" />
       </div>
 
-      <k-modal ref="uploaderModal">
-        <k-uploader ref="uploader"
+      <KModal ref="uploaderModal">
+        <KUploader ref="uploader"
           :resource="objectId"
           :base-query="uploaderQuery()"
           :options="uploaderOptions()"
-          @uploader-ready="initializeMedias" />
-      </k-modal>
+          @uploader-ready="initializeMedias" 
+        />
+      </KModal>
 
-      <k-media-browser ref="mediaBrowser" :options="mediaBrowserOptions()" />
+      <KMediaBrowser ref="mediaBrowser" :options="mediaBrowserOptions()" />
 
       <router-view service="events"></router-view>
     </template>
-  </k-page>
+  </KPage>
 </template>
 
 <script>
@@ -304,12 +305,7 @@ export default {
   },
   created () {
     // Load the required components
-    this.$options.components['k-page'] = this.$load('layout/KPage')
-    this.$options.components['k-color-legend'] = this.$load('KColorLegend')
-    this.$options.components['k-modal'] = this.$load('frame/KModal')
-    this.$options.components['k-uploader'] = this.$load('input/KUploader')
-    this.$options.components['k-media-browser'] = this.$load('media/KMediaBrowser')
-    this.registerStyle('tooltip', this.getParticipantTooltip)
+       this.registerStyle('tooltip', this.getParticipantTooltip)
     this.registerStyle('popup', this.getParticipantPopup)
     this.registerStyle('markerStyle', this.getParticipantMarker)
     this.registerStyle('tooltip', this.getProbedLocationForecastTooltip)
diff --git a/src/components/EventActivityPanel.vue b/src/components/EventActivityPanel.vue
index 0503e972..01c3c4f5 100644
--- a/src/components/EventActivityPanel.vue
+++ b/src/components/EventActivityPanel.vue
@@ -94,10 +94,6 @@ export default {
     }
   },
   created () {
-    // Loads the required components
-    this.$options.components['k-avatar'] = this.$load('frame/KAvatar')
-    this.$options.components['k-text-area'] = this.$load('frame/KTextArea')
-    this.$options.components['k-layers-panel'] = this.$load('catalog/KLayersPanel')
     // Archived mode ?
     this.archived = _.get(this.$route, 'query.archived')
   }
diff --git a/src/components/EventCard.vue b/src/components/EventCard.vue
index 5b124fbd..b8b39f5a 100644
--- a/src/components/EventCard.vue
+++ b/src/components/EventCard.vue
@@ -11,7 +11,7 @@
       @collapsed="isExpanded = false">
       <template v-slot:card-description>
         <!-- Description -->
-        <k-card-section
+        <KCardSection
           :title="$t('KCard.DESCRIPTION_SECTION')"
           :actions="descriptionActions"
           :hideHeader="!isExpanded"
@@ -27,14 +27,14 @@
           <div v-else>
             {{ $t('KCard.NO_DESCRIPTION_LABEL')}}
           </div>
-        </k-card-section>
+        </KCardSection>
       </template>
       <!--
         Card content
        -->
       <template v-slot:card-content>
         <!-- Plan section is only visible in event dashbord -->
-        <k-card-section
+        <KCardSection
           v-if="planName"
           :title="$t('EventCard.PLAN_SECTION')"
           :hideHeader="!isExpanded"
@@ -51,11 +51,11 @@
           </q-badge>
           <q-space />
           <k-panel v-if="!isExpanded" :content="planActions" :context="$props" />
-          <k-stamp v-if="!planName" :text="'EventCard.UNDEFINED_PLAN_LABEL'" direction="horizontal" />
+          <KStamp v-if="!planName" :text="'EventCard.UNDEFINED_PLAN_LABEL'" direction="horizontal" />
           </div>
-        </k-card-section>
+        </KCardSection>
         <!-- Objective section is only visible in plan dashbord -->
-        <k-card-section
+        <KCardSection
           v-if="plan && !planName && (isExpanded || objective)"
           :title="$t('EventCard.OBJECTIVE_SECTION')"
           :hideHeader="!isExpanded"
@@ -64,34 +64,34 @@
           :dense="dense"
         >
           <q-badge v-if="objective" :label="objective" color="grey-7" :multi-line="true" />
-          <k-stamp v-else :text="'EventCard.UNDEFINED_OBJECTIVE_LABEL'" direction="horizontal" />
-        </k-card-section>
+          <KStamp v-else :text="'EventCard.UNDEFINED_OBJECTIVE_LABEL'" direction="horizontal" />
+        </KCardSection>
         <!-- Interaction section -->
-        <k-card-section v-if="participantLabel || coordinatorLabel"
+        <KCardSection v-if="participantLabel || coordinatorLabel"
           :context="$props"
           :dense="dense"
         >
           <div v-if="participantLabel" v-html="participantLabel"></div>
           <div v-if="coordinatorLabel" v-html="coordinatorLabel"></div>
-        </k-card-section>
+        </KCardSection>
         <!-- Comment section -->
-        <k-card-section v-if="comment"
+        <KCardSection v-if="comment"
           :title="$t('EventCard.COMMENT_SECTION')"
           :dense="dense">
           <k-text-area class="light-paragraph" :text="comment" :length="100" />
-        </k-card-section>
+        </KCardSection>
         <!-- Location section -->
-        <k-card-section
+        <KCardSection
           v-if="isExpanded"
           :title="$t('EventCard.LOCATION_SECTION')"
           :actions="locationActions"
           :context="$props"
           :dense="dense">
-          <k-location-map v-if="item.location" v-model="item.location" :editable="false" style="min-height: 220px;" />
-          <k-stamp v-else :text="'PlanCard.NO_LOCATION_LABEL'" direction="horizontal" />
-        </k-card-section>
+          <KLocationMap v-if="item.location" v-model="item.location" :editable="false" style="min-height: 220px;" />
+          <KStamp v-else :text="'PlanCard.NO_LOCATION_LABEL'" direction="horizontal" />
+        </KCardSection>
         <!-- Participants section -->
-        <k-card-section
+        <KCardSection
           v-if="isExpanded"
           :title="$t('EventCard.PARTICIPANTS_SECTION')"
           :actions="participantsActions"
@@ -107,9 +107,9 @@
           <div v-else>
             {{ $t('EventCard.UNDEFINED_PARTICIPANTS_LABEL')}}
           </div>
-        </k-card-section>
+        </KCardSection>
         <!-- Coordinators section -->
-        <k-card-section v-if="isExpanded"
+        <KCardSection v-if="isExpanded"
           :title="$t('EventCard.COORDINATORS_SECTION')"
           :actions="coordinatorsActions"
           :context="$props"
@@ -119,9 +119,9 @@
             class="q-pl-sm"
             :chips="item.coordinators"
             :value-path="['profile.name', 'value', 'name']" />
-        </k-card-section>
+        </KCardSection>
         <!-- Timestamps section -->
-        <k-card-section v-if="isExpanded" :dense="dense">
+        <KCardSection v-if="isExpanded" :dense="dense">
           <div v-if="createdAt || updatedAt || expireAt">
             <cite v-if="createdAt">
               <small>{{ $t('EventCard.CREATED_AT_LABEL') }} {{ createdAt.toLocaleString() }}</small>
@@ -135,7 +135,7 @@
               <small>{{ $t('EventCard.EXPIRE_AT_LABEL') }} {{ expireAt.toLocaleString() }}</small>
             </cite>
           </div>
-        </k-card-section>
+        </KCardSection>
       </template>
     </k-card>
     <!--
@@ -187,6 +187,9 @@ import mixins from '../mixins'
 
 export default {
   name: 'event-card',
+  components: {
+    EventLogsList: kCoreUtils.loadComponent('EventLogsList')
+  },
   mixins: [
     kCoreMixins.baseItem,
     kCoreMixins.service,
@@ -679,21 +682,6 @@ export default {
       this.$refs.followUpModal.close()
     }
   },
-  beforeCreate () {
-    // Load the required components
-    this.$options.components['k-stamp'] = this.$load('frame/KStamp')
-    this.$options.components['k-card'] = this.$load('collection/KCard')
-    this.$options.components['k-card-section'] = this.$load('collection/KCardSection')
-    this.$options.components['k-panel'] = this.$load('frame/KPanel')
-    this.$options.components['k-modal'] = this.$load('frame/KModal')
-    this.$options.components['k-text-area'] = this.$load('frame/KTextArea')
-    this.$options.components['k-chips-pane'] = this.$load('frame/KChipsPane')
-    this.$options.components['k-form'] = this.$load('form/KForm')
-    this.$options.components['k-uploader'] = this.$load('input/KUploader')
-    this.$options.components['k-media-browser'] = this.$load('media/KMediaBrowser')
-    this.$options.components['event-logs-list'] = this.$load('EventLogsList')
-    this.$options.components['k-location-map'] = this.$load('KLocationMap')
-  },
   created () {
     // Required alias for the event logs mixin
     this.event = this.item
diff --git a/src/components/EventLogItem.vue b/src/components/EventLogItem.vue
index e2daca7e..388d185e 100644
--- a/src/components/EventLogItem.vue
+++ b/src/components/EventLogItem.vue
@@ -1,5 +1,5 @@
 <template>
-  <k-item
+  <KItem
     v-bind="$props"
     :options="{ toggle: true }"
     :actions="itemActions"
@@ -24,7 +24,7 @@
         <q-item-label v-if="createdAt" caption>{{ createdAt.toLocaleString() }}</q-item-label>
       </q-item-section>
     </template>
-  </k-item>
+  </KItem>
 </template>
 
 <script>
@@ -60,10 +60,6 @@ export default {
       return this.item.createdAt ? new Date(this.item.createdAt) : null
     }
   },
-  beforeCreate () {
-    // Load the required components
-    this.$options.components['k-item'] = this.$load('collection/KItem')
-  },
   created () {
     // Archived mode ?
     this.archived = _.get(this.$route, 'query.archived')
diff --git a/src/components/EventLogsList.vue b/src/components/EventLogsList.vue
index 6026f55a..d06a1e09 100644
--- a/src/components/EventLogsList.vue
+++ b/src/components/EventLogsList.vue
@@ -12,7 +12,7 @@
     <!--
       Event logs list
     -->
-    <k-list
+    <KList
       ref="list"
       :service="getServiceName()"
       :renderer="renderer"
@@ -23,18 +23,18 @@
       @toggle-changed="onItemToggled"
       @collection-refreshed="onCollectionRefreshed">
         <template v-slot:empty-section>
-          <k-stamp icon="las la-exclamation-circle" icon-size="3rem" :text="$t('KList.EMPTY_LIST')" />
+          <KStamp icon="las la-exclamation-circle" icon-size="3rem" :text="$t('KList.EMPTY_LIST')" />
         </template>
-      </k-list>
+      </KList>
     <!--
       Follow up modal
     -->
-    <k-modal ref="followUpModal"
+    <KModal ref="followUpModal"
       :title="followUpTitle"
       :buttons="getFollowUpButtons()"
     >
-      <k-form ref="form" :schema="schema"/>
-    </k-modal>
+      <KForm ref="form" :schema="schema" />
+    </KModal>
   </div>
 </template>
 
@@ -259,7 +259,7 @@ export default {
   created () {
     // Load the required components
     this.$options.components['k-list'] = this.$load('collection/KList')
-    this.$options.components['k-stamp'] = this.$load('frame/KStamp')
+    this.$options.components['KStamp'] = this.$load('frame/KStamp')
     this.$options.components['k-modal'] = this.$load('frame/KModal')
     this.$options.components['k-form'] = this.$load('form/KForm')
     this.$options.components['k-action'] = this.$load('frame/KAction')
diff --git a/src/components/EventTemplateCard.vue b/src/components/EventTemplateCard.vue
index 4c4da5b8..b68a4d82 100644
--- a/src/components/EventTemplateCard.vue
+++ b/src/components/EventTemplateCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <k-card
+  <KCard
     v-bind="$props"
     :actions="itemActions"
     :bind-actions="false">
@@ -8,7 +8,7 @@
      -->
     <template v-slot:card-content>
        <!-- Participants section -->
-      <k-card-section
+      <KCardSection
         :title="$t('EventTemplateCard.PARTICIPANTS_SECTION')"
         :actions="participantsActions"
         :context="$props">
@@ -20,9 +20,9 @@
         <div v-else>
           {{ $t('EventTemplateCard.NO_PARTICIPANTS_LABEL')}}
         </div>
-      </k-card-section>
+      </KCardSection>
       <!-- Coordinators section -->
-      <k-card-section
+      <KCardSection
         :title="$t('PlanTemplateCard.COORDINATORS_SECTION')"
         :actions="coordinatorsActions"
         :context="$props">
@@ -34,9 +34,9 @@
         <div v-else>
           {{ $t('PlanTemplateCard.NO_COORDINATORS_LABEL')}}
         </div>
-      </k-card-section>
+      </KCardSection>
       <!-- Expiry duration section -->
-      <k-card-section
+      <KCardSection
         :title="$t('EventTemplateCard.EXPIRY_DURATION_SECTION')"
         :actions="expiryDurationActions"
         :context="$props">
@@ -46,16 +46,16 @@
         <div v-else>
           {{ $t('EventTemplateCard.NO_EXPIRY_DURATION_LABEL')}}
         </div>
-      </k-card-section>
+      </KCardSection>
       <!-- Permission section -->
-      <k-card-section
+      <KCardSection
         :title="$t('EventTemplateCard.PERMISSION_SECTION')"
         :actions="permissionActions"
         :context="$props">
         <q-chip :label="permission" outline square dense color="grey-10" />
-      </k-card-section>
+      </KCardSection>
       <!-- Workflow section -->
-      <k-card-section
+      <KCardSection
         :title="$t('EventTemplateCard.WORKFLOW_SECTION')"
         :actions="workflowActions"
         :context="$props">
@@ -65,9 +65,9 @@
         <div v-else>
           {{ $t('EventTemplateCard.NO_WORKFLOW_LABEL')}}
         </div>
-      </k-card-section>
+      </KCardSection>
     </template>
-  </k-card>
+  </KCard>
 </template>
 
 <script>
@@ -132,13 +132,6 @@ export default {
         this.$api.getService('event-templates').patch(this.item._id, { workflow: null, hasWorkflow: false })
       })
     }
-  },
-  beforeCreate () {
-    // Load the required components
-    this.$options.components['k-card'] = this.$load('collection/KCard')
-    this.$options.components['k-card-section'] = this.$load('collection/KCardSection')
-    this.$options.components['k-chips-pane'] = this.$load('frame/KChipsPane')
-    this.$options.components['k-text-area'] = this.$load('frame/KTextArea')
   }
 }
 </script>
diff --git a/src/components/EventTemplatesActivity.vue b/src/components/EventTemplatesActivity.vue
index 88aba124..434841e6 100644
--- a/src/components/EventTemplatesActivity.vue
+++ b/src/components/EventTemplatesActivity.vue
@@ -1,5 +1,5 @@
 <template>
-  <k-page padding>
+  <KPage padding>
     <template v-slot:page-content>
       <!--
         Templates collection
@@ -14,7 +14,7 @@
         :list-strategy="'smart'">
         <template v-slot:empty-section>
           <div class="absolute-center">
-            <k-stamp icon="las la-exclamation-circle" icon-size="3rem" :text="$t('KGrid.EMPTY_GRID')" />
+            <KStamp icon="las la-exclamation-circle" icon-size="3rem" :text="$t('KGrid.EMPTY_GRID')" />
           </div>
         </template>
       </k-grid>
@@ -23,7 +23,7 @@
       -->
       <router-view service="event-templates"></router-view>
     </template>
-  </k-page>
+  </KPage>
 </template>
 
 <script>
@@ -48,12 +48,6 @@ export default {
         component: 'EventTemplateCard'
       }, this.activityOptions.items)
     }
-  },
-  created () {
-    // Load the required components
-    this.$options.components['k-page'] = this.$load('layout/KPage')
-    this.$options.components['k-grid'] = this.$load('collection/KGrid')
-    this.$options.components['k-stamp'] = this.$load('frame/KStamp')
   }
 }
 </script>
diff --git a/src/components/EventsActivity.vue b/src/components/EventsActivity.vue
index e430065a..991b4d8a 100644
--- a/src/components/EventsActivity.vue
+++ b/src/components/EventsActivity.vue
@@ -1,10 +1,10 @@
 <template>
-  <k-page padding @content-resized="onPageContentResized">
+  <KPage padding @content-resized="onPageContentResized">
     <template v-slot:page-content>
       <!--
         Events collection
       -->
-      <k-grid
+      <KGrid
         v-if="!planId"
         ref="eventsGrid"
         service="events"
@@ -15,21 +15,22 @@
         :list-strategy="'smart'">
         <template v-slot:empty-section>
           <div class="absolute-center">
-            <k-stamp icon="las la-exclamation-circle" icon-size="3rem" :text="$t('KGrid.EMPTY_GRID')" />
+            <KStamp icon="las la-exclamation-circle" icon-size="3rem" :text="$t('KGrid.EMPTY_GRID')" />
           </div>
         </template>
-      </k-grid>
-      <k-board
+      </KGrid>
+      <KBoard
         v-else-if="height"
         ref="eventsBoard"
         :columns="boardColumns"
-        :height="height" />
+        :height="height" 
+      />
       <!--
         Router view to enable routing to modals
       -->
       <router-view service="events"></router-view>
     </template>
-  </k-page>
+  </KPage>
 </template>
 
 <script>
@@ -198,13 +199,6 @@ export default {
       column.refreshCollection()
     }
   },
-  beforeCreate () {
-    // Load the required components
-    this.$options.components['k-page'] = this.$load('layout/KPage')
-    this.$options.components['k-grid'] = this.$load('collection/KGrid')
-    this.$options.components['k-board'] = this.$load('collection/KBoard')
-    this.$options.components['k-stamp'] = this.$load('frame/KStamp')
-  },
   created () {
     this.$events.on('user-changed', this.refreshFab)
     // Keep track of changes once loaded
diff --git a/src/components/OrganisationCard.vue b/src/components/OrganisationCard.vue
index 2c6ee3d7..94e0ca23 100644
--- a/src/components/OrganisationCard.vue
+++ b/src/components/OrganisationCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <k-card
+  <KCard
     v-bind="$props"
     :header="header"
     :actions="itemActions"
@@ -10,82 +10,88 @@
     <!--
       Card avatar
     -->
-    <template slot:card-avatar>
-      <k-avatar class="q-pa-sm" :object="item" :contextId="item._id" size="4rem" />
+    <template v-slot:card-avatar>
+      <KAvatar class="q-pa-sm" :object="item" :contextId="item._id" size="4rem" />
     </template>
     <!--
       Card content
      -->
-    <template slot:card-content>
-      <k-card-section
+    <template v-slot:card-content>
+      <KCardSection
         :title="$t('OrganisationCard.EVENTS_SECTION')"
         :hide-header="!isExpanded"
       >
         <!-- Events section -->
         <div class="full-width row justify-between items-center no-wrap">
-          <k-action
+          <KAction
             id= "organisation-events"
             icon= "las la-fire"
             :label="$t('OrganisationCard.EVENTS_LABEL', { count: eventsCount })"
             @triggered="routeTo('events-activity')"
-            style="max-width: 60%" />
+            style="max-width: 60%" 
+          />
           <div>
-            <k-action
+            <KAction
               v-if="canAccessCatalog"
               id= "organisation-catalog"
               icon= "las la-map"
               :tooltip="$t('OrganisationCard.VIEW_CATALOG')"
-              @triggered="routeTo('catalog-activity')"  />
-            <k-action
+              @triggered="routeTo('catalog-activity')"
+            />
+            <KAction
               v-if="canAccessArchivedEvents"
               id= "organisation-archived-events"
               icon= "las la-clipboard-list"
               :tooltip="$t('OrganisationCard.VIEW_ARCHIVED_EVENTS')"
-              @triggered="routeTo('archived-events-activity')"   />
+              @triggered="routeTo('archived-events-activity')"
+            />
           </div>
         </div>
-      </k-card-section>
+      </KCardSection>
       <!-- Plans section -->
-      <k-card-section
+      <KCardSection
         v-if="canAccessPlans"
         :title="$t('OrganisationCard.PLANS_SECTION')"
         :hide-header="!isExpanded"
       >
         <div class="full-width row justify-between items-center no-wrap">
-          <k-action
+          <KAction
             id= "organisation-plans"
             icon= "las la-stream"
             :label="$t('OrganisationCard.PLANS_LABEL', { count: plansCount })"
             @triggered="routeTo('plans-activity')"
-            style="max-width: 75%" />
-          <k-action
+            style="max-width: 75%"
+          />
+          <KAction
             v-if="canAccessArchivedPlans"
             id= "organisation-archived-plans"
             icon= "las la-archive"
             :tooltip="$t('OrganisationCard.VIEW_ARCHIVED_PLANS')"
-            @triggered="routeTo('archived-plans-activity')" />
+            @triggered="routeTo('archived-plans-activity')" 
+          />
         </div>
-      </k-card-section>
+      </KCardSection>
       <!-- Administation section -->
       <div v-if="isExpanded">
         <!-- Organisation section -->
-        <k-card-section :title="isMember ? $t('OrganisationCard.INFORMATION_SECTION') : $t('OrganisationCard.ADMINISTRATION_SECTION')">
+        <KCardSection :title="isMember ? $t('OrganisationCard.INFORMATION_SECTION') : $t('OrganisationCard.ADMINISTRATION_SECTION')">
           <div class="q-pb-sm">
             <template v-for="element in structure" :key="element.key">
               <div class="full-width row justify-between items-center no-wrap">
-                <k-action
+                <KAction
                   :id="`organisation-${element.name}`"
                   :icon="element.icon"
                   :label="$t(`OrganisationCard.${element.key}`, { count: counters[element.name] })"
                   @triggered="routeTo(`${element.name}-activity`)"
-                  style="max-width: 75%" />
+                  style="max-width: 75%" 
+                />
                 <q-badge v-if="!isMember" :label="`${quotas[element.name]} max`" color="grey-7" />
               </div>
             </template>
           </div>
-        </k-card-section>
+        </KCardSection>
         <!-- Billing section -->
-        <k-card-section v-if="canAccessBilling" :title="$t('OrganisationCard.SUBSCRIPTIONS_LABEL')" :actions="[{
+        <KCardSection v-if="canAccessBilling" :title="$t('OrganisationCard.SUBSCRIPTIONS_LABEL')" :actions="[{
           id: 'edit-billing', icon: 'las la-edit', size: 'sm', tooltip: 'OrganisationCard.EDIT_ACTION',
           route: { name: 'edit-organisation-billing', params: { objectId: item._id, title: item.name } }
         }]">
@@ -96,10 +102,10 @@
               </div>
             </template>
           </div>
-        </k-card-section>
+        </KCardSection>
       </div>
     </template>
-  </k-card>
+  </KCard>
 </template>
 
 <script>
@@ -227,17 +233,10 @@ export default {
       // Counts the different elements
       for (let i = 0; i < this.structure.length; ++i) {
         const service = this.structure[i].name
-        this.$set(this.counters, service, await this.countItems(service))
+        this.counters[service] = await this.countItems(service)
       }
     }
   },
-  beforeCreate () {
-    // Load the required components
-    this.$options.components['k-card'] = this.$load('collection/KCard')
-    this.$options.components['k-card-section'] = this.$load('collection/KCardSection')
-    this.$options.components['k-avatar'] = this.$load('frame/KAvatar')
-    this.$options.components['k-action'] = this.$load('frame/KAction')
-  },
   async created () {
     await this.updateCounts()
     // Keep track of changes once loaded
diff --git a/src/components/OrganisationMenu.vue b/src/components/OrganisationMenu.vue
index 94caa052..3ac85365 100644
--- a/src/components/OrganisationMenu.vue
+++ b/src/components/OrganisationMenu.vue
@@ -10,12 +10,13 @@
       menu-self="top middle">
       <template v-slot:label>
         <div>
-          <k-avatar
+          <KAvatar
             id="organisation-avatar"
             :class="$q.screen.lt.sm ? 'q-pa-none' : 'q-pa-xs'"
             :object="organisation"
             :contextId="organisation._id"
-            :size="$q.screen.lt.sm ? '1.5rem' : '2rem'" />
+            :size="$q.screen.lt.sm ? '1.5rem' : '2rem'" 
+          />
         </div>
       </template>
       <template v-slot:default>
@@ -23,58 +24,64 @@
           <div class="row full-width justify-center q-pa-md text-subtitle1 bg-grey-4">
             {{ organisation.name }}
           </div>
-          <k-card-section v-if="hasEventsSection">
+          <KCardSection v-if="hasEventsSection">
             <!-- Events section -->
             <div class="full-width row justify-between items-center no-wrap">
-              <k-action
+              <KAction
                 id= "organisation-events"
                 icon= "las la-fire"
                 :label="$t('OrganisationMenu.EVENTS_LABEL', { count: eventsCount })"
-                @triggered="routeTo('events-activity')" />
-              <q-space />
-              <k-action
+                @triggered="routeTo('events-activity')" 
+              />
+              <QSpace />
+              <KAction
                 v-if="canAccessCatalog"
                 id= "organisation-catalog"
                 icon= "las la-map"
                 :tooltip="$t('OrganisationMenu.VIEW_CATALOG')"
-                @triggered="routeTo('catalog-activity')"  />
-              <k-action
+                @triggered="routeTo('catalog-activity')"  
+              />
+              <KAction
                 v-if="canAccessArchivedEvents"
                 id= "organisation-archived-events"
                 icon= "las la-clipboard-list"
                 :tooltip="$t('OrganisationMenu.VIEW_ARCHIVED_EVENTS')"
-                @triggered="routeTo('archived-events-activity')"   />
+                @triggered="routeTo('archived-events-activity')"   
+              />
             </div>
-          </k-card-section>
+          </KCardSection>
           <!-- Plans section -->
-          <k-card-section v-if="hasPlansSection && canAccessPlans">
+          <KCardSection v-if="hasPlansSection && canAccessPlans">
             <div class="full-width row justify-between items-center no-wrap">
-              <k-action
+              <KAction
                 id= "organisation-plans"
                 icon= "las la-stream"
                 :label="$t('OrganisationMenu.PLANS_LABEL', { count: plansCount })"
-                @triggered="routeTo('plans-activity')" />
-              <q-space />
-              <k-action
+                @triggered="routeTo('plans-activity')" 
+              />
+              <QSpace />
+              <KAction
                 v-if="canAccessArchivedPlans"
                 id= "organisation-archived-plans"
                 icon= "las la-archive"
                 :tooltip="$t('OrganisationMenu.VIEW_ARCHIVED_PLANS')"
-                @triggered="routeTo('archived-plans-activity')" />
+                @triggered="routeTo('archived-plans-activity')" 
+              />
             </div>
-          </k-card-section>
+          </KCardSection>
           <!-- Manage section -->
-          <k-card-section v-if="hasManageSection && canManageOrganisation">
+          <KCardSection v-if="hasManageSection && canManageOrganisation">
             <div class="row justify-center">
-              <k-action
+              <KAction
                 id= "manage-organisation"
                 icon= "las la-cog"
                 size="md"
                 :label="$t('OrganisationMenu.MANAGE_ORGANISATION')"
                 @triggered="routeTo('members-activity')"
-                :propagate="false" />
+                :propagate="false" 
+              />
             </div>
-          </k-card-section>
+          </KCardSection>
         </q-card>
       </template>
     </q-btn-dropdown>
@@ -173,11 +180,6 @@ export default {
       this.plansCount = await this.countItems('plans', query)
     }
   },
-  beforeCreate () {
-    this.$options.components['k-avatar'] = this.$load('frame/KAvatar')
-    this.$options.components['k-card-section'] = this.$load('collection/KCardSection')
-    this.$options.components['k-action'] = this.$load('frame/KAction')
-  },
   async created () {
     await this.updateCounts()
     // Keep track of changes once loaded
diff --git a/src/components/PlanCard.vue b/src/components/PlanCard.vue
index c39fd398..fc07c20c 100644
--- a/src/components/PlanCard.vue
+++ b/src/components/PlanCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <k-card
+  <KCard
     v-bind="$props"
     :header="header"
     :actions="itemActions"
@@ -9,47 +9,50 @@
      -->
     <template v-slot:card-content>
       <!-- Objectives section -->
-      <k-card-section :title="$t('PlanCard.OBJECTIVES_SECTION')" :actions="objectivesActions">
+      <KCardSection :title="$t('PlanCard.OBJECTIVES_SECTION')" :actions="objectivesActions">
         <k-chips-pane v-if="hasObjectives" class="q-pl-sm" :chips="item.objectives" :value-path="'name'" />
-        <k-stamp v-else :text="'PlanCard.NO_OBJECTIVES_LABEL'" direction="horizontal" />
-      </k-card-section>
+        <KStamp v-else :text="'PlanCard.NO_OBJECTIVES_LABEL'" direction="horizontal" />
+      </KCardSection>
       <!-- location section -->
-      <k-card-section :title="$t('PlanCard.LOCATION_SECTION')" :actions="locationActions" :context="$props">
-        <k-location-map v-if="item.location" v-model="item.location" :editable="false" style="min-height: 220px;" />
-        <k-stamp v-else :text="'PlanCard.NO_LOCATION_LABEL'" direction="horizontal" />
-      </k-card-section>
+      <KCardSection :title="$t('PlanCard.LOCATION_SECTION')" :actions="locationActions" :context="$props">
+        <KLocationMap v-if="item.location" v-model="item.location" :editable="false" style="min-height: 220px;" />
+        <KStamp v-else :text="'PlanCard.NO_LOCATION_LABEL'" direction="horizontal" />
+      </KCardSection>
       <!-- coordinators section -->
-      <k-card-section
+      <KCardSection
         :title="$t('PlanCard.COORDINATORS_SECTION')"
         :actions="coordinatorsActions"
         :context="$props">
         <k-chips-pane class="q-pl-sm" :chips="item.coordinators" :value-path="['profile.name', 'value', 'name']" />
-      </k-card-section>
+      </KCardSection>
       <!-- Events section -->
-      <k-card-section :title="$t('PlanCard.EVENTS_SECTION')">
+      <KCardSection :title="$t('PlanCard.EVENTS_SECTION')">
         <div class="full-width row justify-between items-center no-wrap">
-          <k-action
+          <KAction
             id= "plan-events"
             icon= "las la-fire"
             :label="$t('PlanCard.EVENTS', { count: eventsCount })"
-            :route="{ name: 'events-activity', params: { contextId }, query: { plan: item._id } }" />
-          <q-space />
-          <k-action
+            :route="{ name: 'events-activity', params: { contextId }, query: { plan: item._id } }"
+          />
+          <QSpace />
+          <KAction
             v-if="canAccessCatalog"
             id= "plan-catalog"
             icon= "las la-map"
             :tooltip="$t('PlanCard.VIEW_CATALOG')"
-            :route="{ name: 'catalog-activity', params: { contextId }, query: { plan: item._id } }" />
-          <k-action
+            :route="{ name: 'catalog-activity', params: { contextId }, query: { plan: item._id } }"
+          />
+          <KAction
             v-if="canAccessArchivedEvents"
             id= "plan-archived-events"
             icon= "las la-clipboard-list"
             :tooltip="$t('PlanCard.VIEW_ARCHIVED_EVENTS')"
-            :route="{ name: 'archived-events-activity', params: { contextId }, query: { plan: item._id } }"  />
+            :route="{ name: 'archived-events-activity', params: { contextId }, query: { plan: item._id } }" 
+          />
         </div>
-      </k-card-section>
+      </KCardSection>
     </template>
-  </k-card>
+  </KCard>
 </template>
 
 <script>
@@ -101,16 +104,6 @@ export default {
       })
     }
   },
-  beforeCreate () {
-    // Load the required components
-    this.$options.components['k-stamp'] = this.$load('frame/KStamp')
-    this.$options.components['k-card'] = this.$load('collection/KCard')
-    this.$options.components['k-card-section'] = this.$load('collection/KCardSection')
-    this.$options.components['k-action'] = this.$load('frame/KAction')
-    this.$options.components['k-text-area'] = this.$load('frame/KTextArea')
-    this.$options.components['k-chips-pane'] = this.$load('frame/KChipsPane')
-    this.$options.components['k-location-map'] = this.$load('KLocationMap')
-  },
   async created () {
     // Count the number of events
     const service = this.$api.getService('events', this.contextId)
diff --git a/src/components/PlanEditor.vue b/src/components/PlanEditor.vue
index 31e33b4e..2d486883 100644
--- a/src/components/PlanEditor.vue
+++ b/src/components/PlanEditor.vue
@@ -1,16 +1,16 @@
 <template>
-  <k-modal
+  <KModal
     :title="editorTitle"
     :buttons="getButtons()"
     v-model="isModalOpened"
   >
-    <k-form 
+    <KForm
       ref="planForm"
       :contextId="contextId" 
       :objectId="objectId" 
       :schema="schema" 
     />
-  </k-modal>
+  </KModal>
 </template>
 
 <script>
diff --git a/src/components/PlanMenu.vue b/src/components/PlanMenu.vue
index 7c1dcbb7..c4ac08c9 100644
--- a/src/components/PlanMenu.vue
+++ b/src/components/PlanMenu.vue
@@ -14,11 +14,12 @@
     <template v-slot:default>
       <q-card v-if="plan" class="bg-white" :style="computedStyle">
         <div class="row full-width justify-center items-center q-pa-md q-gutter-x-sm text-subtitle1 bg-grey-4">
-          <k-avatar
+          <KAvatar
             :class="$q.screen.lt.sm ? 'q-pa-none' : 'q-pa-xs'"
             :object="plan"
             :contextId="organisation._id"
-            size="sm" />
+            size="sm" 
+          />
           <div>
             {{ plan.name }}
           </div>
@@ -26,12 +27,12 @@
         <div class="q-pa-xs">
           <k-text-area class="light-paragraph q-pa-sm" :text="plan.description" />
           <!-- Objectives section -->
-          <k-card-section>
+          <KCardSection>
             <template v-for="(objective, index) in plan.objectives" :key="objective.id">
               <div class="row full-width items-center justify-between no-wrap">
                 <q-toggle class="col-8" v-model="objectiveFilters[index]" :label="objective.name" />
                 <div class="row items-center q-gutter-x-sm no-wrap q-pr-sm">
-                  <k-panel id="objective-actions" :content="getObjectiveActions(objective)" :dense="true" />
+                  <KPanel id="objective-actions" :content="getObjectiveActions(objective)" :dense="true" />
                   <q-knob
                     readonly
                     show-value
@@ -48,7 +49,7 @@
                 </div>
               </div>
             </template>
-          </k-card-section>
+          </KCardSection>
         </div>
       </q-card>
     </template>
@@ -169,14 +170,6 @@ export default {
         }
       }
     }
-  },
-  async beforeCreate () {
-    // Loads the required components
-    this.$options.components['k-action'] = this.$load('frame/KAction')
-    this.$options.components['k-panel'] = this.$load('frame/KPanel')
-    this.$options.components['k-avatar'] = this.$load('frame/KAvatar')
-    this.$options.components['k-text-area'] = this.$load('frame/KTextArea')
-    this.$options.components['k-card-section'] = this.$load('collection/KCardSection')
   }
 }
 </script>
diff --git a/src/components/PlanObjectiveItem.vue b/src/components/PlanObjectiveItem.vue
index 7b8ab75f..89f209c3 100644
--- a/src/components/PlanObjectiveItem.vue
+++ b/src/components/PlanObjectiveItem.vue
@@ -5,7 +5,7 @@
         <span v-html="description" />
       </q-tooltip>
     </div>
-    <k-panel id="item-actions" :content="itemActions" :context="$props" />
+    <KPanel id="item-actions" :content="itemActions" :context="$props" />
   </div>
 </template>
 
@@ -14,10 +14,6 @@ import { mixins } from '@kalisio/kdk/core.client'
 
 export default {
   name: 'plan-objective-item',
-  mixins: [mixins.baseItem],
-  created () {
-    // Loads the required components
-    this.$options.components['k-panel'] = this.$load('frame/KPanel')
-  }
+  mixins: [mixins.baseItem]
 }
 </script>
diff --git a/src/components/PlanObjectivesEditor.vue b/src/components/PlanObjectivesEditor.vue
index fd887bc9..18d3491f 100644
--- a/src/components/PlanObjectivesEditor.vue
+++ b/src/components/PlanObjectivesEditor.vue
@@ -226,13 +226,6 @@ export default {
       await this.updatePlanObjectives(objectives)
     }
   },
-  beforeCreate () {
-    // Load the required components
-    this.$options.components['k-modal'] = this.$load('frame/KModal')
-    this.$options.components['k-panel'] = this.$load('frame/KPanel')
-    this.$options.components['k-list'] = this.$load('collection/KList')
-    this.$options.components['k-form'] = this.$load('form/KForm')
-  },
   async created () {
     await this.loadObject()
     // Extract objectives as we will map it using an in-memory service
diff --git a/src/components/PlanTemplateCard.vue b/src/components/PlanTemplateCard.vue
index 495d6608..9625f6d7 100644
--- a/src/components/PlanTemplateCard.vue
+++ b/src/components/PlanTemplateCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <k-card
+  <KCard
     v-bind="$props"
     :actions="itemActions"
     :bind-actions="false">
@@ -8,7 +8,7 @@
      -->
     <template v-slot:card-content>
       <!-- Objectives section -->
-      <k-card-section
+      <KCardSection
         :title="$t('PlanTemplateCard.OBJECTIVES_SECTION')"
         :actions="objectivesActions"
         :context="$props">
@@ -18,9 +18,9 @@
         <div v-else>
           {{ $t('PlanTemplateCard.NO_OBJECTIVES_LABEL')}}
         </div>
-      </k-card-section>
+      </KCardSection>
       <!-- coordinators section -->
-      <k-card-section
+      <KCardSection
         :title="$t('PlanTemplateCard.COORDINATORS_SECTION')"
         :actions="coordinatorsActions"
         :context="$props">
@@ -33,16 +33,16 @@
         <div v-else>
           {{ $t('PlanTemplateCard.NO_COORDINATORS_LABEL')}}
         </div>
-      </k-card-section>
+      </KCardSection>
       <!-- Permission section -->
-      <k-card-section
+      <KCardSection
         :title="$t('PlanTemplateCard.PERMISSION_SECTION')"
         :actions="permissionActions"
         :context="$props">
         <q-chip :label="permission" outline square dense color="grey-10" />
-      </k-card-section>
+      </KCardSection>
     </template>
-  </k-card>
+  </KCard>
 </template>
 
 <script>
@@ -78,13 +78,6 @@ export default {
         name: 'edit-plan-template-objectives', params: { objectId: this.item._id }
       })
     }
-  },
-  beforeCreate () {
-    // Load the required components
-    this.$options.components['k-card'] = this.$load('collection/KCard')
-    this.$options.components['k-card-section'] = this.$load('collection/KCardSection')
-    this.$options.components['k-chips-pane'] = this.$load('frame/KChipsPane')
-    this.$options.components['k-text-area'] = this.$load('frame/KTextArea')
   }
 }
 </script>
diff --git a/src/components/PlanTemplatesActivity.vue b/src/components/PlanTemplatesActivity.vue
index 88b7027a..1f6db6a5 100644
--- a/src/components/PlanTemplatesActivity.vue
+++ b/src/components/PlanTemplatesActivity.vue
@@ -1,10 +1,10 @@
 <template>
-  <k-page padding>
+  <KPage padding>
     <template v-slot:page-content>
       <!--
         Templates collection
       -->
-      <k-grid
+      <KGrid
         ref="planTemplatesGrid"
         service="plan-templates"
         :renderer="renderer"
@@ -14,16 +14,16 @@
         :list-strategy="'smart'">
         <template v-slot:empty-section>
           <div class="absolute-center">
-            <k-stamp icon="las la-exclamation-circle" icon-size="3rem" :text="$t('KGrid.EMPTY_GRID')" />
+            <KStamp icon="las la-exclamation-circle" icon-size="3rem" :text="$t('KGrid.EMPTY_GRID')" />
           </div>
         </template>
-      </k-grid>
+      </KGrid>
       <!--
         Router view to enable routing to modals
       -->
       <router-view service="plan-templates"></router-view>
     </template>
-  </k-page>
+  </KPage>
 </template>
 
 <script>
@@ -48,12 +48,6 @@ export default {
         component: 'PlanTemplateCard'
       }, this.activityOptions.items)
     }
-  },
-  created () {
-    // Load the required components
-    this.$options.components['k-page'] = this.$load('layout/KPage')
-    this.$options.components['k-grid'] = this.$load('collection/KGrid')
-    this.$options.components['k-stamp'] = this.$load('frame/KStamp')
   }
 }
 </script>
diff --git a/src/components/PlansActivity.vue b/src/components/PlansActivity.vue
index aa3646f7..7139f8cc 100644
--- a/src/components/PlansActivity.vue
+++ b/src/components/PlansActivity.vue
@@ -1,10 +1,10 @@
 <template>
-  <k-page padding>
+  <KPage padding>
     <template v-slot:page-content>
       <!--
         Templates collection
       -->
-      <k-grid
+      <KGrid
         ref="plansGrid"
         service="plans"
         :renderer="renderer"
@@ -14,16 +14,16 @@
         :list-strategy="'smart'">
         <template v-slot:empty-section>
           <div class="absolute-center">
-            <k-stamp icon="las la-exclamation-circle" icon-size="3rem" :text="$t('KGrid.EMPTY_GRID')" />
+            <KStamp icon="las la-exclamation-circle" icon-size="3rem" :text="$t('KGrid.EMPTY_GRID')" />
           </div>
         </template>
-      </k-grid>
+      </KGrid>
       <!--
         Router view to enable routing to modals
       -->
       <router-view service="plans"></router-view>
     </template>
-  </k-page>
+  </KPage>
 </template>
 
 <script>
@@ -122,12 +122,6 @@ export default {
       if (this.mode) this.setTopPaneMode(this.mode)
     }
   },
-  beforeCreate () {
-    // Load the required components
-    this.$options.components['k-page'] = this.$load('layout/KPage')
-    this.$options.components['k-grid'] = this.$load('collection/KGrid')
-    this.$options.components['k-stamp'] = this.$load('frame/KStamp')
-  },
   async created () {
     this.$events.on('user-changed', this.configureActivity)
     // Build base query
diff --git a/src/i18n/aktnmap_en.json b/src/i18n/aktnmap_en.json
index dfbd309e..875dca71 100644
--- a/src/i18n/aktnmap_en.json
+++ b/src/i18n/aktnmap_en.json
@@ -9,11 +9,11 @@
   "errors": {
     "EVENTS_LIMIT": "Too much events to display all of them",
     "EVENT_LOG_LIMIT": "Too much participants to display all of them",
-    "CANNOT_REMOVE_CUSTOMER": "You are not allowed to remove the customer of <b>{{resource}}</b>, change the payment information first.",
+    "CANNOT_REMOVE_CUSTOMER": "You are not allowed to remove the customer of <b>{resource}</b>, change the payment information first.",
     "UNSUBSCRIBED_OPTION": "Sorry, it seems you did not subscribe to this option. Please update your subscription before coming back here."
   },
   "schemas": {
-    "ORGANISATIONS_BILLING_PLAN_NAME": "{{ object.name }}'s billing plan",
+    "ORGANISATIONS_BILLING_PLAN_NAME": "{ object.name }'s billing plan",
     "ORGANISATIONS_PLAN_FIELD_LABEL": "Select the billing plan of this organisation",
     "ORGANISATIONS_CUSTOMER_FIELD_LABEL": "Select a payment method",
     "ORGANISATIONS_EXTRA_INFOS_FIELD_LABEL": "Enter any extra information to appear on your receipts",
@@ -135,7 +135,7 @@
       "SETTINGS_LABEL": "This entry allows to update the <b>settings</b> of your organisation (name, logo, etc.).",
       "SETTINGS_LINK_LABEL": "How to manage settings",
       "REMOVE_ORGANISATION_LABEL": "Remove your organisation through this action.",
-      "REMOVE_CONFIRMATION_LABEL": "$t(tours.REMOVE_CONFIRMATION_LABEL) You must first remove all your organisation groups."
+      "REMOVE_CONFIRMATION_LABEL": "@:tours.REMOVE_CONFIRMATION_LABEL) You must first remove all your organisation groups."
     },
     "organisation": {
       "NAME_LABEL": "Update the name of your organisation.",
@@ -174,7 +174,7 @@
       "ADD_MEDIA_LABEL": "Join files to your event through this action, this will send a <p>notification</b> to all participants.",
       "EVENT_MAP_LABEL": "View the map of your event through this action.",
       "REMOVE_EVENT_LABEL": "Remove your event through this action.",
-      "REMOVE_CONFIRMATION_LABEL": "$t(tours.REMOVE_CONFIRMATION_LABEL), this will send a <p>notification</b> to all participants.",
+      "REMOVE_CONFIRMATION_LABEL": "@:tours.REMOVE_CONFIRMATION_LABEL), this will send a <p>notification</b> to all participants.",
       "ORGANISATION_MENU_LABEL": "Use the top dropdown menu to easily view the plans of your organisation."
     },
     "create-event": {
@@ -196,7 +196,7 @@
     "event-templates": {
       "TEMPLATES_LABEL": "This activity allows to manage the event <b>templates</b> in your organisation.",
       "TEMPLATE_DEFINITION_LABEL": "A template allows to define the recurrent content of a specific event type.",
-      "OVERFLOW_MENU_LABEL": "$t(tours.APP_BAR_OVERFLOW_MENU_LABEL)",
+      "OVERFLOW_MENU_LABEL": "@:tours.APP_BAR_OVERFLOW_MENU_LABEL",
       "SEARCH_LABEL": "Type part of a word contained in the name of your models in the arising bar to perform a search.",
       "SORT_LABEL": "Sort your templates by ascending or descending alphabetical order this button.",
       "NEW_TEMPLATE_LABEL": "Create a <b>new template</b> using this button.",
@@ -225,9 +225,9 @@
       "UPDATE_DESCRIPTION_LABEL": "Update the description of your model through this action.",
       "UPDATE_PROPERTIES_LABEL": "Similarly, update the properties of your model through the action associated to each field.",
       "COPY_TEMPLATE_LABEL": "Go fast by creatng a new model from this one through this action.",
-      "TEMPLATE_OVERFLOW_MENU_LABEL": "$t(tours.CARD_OVERFLOW_MENU_LABEL)",
+      "TEMPLATE_OVERFLOW_MENU_LABEL": "@:tours.CARD_OVERFLOW_MENU_LABEL",
       "REMOVE_TEMPLATE_LABEL": "Remove your model through this action.",
-      "REMOVE_CONFIRMATION_LABEL": "$t(tours.REMOVE_CONFIRMATION_LABEL)",
+      "REMOVE_CONFIRMATION_LABEL": "@:tours.REMOVE_CONFIRMATION_LABEL",
       "ORGANISATION_MENU_LABEL": "Use the top dropdown menu to easily view your events or the plans of your organisation."
     },
     "create-event-template": {
@@ -291,7 +291,7 @@
       "UPDATE_DESCRIPTION_LABEL": "Update the description of your plan through this action.",
       "UPDATE_PROPERTIES_LABEL": "Similarly, update the properties of your model through the action associated to each field, you can choose if this will send a <p>notification</b> to all participants or not.",
       "REMOVE_PLAN_LABEL": "Remove your plan through this action.",
-      "REMOVE_CONFIRMATION_LABEL": "$t(tours.REMOVE_CONFIRMATION_LABEL).",
+      "REMOVE_CONFIRMATION_LABEL": "@:tours.REMOVE_CONFIRMATION_LABEL).",
       "ORGANISATION_MENU_LABEL": "Use the top dropdown menu to easily view your events or manage your organisation."
     },
     "create-plan": {
@@ -310,7 +310,7 @@
     "plan-templates": {
       "TEMPLATES_LABEL": "This activity allows to manage the plan <b>templates</b> in your organisation.",
       "TEMPLATE_DEFINITION_LABEL": "A template allows to define the recurrent content of a specific plan type.",
-      "OVERFLOW_MENU_LABEL": "$t(tours.APP_BAR_OVERFLOW_MENU_LABEL)",
+      "OVERFLOW_MENU_LABEL": "@:tours.APP_BAR_OVERFLOW_MENU_LABEL",
       "SEARCH_LABEL": "Type part of a word contained in the name of your models in the arising bar to perform a search.",
       "SORT_LABEL": "Sort your templates by ascending or descending alphabetical order this button.",
       "NEW_TEMPLATE_LABEL": "Create a <b>new template</b> using this button.",
@@ -322,7 +322,7 @@
       "UPDATE_PROPERTIES_LABEL": "Similarly, update the properties of your model through the action associated to each field.",
       "COPY_TEMPLATE_LABEL": "Go fast by creatng a new model from this one through this action.",
       "REMOVE_TEMPLATE_LABEL": "Remove your model through this action.",
-      "REMOVE_CONFIRMATION_LABEL": "$t(tours.REMOVE_CONFIRMATION_LABEL)",
+      "REMOVE_CONFIRMATION_LABEL": "@:tours.REMOVE_CONFIRMATION_LABEL",
       "ORGANISATION_MENU_LABEL": "Use the top dropdown menu to easily view your events or the plans of your organisation."
     },
     "create-plan-template": {
@@ -366,7 +366,7 @@
   "leftPane": {
     "ORGANISATIONS": "My organisations",
     "ONLINE_HELP": "Online help",
-    "CONTEXTUAL_HELP": "$t(CONTEXTUAL_HELP)",
+    "CONTEXTUAL_HELP": "@:CONTEXTUAL_HELP",
     "LOGOUT": "Logout"
   },
   "Context": {
@@ -378,35 +378,35 @@
     "GROUPS": "Groups",
     "CATALOG": "Cartography",
     "SEARCH": "Search",
-    "CONTEXTUAL_HELP": "$t(CONTEXTUAL_HELP)",
+    "CONTEXTUAL_HELP": "@:CONTEXTUAL_HELP",
     "REFRESH": "Refresh",
     "SETTINGS": "Settings"
   },
   "OrganisationCard": {
     "EVENTS_SECTION": "Events",
-    "EVENTS_LABEL": "{{count}} event(s)",
+    "EVENTS_LABEL": "{count} event(s)",
     "PLANS_SECTION": "Plans",
     "VIEW_EVENTS": "View events",
     "VIEW_PLANS": "View plans",
-    "PLANS_LABEL": "{{count}} plan(s)",
+    "PLANS_LABEL": "{count} plan(s)",
     "VIEW_CATALOG": "View map",
     "VIEW_ARCHIVED_EVENTS": "View logbook",
     "VIEW_ARCHIVED_PLANS": "View plans archive",
     "CATALOG": "Map",
     "ARCHIVED_EVENTS": "Logbook",
-    "MEMBERS": "{{count}} member(s)",
+    "MEMBERS": "{count} member(s)",
     "VIEW_MEMBERS": "View members",
-    "TAGS": "{{count}} tag(s)",
+    "TAGS": "{count} tag(s)",
     "VIEW_TAGS": "View tags",
-    "GROUPS": "{{count}} group(s)",
+    "GROUPS": "{count} group(s)",
     "VIEW_GROUPS": "View groups",
-    "EVENT_TEMPLATES": "{{count}} event template(s)",
+    "EVENT_TEMPLATES": "{count} event template(s)",
     "VIEW_EVENT_TEMPLATES": "View event templates",
-    "PLAN_TEMPLATES": "{{count}} plan template(s)",
+    "PLAN_TEMPLATES": "{count} plan template(s)",
     "VIEW_PLAN_TEMPLATES": "View plan templates",
     "MANAGE_SUBSCRIPTIONS": "Manage your subscriptions",
-    "EDIT_ACTION": "$t(EDIT_LABEL)",
-    "REMOVE_ACTION": "$t(REMOVE_LABEL)",
+    "EDIT_ACTION": "@:EDIT_LABEL",
+    "REMOVE_ACTION": "@:REMOVE_LABEL",
     "ADMINISTRATION_SECTION": "Management",
     "INFORMATION_SECTION": "Informations",
     "SUBSCRIPTIONS_LABEL": "Subscriptions"
@@ -415,8 +415,8 @@
     "CUSTOMER_BLOCK_TITLE": "Payment Information",
     "CUSTOMER_BLOCK_TEXT_UNVERIFIED_USER": "You must be verified to enter your payment information",
     "CUSTOMER_BLOCK_TEXT_NO_PAYMENT": "You did not enter in any payment information",
-    "CUSTOMER_BLOCK_TEXT_INVOICE_PAYMENT": "You have chosen a monthly bill payment method.<br/>Invoices will be send to <b>{{email}}</b>",
-    "CUSTOMER_BLOCK_TEXT_CARD_PAYMENT": "You have chosen a monthly bank debit payment method.<br/>Your are using a <b>{{brand}}</b> card which number is ending with <b>{{last4}}</b>",
+    "CUSTOMER_BLOCK_TEXT_INVOICE_PAYMENT": "You have chosen a monthly bill payment method.<br/>Invoices will be send to <b>{email}</b>",
+    "CUSTOMER_BLOCK_TEXT_CARD_PAYMENT": "You have chosen a monthly bank debit payment method.<br/>Your are using a <b>{brand}</b> card which number is ending with <b>{last4}</b>",
     "CUSTOMER_BLOCK_ACTION": "Update",
     "OPTIONS_BLOCK_TITLE": "Your plans",
     "PLAN_TITLE": "Your basic plan",
@@ -485,15 +485,15 @@
     "bronze_LABEL": "Bronze",
     "bronze_PRICE": "Free",
     "bronze_DESCRIPTION": "Our basic version for users just getting started",
-    "bronze_DETAILS": "</br>Unlimited tags</br>Unlimited events<br>Up to <b>{{groups}}</b> groups</br>Up to <b>{{event-templates}}</b> templates</br>Up to <b>{{members}}</b> members</br></br>",
+    "bronze_DETAILS": "</br>Unlimited tags</br>Unlimited events<br>Up to <b>{groups}</b> groups</br>Up to <b>{event-templates}</b> templates</br>Up to <b>{members}</b> members</br></br>",
     "silver_LABEL": "Silver",
     "silver_PRICE": "99€ per month",
     "silver_DESCRIPTION": "Powerful enough to run a small business",
-    "silver_DETAILS": "</br>Unlimited tags</br>Unlimited events</br>Unlimited templates</br>Up to <b>{{groups}}</b> groups</br>Up to <b>{{members}}</b> members</br></br>",
+    "silver_DETAILS": "</br>Unlimited tags</br>Unlimited events</br>Unlimited templates</br>Up to <b>{groups}</b> groups</br>Up to <b>{members}</b> members</br></br>",
     "gold_LABEL": "Gold",
     "gold_PRICE": "399€ per month",
     "gold_DESCRIPTION": "Powerful enough to run a large business",
-    "gold_DETAILS": "</br>Unlimited tags</br>Unlimited events</br>Unlimited templates</br>Unlimited groups</br>Up to <b>{{members}}</b> members</br></br>",
+    "gold_DETAILS": "</br>Unlimited tags</br>Unlimited events</br>Unlimited templates</br>Unlimited groups</br>Up to <b>{members}</b> members</br></br>",
     "diamond_LABEL": "Diamond",
     "diamond_PRICE": "Let's talk !",
     "diamond_DESCRIPTION": "Custom plan tailored for your business, with more control and support",
@@ -547,26 +547,26 @@
     "ALL_INTERACTIONS": "All",
     "VIEW_LOCATION": "View location",
     "FOLLOW_UP_MODAL_TITLE": "Enter your choice",
-    "FOLLOWUP_MODAL_CANCEL_BUTTON": "$t(CANCEL)",
-    "FOLLOWUP_MODAL_APPLY_BUTTON": "$t(SAVE_LABEL)",
-    "FOLLOWUP_MODAL_APPLY_ALL_BUTTON": "$t(SAVE_LABEL) for selected",
+    "FOLLOWUP_MODAL_CANCEL_BUTTON": "@:CANCEL",
+    "FOLLOWUP_MODAL_APPLY_BUTTON": "@:SAVE_LABEL",
+    "FOLLOWUP_MODAL_APPLY_ALL_BUTTON": "@:SAVE_LABEL) for selected",
     "EVENT_LOGS_EXPORT_FILE": "Participants.csv",
-    "MATCHING_RESULTS": "{{total}} participants found.",
-    "MAXIMUM_RESULTS": "Please refine your filter because you miss some results beyond {{max}} participants.",
+    "MATCHING_RESULTS": "{total} participants found.",
+    "MAXIMUM_RESULTS": "Please refine your filter because you miss some results beyond {max} participants.",
     "UNMATCHING_STEPS": "Unmatching steps",
     "CANNOT_LOG_UNMATCHING_STEPS": "Cannot apply action to participants at different steps."
   },
   "EventActivity": {
     "ADD_MEDIA_LABEL": "Add media",
     "BROWSE_MEDIA_LABEL": "Browse media",
-    "EDIT_LABEL": "$t(EDIT_LABEL)",
+    "EDIT_LABEL": "@:EDIT_LABEL",
     "SHOW_PANE_LABEL": "View participants pane",
     "HIDE_PANE_LABEL": "Hide participants pane",
     "ACTION_REQUIRED": "action required",
     "AWAITING_INFORMATION": "awaiting information",
-    "UNAMED": "$t(EventLog.UNAMED)",
+    "UNAMED": "@:EventLog.UNAMED",
     "PARTICIPANTS_LAYER_NAME": "Participants",
-    "UPLOADER_MODAL_CLOSE_ACTION": "$t(CLOSE_LABEL)"
+    "UPLOADER_MODAL_CLOSE_ACTION": "@:CLOSE_LABEL"
   },
   "EventActivityPanel": {
     "PARTICIPANTS_LABEL": "Participants",
@@ -596,31 +596,31 @@
     "CREATED_AT_LABEL": "Created at",
     "UPDATED_AT_LABEL": "Updated at",
     "EXPIRE_AT_LABEL": "Expire at",
-    "REMOVE_LABEL": "$t(REMOVE_LABEL)",
-    "EDIT_LABEL": "$t(EDIT_LABEL)",
+    "REMOVE_LABEL": "@:REMOVE_LABEL",
+    "EDIT_LABEL": "@:EDIT_LABEL",
     "FOLLOW_UP_LABEL": "Follow up",
     "FOLLOW_UP_MODAL_TITLE": "Enter your choice",
     "EVENT_LOGS_LABEL": "Follow up participants",
-    "ADD_MEDIA_LABEL": "$t(EventActivity.ADD_MEDIA_LABEL)",
-    "BROWSE_MEDIA_LABEL": "$t(EventActivity.BROWSE_MEDIA_LABEL)",
-    "UPLOADER_MODAL_CLOSE_ACTION": "$t(EventActivity.UPLOADER_MODAL_CLOSE_ACTION)",
-    "LOCATION_MAP_MODAL_CLOSE_ACTION": "$t(CLOSE_LABEL)",
+    "ADD_MEDIA_LABEL": "@:EventActivity.ADD_MEDIA_LABEL",
+    "BROWSE_MEDIA_LABEL": "@:EventActivity.BROWSE_MEDIA_LABEL",
+    "UPLOADER_MODAL_CLOSE_ACTION": "@:EventActivity.UPLOADER_MODAL_CLOSE_ACTION",
+    "LOCATION_MAP_MODAL_CLOSE_ACTION": "@:CLOSE_LABEL",
     "EVENT_LOGS_MODAL_TITLE": "Details about participants",
-    "EVENT_LOGS_MODAL_CLOSE_ACTION": "$t(CLOSE_LABEL)",
+    "EVENT_LOGS_MODAL_CLOSE_ACTION": "@:CLOSE_LABEL",
     "EVENT_LOGS_MODAL_EXPORT_DATA_LABEL": "Export data",
     "NAVIGATE_LABEL": "Navigate",
     "LOCATE_LABEL": "View the location",
     "MAP_LABEL": "Map",
-    "REMOVE_DIALOG_TITLE": "Remove the event {{event}} ?",
-    "REMOVE_DIALOG_MESSAGE": "Are you sure you want to remove the event <b>{{event}}</b> ?",
+    "REMOVE_DIALOG_TITLE": "Remove the event {event} ?",
+    "REMOVE_DIALOG_MESSAGE": "Are you sure you want to remove the event <b>{event}</b> ?",
     "ACTION_REQUIRED_WARNING": "Action required",
     "WAITING_COORDINATION_WARNING": "Waiting coordination",
     "WAITING_FOR_PARTICIPANT_LABEL": "Coordinator is waiting for your input",
     "WAITING_FOR_COORDINATOR_LABEL": "Waiting for coordinator feedback",
-    "PARTICPANTS_AWAITING_LABEL": "{{number}} participants awaiting coordination",
+    "PARTICPANTS_AWAITING_LABEL": "{number} participants awaiting coordination",
     "NO_PARTICPANTS_AWAITING_LABEL": "No participants awaiting coordination",
-    "FOLLOWUP_MODAL_CLOSE_ACTION": "$t(CLOSE_LABEL)",
-    "FOLLOWUP_MODAL_SAVE_BUTTON": "$t(SAVE_LABEL)",
+    "FOLLOWUP_MODAL_CLOSE_ACTION": "@:CLOSE_LABEL",
+    "FOLLOWUP_MODAL_SAVE_BUTTON": "@:SAVE_LABEL",
     "VIEW_LOCATION_MAP": "View location map",
     "VIEW_PARTICIPANTS": "View partcipants"
   },
@@ -663,8 +663,8 @@
     "SHOW_BY_TEMPLATE_LABEL": "By type",
     "SHOW_ALL_LABEL": "Globally",
     "EVENTS_LAYER_NAME": "My events",
-    "MATCHING_RESULTS": "{{total}} events found.",
-    "MAXIMUM_RESULTS": "Please refine your search parameters because you miss some results beyond {{max}} events.",
+    "MATCHING_RESULTS": "{total} events found.",
+    "MAXIMUM_RESULTS": "Please refine your search parameters because you miss some results beyond {max} events.",
     "SORT_EVENTS": "Sort events"
   },
   "ArchivedEventCard": {
@@ -691,19 +691,19 @@
     "BROWSE_MEDIA": "View media"
   },
   "EventTemplatesActivity": {
-    "EVENT_TEMPLATES_LABEL": "$t(EVENT_TEMPLATES_LABEL)",
+    "EVENT_TEMPLATES_LABEL": "@:EVENT_TEMPLATES_LABEL",
     "CREATE_TEMPLATE_LABEL": "Create an event template",
     "SEARCH_EVENT_TEMPLATES": "Search event templates",
     "SORT_EVENT_TEMPLATES": "Sort event templates"
   },
   "EventTemplateCard": {
-    "REMOVE_ACTION": "$t(REMOVE_LABEL)",
-    "EDIT_ACTION": "$t(EDIT_LABEL)",
+    "REMOVE_ACTION": "@:REMOVE_LABEL",
+    "EDIT_ACTION": "@:EDIT_LABEL",
     "ADD_WORKFLOW_ACTION": "Add workflow",
     "EDIT_WORKFLOW_ACTION": "Update workflow",
     "REMOVE_WORKFLOW_ACTION": "Remove workflow",
     "REMOVE_WORKFLOW_TITLE": "Are you sure you want to delete the workflow?",
-    "COPY_ACTION": "$t(COPY_LABEL)",
+    "COPY_ACTION": "@:COPY_LABEL",
     "DESCRIPTION_SECTION": "Description",
     "NO_DESRIPTION_LABEL": "No description",
     "PARTICIPANTS_SECTION": "Participants",
@@ -711,11 +711,11 @@
     "COORDINATORS_SECTION": "Coordinators",
     "NO_COORDINATORS_LABEL": "No coordinators",
     "EXPIRY_DURATION_SECTION": "Expriy duration",
-    "EXPIRY_DURATION_LABEL": "{{days}} days",
+    "EXPIRY_DURATION_LABEL": "{days} days",
     "NO_EXPIRY_DURATION_LABEL": "No expriy duration",
     "PERMISSION_SECTION": "Permission",
     "WORKFLOW_SECTION": "Workflow",
-    "WORKFLOW_LABEL": "{{count}} step workflow",
+    "WORKFLOW_LABEL": "{count} step workflow",
     "NO_WORKFLOW_LABEL": "No workflow"
   },
   "EventTemplateWorkflowForm": {
@@ -728,7 +728,7 @@
   },
   "EventTemplateEditor": {
     "WORKFLOW_HELPER_LABEL": "Copy workflow",
-    "CLOSE_ACTION":  "$t(CLOSE_LABEL)"
+    "CLOSE_ACTION":  "@:CLOSE_LABEL"
   },
   "EventNotifications": {
     "CREATE": "New",
@@ -740,8 +740,8 @@
     "NOTIFY": "Notify participants"
   },
   "EventLogEditor": {
-    "CLOSE_ACTION": "$t(CLOSE_LABEL)",
-    "SAVE_BUTTON": "$t(SAVE_LABEL)"
+    "CLOSE_ACTION": "@:CLOSE_LABEL",
+    "SAVE_BUTTON": "@:SAVE_LABEL"
   },
   "CustomerEditor": {
     "TITLE": "Enter your billing information",
@@ -758,7 +758,7 @@
     "SELECT": "Select",
     "CURRENT_PLAN": "Your plan",
     "CONFIRM_DIALOG_TITLE": "Are you sure you want to update your plan ?",
-    "CONFIRM_DIALOG_MESSAGE": "Please confirm to subscribe to the <b>$t({{plan}})</b> plan",
+    "CONFIRM_DIALOG_MESSAGE": "Please confirm to subscribe to the <b>@:{plan})</b> plan",
     "PLAN_DISABLED_TOOLTIP": "Please provide the payment information to subscribe to this plan"
   },
   "OptionsChooser": {
@@ -766,8 +766,8 @@
     "SELECT": "Select",
     "SUBSCRIBED": "Subscribed",
     "CONFIRM_DIALOG_TITLE": "Are you sure you want to update your option ?",
-    "CONFIRM_DIALOG_SUBSCRIBE_MESSAGE": "Please confirm to subscribe to the <b>$t({{option}})</b> option",
-    "CONFIRM_DIALOG_UNSUBSCRIBE_MESSAGE": "Please confirm unsubscribtion to the <b>$t({{option}})</b> option",
+    "CONFIRM_DIALOG_SUBSCRIBE_MESSAGE": "Please confirm to subscribe to the <b>@:{option})</b> option",
+    "CONFIRM_DIALOG_UNSUBSCRIBE_MESSAGE": "Please confirm unsubscribtion to the <b>@:{option})</b> option",
     "OPTION_DISABLED_TOOLTIP": "Please provide the payment information to subscribe to this option"
   },
   "PlansActivity": {
@@ -776,16 +776,16 @@
     "SORT_PLANS": "Sort plans"
   },
   "PlanObjectivesEditor": {
-    "MANAGE": "Manage objectives - {{name}}",
-    "CREATE": "Add a new objective - {{name}}",
-    "EDIT": "Update objective {{name}}",
+    "MANAGE": "Manage objectives - {name}",
+    "CREATE": "Add a new objective - {name}",
+    "EDIT": "Update objective {name}",
     "SORT": "Sort objectives",
     "ADD_OBJECTIVE": "Add a new objective",
-    "EDIT_OBJECTIVE": "$t(EDIT)",
-    "REMOVE_OBJECTIVE": "$t(REMOVE)"
+    "EDIT_OBJECTIVE": "@:EDIT",
+    "REMOVE_OBJECTIVE": "@:REMOVE"
   },
   "PlanCard": {
-    "EDIT_ACTION": "$t(EDIT_LABEL)",
+    "EDIT_ACTION": "@:EDIT_LABEL",
     "REMOVE_ACTION": "Close",
     "DESCRIPTION_SECTION": "Description",
     "OBJECTIVES_SECTION": "Objectives",
@@ -795,7 +795,7 @@
     "NO_LOCATION_LABEL": "Undefined location",
     "COORDINATORS_SECTION": "Coordinators",
     "EVENTS_SECTION": "Events",
-    "EVENTS": "{{count}} event(s)",
+    "EVENTS": "{count} event(s)",
     "VIEW_PLANS": "View plans",
     "VIEW_CATALOG": "View map",
     "VIEW_ARCHIVED_EVENTS": "View logbook"
@@ -805,9 +805,9 @@
     "CREATE_TEMPLATE_LABEL": "Create a new plan template"
   },
   "PlanTemplateCard": {
-    "EDIT_ACTION": "$t(EDIT_LABEL)",
-    "COPY_ACTION": "$t(COPY_LABEL)",
-    "REMOVE_ACTION": "$t(REMOVE_LABEL)",
+    "EDIT_ACTION": "@:EDIT_LABEL",
+    "COPY_ACTION": "@:COPY_LABEL",
+    "REMOVE_ACTION": "@:REMOVE_LABEL",
     "DESCRIPTION_SECTION": "Description",
     "NO_DESRIPTION_LABEL": "No description",
     "OBJECTIVES_SECTION": "Objectives",
@@ -837,11 +837,11 @@
   "PlanMenu": {
     "VIEW_DESCRIPTION": "View description",
     "VIEW_LOCATION": "View location",
-    "PERCENT_LABEL": "{{percent}}% done"
+    "PERCENT_LABEL": "{percent}% done"
   },
   "OrganisationMenu": {
-    "EVENTS_LABEL": "{{count}} event(s)",
-    "PLANS_LABEL": "{{count}} plan(s)",
+    "EVENTS_LABEL": "{count} event(s)",
+    "PLANS_LABEL": "{count} plan(s)",
     "VIEW_CATALOG": "View map",
     "VIEW_ARCHIVED_EVENTS": "View logbook",
     "VIEW_ARCHIVED_PLANS": "View plans archive",
diff --git a/src/i18n/aktnmap_fr.json b/src/i18n/aktnmap_fr.json
index da3ec7ba..e570c39b 100644
--- a/src/i18n/aktnmap_fr.json
+++ b/src/i18n/aktnmap_fr.json
@@ -9,11 +9,11 @@
   "errors": {
     "EVENTS_LIMIT": "Trop d'événements pour les afficher tous",
     "EVENT_LOG_LIMIT": "Trop de participants pour afficher l'ensemble des informations",
-    "CANNOT_REMOVE_CUSTOMER": "Vous n'êtes pas autorisé à supprimer le client de <b>{{resource}}</b>, modifiez préalablement les informations de paiement.",
+    "CANNOT_REMOVE_CUSTOMER": "Vous n'êtes pas autorisé à supprimer le client de <b>{resource}</b>, modifiez préalablement les informations de paiement.",
     "UNSUBSCRIBED_OPTION": "Désolé, il semble que vous n'ayez pas souscrit à cette option. Merci de modifier votre abonnement avant de revenir ici."
   },
   "schemas": {
-    "ORGANISATIONS_BILLING_PLAN_NAME": "Plan de paiement pour {{ object.name }}",
+    "ORGANISATIONS_BILLING_PLAN_NAME": "Plan de paiement pour { object.name }",
     "ORGANISATIONS_PLAN_FIELD_LABEL": "Sélectionnez le plan de paiement pour l'organisation",
     "ORGANISATIONS_CUSTOMER_FIELD_LABEL": "Sélectionnez une méthode de paiement",
     "ORGANISATIONS_EXTRA_INFOS_FIELD_LABEL": "Saisissez des informations supplémentaires apparaissant sur vos factures",
@@ -141,7 +141,7 @@
       "SETTINGS_LABEL": "Modifiez le <b>paramétrage</b> de votre organisation (nom, logo, etc.).",
       "SETTINGS_LINK_LABEL": "Voir comment modifier les paramètres",
       "REMOVE_ORGANISATION_LABEL": "Supprimez votre organisation via cette action.",
-      "REMOVE_CONFIRMATION_LABEL": "$t(tours.REMOVE_CONFIRMATION_LABEL) Vous devrez préalablement supprimer l'ensemble des groupes."
+      "REMOVE_CONFIRMATION_LABEL": "@:tours.REMOVE_CONFIRMATION_LABEL) Vous devrez préalablement supprimer l'ensemble des groupes."
     },
     "organisation": {
       "NAME_LABEL": "Modifiez le nom de votre organisation.",
@@ -180,7 +180,7 @@
       "UPDATE_PROPERTIES_LABEL": "De la même façon, modifiez les différentes propriétés de votre événement via l'action afférente, vous pourrez choisir d'envoyer d'une <b>notification</b> à tous les participants ou non.",
       "EVENT_MAP_LABEL": "Accédez à la carte lié à votre événement via cette action.",
       "REMOVE_EVENT_LABEL": "Supprimez votre événement via cette action.",
-      "REMOVE_CONFIRMATION_LABEL": "$t(tours.REMOVE_CONFIRMATION_LABEL), ceci provoquera l'envoi d'une <b>notification</b> à tous les participants.",
+      "REMOVE_CONFIRMATION_LABEL": "@:tours.REMOVE_CONFIRMATION_LABEL), ceci provoquera l'envoi d'une <b>notification</b> à tous les participants.",
       "ORGANISATION_MENU_LABEL": "Utilisez le menu déroulant supérieur pour revenir facilement aux plans de votre organisation."
     },
     "create-event": {
@@ -202,7 +202,7 @@
     "event-templates": {
       "TEMPLATES_LABEL": "Cette activité vous permet de gérer les <b>modèles</b> d'événements au sein de votre organisation.",
       "TEMPLATE_DEFINITION_LABEL": "Un modèle permet de définir le contenu récurrent d'un type d'événement particulier.",
-      "OVERFLOW_MENU_LABEL": "$t(tours.APP_BAR_OVERFLOW_MENU_LABEL)",
+      "OVERFLOW_MENU_LABEL": "@:tours.APP_BAR_OVERFLOW_MENU_LABEL",
       "SEARCH_LABEL": "Tapez tout ou partie d'un mot contenu dans le nom de vos modèles au sein de la barre qui apparait pour effectuer une recherche.",
       "SORT_LABEL": "Ordonnez vos modèles par ordre alphabétique ascendant ou descendant via ce bouton.",
       "NEW_TEMPLATE_LABEL": "Créez un <b>nouveau modèle</b> via ce bouton.",
@@ -232,7 +232,7 @@
       "UPDATE_PROPERTIES_LABEL": "De la même façon, modifiez les différentes propriétés de votre modèle via l'action afférente.",
       "COPY_TEMPLATE_LABEL": "Gagnez du temps en créant un nouveau modèle à partir de celui-ci via cette action.",
       "REMOVE_TEMPLATE_LABEL": "Supprimez votre modèle via cette action.",
-      "REMOVE_CONFIRMATION_LABEL": "$t(tours.REMOVE_CONFIRMATION_LABEL)",
+      "REMOVE_CONFIRMATION_LABEL": "@:tours.REMOVE_CONFIRMATION_LABEL",
       "ORGANISATION_MENU_LABEL": "Utilisez le menu déroulant supérieur pour revenir facilement à vos événements ou aux plans votre organisation."
     },
     "create-event-template": {
@@ -296,7 +296,7 @@
       "UPDATE_DESCRIPTION_LABEL": "Modifiez la description de votre plan via cette action.",
       "UPDATE_PROPERTIES_LABEL": "De la même façon, modifiez les différentes propriétés de votre plan via l'action afférente, vous pourrez choisir d'envoyer d'une <b>notification</b> à tous les participants ou non.",
       "REMOVE_PLAN_LABEL": "Supprimez votre plan via cette action.",
-      "REMOVE_CONFIRMATION_LABEL": "$t(tours.REMOVE_CONFIRMATION_LABEL).",
+      "REMOVE_CONFIRMATION_LABEL": "@:tours.REMOVE_CONFIRMATION_LABEL).",
       "ORGANISATION_MENU_LABEL": "Utilisez le menu déroulant supérieur pour revenir facilement à vos événements ou administrer votre organisation."
     },
     "create-plan": {
@@ -315,7 +315,7 @@
     "plan-templates": {
       "TEMPLATES_LABEL": "Cette activité vous permet de gérer les <b>modèles</b> de plans au sein de votre organisation.",
       "TEMPLATE_DEFINITION_LABEL": "Un modèle permet de définir le contenu récurrent d'un type de plan particulier.",
-      "OVERFLOW_MENU_LABEL": "$t(tours.APP_BAR_OVERFLOW_MENU_LABEL)",
+      "OVERFLOW_MENU_LABEL": "@:tours.APP_BAR_OVERFLOW_MENU_LABEL",
       "SEARCH_LABEL": "Tapez tout ou partie d'un mot contenu dans le nom de vos modèles au sein de la barre qui apparait pour effectuer une recherche.",
       "SORT_LABEL": "Ordonnez vos modèles par ordre alphabétique ascendant ou descendant via ce bouton.",
       "NEW_TEMPLATE_LABEL": "Créez un <b>nouveau modèle</b> via ce bouton.",
@@ -327,7 +327,7 @@
       "UPDATE_PROPERTIES_LABEL": "De la même façon, modifiez les différentes propriétés de votre modèle via l'action afférente.",
       "COPY_TEMPLATE_LABEL": "Gagnez du temps en créant un nouveau modèle à partir de celui-ci via cette action.",
       "REMOVE_TEMPLATE_LABEL": "Supprimez votre modèle via cette action.",
-      "REMOVE_CONFIRMATION_LABEL": "$t(tours.REMOVE_CONFIRMATION_LABEL)",
+      "REMOVE_CONFIRMATION_LABEL": "@:tours.REMOVE_CONFIRMATION_LABEL",
       "ORGANISATION_MENU_LABEL": "Utilisez le menu déroulant supérieur pour revenir facilement à vos événements ou aux plans votre organisation."
     },
     "create-plan-template": {
@@ -371,7 +371,7 @@
   "leftPane": {
     "ORGANISATIONS": "Mes organisations",
     "ONLINE_HELP": "Aide en ligne",
-    "CONTEXTUAL_HELP": "$t(CONTEXTUAL_HELP)",
+    "CONTEXTUAL_HELP": "@:CONTEXTUAL_HELP",
     "LOGOUT": "Se déconnecter"
   },
   "Context": {
@@ -383,35 +383,35 @@
     "GROUPS": "Groupes",
     "CATALOG": "Cartographie",
     "SEARCH": "Rechercher",
-    "CONTEXTUAL_HELP": "$t(CONTEXTUAL_HELP)",    
+    "CONTEXTUAL_HELP": "@:CONTEXTUAL_HELP",    
     "REFRESH": "Rafraîchir",
     "SETTINGS": "Paramètres"
   },
   "OrganisationCard": {
     "EVENTS_SECTION": "Evénements",
-    "EVENTS_LABEL": "{{count}} événement(s)",
+    "EVENTS_LABEL": "{count} événement(s)",
     "PLANS_SECTION": "Plans",
     "VIEW_EVENTS": "Voir les événements",
     "VIEW_PLANS": "Voir les plans",
-    "PLANS_LABEL": "{{count}} plan(s)",
+    "PLANS_LABEL": "{count} plan(s)",
     "VIEW_CATALOG": "Voir la carte",
     "VIEW_ARCHIVED_EVENTS": "Voir la main courante",
     "VIEW_ARCHIVED_PLANS": "Voir l'archive de plans",
     "CATALOG": "Cartographie",
     "ARCHIVED_EVENTS": "Main courante",
-    "MEMBERS": "{{count}} membre(s)",
+    "MEMBERS": "{count} membre(s)",
     "VIEW_MEMBERS": "Voir les membres",
-    "TAGS": "{{count}} étiquette(s)",
+    "TAGS": "{count} étiquette(s)",
     "VIEW_TAGS": "Voir les étiquettes",
-    "GROUPS": "{{count}} groupe(s)",
+    "GROUPS": "{count} groupe(s)",
     "VIEW_GROUPS": "Voir les groupes",
-    "EVENT_TEMPLATES": "{{count}} modèle(s) d'événement",
+    "EVENT_TEMPLATES": "{count} modèle(s) d'événement",
     "VIEW_EVENT_TEMPLATES": "Voir les modèles d'événement",
-    "PLAN_TEMPLATES": "{{count}} modèle(s) de plan",
+    "PLAN_TEMPLATES": "{count} modèle(s) de plan",
     "VIEW_PLAN_TEMPLATES": "Voir les modèles de plan",    
     "MANAGE_SUBSCRIPTIONS": "Gérer vos abonnements",
-    "EDIT_ACTION": "$t(EDIT_LABEL)",
-    "REMOVE_ACTION": "$t(REMOVE_LABEL)",
+    "EDIT_ACTION": "@:EDIT_LABEL",
+    "REMOVE_ACTION": "@:REMOVE_LABEL",
     "ADMINISTRATION_SECTION": "Gestion",
     "INFORMATION_SECTION": "Informations",
     "SUBSCRIPTIONS_LABEL": "Abonnements"
@@ -420,8 +420,8 @@
     "CUSTOMER_BLOCK_TITLE": "Information de paiement",
     "CUSTOMER_BLOCK_TEXT_UNVERIFIED_USER": "Vous devez être vérifié pour renseigner vos informations de paiement",
     "CUSTOMER_BLOCK_TEXT_NO_PAYMENT": "Vous n'avez renseigné aucune information de paiement",
-    "CUSTOMER_BLOCK_TEXT_INVOICE_PAYMENT": "Vous avez choisi une méthode paiement par facturation mensuelle.<br/>Les factures seront envoyées à <b>{{email}}</b>",
-    "CUSTOMER_BLOCK_TEXT_CARD_PAYMENT": "Vous avez choisi une méthode paiement par débit bancaire mensuel.<br/>Vous utilisez une carte <b>{{brand}}</b> dont le numéro se termine par <b>{{last4}}</b>",
+    "CUSTOMER_BLOCK_TEXT_INVOICE_PAYMENT": "Vous avez choisi une méthode paiement par facturation mensuelle.<br/>Les factures seront envoyées à <b>{email}</b>",
+    "CUSTOMER_BLOCK_TEXT_CARD_PAYMENT": "Vous avez choisi une méthode paiement par débit bancaire mensuel.<br/>Vous utilisez une carte <b>{brand}</b> dont le numéro se termine par <b>{last4}</b>",
     "CUSTOMER_BLOCK_ACTION": "Mettre à jour",
     "OPTIONS_BLOCK_TITLE": "Vos abonnements",
     "PLAN_TITLE": "Votre abonnement de base",
@@ -490,15 +490,15 @@
     "bronze_LABEL": "Bronze",
     "bronze_PRICE": "Gratuit",
     "bronze_DESCRIPTION": "Notre version basique pour les personnes qui souhaitent découvrir",
-    "bronze_DETAILS": "</br>Etiquettes illimités</br>Evénements illimitées</br>Jusqu’à <b>{{event-templates}}</b> modèles</br>Jusqu’à <b>{{groups}}</b> groupes</br>Jusqu’à <b>{{members}}</b> membres</br></br>",
+    "bronze_DETAILS": "</br>Etiquettes illimités</br>Evénements illimitées</br>Jusqu’à <b>{event-templates}</b> modèles</br>Jusqu’à <b>{groups}</b> groupes</br>Jusqu’à <b>{members}</b> membres</br></br>",
     "silver_LABEL": "Argent",
     "silver_PRICE": "99€ par mois",
     "silver_DESCRIPTION": "Assez puissant pour gérer une association ou une entreprise de taille moyenne",
-    "silver_DETAILS": "</br>Etiquettes illimitées</br>Evénements illimités</br>Modèles illimités</br>Jusqu’à <b>{{groups}}</b> groupes</br>Jusqu’à <b>{{members}}</b> membres</br></br>",
+    "silver_DETAILS": "</br>Etiquettes illimitées</br>Evénements illimités</br>Modèles illimités</br>Jusqu’à <b>{groups}</b> groupes</br>Jusqu’à <b>{members}</b> membres</br></br>",
     "gold_LABEL": "Or",
     "gold_PRICE": "399€ par mois",
     "gold_DESCRIPTION": "Assez puissant pour gérer une association ou une entreprise de grande taille",
-    "gold_DETAILS": "</br>Etiquettes illimitées</br>Evénements illimités</br>Modèles illimités</br>Groupes illimités</br>Jusqu’à <b>{{members}}</b> membres</br></br>",
+    "gold_DETAILS": "</br>Etiquettes illimitées</br>Evénements illimités</br>Modèles illimités</br>Groupes illimités</br>Jusqu’à <b>{members}</b> membres</br></br>",
     "diamond_LABEL": "Diamant",
     "diamond_PRICE": "Parlons-en !",
     "diamond_DESCRIPTION": "Définissons une solution adaptée à vos besoins, avec un contrôle accru et plus d’assistance",
@@ -552,33 +552,33 @@
     "ALL_INTERACTIONS": "Toutes",
     "VIEW_LOCATION": "Voir la localisation",
     "FOLLOW_UP_MODAL_TITLE": "Entrez votre choix",
-    "FOLLOWUP_MODAL_CANCEL_BUTTON": "$t(CANCEL)",
-    "FOLLOWUP_MODAL_APPLY_BUTTON": "$t(SAVE_LABEL)",
-    "FOLLOWUP_MODAL_APPLY_ALL_BUTTON": "$t(SAVE_LABEL) pour la sélection",
+    "FOLLOWUP_MODAL_CANCEL_BUTTON": "@:CANCEL",
+    "FOLLOWUP_MODAL_APPLY_BUTTON": "@:SAVE_LABEL",
+    "FOLLOWUP_MODAL_APPLY_ALL_BUTTON": "@:SAVE_LABEL) pour la sélection",
     "EVENT_LOGS_EXPORT_FILE": "Participants.csv",
-    "MATCHING_RESULTS": "{{total}} participants trouvés.",
-    "MAXIMUM_RESULTS": "Raffinez votre filtre car certains résultats sont omis au-delà de {{max}} participants.",
+    "MATCHING_RESULTS": "{total} participants trouvés.",
+    "MAXIMUM_RESULTS": "Raffinez votre filtre car certains résultats sont omis au-delà de {max} participants.",
     "UNMATCHING_STEPS": "Etapes différentes",
     "CANNOT_LOG_UNMATCHING_STEPS": "Impossible de réaliser l'action pour des participants à différentes étapes."
   },
   "EventActivity": {
     "ADD_MEDIA_LABEL": "Ajouter un média",
     "BROWSE_MEDIA_LABEL": "Parcourir les médias",
-    "EDIT_LABEL": "$t(EDIT_LABEL)",
+    "EDIT_LABEL": "@:EDIT_LABEL",
     "SHOW_PANE_LABEL": "Afficher le volet participants",
     "HIDE_PANE_LABEL": "Cacher le volet participants",
     "ACTION_REQUIRED": "action requise",
     "AWAITING_INFORMATION": "en attente d'information",
-    "UNAMED": "$t(EventLog.UNAMED)",
+    "UNAMED": "@:EventLog.UNAMED",
     "PARTICIPANTS_LAYER_NAME": "Participants",
-    "UPLOADER_MODAL_CLOSE_ACTION": "$t(CLOSE_LABEL)"
+    "UPLOADER_MODAL_CLOSE_ACTION": "@:CLOSE_LABEL"
   },
   "EventActivityPanel": {
     "PARTICIPANTS_LABEL": "Participants",
     "FILTER_PARTICIPANTS": "Sélectionnez pour filtrer les participants avec ce statut"
   },
   "EventsActivity": {
-    "EVENTS_LABEL": "$t(EVENTS_LABEL)",
+    "EVENTS_LABEL": "@:EVENTS_LABEL",
     "SEARCH_EVENTS": "Rechercher des événements",
     "SORT_EVENTS": "Trier les événements",
     "TODO_LABEL": "A faire",
@@ -602,30 +602,30 @@
     "UPDATED_AT_LABEL": "Mis à jour le",
     "EXPIRE_AT_LABEL": "Expire le",
     "REMOVE_ACTION": "Clôturer",
-    "EDIT_ACTION": "$t(EDIT_LABEL)",
+    "EDIT_ACTION": "@:EDIT_LABEL",
     "FOLLOW_UP_LABEL": "Suivre",
     "FOLLOW_UP_MODAL_TITLE": "Entrez votre choix",
     "EVENT_LOGS_LABEL": "Suivi des participants",
-    "ADD_MEDIA_LABEL": "$t(EventActivity.ADD_MEDIA_LABEL)",
-    "BROWSE_MEDIA_LABEL": "$t(EventActivity.BROWSE_MEDIA_LABEL)",
-    "UPLOADER_MODAL_CLOSE_ACTION": "$t(EventActivity.UPLOADER_MODAL_CLOSE_ACTION)",
-    "LOCATION_MAP_MODAL_CLOSE_ACTION": "$t(CLOSE_LABEL)",
+    "ADD_MEDIA_LABEL": "@:EventActivity.ADD_MEDIA_LABEL",
+    "BROWSE_MEDIA_LABEL": "@:EventActivity.BROWSE_MEDIA_LABEL",
+    "UPLOADER_MODAL_CLOSE_ACTION": "@:EventActivity.UPLOADER_MODAL_CLOSE_ACTION",
+    "LOCATION_MAP_MODAL_CLOSE_ACTION": "@:CLOSE_LABEL",
     "EVENT_LOGS_MODAL_TITLE": "Détails des participants",
-    "EVENT_LOGS_MODAL_CLOSE_ACTION": "$t(CLOSE_LABEL)",
+    "EVENT_LOGS_MODAL_CLOSE_ACTION": "@:CLOSE_LABEL",
     "EVENT_LOGS_MODAL_EXPORT_DATA_LABEL": "Exporter les données",
     "NAVIGATE_LABEL": "Naviguer",
     "LOCATE_LABEL": "Voir la localisation",    
     "MAP_LABEL": "Carte",    
-    "REMOVE_DIALOG_TITLE": "Clôturer l'événement {{event}} ?",
-    "REMOVE_DIALOG_MESSAGE": "Etes vous sûr de vouloir clôturer l'événement <b>{{event}}</b> ?",
+    "REMOVE_DIALOG_TITLE": "Clôturer l'événement {event} ?",
+    "REMOVE_DIALOG_MESSAGE": "Etes vous sûr de vouloir clôturer l'événement <b>{event}</b> ?",
     "ACTION_REQUIRED_WARNING": "Action requise",
     "WAITING_COORDINATION_WARNING": "En attente du coordonnateur",
     "WAITING_FOR_PARTICIPANT_LABEL": "Le coordonnateur est en attente de votre action",
     "WAITING_FOR_COORDINATOR_LABEL": "En attente du coordonnateur",
-    "PARTICPANTS_AWAITING_LABEL": "{{number}} participants en attente de coordination",
+    "PARTICPANTS_AWAITING_LABEL": "{number} participants en attente de coordination",
     "NO_PARTICPANTS_AWAITING_LABEL": "Aucun participant en attente de coordination",
-    "FOLLOWUP_MODAL_CLOSE_ACTION": "$t(CLOSE_LABEL)",
-    "FOLLOWUP_MODAL_SAVE_BUTTON": "$t(SAVE_LABEL)",
+    "FOLLOWUP_MODAL_CLOSE_ACTION": "@:CLOSE_LABEL",
+    "FOLLOWUP_MODAL_SAVE_BUTTON": "@:SAVE_LABEL",
     "VIEW_LOCATION_MAP": "Voir la localisation",
     "VIEW_PARTICIPANTS": "Voir les participants"
   },
@@ -668,8 +668,8 @@
     "SHOW_BY_TEMPLATE_LABEL": "Par type",
     "SHOW_ALL_LABEL": "Globalement",
     "EVENTS_LAYER_NAME": "Mes événements",
-    "MATCHING_RESULTS": "{{total}} événements trouvés.",
-    "MAXIMUM_RESULTS": "Raffinez vos paramètres de recherches car certains résultats sont omis au-delà de {{max}} événements.",
+    "MATCHING_RESULTS": "{total} événements trouvés.",
+    "MAXIMUM_RESULTS": "Raffinez vos paramètres de recherches car certains résultats sont omis au-delà de {max} événements.",
     "SORT_EVENTS": "Trier les événements"
   },
   "ArchivedEventCard": {
@@ -696,19 +696,19 @@
     "BROWSE_MEDIA": "Voir les médias"
   },
   "EventTemplatesActivity": {
-    "EVENT_TEMPLATES_LABEL": "$t(EVENT_TEMPLATES_LABEL)",
+    "EVENT_TEMPLATES_LABEL": "@:EVENT_TEMPLATES_LABEL",
     "CREATE_TEMPLATE_LABEL": "Créer un modèle d'événement",
     "SEARCH_EVENT_TEMPLATES": "Rechercher des modèles d'événements",
     "SORT_EVENT_TEMPLATES": "Trier les modèles d'événements"
   },
   "EventTemplateCard": {
-    "REMOVE_ACTION": "$t(REMOVE_LABEL)",
-    "EDIT_ACTION": "$t(EDIT_LABEL)",
+    "REMOVE_ACTION": "@:REMOVE_LABEL",
+    "EDIT_ACTION": "@:EDIT_LABEL",
     "ADD_WORKFLOW_ACTION": "Ajouter un processus",
     "EDIT_WORKFLOW_ACTION": "Modifier le processus",
     "REMOVE_WORKFLOW_ACTION": "Supprimer le processus",
     "REMOVE_WORKFLOW_TITLE": "Etes vous sûr de vouloir supprimer le processus ?",
-    "COPY_ACTION": "$t(COPY_LABEL)",
+    "COPY_ACTION": "@:COPY_LABEL",
     "DESCRIPTION_SECTION": "Description",
     "NO_DESRIPTION_LABEL": "Aucune description",
     "PARTICIPANTS_SECTION": "Participants",
@@ -716,11 +716,11 @@
     "COORDINATORS_SECTION": "Coordonnateurs",
     "NO_COORDINATORS_LABEL": "Aucun coordonnateurs",
     "EXPIRY_DURATION_SECTION": "Durée d'expiration",
-    "EXPIRY_DURATION_LABEL": "{{days}} jours",
+    "EXPIRY_DURATION_LABEL": "{days} jours",
     "NO_EXPIRY_DURATION_LABEL": "Aucune durée d'expiration",    
     "PERMISSION_SECTION": "Permission",
     "WORKFLOW_SECTION": "Processus",
-    "WORKFLOW_LABEL": "Processus en {{count}} étape(s)",
+    "WORKFLOW_LABEL": "Processus en {count} étape(s)",
     "NO_WORKFLOW_LABEL": "Aucun processus"    
   },
   "EventTemplateWorkflowForm": {
@@ -733,7 +733,7 @@
   },
   "EventTemplateEditor": {
     "WORKFLOW_HELPER_LABEL": "Copier le processus",
-    "CLOSE_ACTION":  "$t(CLOSE_LABEL)"
+    "CLOSE_ACTION":  "@:CLOSE_LABEL"
   },
   "EventNotifications": {
     "CREATE": "Nouveau",
@@ -745,8 +745,8 @@
     "NOTIFY": "Notifier les participants"
   },
   "EventLogEditor": {
-    "CLOSE_ACTION": "$t(CLOSE_LABEL)",
-    "SAVE_BUTTON": "$t(SAVE_LABEL)"
+    "CLOSE_ACTION": "@:CLOSE_LABEL",
+    "SAVE_BUTTON": "@:SAVE_LABEL"
   },
   "CustomerEditor": {
     "TITLE": "Saisissez vos informations de paiement",
@@ -763,7 +763,7 @@
     "SELECT": "Sélectionner",
     "CURRENT_PLAN": "Votre offre",
     "CONFIRM_DIALOG_TITLE": "Êtes vous sur de vouloir mettre à jour votre plan ?",
-    "CONFIRM_DIALOG_MESSAGE": "Merci de confirmer la souscription au plan <b>$t({{plan}})</b>",
+    "CONFIRM_DIALOG_MESSAGE": "Merci de confirmer la souscription au plan <b>@:{plan})</b>",
     "PLAN_DISABLED_TOOLTIP": "Merci de renseigner les informations de paiement pour souscrire à ce plan"
   },
   "OptionsChooser": {
@@ -771,8 +771,8 @@
     "SELECT": "Sélectionner",
     "SUBSCRIBED": "Souscrite",
     "CONFIRM_DIALOG_TITLE": "Êtes vous sur de vouloir mettre à jour votre option ?",
-    "CONFIRM_DIALOG_SUBSCRIBE_MESSAGE": "Merci de confirmer la souscription à l'option <b>$t({{option}})</b>",
-    "CONFIRM_DIALOG_UNSUBSCRIBE_MESSAGE": "Merci de confirmer la résiliation de l'option <b>$t({{option}})</b>",
+    "CONFIRM_DIALOG_SUBSCRIBE_MESSAGE": "Merci de confirmer la souscription à l'option <b>@:{option})</b>",
+    "CONFIRM_DIALOG_UNSUBSCRIBE_MESSAGE": "Merci de confirmer la résiliation de l'option <b>@:{option})</b>",
     "OPTION_DISABLED_TOOLTIP": "Merci de renseigner les informations de paiement pour souscrire aux options"
   },
   "PlansActivity": {
@@ -781,16 +781,16 @@
     "SORT_PLANS": "Trier les plans"
   },
   "PlanObjectivesEditor": {
-    "MANAGE": "Gérer les objectifs - {{name}}",
-    "CREATE": "Ajouter un nouvel objectif - {{name}}",
-    "EDIT": "Editer l'objectif {{name}}",
+    "MANAGE": "Gérer les objectifs - {name}",
+    "CREATE": "Ajouter un nouvel objectif - {name}",
+    "EDIT": "Editer l'objectif {name}",
     "SORT": "Trier les objectifs",
     "ADD_OBJECTIVE": "Ajouter un nouvel objectif",
-    "EDIT_OBJECTIVE": "$t(EDIT)",
-    "REMOVE_OBJECTIVE": "$t(REMOVE)"
+    "EDIT_OBJECTIVE": "@:EDIT",
+    "REMOVE_OBJECTIVE": "@:REMOVE"
   },
   "PlanCard": {
-    "EDIT_ACTION": "$t(EDIT_LABEL)",
+    "EDIT_ACTION": "@:EDIT_LABEL",
     "REMOVE_ACTION": "Clôturer",
     "DESCRIPTION_SECTION": "Description",
     "OBJECTIVES_SECTION": "Objectifs",
@@ -800,7 +800,7 @@
     "NO_LOCATION_LABEL": "Aucune localisation",
     "COORDINATORS_SECTION": "Coordonnateurs",
     "EVENTS_SECTION": "Evénements",
-    "EVENTS": "{{count}} événements(s)",
+    "EVENTS": "{count} événements(s)",
     "VIEW_PLANS": "Voir les plans",
     "VIEW_CATALOG": "Voir la carte",
     "VIEW_ARCHIVED_EVENTS": "Voir la main courante"
@@ -810,9 +810,9 @@
     "CREATE_TEMPLATE_LABEL": "Créer un nouveau modèle de plan"
   },
   "PlanTemplateCard": {
-    "EDIT_ACTION": "$t(EDIT_LABEL)",
-    "COPY_ACTION": "$t(COPY_LABEL)",
-    "REMOVE_ACTION": "$t(REMOVE_LABEL)",
+    "EDIT_ACTION": "@:EDIT_LABEL",
+    "COPY_ACTION": "@:COPY_LABEL",
+    "REMOVE_ACTION": "@:REMOVE_LABEL",
     "DESCRIPTION_SECTION": "Description",
     "NO_DESRIPTION_LABEL": "Aucune description",
     "OBJECTIVES_SECTION": "Objectifs",
@@ -842,11 +842,11 @@
   "PlanMenu": {
     "VIEW_DESCRIPTION": "Voir la description",
     "VIEW_LOCATION": "Voir la localisation",
-    "PERCENT_LABEL": "{{percent}}% réalisé"
+    "PERCENT_LABEL": "{percent}% réalisé"
   },
   "OrganisationMenu": {
-    "EVENTS_LABEL": "{{count}} événement(s)",
-    "PLANS_LABEL": "{{count}} plan(s)",
+    "EVENTS_LABEL": "{count} événement(s)",
+    "PLANS_LABEL": "{count} plan(s)",
     "VIEW_CATALOG": "Voir la carte",
     "VIEW_ARCHIVED_EVENTS": "Voir la main courante",
     "VIEW_ARCHIVED_PLANS": "Voir l'archive des plans",