diff --git a/fancytokens.php b/fancytokens.php
index 44d40af..bfcd6d9 100644
--- a/fancytokens.php
+++ b/fancytokens.php
@@ -29,7 +29,7 @@ function fancytokens_civicrm_tokens( &$tokens ){
   		$e_id = $dao->id;
   		$e_title = $dao->title;
   		$e_start_date = $dao->start_date;
-  		$label = 'Registration Page: '.$e_title.' on '.$e_start_date.' (id: '.$e_id.')  :: Events'; 
+  		$label = 'Registration Page: '.$e_title.' '.$e_start_date.' (id: '.$e_id.')  :: Events'; 
   		$key = 'communitynews.event_registrationpage___'.$e_id ;
   		
   		 $tokens['communitynews'][$key] = $label; 
@@ -499,7 +499,7 @@ $protocol = $isSecure ? 'https://' : 'http://';
 	            if( is_numeric( $date_number) && ( $date_unit == 'day'  || $date_unit == 'week' || $date_unit == 'month'  )){ 
 	            // get event data 
 	            $sql = "SELECT e.id , e.summary,  e.title, e.registration_link_text, 
-	             date_format( e.start_date, '%W %b %e at %l:%i %p' ) as start_date  ,
+	             date_format( e.start_date, '%d/%m/%Y à %Hh%i' ) as start_date  ,
 	             if( e.is_online_registration = 1 AND 
 	               ( e.registration_end_date is null || now() <= e.registration_end_date ) AND
 	               ( e.registration_start_date is null || now() >= e.registration_start_date ), '1', '0') as 
@@ -549,7 +549,7 @@ $protocol = $isSecure ? 'https://' : 'http://';
   		     		$summary_html = ""; 
   		     	
   		     	} 
-  		     	$tmp_event_html = $tmp_event_html."\n<br><br><a href='".$event_info_link_url.$eid."'>".$e_title."</a> on ".
+  		     	$tmp_event_html = $tmp_event_html."\n<br><br><a href='".$event_info_link_url.$eid."'>".$e_title."</a> ".
   		     		$e_start_date.$register_html.$summary_html; 
   		     }
   		     $dao->free(); 
@@ -571,7 +571,7 @@ $protocol = $isSecure ? 'https://' : 'http://';
 	            if( is_numeric( $token_event_id) ){ 
 	            // get event data 
 	            $sql = "SELECT e.id , e.summary,  e.title, e.registration_link_text, 
-	             date_format( e.start_date, '%W %b %e at %l:%i %p' ) as start_date  ,
+	             date_format( e.start_date, '%d/%m/%Y à %Hh%i' ) as start_date  ,
 	             if( e.is_online_registration = 1 AND 
 	               ( e.registration_end_date is null || now() <= e.registration_end_date ) AND
 	               ( e.registration_start_date is null || now() >= e.registration_start_date ), '1', '0') as 
@@ -621,7 +621,7 @@ $protocol = $isSecure ? 'https://' : 'http://';
   		     		$summary_html = ""; 
   		     	
   		     	} 
-  		     	$tmp_event_html = $tmp_event_html."\n<br><br>".$e_title." on ".
+  		     	$tmp_event_html = $tmp_event_html."\n<br><br>".$e_title." ".
   		     		$e_start_date.$register_html.$summary_html; 
   		     }
   		     $dao->free();