diff --git a/application-mocca-calendar-ui/pom.xml b/application-mocca-calendar-ui/pom.xml
index ef57d16..13a2e0d 100644
--- a/application-mocca-calendar-ui/pom.xml
+++ b/application-mocca-calendar-ui/pom.xml
@@ -104,7 +104,7 @@
     <dependency>
       <groupId>org.xwiki.contrib</groupId>
       <artifactId>macro-fullcalendar-ui</artifactId>
-      <version>2.1.9</version>
+      <version>2.2</version>
       <type>xar</type>
     </dependency>
     <!-- This application is needed to preselect the Calendar template at creation step according to
diff --git a/application-mocca-calendar-ui/src/main/resources/MoccaCalendar/Macro.xml b/application-mocca-calendar-ui/src/main/resources/MoccaCalendar/Macro.xml
index 11494fe..678fa71 100644
--- a/application-mocca-calendar-ui/src/main/resources/MoccaCalendar/Macro.xml
+++ b/application-mocca-calendar-ui/src/main/resources/MoccaCalendar/Macro.xml
@@ -1005,8 +1005,6 @@ div.calendar-buttons span.buttonwrapper {
     </class>
     <property>
       <code>{{velocity output="false"}}
-$xwiki.jsx.use("Calendar.JQueryUI", {'defer': false, 'minify': false})
-$xwiki.jsx.use("Calendar.Moment", {'defer': false, 'minify': false})
 $xwiki.jsx.use("Calendar.FullCalendar", {'defer': false, 'minify': false})
 $xwiki.jsx.use("MoccaCalendar.Macro", {'defer': false, 'v' : '2.6'})
 $xwiki.jsx.use("MoccaCalendar.DatePickerExtension", {'defer': false})
@@ -1134,7 +1132,7 @@ $xwiki.ssx.use("MoccaCalendar.Macro")
 &lt;div id="calendar${calcounter}"&gt;&lt;/div&gt;
 &lt;script type="text/javascript"&gt;
 require(['jquery'], function(jQuery) {
- jQuery(document).ready(function() {
+ jQuery(window).load(function() {
 
   var defaultView = XWiki.MoccaCalendar.Helper.getCalendarView("$!escapetool.javascript($defaultView)");
 
@@ -1198,13 +1196,6 @@ require(['jquery'], function(jQuery) {
       calendarHelper.updateEvent(event.id, true, delta, event.start, event.end, revertFunc);
     },
     aspectRatio:1.8,
-    buttonText: {
-      today: '$escapetool.javascript($services.localization.render('xwiki.calendar.button.today'))',
-      day: '$escapetool.javascript($services.localization.render('xwiki.calendar.button.day'))',
-      week:'$escapetool.javascript($services.localization.render('xwiki.calendar.button.week'))',
-      month:'$escapetool.javascript($services.localization.render('xwiki.calendar.button.month'))',
-      plainList:'$escapetool.javascript($services.localization.render('MoccaCalendar.calendar.plainlist'))'
-    },
     monthNames: $services.localization.render('xwiki.calendar.monthNames'),
     monthNamesShort: $services.localization.render('xwiki.calendar.monthNamesShort'),
     dayNames: $services.localization.render('xwiki.calendar.dayNames'),
@@ -1212,15 +1203,25 @@ require(['jquery'], function(jQuery) {
     allDayText: "$escapetool.javascript($services.localization.render('xwiki.calendar.allDayText'))",
     axisFormat: "$escapetool.javascript($services.localization.render('xwiki.calendar.axisFormat'))",
     timeFormat: "$!escapetool.javascript($services.localization.render('xwiki.calendar.timeFormat'))",
-    columnFormat: {
-      month: "$!escapetool.javascript($services.localization.render('xwiki.calendar.columnFormat.month'))",
-      week: "$!escapetool.javascript($services.localization.render('xwiki.calendar.columnFormat.week'))",
-      day: "$!escapetool.javascript($services.localization.render('xwiki.calendar.columnFormat.day'))"
-    },
-    titleFormat: {
-      month: "$!escapetool.javascript($services.localization.render('xwiki.calendar.titleFormat.month'))",
-      week: "$!escapetool.javascript($services.localization.render('xwiki.calendar.titleFormat.week'))",
-      day: "$!escapetool.javascript($services.localization.render('xwiki.calendar.titleFormat.day'))"
+    views: {
+      month : {
+        columnFormat: "$!services.localization.render('xwiki.calendar.columnFormat.month')",
+        titleFormat: "$!services.localization.render('xwiki.calendar.titleFormat.month')",
+        buttonText: "$!services.localization.render('xwiki.calendar.button.month')"
+      },
+      week : {
+        columnFormat: "$!services.localization.render('xwiki.calendar.columnFormat.week')",
+        titleFormat: "$!services.localization.render('xwiki.calendar.titleFormat.week')",
+        buttonText: "$!services.localization.render('xwiki.calendar.button.week')"
+      },
+      day : {
+        columnFormat: "$!services.localization.render('xwiki.calendar.columnFormat.day')",
+        titleFormat: "$!services.localization.render('xwiki.calendar.titleFormat.day')",
+        buttonText: "$!services.localization.render('xwiki.calendar.button.day')"
+      },
+      today: {
+        buttonText: "$!services.localization.render('xwiki.calendar.button.today')"
+      }
     }
   });
   jQuery('#calendar${calcounter}-btn').click( function(e) { calendarHelper.showCreateEvent(); e.preventDefault(); });