diff --git a/view/templates/event_head.tpl b/view/templates/event_head.tpl
index b794e6dc40..f2d2d03141 100644
--- a/view/templates/event_head.tpl
+++ b/view/templates/event_head.tpl
@@ -1,8 +1,8 @@
 
-<link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
-<script type="text/javascript" src="{{$baseurl}}/library/moment/moment.min.js"></script>
-<script type="text/javascript" src="{{$baseurl}}/library/moment/locales.min.js"></script>
-<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
+<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.css" />
+<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.print.min.css" />
+<script type="text/javascript" src="{{$baseurl}}/vendor/asset/moment/min/moment-with-locales.min.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.js"></script>
 
 <script>
 	function showEvent(eventid) {
diff --git a/view/theme/frio/templates/event_head.tpl b/view/theme/frio/templates/event_head.tpl
index ba90da2a84..e38f5610d8 100644
--- a/view/theme/frio/templates/event_head.tpl
+++ b/view/theme/frio/templates/event_head.tpl
@@ -1,9 +1,9 @@
 
-<link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
-<link rel='stylesheet' type='text/css' href='view/theme/frio/css/mod_events.css' />
-<script type="text/javascript" src="{{$baseurl}}/library/moment/moment.min.js"></script>
-<script type="text/javascript" src="{{$baseurl}}/library/moment/locales.min.js"></script>
-<script type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
+<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.css" />
+<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.print.min.css" />
+<link rel="stylesheet" type="text/css" href="view/theme/frio/css/mod_events.css" />
+<script type="text/javascript" src="{{$baseurl}}/vendor/asset/moment/min/moment-with-locales.min.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.js"></script>
 <script type="text/javascript" src="view/theme/frio/js/mod_events.js"></script>
 
 <script type="text/javascript">
diff --git a/view/theme/frost-mobile/templates/event_end.tpl b/view/theme/frost-mobile/templates/event_end.tpl
index 8bc2a5bd18..1df60bdfd8 100644
--- a/view/theme/frost-mobile/templates/event_end.tpl
+++ b/view/theme/frost-mobile/templates/event_end.tpl
@@ -1,4 +1,3 @@
 
-<script type="text/javascript" src="{{$baseurl}}/library/moment/moment.min.js"></script>
-<script type="text/javascript" src="{{$baseurl}}/library/moment/locales.min.js"></script>
-<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/vendor/asset/moment/min/moment-with-locales.min.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.js"></script>
diff --git a/view/theme/frost-mobile/templates/event_head.tpl b/view/theme/frost-mobile/templates/event_head.tpl
index ccd88f6c86..0f1b2d4e84 100644
--- a/view/theme/frost-mobile/templates/event_head.tpl
+++ b/view/theme/frost-mobile/templates/event_head.tpl
@@ -1,9 +1,10 @@
 
-<link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
+<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.css" />
+<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.print.min.css" />
 
 <script language="javascript" type="text/javascript">
 window.aclType = 'event_head';
-window.eventModuleUrl = "{{$module_url}}";
-window.eventModeParams = "{{$modparams}}" ;
+window.eventModuleUrl = '{{$module_url}}';
+window.eventModeParams = '{{$modparams}}';
 </script>
 
diff --git a/view/theme/frost/templates/event_end.tpl b/view/theme/frost/templates/event_end.tpl
index 8bc2a5bd18..1df60bdfd8 100644
--- a/view/theme/frost/templates/event_end.tpl
+++ b/view/theme/frost/templates/event_end.tpl
@@ -1,4 +1,3 @@
 
-<script type="text/javascript" src="{{$baseurl}}/library/moment/moment.min.js"></script>
-<script type="text/javascript" src="{{$baseurl}}/library/moment/locales.min.js"></script>
-<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/vendor/asset/moment/min/moment-with-locales.min.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.js"></script>
diff --git a/view/theme/frost/templates/event_head.tpl b/view/theme/frost/templates/event_head.tpl
index ccd88f6c86..0f1b2d4e84 100644
--- a/view/theme/frost/templates/event_head.tpl
+++ b/view/theme/frost/templates/event_head.tpl
@@ -1,9 +1,10 @@
 
-<link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
+<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.css" />
+<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.print.min.css" />
 
 <script language="javascript" type="text/javascript">
 window.aclType = 'event_head';
-window.eventModuleUrl = "{{$module_url}}";
-window.eventModeParams = "{{$modparams}}" ;
+window.eventModuleUrl = '{{$module_url}}';
+window.eventModeParams = '{{$modparams}}';
 </script>
 
diff --git a/view/theme/quattro/templates/events_reminder.tpl b/view/theme/quattro/templates/events_reminder.tpl
index 306e278bc0..febdf32568 100644
--- a/view/theme/quattro/templates/events_reminder.tpl
+++ b/view/theme/quattro/templates/events_reminder.tpl
@@ -1,12 +1,13 @@
 
-<link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
-<script type="text/javascript" src="{{$baseurl}}/library/moment/moment.min.js"></script>
-<script type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
+<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.css" />
+<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.print.min.css" />
+<script type="text/javascript" src="{{$baseurl}}/vendor/asset/moment/min/moment-with-locales.min.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.js"></script>
 <script>
 	// start calendar from yesterday
 	var yesterday= new Date()
 	yesterday.setDate(yesterday.getDate()-1)
-	
+
 	function showEvent(eventid) {
 		$.get(
 			'{{$baseurl}}/events/?id='+eventid,
diff --git a/view/theme/vier/templates/event_head.tpl b/view/theme/vier/templates/event_head.tpl
index c7f9ec3457..5cc355687a 100644
--- a/view/theme/vier/templates/event_head.tpl
+++ b/view/theme/vier/templates/event_head.tpl
@@ -1,8 +1,8 @@
 
-<link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
-<script type="text/javascript" src="{{$baseurl}}/library/moment/moment.min.js"></script>
-<script type="text/javascript" src="{{$baseurl}}/library/moment/locales.min.js"></script>
-<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
+<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.css" />
+<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.print.min.css" />
+<script type="text/javascript" src="{{$baseurl}}/vendor/asset/moment/min/moment-with-locales.min.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.js"></script>
 
 <script>
 	function showEvent(eventid) {