diff --git a/e107_plugins/calendar_menu/e_notify.php b/e107_plugins/calendar_menu/e_notify.php
index 3ded1b3c5..7e53430e2 100644
--- a/e107_plugins/calendar_menu/e_notify.php
+++ b/e107_plugins/calendar_menu/e_notify.php
@@ -6,57 +6,50 @@
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
- *	Notify shim
- *
- * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/e_notify.php,v $
- * $Revision$
- * $Date$
- * $Author$
- */
-
-/**
- *	e107 Event calendar plugin
- *
- *	Notify shim
- *
- *	@package	e107_plugins
- *	@subpackage	event_calendar
- *	@version 	$Id$;
  */
 
 if (!defined('e107_INIT')) { exit; }
 
-if(defined('ADMIN_PAGE') && ADMIN_PAGE === true)
-{
-	include_lan(e_PLUGIN.'calendar_menu/languages/'.e_LANGUAGE.'_class.php');
-	$config_category = NT_LAN_EC_1;
-	$config_events = array('ecalnew' => NT_LAN_EC_7, 'ecaledit' => NT_LAN_EC_2);
-}
-
-if (!function_exists('notify_ecalnew'))
-{
-	function notify_ecalnew($data) 
+// v2.x Standard 
+class calendar_menu_notify extends notify
+{		
+	function config()
+	{
+			
+		$config = array();
+	
+		$config[] = array(
+			'name'			=> NT_LAN_EC_7,
+			'function'		=> "ecalnew",
+			'category'		=> ''
+		);	
+
+		$config[] = array(
+			'name'			=> NT_LAN_EC_2,
+			'function'		=> "ecaledit",
+			'category'		=> ''
+		);	
+		
+		return $config;
+	}
+	
+	function ecalnew($data) 
 	{
-		global $nt;
-		include_lan(e_PLUGIN.'calendar_menu/languages/'.e_LANGUAGE.'.php');
 		$message = NT_LAN_EC_3.': '.USERNAME.' ('.NT_LAN_EC_4.': '.$data['ip'].' )<br />';
 		$message .= NT_LAN_EC_5.':<br />'.$data['cmessage'].'<br /><br />';
-		$nt -> send('ecaledit', NT_LAN_EC_6, $message);
+		
+		$this->send('ecalnew', NT_LAN_EC_6, $message);
 	}
-}
 
-if (!function_exists('notify_ecaledit')) 
-{
-	function notify_ecaledit($data) 
+	function ecaledit($data)
 	{
-		global $nt;
-		include_lan(e_PLUGIN.'calendar_menu/languages/'.e_LANGUAGE.'.php');
 		$message = NT_LAN_EC_3.': '.USERNAME.' ('.NT_LAN_EC_4.': '.$data['ip'].' )<br />';
 		$message .= NT_LAN_EC_5.':<br />'.$data['cmessage'].'<br /><br />';
-		$nt -> send('ecaledit', NT_LAN_EC_8, $message);
-	}
-}
 
+		$this->send('ecaledit', NT_LAN_EC_8, $message);
+	}
+	
+}
 
 
 ?>
\ No newline at end of file