reordered events table;

fixed events name;
bumped sources date;


git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2470 17fca916-40b9-46aa-a4ea-0a15b648b75c

8 files changed, 1797 insertions, 1785 deletions

diff --git a/src/kvilib/config/kvi_sourcesdate.h b/src/kvilib/config/kvi_sourcesdate.h
index 266e3fa9e..a2a255c4e 100644
--- a/src/kvilib/config/kvi_sourcesdate.h
+++ b/src/kvilib/config/kvi_sourcesdate.h
@@ -36,8 +36,8 @@
 * \def KVI_SOURCES_DATE Defines the sources date
 * \def KVI_SOURCES_DATE_NUMERIC Defines the sources date
 */
-#define KVI_SOURCES_DATE "20080829"
-#define KVI_SOURCES_DATE_NUMERIC 0x20080829
+#define KVI_SOURCES_DATE "20080916"
+#define KVI_SOURCES_DATE_NUMERIC 0x20080916
 
 /**
 * \brief This is the date of the sources before that we should force a setup
diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
index 15228d36c..28a0df7ab 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
@@ -1233,7 +1233,7 @@ void KviIrcConnection::loginComplete(const QString &szNickName)
 	g_pApp->addRecentNickname(szNickName);
 
 	bool bHaltOutput = false;
-	bHaltOutput = KVS_TRIGGER_EVENT_0_HALTED(KviEvent_OnIrc,m_pConsole);
+	bHaltOutput = KVS_TRIGGER_EVENT_0_HALTED(KviEvent_OnIRC,m_pConsole);
 
 	if(!bHaltOutput)
 		m_pConsole->outputNoFmt(KVI_OUT_IRC,__tr2qs("Login operations complete, happy ircing!"));
diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp
index 715f49910..aa23ed04d 100644
--- a/src/kvirc/kernel/kvi_irccontext.cpp
+++ b/src/kvirc/kernel/kvi_irccontext.cpp
@@ -661,7 +661,7 @@ void KviIrcContext::connectionEstabilished()
 
 	setState(LoggingIn); // this must be set in order for $server and other functions to return the correct values
 
-	bStopOutput = KVS_TRIGGER_EVENT_0_HALTED(KviEvent_OnIrcConnectionEstabilished,m_pConsole);
+	bStopOutput = KVS_TRIGGER_EVENT_0_HALTED(KviEvent_OnIRCConnectionEstabilished,m_pConsole);
 
 	if(!bStopOutput)
 	{
@@ -767,7 +767,7 @@ void KviIrcContext::connectionTerminated()
 
 	bool bStopOutput = false;
 
-	bStopOutput = KVS_TRIGGER_EVENT_0_HALTED(KviEvent_OnIrcConnectionTerminated,m_pConsole);
+	bStopOutput = KVS_TRIGGER_EVENT_0_HALTED(KviEvent_OnIRCConnectionTerminated,m_pConsole);
 
 	if(!bStopOutput)
 	{
diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
index d32b13264..401d7c2c9 100644
--- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
@@ -30,6 +30,7 @@
 
 KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]=
 {
+	// Application
 	/*
 		@doc: onkvircstartup
 		@type:
@@ -125,6 +126,531 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]=
 	EVENT("OnIRCContextDestroyed",""),
 
 	/*
+		@doc: onframewindowcreated
+		@type:
+			event
+		@title:
+			OnFrameWindowCreated
+		@short:
+			Triggered when a new frame window is opened
+		@parameters:
+			None
+		@window:
+			First console in the frame window
+		@description:
+			This event is triggered in the first console of a new frame window.
+			A frame window is the toplevel window that contains the consoles
+			and the other MDI children windows.
+		@seealso:
+			[event:onframewindowdestroyed]OnFrameWindowDestroyed[/event]
+	*/
+	EVENT("OnFrameWindowCreated",""),
+
+	/*
+		@doc: onframewindowdestroyed
+		@type:
+			event
+		@title:
+			OnFrameWindowDestroyed
+		@short:
+			Triggered when a frame window is being destroyed
+		@parameters:
+			None
+		@window:
+			Last console in the frame window
+		@description:
+			This event is triggered in the last console of a frame window that is
+			being destroyed. In fact the frame window is not destroyed yet, but it
+			is going to: there would be no way to trigger this event after the
+			last frame window destruction.
+		@seealso:
+			[event:onframewindowcreated]OnFrameWindowCreated[/event]
+	*/
+	EVENT("OnFrameWindowDestroyed",""),
+
+	/*
+		@doc: onurl
+		@type:
+			event
+		@title:
+			OnURL
+		@short:
+			Triggered when an URL appears in one of the output windows
+		@parameters:
+			$0 = URL
+		@window:
+			The window that the URL appeared in
+		@description:
+			This event is triggered every time that an URL is going to appear
+			in a KVIrc window output widget. You cannot stop it or modify it.
+			This event is good for implementing an URL catcher.[br]
+			WARNING: If you attempt to "echo $0" inside this event, you will cause an infinite loop.
+	*/
+	EVENT("OnURL", \
+		"$0 = URL"),
+
+	/*
+		@doc: onerror
+		@type:
+			event
+		@title:
+			OnError
+		@short:
+			Server ERROR message received
+		@parameters:
+			$0 = message source
+			$1 = error reason
+		@window:
+			Console
+		@description:
+			Triggered when an ERROR message is received from the server.[br]
+			$0 is the message (server) source but be aware that it often happens to be empty.[br]
+			Calling 'halt' in this event will stop the default output.[br]
+	*/
+	EVENT("OnError", \
+		"$0 = message source\n" \
+		"$1 = error reason"),
+
+	/*
+		@doc: onaccelkeypressed
+		@type:
+			event
+		@title:
+			OnAccelKeyPressed
+		@short:
+			An accelerator key was pressed
+		@parameters:
+			$0 = keys
+		@window:
+			Active window
+		@description:
+			An accelerator key has been pressed by the user.[br]
+			The key sequence that the user has pressed is passed in $0 as a
+			human readable string.[br]
+			The keys that actually work with KVIrc are:[br]
+			F2 to F12, F1 to F12 with SHIFT key pressed, 0 to 9 with CTRL key pressed.[br]
+			This means that you can set up 33 "quick" aliases...that's really more than
+			an user can remember.[br]
+			If you need more keys , mail me , I'll see what I can do :)[br]
+	*/
+	EVENT("OnAccelKeyPressed", \
+		"$0 = keys"),
+
+	/*
+		@doc: onhighlight
+		@type:
+			event
+		@title:
+			OnHighlight
+		@short:
+			A channel or query message is going to be highlighted
+		@parameters:
+			$0 = talker nick
+			$1 = target username
+			$2 = target hostname
+			$3 = message
+			$4 = highlight word
+			$5 = message type
+			$6 = is action
+		@window:
+			Channel or query window
+		@description:
+			A channel or query message is going to be highlighted.[br]
+			The message may be either a PRIVMSG, a NOTICE or a CTCP ACTION.[br]
+			The highlight may be either caused by a "highlight word" or by your own nickname
+			(if that option was specified).[br]
+			$5 contains the original color/icon set of the message that depends on
+			the type of the message itself.[br]
+			Since the CTCP ACTION messages generally have different format of output
+			then for your convenience $6 contains 1 if the message was caused by a
+			CTCP ACTION and 0 otherwise.[br]
+			If you call [cmd]halt[/cmd] in this event the message output will be completely disabled
+			(thus, KVIrc assumes that YOU have provided the necessary output and feedback to the user).[br]
+			A common error here is to call halt and re-echo the unmodified output; [b]this
+			can cause another OnHighlight event to be triggered and create an infinite loop![/b].
+			[cmd]echoprivmsg[/cmd] [b]-n[/b] is the command you probably want. 
+	*/
+	EVENT("OnHighlight", \
+		"$0 = source nick\n" \
+		"$1 = source username\n" \
+		"$2 = source hostname\n" \
+		"$3 = message\n" \
+		"$4 = highlight word"),
+
+	/*
+		@doc: onwindowactivated
+		@type:
+			event
+		@title:
+			OnWindowActivated
+		@short:
+			A window has just been activated
+		@parameters:
+			none
+		@window:
+			Any window
+		@description:
+			This event is triggered when a KVIrc MDI window gets activated.[br]
+			This might be a good place to update your toolbar button status (for example).[br]
+	*/
+	EVENT("OnWindowActivated",""),
+
+	/*
+		@doc: onnotifyonline
+		@type:
+			event
+		@title:
+			OnNotifyOnline
+		@short:
+			An user in the notify list is on-line
+		@parameters:
+			$0 = nickname
+		@window:
+			Console or active window of the IRC context
+		@description:
+			This event is triggered when one of the users in your [doc:notify_list]notify[/doc] lists
+			is detected to be ON-Line.[br]
+			The event is triggered in the console window or the active window of the IRC context depending
+			on the user options.[br]
+			(Note: If you call [cmd]halt[/cmd] in this event , you will stop the "Nick is on irc" output,
+			but this is rather a bad idea since KVIrc gives a lot of additional informations to the
+			user with some notify-methods).[br]
+			This is a good place to play a sound or attract the user attention in some other way.[br]
+
+	*/
+	EVENT("OnNotifyOnline", \
+		"$0 = nickname"),
+
+	/*
+		@doc: onnotifyoffline
+		@type:
+			event
+		@title:
+			OnNotifyOffline
+		@short:
+			An user in the notify list went off-line
+		@parameters:
+			$0 = nickname
+		@window:
+			Console or active window of the IRC context
+		@description:
+			This event is triggered when one of the users in your [doc:notify_list]notify[/doc] lists
+			has just left IRC.[br]
+			The event is triggered in the console window or the active window of the IRC context depending
+			on the user options.[br]
+			(Note: If you call [cmd]halt[/cmd] in this event , you will stop the "Nick has left irc" output,
+			but this is rather a bad idea since KVIrc gives a lot of additional informations to the
+			user with some notify-methods).[br]
+			This is a good place to play a sound or attract the user attention in some other way.[br]
+	*/
+	EVENT("OnNotifyOffline", \
+		"$0 = nickname"),
+
+	/*
+		@doc: onping
+		@type:
+			event
+		@title:
+			OnPing
+		@short:
+			Server ping handler
+		@parameters:
+			$0 = server
+			$1 = ping message parameters
+		@window:
+			Console
+		@description:
+			Triggered when a PING message was received from a server.[br]
+			Calling 'halt' in this event will stop the informational message about 'ping->pong'.[br]
+	*/
+	EVENT("OnPing", \
+		"$0 = server\n" \
+		"$1 = message parameters"),
+
+	/*
+		@doc: onpong
+		@type:
+			event
+		@title:
+			OnPong
+		@short:
+			Server pong handler
+		@parameters:
+			$0 = server
+			$1 = pong message parameters
+		@window:
+			Console
+		@description:
+			Triggered when a PONG message was received from a server.[br]
+			Calling 'halt' in this event will stop the informational message about the pong'.[br]
+	*/
+	EVENT("OnPong", \
+		"$0 = server\n" \
+		"$1 = pong message parameters"),
+
+	/*
+		@doc: onlagalarmtimeup
+		@type:
+			event
+		@title:
+			OnLagAlarmTimeUp
+		@short:
+			High-Lag Alarm Started
+		@parameters:
+			$0 = server
+			$1 = Lag value in miliseconds
+		@window:
+			Console
+		@description:
+		Triggered when the Lag on the server tied to this console is higher than the configured Lag-Alarm time.
+	*/
+	EVENT("OnLagAlarmTimeUp", \
+		"$0 = server\n" \
+		"$1 = lag time in miliseconds"),
+
+	/*
+		@doc: onlagalarmtimedown
+		@type:
+			event
+		@title:
+			OnLagAlarmTimeDown
+		@short:
+			High-Lag Alarm Stopped
+		@parameters:
+			$0 = server
+			$1 = Lag value in miliseconds
+		@window:
+			Console
+		@description:
+		Triggered when the Lag on the server tied to this console is lower than the configured Lag-Alarm time but was higher in the previous lag check.
+	*/
+	EVENT("OnLagAlarmTimeDown", \
+		"$0 = server\n" \
+		"$1 = lag time in miliseconds"),
+
+	/*
+		@doc: onlagcheck
+		@type:
+			event
+		@title:
+			OnLagCheck
+		@short:
+			The lag metering engine has checked the lag
+		@parameters:
+			$0 = server
+			$1 = Lag value in miliseconds
+		@window:
+			Console
+		@description:
+			Triggered when the lag metering engine calculate a new current lag.[br]
+	*/
+	EVENT("OnLagCheck", \
+		"$0 = server\n" \
+		"$1 = lag time in miliseconds"),
+
+	/*
+		@doc: ontextinput
+		@type:
+			event
+		@title:
+			OnTextInput
+		@short:
+			The user has just entered some text in the text input
+		@parameters:
+			$0 = text
+		@window:
+			window in that the text is entered
+		@description:
+			Triggered when the user enters some text in the text input
+			window and presses return.
+			Calling [cmd]halt[/cmd] will stop the automatic text processing
+			and the result depends on the window the text is typed in.
+			In channel/query and console windows the text will NOT be sent to
+			the IRC server. This event might be useful for performing
+			substitutions in the text sent to the server. If you stop the
+			text processing in a channel or query window then the local
+			echo of the message will be omitted too. You might want to
+			realize the echo by the means of the [cmd]echoprivmsg[/cmd] command.
+			This event is NOT triggered when the user enters a command
+			in the input window.
+		@seealso:
+			[cmd]echoprivmsg[/cmd]
+	*/
+	EVENT("OnTextInput", \
+		"$0 = text"),
+
+	/*
+		@doc: onnotifylistdefaultactionrequest
+		@type:
+			event
+		@title:
+			OnNotifyListDefaultActionRequest
+		@short:
+			Notify list double click customization
+		@parameters:
+			$0 = nickname
+		@window:
+			The window that the user has clicked in
+		@description:
+			This event is triggered when an user has double clicked on a nickname in
+			the notify list (console window).[br]
+			You should use this event to do some significant action associated with the double click.[br]
+			A good example might be a [cmd]whois[/cmd] query or a [cmd]dcc.chat[/cmd]
+	*/
+	EVENT("OnNotifyListDefaultActionRequest", \
+		"$0 = nickname"),
+
+	/*
+		@doc: onnotifylistpopuprequest
+		@type:
+			event
+		@title:
+			OnNotifyListPopupRequest
+		@short:
+			Notify list context popup customization
+		@parameters:
+			$0 = nickname list
+		@window:
+			The window that the user has clicked in
+		@description:
+			This event is triggered when an user has right clicked on a list of nicknames in
+			the notify list (console window).[br]
+			This is a good place to show a [cmd]popup[/cmd] with some actions that can be performed
+			on the nicknames like querying , performing a whois lookup or sth similar.[br]
+	*/
+	EVENT("OnNotifyListPopupRequest", \
+		"$0 = nickname list"),
+
+	/*
+		@doc: onwallops
+		@type:
+			event
+		@title:
+			OnWallops
+		@short:
+			Triggered when a WALLOPS message is received from the server
+		@parameters:
+			$0 = source nick
+			$1 = source user
+			$2 = source host
+			$3 = message text
+		@window:
+			channel
+		@description:
+			Triggered when a WALLOPS message is received from the server.
+			If you call [cmd]halt[/cmd] the message output will be stopped.
+		@seealso:
+	*/
+	EVENT("OnWallops", \
+		"$0 = nick\n" \
+		"$1 = user\n" \
+		"$2 = host\n" \
+		"$3 = message text"),
+
+	/*
+		@doc: OnIgnoredMessage
+		@type:
+			event
+		@title:
+			OnIgnoredMessage
+		@short:
+			Triggered when a message is ignored.
+		@parameters:
+			$0 = source nick
+			$1 = source username
+			$2 = source host
+			$3 = message target
+			$4 = message
+		@window:
+			any
+		@description:
+			Triggered when a message is ignored.
+	*/
+	EVENT("OnIgnoredMessage", \
+		"$0 = source nick\n" \
+		"$1 = source username\n" \
+		"$2 = source host\n" \
+		"$3 = message target\n" \
+		"$4 = message"),
+
+	/*
+		@doc: onservernotice
+		@type:
+			event
+		@title:
+			OnServerNotice
+		@short:
+			A server NOTICE have been issued.
+		@parameters:
+			$0 = source nick
+			$1 = message
+		@window:
+			Console window
+		@description:
+			Someone has issued a server NOTICE.
+		@seealso:
+			[event:onchannelnotice]OnChannelNotice[/event]
+	*/
+	EVENT("OnServerNotice", \
+		"$0 = source nick\n" \
+		"$1 = message"),
+
+	/*
+		@doc: ontextviewdoublecliked
+		@type:
+			event
+		@title:
+			OnTextViewDoubleClicked
+		@short:
+			Text view link double click customization
+		@parameters:
+			$0 = actual name
+			$1 - visible name
+			$2 - command name
+		@window:
+			The window that the user has clicked in
+		@description:
+			Actual name is equal to the command name if command name is not null.
+			Visible name is the link text (as it shown by user).
+			Command name is set if the visible name differs with the actual link target (probably contains mIRC colors,etc). It is equal to the actual target name.
+			This event is triggered when an user has double clicked on a text view and has not hit any link.[br]
+			I have no idea what you can do in this event....maybe some sort of channel-central dialog? :)
+	*/
+	EVENT("OnTextViewDoubleClicked",""),
+
+	/*
+		@doc: onnicklinkdefaultactionrequest
+		@type:
+			event
+		@title:
+			OnNickLinkDefaultActionRequest
+		@short:
+			Nick link double click customization
+		@parameters:
+			$0 = actual name
+			$1 - visible name
+			$2 - command name
+		@window:
+			The window that the user has clicked in
+		@description:
+			Actual name is equal to the command name if command name is not null.
+			Visible name is the link text (as it shown by user)
+			Command name is set if the visible name differs with the actual link target(probably contains mIRC colors,etc). It is equal to the actual target name.
+			This event is triggered when an user has double clicked on a nickname link.[br]
+			You should use this event to perform some significant action associated with the double click.[br]
+			A good example might be a [cmd]whois[/cmd] or a [cmq]query[/cmd] call.[br]
+			Please note that NOT ALL nickname links will cause this event to be triggered: some nickname
+			links default actions are actually handled by the
+			[event:onquerynickdefaultactionrequest]OnQueryNickDefaultActionRequest[/event] and
+			[event:onchannelnickdefatulactionrequest]OnChannelNickDefaultActionRequest[/event] events.[br]
+	*/
+	EVENT("OnNickLinkDefaultActionRequest", \
+		"$0 = actual name\n" \
+		"$1 - visible name\n" \
+		"$2 - command name"),
+
+	// Connection
+	/*
 		@doc: onircconnectionestablished
 		@type:
 			event
@@ -204,93 +730,141 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]=
 	EVENT("OnIRC",""),
 
 	/*
-		@doc: onchannelnickpopuprequest
+		@doc: onnetsplit
 		@type:
 			event
 		@title:
-			OnChannelNickPopupRequest
+			OnNetsplit
 		@short:
-			Allows customization of the nick-on-channel context popup
+			A netsplit has been detected
 		@parameters:
-			$0 = nick list
+			$0 = server1
+			$1 = server2
 		@window:
-			Channel window
+			console
 		@description:
-			This event is triggered when the user right-clicks in the channel user list
-			or on a nickname link in the channel text view.[br]
-			The first parameter ($0) contains a comma separated list of selected nicknames (if it is an user list click)
-			or a single nickname (if it is a link).[br]
-			In both cases all the nicknames are currently on the channel.[br]
-			You should popup a popup-menu with a set of possible channel-related actions,
-			like op/deop , voice/devoice , whois etc...
-		@seealso:
-			[event:onchannelnickdefaultactionrequest]OnChannelNickDefaultActionRequest[/event]
+			Triggered when KVIrc detects a netsplit by looking at an user's quit message.
+			The two parameters passed are the two servers that lost the link and were
+			signaled in that particular quit message.[br]
+			The actual netsplit detector in the KVIrc core uses the following rule
+			(extracted from the eggdrop bot code): "determine if signoff string matches "%.% %.%",
+			and only one space".[br]
+			[b]Note that this may be not accurate and KVIrc CAN be fooled by specially
+			formatted quit messages that aren't really netsplits.[/b][br]
+			KVIrc tries to avoid duplicate netsplit warnings thus this event will NOT
+			be triggered for EVERY quit in a netsplit: you will get it once for every
+			different set of servers that lost the link.[br]
+			Determining where the network link has been exactly broken may be a hard
+			task since the quit messages you see may not involve
+			the servers on the split boundary.
 	*/
-	EVENT("OnChannelNickPopupRequest", \
-		"$0 = nick list"),
+	EVENT("OnNetsplit", \
+		"$0 = server1\n" \
+		"$1 = server2"),
 
 	/*
-		@doc: onchannelnickdefaultactionrequest
+		@doc: ondisconnectrequest
 		@type:
 			event
 		@title:
-			OnChannelNickDefaultActionRequest
+			OnDisconnectRequest
 		@short:
-			Allows customization of the double click on nicknames
+			Triggered when the user requests a disconnection
 		@parameters:
-			$0 = nick list
+			none
 		@window:
-			Channel window
+			console
 		@description:
+			Triggered when the user requests a disconnection from
+			a server by pressing the "disconnect", by closing
+			the console or closing KVIrc. It is your last chance
+			to send some meaningful data to the server before the QUIT message
+			is sent. You can't prevent the user from disconnecting: [cmd]halt [/cmd]does nothing here.[br]
+			This event is useful to either give a salute to all the users
+			you were talking with or maybe to send some commands to the
+			bouncer you're connected to. Note that you can override the QUIT
+			message sent by KVIrc by sending it by youself first.[br]
 		@seealso:
-			[event:onchannelnickpopuprequest]OnChannelNickPopupRequest[/event]
 	*/
-	EVENT("OnChannelNickDefaultActionRequest", \
-		"$0 = nick list"),
+	EVENT("OnDisconnectRequest",""),
 
 	/*
-		@doc: onframewindowcreated
+		@doc: OnHTTPGetTerminated
 		@type:
 			event
 		@title:
-			OnFrameWindowCreated
+			OnHTTPGetTerminated
 		@short:
-			Triggered when a new frame window is opened
+			A http.get command has terminated execution
 		@parameters:
-			None
+			$0 = status
+			$1 = remote url
+			$2 = local file
+			$3 = magic identifier
 		@window:
-			First console in the frame window
+			Console
 		@description:
-			This event is triggered in the first console of a new frame window.
-			A frame window is the toplevel window that contains the consoles
-			and the other MDI children windows.
+			Triggered when a [cmd]http.get[/cmd] file download has terminated execution.
+			If the transfer has been succesfull then $0 will contain the value 1 (true),
+			otherwise will contain the value 0. $1 contains the remote url and $2 the local
+			path on disk of the saved file. $3 contains the magic identifier passed to
+			the http.get command by the means of the -i switch.
+	*/
+	EVENT("OnHTTPGetTerminated", \
+		"$0 = status\n" \
+		"$1 = remote url\n" \
+		"$2 = local file\n" \
+		"$3 = magic identifier"),
+
+	/*
+		@doc: onunhandledliteral
+		@type:
+			event
+		@title:
+			OnUnhandledLiteral
+		@short:
+			An unhandled literal server message has been received
+		@parameters:
+			$0 = source mask
+			$1 = message (literal)
+			$2- = parameters
+		@window:
+			Console window
+		@description:
+			An unhandled/unrecognized literal server message has been received.[br]
+			The KVIrc core code hasn't been able to recognize it nor handle it in any way.[br]
+			If you call [cmd]halt[/cmd] you will stop the standard or warning message output.[br]
+			For server numerics there is no "unhandled" event, you should use the raw numeric events to handle them.[br]
 		@seealso:
-			[event:onframewindowdestroyed]OnFrameWindowDestroyed[/event]
 	*/
-	EVENT("OnFrameWindowCreated",""),
+	EVENT("OnUnhandledLiteral", \
+		"$0 = source mask\n" \
+		"$1 = message\n" \
+		"$2- parameters"),
 
 	/*
-		@doc: onframewindowdestroyed
+		@doc: onoutboundtraffic
 		@type:
 			event
 		@title:
-			OnFrameWindowDestroyed
+			OnOutboundTraffic
 		@short:
-			Triggered when a frame window is being destroyed
+			Triggered on outbound traffic.[br]
+			USE THIS EVENT WITH REALLY CAUTION: an improper use can leads to many problems to KVIrc; especially avoid the use of 'halt' command.
 		@parameters:
-			None
+			$0 = outbound string
 		@window:
-			Last console in the frame window
+			any
 		@description:
-			This event is triggered in the last console of a frame window that is
-			being destroyed. In fact the frame window is not destroyed yet, but it
-			is going to: there would be no way to trigger this event after the
-			last frame window destruction.
+			This event is triggered on outbound traffic.
 		@seealso:
-			[event:onframewindowcreated]OnFrameWindowCreated[/event]
+			[event:ontextinput]OnTextInput[/event]
+			[event:onchannelmessage]OnChannelMessage[/event]
 	*/
-	EVENT("OnFrameWindowDestroyed",""),
+	EVENT("OnOutboundTraffic", \
+		"$0 = outbound string"),
 
+	// Popups
 	/*
 		@doc: onchannelpopuprequest
 		@type:
@@ -361,55 +935,6 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]=
 	EVENT("OnQueryPopupRequest",""),
 
 	/*
-		@doc: onchannelsync
-		@type:
-			event
-		@title:
-			OnChannelSync
-		@short:
-			Triggered when all the channel informations have been received
-		@parameters:
-			$0 = channel sync time in milliseconds
-		@window:
-			Channel
-		@description:
-			This event is triggered after you have joined a channel
-			and all the informations have been received.[br]
-			This includes the channel users list, the ban list,
-			the channel mode, the topic and eventually
-			the invite and ban exception lists.[br]
-			Calling halt in this even stops the "channel synchronized" output.[br]
-			(the output will be halted anyway if [fnc]$option[/fnc](boolShowChannelSyncTime) evaluates to false)
-		@seealso:
-			[event:ondccchatpopuprequest]OnDCCChatPopupRequest[/event],
-			[event:onconsolepopuprequest]OnConsolePopupRequest[/event],
-			[event:onchannelpopuprequest]OnChannelPopupRequest[/event]
-	*/
-	EVENT("OnChannelSync", \
-		"$0 = Channel sync time in milliseconds"),
-
-	/*
-		@doc: onurl
-		@type:
-			event
-		@title:
-			OnURL
-		@short:
-			Triggered when an URL appears in one of the output windows
-		@parameters:
-			$0 = URL
-		@window:
-			The window that the URL appeared in
-		@description:
-			This event is triggered every time that an URL is going to appear
-			in a KVIrc window output widget. You cannot stop it or modify it.
-			This event is good for implementing an URL catcher.[br]
-			WARNING: If you attempt to "echo $0" inside this event, you will cause an infinite loop.
-	*/
-	EVENT("OnURL", \
-		"$0 = URL"),
-
-	/*
 		@doc: onwindowpopuprequest
 		@type:
 			event
@@ -608,261 +1133,522 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]=
 		"$2 - command name"),
 
 	/*
-		@doc: onquerynickdefaultactionrequest
+		@doc: onchannelnickpopuprequest
 		@type:
 			event
 		@title:
-			OnQueryNickDefaultActionRequest
+			OnChannelNickPopupRequest
 		@short:
-			Query double click customization
+			Allows customization of the nick-on-channel context popup
 		@parameters:
-			$0 = actual name
-			$1 - visible name
-			$2 - command name
+			$0 = nick list
 		@window:
-			The window that the user has clicked in
+			Channel window
 		@description:
-			Actual name is equal to the command name if command name is not null.
-			Visible name is the link text (as it shown by user)
-			Command name is set if the visible name differs with the actual link target(probably contains mIRC colors,etc). It is equal to the actual target name.
-			This event is triggered when an user has double clicked on a nickname in
-			the query target list.[br]
-			You should use this event to do some significant action associated with the double click.[br]
-			A good example might be a [cmd]whois[/cmd] query or a [cmd]dcc.chat[/cmd]
+			This event is triggered when the user right-clicks in the channel user list
+			or on a nickname link in the channel text view.[br]
+			The first parameter ($0) contains a comma separated list of selected nicknames (if it is an user list click)
+			or a single nickname (if it is a link).[br]
+			In both cases all the nicknames are currently on the channel.[br]
+			You should popup a popup-menu with a set of possible channel-related actions,
+			like op/deop , voice/devoice , whois etc...
+		@seealso:
+			[event:onchannelnickdefaultactionrequest]OnChannelNickDefaultActionRequest[/event]
 	*/
-	EVENT("OnQueryNickDefaultActionRequest", \
-		"$0 = actual name\n" \
-		"$1 - visible name\n" \
-		"$2 - command name"),
+	EVENT("OnChannelNickPopupRequest", \
+		"$0 = nick list"),
 
+	// Channels
 	/*
-		@doc: onnicklinkdefaultactionrequest
+		@doc: onchannelnickdefaultactionrequest
 		@type:
 			event
 		@title:
-			OnNickLinkDefaultActionRequest
+			OnChannelNickDefaultActionRequest
 		@short:
-			Nick link double click customization
+			Allows customization of the double click on nicknames
 		@parameters:
-			$0 = actual name
-			$1 - visible name
-			$2 - command name
+			$0 = nick list
 		@window:
-			The window that the user has clicked in
+			Channel window
 		@description:
-			Actual name is equal to the command name if command name is not null.
-			Visible name is the link text (as it shown by user)
-			Command name is set if the visible name differs with the actual link target(probably contains mIRC colors,etc). It is equal to the actual target name.
-			This event is triggered when an user has double clicked on a nickname link.[br]
-			You should use this event to perform some significant action associated with the double click.[br]
-			A good example might be a [cmd]whois[/cmd] or a [cmq]query[/cmd] call.[br]
-			Please note that NOT ALL nickname links will cause this event to be triggered: some nickname
-			links default actions are actually handled by the
-			[event:onquerynickdefaultactionrequest]OnQueryNickDefaultActionRequest[/event] and
-			[event:onchannelnickdefatulactionrequest]OnChannelNickDefaultActionRequest[/event] events.[br]
+		@seealso:
+			[event:onchannelnickpopuprequest]OnChannelNickPopupRequest[/event]
 	*/
-	EVENT("OnNickLinkDefaultActionRequest", \
-		"$0 = actual name\n" \
-		"$1 - visible name\n" \
-		"$2 - command name"),
+	EVENT("OnChannelNickDefaultActionRequest", \
+		"$0 = nick list"),
 
 	/*
-		@doc: ontextviewdoublecliked
+		@doc: onchannelwindowcreated
 		@type:
 			event
 		@title:
-			OnTextViewDoubleClicked
+			OnChannelWindowCreated
 		@short:
-			Text view link double click customization
+			A channel window has just been opened
 		@parameters:
-			$0 = actual name
-			$1 - visible name
-			$2 - command name
+			none
 		@window:
-			The window that the user has clicked in
+			Channel window
 		@description:
-			Actual name is equal to the command name if command name is not null.
-			Visible name is the link text (as it shown by user).
-			Command name is set if the visible name differs with the actual link target (probably contains mIRC colors,etc). It is equal to the actual target name.
-			This event is triggered when an user has double clicked on a text view and has not hit any link.[br]
-			I have no idea what you can do in this event....maybe some sort of channel-central dialog? :)
+			Triggered when a channel window has just been created
+			Note that the channel is still empty: no users have joined it.
+		@seealso:
+			[event:onquerywindowcreated]OnQueryWindowCreated[/event]
 	*/
-	EVENT("OnTextViewDoubleClicked",""),
+	EVENT("OnChannelWindowCreated",""),
 
 	/*
-		@doc: onnotifylistdefaultactionrequest
+		@doc: onchannelsync
 		@type:
 			event
 		@title:
-			OnNotifyListDefaultActionRequest
+			OnChannelSync
 		@short:
-			Notify list double click customization
+			Triggered when all the channel informations have been received
+		@parameters:
+			$0 = channel sync time in milliseconds
+		@window:
+			Channel
+		@description:
+			This event is triggered after you have joined a channel
+			and all the informations have been received.[br]
+			This includes the channel users list, the ban list,
+			the channel mode, the topic and eventually
+			the invite and ban exception lists.[br]
+			Calling halt in this even stops the "channel synchronized" output.[br]
+			(the output will be halted anyway if [fnc]$option[/fnc](boolShowChannelSyncTime) evaluates to false)
+		@seealso:
+			[event:ondccchatpopuprequest]OnDCCChatPopupRequest[/event],
+			[event:onconsolepopuprequest]OnConsolePopupRequest[/event],
+			[event:onchannelpopuprequest]OnChannelPopupRequest[/event]
+	*/
+	EVENT("OnChannelSync", \
+		"$0 = Channel sync time in milliseconds"),
+
+	/*
+		@doc: onchannelmessage
+		@type:
+			event
+		@title:
+			OnChannelMessage
+		@short:
+			A message has been received from the channel
+		@parameters:
+			$0 = source nick
+			$1 = source username
+			$2 = source host
+			$3 = message
+			$4 = [target mode prefixes]
+		@window:
+			Channels window
+		@description:
+			Triggered when a channel message is received
+			$0!$1@$2 is the source of the message, $3 is the message text
+			and $4 are the eventual mode prefixes added to the target channel (i.e:
+			if the message is only for channel operators then you will get the string @ in $4).
+		@seealso:
+			[event:onquerymessage]OnQueryMessage[/event]
+			[event:ondccchatmessage]OnDCCChatMessage[/event]
+	*/
+	EVENT("OnChannelMessage", \
+		"$0 = source nick\n" \
+		"$1 = source username\n" \
+		"$2 = source hostname\n" \
+		"$3 = message\n" \
+		"$4 = target mode prefixes"),
+
+	/*
+		@doc: onchannelnotice
+		@type:
+			event
+		@title:
+			OnChannelNotice
+		@short:
+			A NOTICE have been issued to a channel
+		@parameters:
+			$0 = source nick
+			$1 = message
+			$2 = target
+		@window:
+			Channel window
+		@description:
+			Someone has issued a NOTICE with a channel as his target
+			For normal channel notices $2 parameter will only a channel name.
+			For channel op or channel voice notices it will contain also the leading '@' or '+' flag.
+			Please note that this convention is different from the one used in [event:onchannelprivmsg]OnChannelPrivmsg[/event]:
+			the incompatibility is here for historical reasons: it is not a big deal so we're not fighting it :)
+		@seealso:
+			[event:onservernotice]OnServerNotice[/event]
+	*/
+	EVENT("OnChannelNotice", \
+		"$0 = source nick\n" \
+		"$1 = message\n" \
+		"$2 = target"),
+
+	// Queries
+	/*
+		@doc: onquerymessage
+		@type:
+			event
+		@title:
+			OnQueryMessage
+		@short:
+			A message has been received from a query
+		@parameters:
+			$0 = source nick
+			$1 = source username
+			$2 = source host
+			$3 = message
+		@window:
+			Query or console window.
+		@description:
+			Triggered when a query message is received.[br]
+			If you [cmd]return[/cmd] [fnc]$false[/fnc] in this event, the message output will be stopped.[br]
+			This event is triggered in the query window associated to the source nick, or in
+			the IRC context console window if the query window has not been created for some reason.
+			Note that you can't stop the query window creation with this event: you must
+			use [event:onquerywindowrequest]OnQueryWindowRequest[/event] for that purpose.
+			Note also that you may not receive this event if the anti-spam option is in use and
+			KVIrc has detected that this might be a spam message. This is usually not an issue
+			but if you care about it then write to pragma at kvirc dot net asking to add a OnSpam event.
+		@seealso:
+			[event:onquerywindowrequest]OnQueryWindowRequest[/event]
+			[event:onquerywindowcreated]OnQueryWindowCreated[/event]
+			[event:onquerytargetadded]OnQueryTargetAdded[/event]
+			[event:onchannelmessage]OnChannelMessage[/event]
+			[event:ondccchatmessage]OnDCCChatMessage[/event]
+	*/
+	EVENT("OnQueryMessage", \
+		"$0 = source nick\n" \
+		"$1 = source username\n" \
+		"$2 = source hostname\n" \
+		"$3 = message"),
+
+	/*
+		@doc: onquerynotice
+		@type:
+			event
+		@title:
+			OnQueryNotice
+		@short:
+			A private notice has been received
+		@parameters:
+			$0 = source nick
+			$1 = source username
+			$2 = source host
+			$3 = message
+		@window:
+			Query window or console
+		@description:
+			Triggered when a private notice is received.[br]
+			If you call [cmd]halt[/cmd] in this event, the message output will be stopped and if the message was going to cause a query window creation, the window will NOT be created
+		@seealso:
+			[event:onchannelmessage]OnChannelMessage[/event]
+			[event:onchannelnotice]OnChannelNotice[/event]
+	*/
+	EVENT("OnQueryNotice", \
+		"$0 = source nick\n" \
+		"$1 = source username\n" \
+		"$2 = source host\n" \
+		"$3 = message"),
+
+	/*
+		@doc: onquerywindowrequest
+		@type:
+			event
+		@title:
+			OnQueryWindowRequest
+		@short:
+			A new query window is going to be opened because a remote message has been received
+		@parameters:
+			$0 = source nickname
+			$1 = source username
+			$2 = source host
+			$3 = message
+		@window:
+			console window
+		@description:
+			Triggered when a PRIVMSG or NOTICE has been received from a remote user and a query
+			for that user doesn't exist yet. KVIrc has already checked its internal conditions
+			and you have the last word on the query creation. If you call halt in this event
+			you will prevent the creation of the query window, in all other cases the window
+			will be created. This is useful for filtering out spam messages that popup unwanted
+			windows in front of the user. You have also the option of creating the query window
+			yourself (by calling [cmd]query[/cmd]). This may be useful if you want to create
+			the query windows in a particular state (minimized, positioned in some special place
+			or maybe undocked if some conditions are verified).
+			The next event you will catch related to this query window will be
+			[event:onquerywindowcreated]OnQueryWindowCreated[/event] and [event:onquerytargetadded]OnQueryTargetAdded[/event].
+			After that you will get [event:onquerymessage]OnQueryMessage[/event] with exactly
+			the parameters passed to this event.
+	*/
+	EVENT("OnQueryWindowRequest", \
+		"$0 = source nick\n" \
+		"$1 = source user\n" \
+		"$2 = source host\n" \
+		"$3 = message"),
+
+	/*
+		@doc: onquerywindowcreated
+		@type:
+			event
+		@title:
+			OnQueryWindowCreated
+		@short:
+			A query window has just been opened
+		@parameters:
+			none
+		@window:
+			Query window
+		@description:
+			Triggered when a query window has just been created
+			Note that the query is still empty: it has no targets.
+			If you want to trigger some events in response to a query
+			creation by some remote user then you probably need
+			[event:onquerywindowrequest]OnQueryWindowRequest[/event] or
+			[event:onquerytargetadded]OnQueryTargetAdded[/event].
+		@seealso:
+			[event:onchannelwindowcreated]OnChannelWindowCreated[/event]
+			[event:onquerywindowrequest]OnQueryWindowRequest[/event]
+			[event:onquerytargetadded]OnQueryTargetAdded[/event]
+	*/
+	EVENT("OnQueryWindowCreated",""),
+
+	/*
+		@doc: onquerytargetadded
+		@type:
+			event
+		@title:
+			OnQueryTargetAdded
+		@short:
+			A new query target has been added
 		@parameters:
 			$0 = nickname
+			$1 = username (may be *)
+			$2 = host (may be *)
+		@window:
+			query window
+		@description:
+			Triggered when a new remote target has been added to a query window.
+			This is the event to catch when you want to perform some specific actions
+			when someone queries you.
+			KVIrc supports multiple target queries and thus, this event is triggered also
+			when a new query target is added by using [cmd]addtarget[/cmd].
+	*/
+	EVENT("OnQueryTargetAdded", \
+		"$0 = nick\n" \
+		"$1 = username (may be *)\n" \
+		"$2 = hostname (may be *)"),
+
+	/*
+		@doc: OnQueryFileDropped
+		@type:
+			event
+		@title:
+			OnQueryFileDropped
+		@short:
+			Drop in query
+		@parameters:
+			$0 = source nick
+			$1 = filedropped
+		@window:
+			Query
+		@description:
+			Triggered when a file is dropped in a query window.[br]
+			$target is the nick.[br]
+	*/
+	EVENT("OnQueryFileDropped", \
+		"$0 = nick\n" \
+		"$1 = filedropped"),
+
+	/*
+		@doc: onquerynickdefaultactionrequest
+		@type:
+			event
+		@title:
+			OnQueryNickDefaultActionRequest
+		@short:
+			Query double click customization
+		@parameters:
+			$0 = actual name
+			$1 - visible name
+			$2 - command name
 		@window:
 			The window that the user has clicked in
 		@description:
+			Actual name is equal to the command name if command name is not null.
+			Visible name is the link text (as it shown by user)
+			Command name is set if the visible name differs with the actual link target(probably contains mIRC colors,etc). It is equal to the actual target name.
 			This event is triggered when an user has double clicked on a nickname in
-			the notify list (console window).[br]
+			the query target list.[br]
 			You should use this event to do some significant action associated with the double click.[br]
 			A good example might be a [cmd]whois[/cmd] query or a [cmd]dcc.chat[/cmd]
 	*/
-	EVENT("OnNotifyListDefaultActionRequest", \
-		"$0 = nickname"),
+	EVENT("OnQueryNickDefaultActionRequest", \
+		"$0 = actual name\n" \
+		"$1 - visible name\n" \
+		"$2 - command name"),
 
+	// Actions
 	/*
-		@doc: onnotifylistpopuprequest
+		@doc: onmeaway
 		@type:
 			event
 		@title:
-			OnNotifyListPopupRequest
+			OnMeAway
 		@short:
-			Notify list context popup customization
+			Local user sets the AWAY status
 		@parameters:
-			$0 = nickname list
+			$0 = server message trailing
 		@window:
-			The window that the user has clicked in
+			Console
 		@description:
-			This event is triggered when an user has right clicked on a list of nicknames in
-			the notify list (console window).[br]
-			This is a good place to show a [cmd]popup[/cmd] with some actions that can be performed
-			on the nicknames like querying , performing a whois lookup or sth similar.[br]
+			Triggered when the local user enters the AWAY state.
+			Calling 'halt' in this event disables the server "You have been marked as being away" message.[br]
+		@seealso:
+			[event:onmeback]OnMeBack[/event]
 	*/
-	EVENT("OnNotifyListPopupRequest", \
-		"$0 = nickname list"),
+	EVENT("OnMeAway", \
+		"$0- = server message trailing"),
 
 	/*
-		@doc: onping
+		@doc: onmeback
 		@type:
 			event
 		@title:
-			OnPing
+			OnMeBack
 		@short:
-			Server ping handler
+			Local user cancels the AWAY status
 		@parameters:
-			$0 = server
-			$1 = ping message parameters
+			$0 = away start time
+			$1- = server message trailing
 		@window:
 			Console
 		@description:
-			Triggered when a PING message was received from a server.[br]
-			Calling 'halt' in this event will stop the informational message about 'ping->pong'.[br]
+			Triggered when the local user leaves the AWAY state.[br]
+			The $0 parameter contains the [b]unix time[/b] of the away status start.[br]
+			You can obtain the current [b]unix time[/b] from the function [fnc]$unixtime[/fnc].[br]
+			Calling 'halt' in this event disables the server "You are no longer marked as being away" message.[br]
+		@seealso:
+			[event:onmeaway]OnMeAway[/event]
 	*/
-	EVENT("OnPing", \
-		"$0 = server\n" \
-		"$1 = message parameters"),
+	EVENT("OnMeBack", \
+		"$0 = away start time\n"
+		"$1- = server message trailing"),
 
 	/*
-		@doc: onmejoin
+		@doc: onaction
 		@type:
 			event
 		@title:
-			OnMeJoin
+			OnAction
 		@short:
-			Local user joining a channel
+			Someone issued a CTCP ACTION
 		@parameters:
-			None
+			$0 = source nick
+			$1 = source username
+			$2 = source host
+			$3 = message target
+			$4 = action message text
 		@window:
-			Channel
+			Channels and query windows
 		@description:
-			Triggered just after the local user has joined a channel.[br]
-			Sine this event is triggered in the chanel window,
-			you can get the channel name by using the [fnc]$target[/fnc] function.[br]
-			Calling 'halt' in this event will stop the join message output.[br]
-		@seealso:
-			[event:onjoin]OnJoin[/event]
+			This event is triggered when a remote user issues a CTCP ACTION.[br]
+			(The CTCP ACTION is usually triggered by the /me command).[br]
+			The parameters $0-$2 identify the source user.[br]
+			$3 identifies the message target and can be one of the following:[br]
+			- The local user nickname : this is a private CTCP ACTION and is triggered inside a query window.[br]
+			- A channel name : this is a channel CTCP ACTION and is triggered in the channel window.[br]
+			- Any other string : this is either a broadcast CTCP ACTION (sent by a privileged user
+				to a subset of clients) or a sign of the server brain damage :D In this
+				case the event is triggered in the console window.[br]
+			Calling [cmd]halt[/cmd] in this event stops the message output.[br]
 	*/
-	EVENT("OnMeJoin",""),
+	EVENT("OnAction", \
+		"$0 = source nick\n" \
+		"$1 = source username\n" \
+		"$2 = source hostname\n" \
+		"$3 = message target\n" \
+		"$4 = action message text"),
 
 	/*
-		@doc: onjoin
+		@doc: onmeaction
 		@type:
 			event
 		@title:
-			OnJoin
+			OnMeAction
 		@short:
-			Non-local user joining a channel
+			User issued a CTCP ACTION
 		@parameters:
-			$0 = nickname
-			$1 = username
-			$2 = hostname
+			$0 = action message text
+			$1 = action target (channel or nickname)
 		@window:
-			Channel
+			Channels and query windows
 		@description:
-			Triggered just after a non-local user has joined a channel.[br]
-			Sine this event is triggered in the chanel window,
-			you can get the channel name by using the [fnc]$target[/fnc] function.[br]
-			Calling 'halt' in this event will stop the join message output.[br]
-		@seealso:
-			[event:onmejoin]OnMeJoin[/event]
+			This event is triggered when user issues a CTCP ACTION.[br]
+			(The CTCP ACTION is usually triggered by the /me command).[br]
+			Warning: don't use a /me inside this event handler, or you'll get an infinite recursion.
+			If you need to halt the action (eg. to do some text substitution), follow the example code.
+		@examples:
+			[example]
+				ctcp $1 action "this text was changed in scripting, old one was $0";
+				echo -i=$msgtype(action) -w=$active "$me this text was changed in scripting, old one was $0";
+				halt;
+			[/example]
 	*/
-	EVENT("OnJoin", \
-		"$0 = nickname\n" \
-		"$1 = username\n" \
-		"$2 = hostname"),
+	EVENT("OnMeAction", \
+		"$0 = action message text\n" \
+		"$1 = action target"),
 
 	/*
-		@doc: ontopic
+		@doc: onjoin
 		@type:
 			event
 		@title:
-			OnTopic
+			OnJoin
 		@short:
-			Topic change on a channel
+			Non-local user joining a channel
 		@parameters:
 			$0 = nickname
 			$1 = username
 			$2 = hostname
-			$3 = new topic string
 		@window:
 			Channel
 		@description:
-			Triggered when a TOPIC message is received for a given channel.[br]
-			The topic change has not been executed effectively in the current window
-			so you can still access the old topic by the channel functions.[br]
-			The new topic is passed as fourth parameter and will effectively
-			become the current topic just after this event handler has been executed.[br]
+			Triggered just after a non-local user has joined a channel.[br]
 			Sine this event is triggered in the chanel window,
 			you can get the channel name by using the [fnc]$target[/fnc] function.[br]
-			Calling 'halt' in this event will stop the topic message output.[br]
+			Calling 'halt' in this event will stop the join message output.[br]
 		@seealso:
 			[event:onmejoin]OnMeJoin[/event]
 	*/
-	EVENT("OnTopic", \
+	EVENT("OnJoin", \
 		"$0 = nickname\n" \
 		"$1 = username\n" \
-		"$2 = hostname\n" \
-		"$3 = topic"),
+		"$2 = hostname"),
 
 	/*
-		@doc: onmepart
+		@doc: onmejoin
 		@type:
 			event
 		@title:
-			OnMePart
+			OnMeJoin
 		@short:
-			Local user is leaving a channel
+			Local user joining a channel
 		@parameters:
-			$0 = part message
+			None
 		@window:
 			Channel
 		@description:
-			Triggered when the local user is leaving a channel.[br]
-			The PART message has already been processed by the server , so
-			the user is effectively no longer on the channel.
-			On the other side, it might be useful to access the channel data from
-			this event, thus the handler is called effectively just BEFORE the
-			user effectively leaves the channel (and thus BEFORE the channel window gets
-			destroyed).[br]
+			Triggered just after the local user has joined a channel.[br]
 			Sine this event is triggered in the chanel window,
 			you can get the channel name by using the [fnc]$target[/fnc] function.[br]
-			Calling 'halt' in this event will stop the part message output.[br]
+			Calling 'halt' in this event will stop the join message output.[br]
 		@seealso:
-			[event:onmejoin]OnMeJoin[/event], [event:OnJoin]OnJoin[/event],
-			[event:onpart]OnPart[/event]
+			[event:onjoin]OnJoin[/event]
 	*/
-	EVENT("OnMePart", \
-		"$0 = part message"),
+	EVENT("OnMeJoin",""),
 
 	/*
 		@doc: onpart
@@ -901,229 +1687,229 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]=
 		"$3 = part message"),
 
 	/*
-		@doc: onquit
+		@doc: onmepart
 		@type:
 			event
 		@title:
-			OnQuit
+			OnMePart
 		@short:
-			An user is leaving a channel
+			Local user is leaving a channel
 		@parameters:
-			$0 = nickname
-			$1 = username
-			$2 = hostname
-			$3 = quit message
-			$4 = channels
+			$0 = part message
 		@window:
-			Console
+			Channel
 		@description:
-			Triggered when an user is quitting IRC.[br]
-			The QUIT message has already been processed by the server , so
-			the user is effectively no longer on IRC.
-			On the other side, it might be useful to access the user-related data from
+			Triggered when the local user is leaving a channel.[br]
+			The PART message has already been processed by the server , so
+			the user is effectively no longer on the channel.
+			On the other side, it might be useful to access the channel data from
 			this event, thus the handler is called effectively just BEFORE the
-			user is effectively removed from the IRC user list (and thus from the channels and query windows).[br]
-			The fifth parameter ($4) contains the list of channels on that the user was
-			just before quitting.
-			Calling 'halt' in this event will stop the quit message output (in ALL the windows!).[br]
+			user effectively leaves the channel (and thus BEFORE the channel window gets
+			destroyed).[br]
+			Sine this event is triggered in the chanel window,
+			you can get the channel name by using the [fnc]$target[/fnc] function.[br]
+			Calling 'halt' in this event will stop the part message output.[br]
 		@seealso:
-			[event:onpart]OnPart[/event],
-			[event:onmepart]OnMePart[/event]
-		@examples:
-			[example]
-				foreach(%cname,$4)echo -r=$channel(%cname) User $0 is quitting...
-			[/example]
-	*/
-	EVENT("OnQuit", \
-		"$0 = nickname\n" \
-		"$1 = username\n" \
-		"$2 = hostname\n" \
-		"$3 = part message\n" \
-		"$4 = channels"),
-
-	/*
-		@doc: onusermode
-		@type:
-			event
-		@title:
-			OnUserMode
-		@short:
-			The local user has changed mode
-		@parameters:
-			$0 = mode flags
-		@window:
-			Console
-		@description:
-			Triggered when the local user has changed his user mode.[br]
-			The first parameter is the changed mode flag with a leading '+' or '-' sign:
-			if the mode was removed it will be something like "-x" , otherwise something like "+x".[br]
-			Calling 'halt' in this event will stop the "mode" message output.[br]
+			[event:onmejoin]OnMeJoin[/event], [event:OnJoin]OnJoin[/event],
+			[event:onpart]OnPart[/event]
 	*/
-	EVENT("OnUserModeChanged", \
-		"$0 = mode flags"),
+	EVENT("OnMePart", \
+		"$0 = part message"),
 
 	/*
-		@doc: onmekick
+		@doc: onkick
 		@type:
 			event
 		@title:
-			OnMeKick
+			OnKick
 		@short:
-			Local user is being kicked from a channel
+			Non-local user is being kicked from a channel
 		@parameters:
 			$0 = source nickname
 			$1 = source username
 			$2 = source hostname
-			$3 = kick reason
+			$3 = kicked nickname
+			$4 = kick reason
 		@window:
 			Channel
 		@description:
-			Triggered when the local user has been kicked from a channel.[br]
+			Triggered when a non-local user is being kicked from a channel.[br]
 			The KICK message has already been processed by the server , so
 			the user is effectively no longer on the channel.
 			On the other side, it might be useful to access the user-related channel data from
 			this event, thus the handler is called effectively just BEFORE the
-			user is effectively removed from the channel internal structures
-			(and thus BEFORE the channel data itself gets destroyed).[br]
+			user is effectively removed from the channel internal structures.[br]
 			Sine this event is triggered in the chanel window,
 			you can get the channel name by using the [fnc]$target[/fnc] function.[br]
 			Calling 'halt' in this event will stop the kick message output.[br]
 		@seealso:
-			[event:onkick]OnKick[/event]
+			[event:onmekick]OnMeKick[/event]
 	*/
-	EVENT("OnMeKick", \
+	EVENT("OnKick", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
 		"$2 = source hostname\n" \
-		"$3 = reason"),
+		"$3 = kicked nick\n" \
+		"$4 = reason"),
 
 	/*
-		@doc: onkick
+		@doc: onmekick
 		@type:
 			event
 		@title:
-			OnKick
+			OnMeKick
 		@short:
-			Non-local user is being kicked from a channel
+			Local user is being kicked from a channel
 		@parameters:
 			$0 = source nickname
 			$1 = source username
 			$2 = source hostname
-			$3 = kicked nickname
-			$4 = kick reason
+			$3 = kick reason
 		@window:
 			Channel
 		@description:
-			Triggered when a non-local user is being kicked from a channel.[br]
+			Triggered when the local user has been kicked from a channel.[br]
 			The KICK message has already been processed by the server , so
 			the user is effectively no longer on the channel.
 			On the other side, it might be useful to access the user-related channel data from
 			this event, thus the handler is called effectively just BEFORE the
-			user is effectively removed from the channel internal structures.[br]
+			user is effectively removed from the channel internal structures
+			(and thus BEFORE the channel data itself gets destroyed).[br]
 			Sine this event is triggered in the chanel window,
 			you can get the channel name by using the [fnc]$target[/fnc] function.[br]
 			Calling 'halt' in this event will stop the kick message output.[br]
 		@seealso:
-			[event:onmekick]OnMeKick[/event]
+			[event:onkick]OnKick[/event]
 	*/
-	EVENT("OnKick", \
+	EVENT("OnMeKick", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
 		"$2 = source hostname\n" \
-		"$3 = kicked nick\n" \
-		"$4 = reason"),
+		"$3 = reason"),
 
 	/*
-		@doc: onmeaway
+		@doc: ontopic
 		@type:
 			event
 		@title:
-			OnMeAway
+			OnTopic
 		@short:
-			Local user sets the AWAY status
+			Topic change on a channel
 		@parameters:
-			$0 = server message trailing
+			$0 = nickname
+			$1 = username
+			$2 = hostname
+			$3 = new topic string
 		@window:
-			Console
+			Channel
 		@description:
-			Triggered when the local user enters the AWAY state.
-			Calling 'halt' in this event disables the server "You have been marked as being away" message.[br]
+			Triggered when a TOPIC message is received for a given channel.[br]
+			The topic change has not been executed effectively in the current window
+			so you can still access the old topic by the channel functions.[br]
+			The new topic is passed as fourth parameter and will effectively
+			become the current topic just after this event handler has been executed.[br]
+			Sine this event is triggered in the chanel window,
+			you can get the channel name by using the [fnc]$target[/fnc] function.[br]
+			Calling 'halt' in this event will stop the topic message output.[br]
 		@seealso:
-			[event:onmeback]OnMeBack[/event]
+			[event:onmejoin]OnMeJoin[/event]
 	*/
-	EVENT("OnMeAway", \
-		"$0- = server message trailing"),
+	EVENT("OnTopic", \
+		"$0 = nickname\n" \
+		"$1 = username\n" \
+		"$2 = hostname\n" \
+		"$3 = topic"),
 
 	/*
-		@doc: onmeback
+		@doc: onquit
 		@type:
 			event
 		@title:
-			OnMeBack
+			OnQuit
 		@short:
-			Local user cancels the AWAY status
+			An user is leaving a channel
 		@parameters:
-			$0 = away start time
-			$1- = server message trailing
+			$0 = nickname
+			$1 = username
+			$2 = hostname
+			$3 = quit message
+			$4 = channels
 		@window:
 			Console
 		@description:
-			Triggered when the local user leaves the AWAY state.[br]
-			The $0 parameter contains the [b]unix time[/b] of the away status start.[br]
-			You can obtain the current [b]unix time[/b] from the function [fnc]$unixtime[/fnc].[br]
-			Calling 'halt' in this event disables the server "You are no longer marked as being away" message.[br]
+			Triggered when an user is quitting IRC.[br]
+			The QUIT message has already been processed by the server , so
+			the user is effectively no longer on IRC.
+			On the other side, it might be useful to access the user-related data from
+			this event, thus the handler is called effectively just BEFORE the
+			user is effectively removed from the IRC user list (and thus from the channels and query windows).[br]
+			The fifth parameter ($4) contains the list of channels on that the user was
+			just before quitting.
+			Calling 'halt' in this event will stop the quit message output (in ALL the windows!).[br]
 		@seealso:
-			[event:onmeaway]OnMeAway[/event]
+			[event:onpart]OnPart[/event],
+			[event:onmepart]OnMePart[/event]
+		@examples:
+			[example]
+				foreach(%cname,$4)echo -r=$channel(%cname) User $0 is quitting...
+			[/example]
 	*/
-	EVENT("OnMeBack", \
-		"$0 = away start time\n"
-		"$1- = server message trailing"),
+	EVENT("OnQuit", \
+		"$0 = nickname\n" \
+		"$1 = username\n" \
+		"$2 = hostname\n" \
+		"$3 = part message\n" \
+		"$4 = channels"),
 
+	// IRC modes
 	/*
-		@doc: onchannelwindowcreated
+		@doc: OnChannelModeChange
 		@type:
 			event
 		@title:
-			OnChannelWindowCreated
+			OnChannelModeChange
 		@short:
-			A channel window has just been opened
+			The channel mode has been changed
 		@parameters:
-			none
+			$0 = source nick
+			$1 = source user
+			$2 = source host
+			$3 = modeflags
+			$4 = mode parameter string
 		@window:
-			Channel window
+			channel
 		@description:
-			Triggered when a channel window has just been created
-			Note that the channel is still empty: no users have joined it.
-		@seealso:
-			[event:onquerywindowcreated]OnQueryWindowCreated[/event]
+			Triggered when a channel mode has been changed, AFTER all the mode specific events
+			were triggered. $3 contains the unparsed mode flags (-o+b...) and $4 contains
+			the unparsed mode parameter string (you need to split it!).
 	*/
-	EVENT("OnChannelWindowCreated",""),
+	EVENT("OnChannelModeChange", \
+		"$0 = sourcenick\n" \
+		"$1 = sourceusername\n" \
+		"$2 = sourcehost\n" \
+		"$3 = modeflags\n" \
+		"$4 = mode params"),
 
 	/*
-		@doc: onquerywindowcreated
+		@doc: onusermode
 		@type:
 			event
 		@title:
-			OnQueryWindowCreated
+			OnUserMode
 		@short:
-			A query window has just been opened
+			The local user has changed mode
 		@parameters:
-			none
+			$0 = mode flags
 		@window:
-			Query window
+			Console
 		@description:
-			Triggered when a query window has just been created
-			Note that the query is still empty: it has no targets.
-			If you want to trigger some events in response to a query
-			creation by some remote user then you probably need
-			[event:onquerywindowrequest]OnQueryWindowRequest[/event] or
-			[event:onquerytargetadded]OnQueryTargetAdded[/event].
-		@seealso:
-			[event:onchannelwindowcreated]OnChannelWindowCreated[/event]
-			[event:onquerywindowrequest]OnQueryWindowRequest[/event]
-			[event:onquerytargetadded]OnQueryTargetAdded[/event]
+			Triggered when the local user has changed his user mode.[br]
+			The first parameter is the changed mode flag with a leading '+' or '-' sign:
+			if the mode was removed it will be something like "-x" , otherwise something like "+x".[br]
+			Calling 'halt' in this event will stop the "mode" message output.[br]
 	*/
-	EVENT("OnQueryWindowCreated",""),
+	EVENT("OnUserModeChanged", \
+		"$0 = mode flags"),
 
 	/*
 		@doc: onban
@@ -1334,104 +2120,110 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]=
 		"$3 = mask"),
 
 	/*
-		@doc: onop
+		@doc: oninviteexception
 		@type:
 			event
 		@title:
-			OnOp
+			OnInviteException
 		@short:
-			Someone has given a user the +o flag
+			A +I mode has been set
 		@parameters:
 			$0 = source nick
 			$1 = source username
 			$2 = source host
-			$3 = opped nick
+			$3 = target mask
 		@window:
 			Channels window
 		@description:
-			Triggered when someone sets a +o (has made Op) flag on a user of the active channel.
+			Someone has set mode +I on a channel
 		@seealso:
-			[event:ondeop]OnDeOp[/event]
+			[event:oninviteexceptionremove]OnInviteExceptionRemove[/event]
 	*/
-	EVENT("OnOp", \
+	EVENT("OnInviteException", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
 		"$2 = source hostname\n" \
-		"$3 = opped nick"),
+		"$3 = target mask"),
 
 	/*
-		@doc: ondeop
+		@doc: oninviteexceptionremove
 		@type:
 			event
 		@title:
-			OnDeOp
+			OnInviteExceptionRemove
 		@short:
-			Someone has given a user the -o flag
+			Move -I has been set
 		@parameters:
 			$0 = source nick
 			$1 = source username
 			$2 = source host
-			$3 = deopped nick
+			$3 = target mask
 		@window:
 			Channels window
 		@description:
-			Triggered when someone sets a -o (DeOp) flag on a user in the active channel.
+			Someone has set mode -I on a channel
 		@seealso:
-			[event:onop]OnOp[/event]
+			[event:oninviteexceptionremove]OnInviteExceptionRemove[/event]
 	*/
-	EVENT("OnDeOp", \
+	EVENT("OnInviteExceptionRemove", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
 		"$2 = source hostname\n" \
-		"$3 = deopped nick"),
+		"$3 = target mask"),
 
 	/*
-		@doc: onmeop
+		@doc: onmeinviteexception
 		@type:
 			event
 		@title:
-			OnMeOp
+			OnMeInviteException
 		@short:
-			Someone has given the +o flag to the local user
+			A +I mode has been set
 		@parameters:
 			$0 = source nick
 			$1 = source username
 			$2 = source host
+			$3 = mask
 		@window:
 			Channels window
 		@description:
-			Triggered when someone sets a +o (has made Op) flag on the local user in the active channel.
+			Someone has set mode +I on a channel with a target mask that matches
+			the local user mask
 		@seealso:
-			[event:onmedeop]OnMeDeOp[/event]
+			[event:onmeinviteexceptionremove]OnMeInviteExceptionRemove[/event]
 	*/
-	EVENT("OnMeOp", \
+	EVENT("OnMeInviteException", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
-		"$2 = source hostname"),
+		"$2 = source hostname\n" \
+		"$3 = mask"),
 
 	/*
-		@doc: onmedeop
+		@doc: onmeinviteexceptionremove
 		@type:
 			event
 		@title:
-			OnMeDeOp
+			OnMeInviteExceptionRemove
 		@short:
-			Someone has given the -o flag to the local user
+			Move -I has been set
 		@parameters:
 			$0 = source nick
 			$1 = source username
 			$2 = source host
+			$3 = mask
 		@window:
 			Channels window
 		@description:
-			Triggered when someone sets a -o (has deoped) flag on the local user in the active channel.
+			Someone has set mode -I on a channel with a target mask that matches
+			the local user mask
 		@seealso:
-			[event:onmeop]OnMeOp[/event]
+			[event:onmeinviteexceptionremove]OnMeInviteExceptionRemove[/event]
 	*/
-	EVENT("OnMeDeOp", \
+	EVENT("OnMeInviteExceptionRemove", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
-		"$2 = source hostname"),
+		"$2 = source hostname\n" \
+		"$3 = mask"),
 
 	/*
 		@doc: onlimitset
@@ -1534,159 +2326,163 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]=
 		"$2 = source hostname"),
 
 	/*
-		@doc: oninvite
+		@doc: onnickchange
 		@type:
 			event
 		@title:
-			OnInvite
+			OnNickChange
 		@short:
-			The local user has received an invitation
+			Someone has changed his nickname
 		@parameters:
 			$0 = source nick
 			$1 = source username
 			$2 = source host
-			$3 = channel
+			$3 = new nickname
 		@window:
-			Active window/console
+			Console window
 		@description:
-			Triggered when someone invites the local user to join a channel
+			Triggered when someone has changed his nickname.
+			The change has already been processed by the server, but not by the local KVIrc database.
+		@seealso:
+			[event:onmenickchange]OnMeNickChange[/event]
 	*/
-	EVENT("OnInvite", \
+	EVENT("OnNickChange", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
 		"$2 = source hostname\n" \
-		"$3 = channel"),
+		"$3 = new nickname"),
 
 	/*
-		@doc: onchannelmessage
+		@doc: onmenickchange
 		@type:
 			event
 		@title:
-			OnChannelMessage
+			OnMeNickChange
 		@short:
-			A message has been received from the channel
+			The local user has changed his nickname
+		@parameters:
+			$0 = old nick
+			$1 = new nickname
+		@window:
+			Console window
+		@description:
+			Triggered when the local user is going to change his nickname.
+			The change has already been processed by the server, but not by the local KVIrc database.
+		@seealso:
+			[event:onnickchange]OnNickChange[/event]
+	*/
+	EVENT("OnMeNickChange", \
+		"$0 = old nick\n" \
+		"$1 = new nick"),
+
+	/*
+		@doc: oninvite
+		@type:
+			event
+		@title:
+			OnInvite
+		@short:
+			The local user has received an invitation
 		@parameters:
 			$0 = source nick
 			$1 = source username
 			$2 = source host
-			$3 = message
-			$4 = [target mode prefixes]
+			$3 = channel
 		@window:
-			Channels window
+			Active window/console
 		@description:
-			Triggered when a channel message is received
-			$0!$1@$2 is the source of the message, $3 is the message text
-			and $4 are the eventual mode prefixes added to the target channel (i.e:
-			if the message is only for channel operators then you will get the string @ in $4).
-		@seealso:
-			[event:onquerymessage]OnQueryMessage[/event]
-			[event:ondccchatmessage]OnDCCChatMessage[/event]
+			Triggered when someone invites the local user to join a channel
 	*/
-	EVENT("OnChannelMessage", \
+	EVENT("OnInvite", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
 		"$2 = source hostname\n" \
-		"$3 = message\n" \
-		"$4 = target mode prefixes"),
+		"$3 = channel"),
 
 	/*
-		@doc: onquerymessage
+		@doc: onchanowner
 		@type:
 			event
 		@title:
-			OnQueryMessage
+			OnChanOwner
 		@short:
-			A message has been received from a query
+			Someone has given a user the +q flag
 		@parameters:
 			$0 = source nick
 			$1 = source username
 			$2 = source host
-			$3 = message
+			$3 = target nick
 		@window:
-			Query or console window.
+			Channels window
 		@description:
-			Triggered when a query message is received.[br]
-			If you [cmd]return[/cmd] [fnc]$false[/fnc] in this event, the message output will be stopped.[br]
-			This event is triggered in the query window associated to the source nick, or in
-			the IRC context console window if the query window has not been created for some reason.
-			Note that you can't stop the query window creation with this event: you must
-			use [event:onquerywindowrequest]OnQueryWindowRequest[/event] for that purpose.
-			Note also that you may not receive this event if the anti-spam option is in use and
-			KVIrc has detected that this might be a spam message. This is usually not an issue
-			but if you care about it then write to pragma at kvirc dot net asking to add a OnSpam event.
+			Triggered when someone sets a +q (has made Channel Owner) flag on a user of the active channel.
 		@seealso:
-			[event:onquerywindowrequest]OnQueryWindowRequest[/event]
-			[event:onquerywindowcreated]OnQueryWindowCreated[/event]
-			[event:onquerytargetadded]OnQueryTargetAdded[/event]
-			[event:onchannelmessage]OnChannelMessage[/event]
-			[event:ondccchatmessage]OnDCCChatMessage[/event]
+			[event:ondechanowner]OnDeChanOwner[/event]
 	*/
-	EVENT("OnQueryMessage", \
+	EVENT("OnChanOwner", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
 		"$2 = source hostname\n" \
-		"$3 = message"),
+		"$3 = target nick"),
 
 	/*
-		@doc: onvoice
+		@doc: ondechanowner
 		@type:
 			event
 		@title:
-			OnVoice
+			OnDeChanOwner
 		@short:
-			Someone has given a user the +v flag
+			Someone has given a user the -q flag
 		@parameters:
 			$0 = source nick
 			$1 = source username
 			$2 = source host
-			$3 = voiced nick
+			$3 = target nick
 		@window:
 			Channels window
 		@description:
-			Triggered when someone sets a +v (voice) flag to someone in the active channel.
+			Triggered when someone sets a -q (DeChanOwner) flag on a user in the active channel.
 		@seealso:
-			[event:ondevoice]OnDeVoice[/event]
+			[event:onchanowner]OnChanOwner[/event]
 	*/
-	EVENT("OnVoice", \
+	EVENT("OnDeChanOwner", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
 		"$2 = source hostname\n" \
-		"$3 = voiced nick"),
+		"$3 = target nick"),
 
 	/*
-		@doc: ondevoice
+		@doc: onmechanowner
 		@type:
 			event
 		@title:
-			OnDeVoice
+			OnMeChanOwner
 		@short:
-			Someone has given a user the -v flag
+			Someone has given the +q flag to the local user
 		@parameters:
 			$0 = source nick
 			$1 = source username
 			$2 = source host
-			$3 = devoiced nick
 		@window:
-		Channels window
+			Channels window
 		@description:
-			Triggered when someone sets a -v (devoice) flag to someone in the active channel.
+			Triggered when someone sets a +q (has made Channel owner) flag on the local user in the active channel.
 		@seealso:
-			[event:ondevoice]OnDeVoice[/event]
+			[event:onmedechanowner]OnMeDeChanOwner[/event]
 	*/
-	EVENT("OnDeVoice", \
+	EVENT("OnMeChanOwner", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
-		"$2 = source hostname\n" \
-		"$3 = voiced nick"),
+		"$2 = source hostname"),
 
 	/*
-		@doc: onmevoice
+		@doc: onmedechanowner
 		@type:
 			event
 		@title:
-			OnMeVoice
+			OnMeDeChanOwner
 		@short:
-			Someone has give the local user a +v flag
+			Someone has given the -q flag to the local user
 		@parameters:
 			$0 = source nick
 			$1 = source username
@@ -1694,187 +2490,175 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]=
 		@window:
 			Channels window
 		@description:
-			Triggered when someone sets a +v (devoice) flag for the local user in the active channel.
+			Triggered when someone sets a -q (has removed channel owner status) flag on the local user in the active channel.
 		@seealso:
-			[event:onmedevoice]OnMeDeVoice[/event]
+			[event:onmechanowner]OnMeChanOwner[/event]
 	*/
-	EVENT("OnMeVoice", \
+	EVENT("OnMeDeChanOwner", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
 		"$2 = source hostname"),
 
 	/*
-		@doc: onmedevoice
+		@doc: onchanadmin
 		@type:
 			event
 		@title:
-			OnMeDeVoice
+			OnChanAdmin
 		@short:
-			Someone has give the local user a -v flag
+			Someone has given a user the +a flag
 		@parameters:
 			$0 = source nick
 			$1 = source username
 			$2 = source host
+			$3 = target nick
 		@window:
 			Channels window
 		@description:
-			Triggered when someone sets a -v (devoice) flag for the local user in the active channel.
+			Triggered when someone sets a +a (has made Channel Administrator) flag on a user of the active channel.
 		@seealso:
-			[event:onmevoice]OnMeVoice[/event]
+			[event:ondechanadmin]OnDeChanAdmin[/event]
 	*/
-	EVENT("OnMeDeVoice", \
+	EVENT("OnChanAdmin", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
-		"$2 = source hostname"),
+		"$2 = source hostname\n" \
+		"$3 = target nick"),
 
 	/*
-		@doc: onnickchange
+		@doc: ondechanadmin
 		@type:
 			event
 		@title:
-			OnNickChange
+			OnDeChanAdmin
 		@short:
-			Someone has changed his nickname
+			Someone has given a user the -a flag
 		@parameters:
 			$0 = source nick
 			$1 = source username
 			$2 = source host
-			$3 = new nickname
+			$3 = target nick
 		@window:
-			Console window
+			Channels window
 		@description:
-			Triggered when someone has changed his nickname.
-			The change has already been processed by the server, but not by the local KVIrc database.
+			Triggered when someone sets a -a (DeChanAdmin) flag on a user in the active channel.
 		@seealso:
-			[event:onmenickchange]OnMeNickChange[/event]
+			[event:onchanadmin]OnChanAdmin[/event]
 	*/
-	EVENT("OnNickChange", \
+	EVENT("OnDeChanAdmin", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
 		"$2 = source hostname\n" \
-		"$3 = new nickname"),
+		"$3 = target nick"),
 
 	/*
-		@doc: onmenickchange
+		@doc: onmechanadmin
 		@type:
 			event
 		@title:
-			OnMeNickChange
+			OnMeChanAdmin
 		@short:
-			The local user has changed his nickname
+			Someone has given the +a flag to the local user
 		@parameters:
-			$0 = old nick
-			$1 = new nickname
+			$0 = source nick
+			$1 = source username
+			$2 = source host
 		@window:
-			Console window
+			Channels window
 		@description:
-			Triggered when the local user is going to change his nickname.
-			The change has already been processed by the server, but not by the local KVIrc database.
+			Triggered when someone sets a +a (has made Channel administrator) flag on the local user in the active channel.
 		@seealso:
-			[event:onnickchange]OnNickChange[/event]
+			[event:onmedeop]OnMeDeChanAdmin[/event]
 	*/
-	EVENT("OnMeNickChange", \
-		"$0 = old nick\n" \
-		"$1 = new nick"),
+	EVENT("OnMeChanAdmin", \
+		"$0 = source nick\n" \
+		"$1 = source username\n" \
+		"$2 = source hostname"),
 
 	/*
-		@doc: onctcprequest
+		@doc: onmedechanadmin
 		@type:
 			event
 		@title:
-			OnCTCPRequest
+			OnMeDeChanAdmin
 		@short:
-			A CTCP request has been received
+			Someone has given the -a flag to the local user
 		@parameters:
 			$0 = source nick
-			$1 = source user
+			$1 = source username
 			$2 = source host
-			$3 = target
-			$4 = ctcp type
-			$5- = ctcp parameters
 		@window:
-			Console window
+			Channels window
 		@description:
-			A CTCP request has been received.[br]
-			If you call [cmd]halt[/cmd] in this event, you will stop the further processing of the CTCP (thus, you can disable some of the KVIrc features).[br]
-			Be careful when using this.
+			Triggered when someone sets a -a (has removed channel admin status) flag on the local user in the active channel.
 		@seealso:
-			[event:onctcpreply]OnCTCPReply[/event]
+			[event:onmeop]OnMeOp[/event]
 	*/
-	EVENT("OnCTCPRequest", \
+	EVENT("OnMeDeChanAdmin", \
 		"$0 = source nick\n" \
-		"$1 = source user\n" \
-		"$2 = source host\n" \
-		"$3 = target\n" \
-		"$4 = ctcp type\n" \
-		"$5- = ctcp parameters"),
+		"$1 = source username\n" \
+		"$2 = source hostname"),
 
 	/*
-		@doc: onctcpreply
+		@doc: onop
 		@type:
 			event
 		@title:
-			OnCTCPReply
+			OnOp
 		@short:
-			A CTCP reply has been received
+			Someone has given a user the +o flag
 		@parameters:
 			$0 = source nick
-			$1 = source user
+			$1 = source username
 			$2 = source host
-			$3 = target
-			$4 = ctcp type
-			$5- = ctcp parameters
+			$3 = opped nick
 		@window:
-			Console window
+			Channels window
 		@description:
-			A CTCP reply has been received.[br]
-			If you call [cmd]halt[/cmd] in this event, you will stop the further processing of the CTCP (thus, you can disable some of the KVIrc features).[br]
-			Be careful when using this.
+			Triggered when someone sets a +o (has made Op) flag on a user of the active channel.
 		@seealso:
-			[event:onctcpreply]OnCTCPReply[/event]
+			[event:ondeop]OnDeOp[/event]
 	*/
-	EVENT("OnCTCPReply", \
+	EVENT("OnOp", \
 		"$0 = source nick\n" \
-		"$1 = source user\n" \
-		"$2 = source host\n" \
-		"$3 = target\n" \
-		"$4 = ctcp type\n" \
-		"$5- = ctcp parameters"),
+		"$1 = source username\n" \
+		"$2 = source hostname\n" \
+		"$3 = opped nick"),
 
 	/*
-		@doc: onunhandledliteral
+		@doc: ondeop
 		@type:
 			event
 		@title:
-			OnUnhandledLiteral
+			OnDeOp
 		@short:
-			An unhandled literal server message has been received
+			Someone has given a user the -o flag
 		@parameters:
-			$0 = source mask
-			$1 = message (literal)
-			$2- = parameters
+			$0 = source nick
+			$1 = source username
+			$2 = source host
+			$3 = deopped nick
 		@window:
-			Console window
+			Channels window
 		@description:
-			An unhandled/unrecognized literal server message has been received.[br]
-			The KVIrc core code hasn't been able to recognize it nor handle it in any way.[br]
-			If you call [cmd]halt[/cmd] you will stop the standard or warning message output.[br]
-			For server numerics there is no "unhandled" event, you should use the raw numeric events to handle them.[br]
+			Triggered when someone sets a -o (DeOp) flag on a user in the active channel.
 		@seealso:
+			[event:onop]OnOp[/event]
 	*/
-	EVENT("OnUnhandledLiteral", \
-		"$0 = source mask\n" \
-		"$1 = message\n" \
-		"$2- parameters"),
+	EVENT("OnDeOp", \
+		"$0 = source nick\n" \
+		"$1 = source username\n" \
+		"$2 = source hostname\n" \
+		"$3 = deopped nick"),
 
 	/*
-		@doc: onmehalfop
+		@doc: onmeop
 		@type:
 			event
 		@title:
-			OnMeHalfOp
+			OnMeOp
 		@short:
-			Someone has given the local user the +h flag
+			Someone has given the +o flag to the local user
 		@parameters:
 			$0 = source nick
 			$1 = source username
@@ -1882,23 +2666,23 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]=
 		@window:
 			Channels window
 		@description:
-			Triggered when someone sets a +h (halfop) flag for the local user in the active channel.
+			Triggered when someone sets a +o (has made Op) flag on the local user in the active channel.
 		@seealso:
-			[event:onmedehalfop]OnMeDeHalfOp[/event]
+			[event:onmedeop]OnMeDeOp[/event]
 	*/
-	EVENT("OnMeHalfOp", \
+	EVENT("OnMeOp", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
 		"$2 = source hostname"),
 
 	/*
-		@doc: onmedehalfop
+		@doc: onmedeop
 		@type:
 			event
 		@title:
-			OnMeDeHalfOp
+			OnMeDeOp
 		@short:
-			Someone has given the local user the -h flag
+			Someone has given the -o flag to the local user
 		@parameters:
 			$0 = source nick
 			$1 = source username
@@ -1906,11 +2690,11 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]=
 		@window:
 			Channels window
 		@description:
-			Triggered when someone sets a -h (dehalfop) flag for the local user in the active channel.
+			Triggered when someone sets a -o (has deoped) flag on the local user in the active channel.
 		@seealso:
-			[event:onmehalfop]OnMeHalfOp[/event]
+			[event:onmeop]OnMeOp[/event]
 	*/
-	EVENT("OnMeDeHalfOp", \
+	EVENT("OnMeDeOp", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
 		"$2 = source hostname"),
@@ -1968,640 +2752,254 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]=
 		"$3 = dehalfopped nick"),
 
 	/*
-		@doc: oninviteexception
+		@doc: onmehalfop
 		@type:
 			event
 		@title:
-			OnInviteException
+			OnMeHalfOp
 		@short:
-			A +I mode has been set
+			Someone has given the local user the +h flag
 		@parameters:
 			$0 = source nick
 			$1 = source username
 			$2 = source host
-			$3 = target mask
 		@window:
 			Channels window
 		@description:
-			Someone has set mode +I on a channel
+			Triggered when someone sets a +h (halfop) flag for the local user in the active channel.
 		@seealso:
-			[event:oninviteexceptionremove]OnInviteExceptionRemove[/event]
+			[event:onmedehalfop]OnMeDeHalfOp[/event]
 	*/
-	EVENT("OnInviteException", \
+	EVENT("OnMeHalfOp", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
-		"$2 = source hostname\n" \
-		"$3 = target mask"),
+		"$2 = source hostname"),
 
 	/*
-		@doc: oninviteexceptionremove
+		@doc: onmedehalfop
 		@type:
 			event
 		@title:
-			OnInviteExceptionRemove
+			OnMeDeHalfOp
 		@short:
-			Move -I has been set
+			Someone has given the local user the -h flag
 		@parameters:
 			$0 = source nick
 			$1 = source username
 			$2 = source host
-			$3 = target mask
 		@window:
 			Channels window
 		@description:
-			Someone has set mode -I on a channel
+			Triggered when someone sets a -h (dehalfop) flag for the local user in the active channel.
 		@seealso:
-			[event:oninviteexceptionremove]OnInviteExceptionRemove[/event]
+			[event:onmehalfop]OnMeHalfOp[/event]
 	*/
-	EVENT("OnInviteExceptionRemove", \
+	EVENT("OnMeDeHalfOp", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
-		"$2 = source hostname\n" \
-		"$3 = target mask"),
+		"$2 = source hostname"),
 
 	/*
-		@doc: onmeinviteexception
+		@doc: onvoice
 		@type:
 			event
 		@title:
-			OnMeInviteException
+			OnVoice
 		@short:
-			A +I mode has been set
+			Someone has given a user the +v flag
 		@parameters:
 			$0 = source nick
 			$1 = source username
 			$2 = source host
-			$3 = mask
+			$3 = voiced nick
 		@window:
 			Channels window
 		@description:
-			Someone has set mode +I on a channel with a target mask that matches
-			the local user mask
+			Triggered when someone sets a +v (voice) flag to someone in the active channel.
 		@seealso:
-			[event:onmeinviteexceptionremove]OnMeInviteExceptionRemove[/event]
+			[event:ondevoice]OnDeVoice[/event]
 	*/
-	EVENT("OnMeInviteException", \
+	EVENT("OnVoice", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
 		"$2 = source hostname\n" \
-		"$3 = mask"),
+		"$3 = voiced nick"),
 
 	/*
-		@doc: onmeinviteexceptionremove
+		@doc: ondevoice
 		@type:
 			event
 		@title:
-			OnMeInviteExceptionRemove
+			OnDeVoice
 		@short:
-			Move -I has been set
+			Someone has given a user the -v flag
 		@parameters:
 			$0 = source nick
 			$1 = source username
 			$2 = source host
-			$3 = mask
+			$3 = devoiced nick
 		@window:
-			Channels window
+		Channels window
 		@description:
-			Someone has set mode -I on a channel with a target mask that matches
-			the local user mask
+			Triggered when someone sets a -v (devoice) flag to someone in the active channel.
 		@seealso:
-			[event:onmeinviteexceptionremove]OnMeInviteExceptionRemove[/event]
+			[event:ondevoice]OnDeVoice[/event]
 	*/
-	EVENT("OnMeInviteExceptionRemove", \
+	EVENT("OnDeVoice", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
 		"$2 = source hostname\n" \
-		"$3 = mask"),
+		"$3 = voiced nick"),
 
 	/*
-		@doc: onaction
+		@doc: onmevoice
 		@type:
 			event
 		@title:
-			OnAction
+			OnMeVoice
 		@short:
-			Someone issued a CTCP ACTION
+			Someone has give the local user a +v flag
 		@parameters:
 			$0 = source nick
 			$1 = source username
 			$2 = source host
-			$3 = message target
-			$4 = action message text
 		@window:
-			Channels and query windows
+			Channels window
 		@description:
-			This event is triggered when a remote user issues a CTCP ACTION.[br]
-			(The CTCP ACTION is usually triggered by the /me command).[br]
-			The parameters $0-$2 identify the source user.[br]
-			$3 identifies the message target and can be one of the following:[br]
-			- The local user nickname : this is a private CTCP ACTION and is triggered inside a query window.[br]
-			- A channel name : this is a channel CTCP ACTION and is triggered in the channel window.[br]
-			- Any other string : this is either a broadcast CTCP ACTION (sent by a privileged user
-				to a subset of clients) or a sign of the server brain damage :D In this
-				case the event is triggered in the console window.[br]
-			Calling [cmd]halt[/cmd] in this event stops the message output.[br]
+			Triggered when someone sets a +v (devoice) flag for the local user in the active channel.
+		@seealso:
+			[event:onmedevoice]OnMeDeVoice[/event]
 	*/
-	EVENT("OnAction", \
+	EVENT("OnMeVoice", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
-		"$2 = source hostname\n" \
-		"$3 = message target\n" \
-		"$4 = action message text"),
+		"$2 = source hostname"),
 
 	/*
-		@doc: onctcpflood
+		@doc: onmedevoice
 		@type:
 			event
 		@title:
-			OnCTCPFlood
+			OnMeDeVoice
 		@short:
-			Someone tried to flood you with CTCP requests
+			Someone has give the local user a -v flag
 		@parameters:
 			$0 = source nick
 			$1 = source username
-			$2 = source hostname
-			$3 = target
-			$4 = ctcp type
-			$5- = ctcp parameters
+			$2 = source host
 		@window:
-			Console window
+			Channels window
 		@description:
-			On IRC there is a kind of attack called 'CTCP Flood'. It consist of a lot of CTCP request in a short period of time, trying to made your client reply to them and made the server kick you. This event is triggered when one of such attacks is detected.
+			Triggered when someone sets a -v (devoice) flag for the local user in the active channel.
 		@seealso:
-			[event:onctcprequest]OnCTCPRequest[/event]
-			[event:onctcpreply]OnCTCPReply[/event]
+			[event:onmevoice]OnMeVoice[/event]
 	*/
-	EVENT("OnCTCPFlood", \
+	EVENT("OnMeDeVoice", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
-		"$2 = source hostname\n" \
-		"$3 = target\n" \
-		"$4 = ctcp type\n" \
-		"$5- = ctcp parameters"),
+		"$2 = source hostname"),
 
 	/*
-	 	@doc: onchannelnotice
+		@doc: onuserop
 		@type:
 			event
 		@title:
-			OnChannelNotice
+			OnUserOp
 		@short:
-			A NOTICE have been issued to a channel
+			Someone has given a user the +u flag
 		@parameters:
 			$0 = source nick
-			$1 = message
-			$2 = target
+			$1 = source username
+			$2 = source host
+			$3 = useropped nick
 		@window:
-			Channel window
+			Channels window
 		@description:
-			Someone has issued a NOTICE with a channel as his target
-			For normal channel notices $2 parameter will only a channel name.
-			For channel op or channel voice notices it will contain also the leading '@' or '+' flag.
-			Please note that this convention is different from the one used in [event:onchannelprivmsg]OnChannelPrivmsg[/event]:
-			the incompatibility is here for historical reasons: it is not a big deal so we're not fighting it :)
+			Triggered when someone sets a +u flag on a user of the active channel.
 		@seealso:
-			[event:onservernotice]OnServerNotice[/event]
+			[event:ondeuserop]OnDeUserOp[/event]
 	*/
-	EVENT("OnChannelNotice", \
+	EVENT("OnUserOp", \
 		"$0 = source nick\n" \
-		"$1 = message\n" \
-		"$2 = target"),
+		"$1 = source username\n" \
+		"$2 = source hostname\n" \
+		"$3 = useropped nick"),
 
 	/*
-		@doc: onservernotice
+		@doc: ondeuserop
 		@type:
 			event
 		@title:
-			OnServerNotice
+			OnDeUserOp
 		@short:
-			A server NOTICE have been issued.
+			Someone has given a user a -u flag
 		@parameters:
 			$0 = source nick
-			$1 = message
+			$1 = source username
+			$2 = source host
+			$3 = deuseropped nick
 		@window:
-			Console window
+			Channels window
 		@description:
-			Someone has issued a server NOTICE.
+			Triggered when someone sets a -u (deuserop) flag on a user in the active channel.
 		@seealso:
-			[event:onchannelnotice]OnChannelNotice[/event]
+			[event:onuserop]OnUserOp[/event]
 	*/
-	EVENT("OnServerNotice", \
+	EVENT("OnDeUserOp", \
 		"$0 = source nick\n" \
-		"$1 = message"),
-
-	/*
-		@doc: ondccchatwindowcreated
-		@type:
-			event
-		@title:
-			OnDCCChatWindowCreated
-		@short:
-			A dcc chat window has been just created
-		@parameters:
-			$0 = DCC session ID
-		@window:
-			DCC Chat
-		@description:
-			A DCC Chat window has been just created.
-			The [module:dcc]dcc[/module] module functions
-			can be used to retrieve the informations about the
-			window and the data transfer.[br]
-			The DCC Chat connection attempt starts from here:
-			you can get [event:ondccchatterminated]OnDCCChatError[/event]
-			in any moment
-		@seealso:
-			[event:ondccchatterminated]OnDCCChatTerminated[/event]
-	*/
-	EVENT("OnDCCChatWindowCreated", \
-		"$0 = DCC session ID"),
-
-	/*
-		@doc: ondccchatconnectioninprogress
-		@type:
-			event
-		@title:
-			OnDCCChatConnectionInProgress
-		@short:
-			A DCC Chat connection has just been started
-		@parameters:
-			$0 = DCC session ID 
-		@window:
-			DCC Chat
-		@description:
-			A DCC Chat connection has just been started succesfully.
-			The [module:dcc]dcc[/module] module functions
-			can be used to retrieve the informations about the
-			window and the data transfer.
-			In case of a passive DCC Chat, the local ip and port
-			are known from the moment that this event triggers.
-		@seealso:
-	*/
-	EVENT("OnDCCChatConnectionInProgress", \
-		"$0 = DCC session ID"),
-
-	/*
-		@doc: ondccchatconnected
-		@type:
-			event
-		@title:
-			OnDCCChatConnected
-		@short:
-			A DCC Chat connection has been established
-		@parameters:
-			$0 = DCC session ID
-		@window:
-			DCC Chat
-		@description:
-			A DCC Chat connection has just been established.
-			The [module:dcc]dcc[/module] module functions
-			can be used to retrieve the informations about the
-			window and the data transfer.
-		@seealso:
-	*/
-	EVENT("OnDCCChatConnected", \
-		"$0 = DCC session ID"),
-
-	/*
-		@doc: ondccchatmessage
-		@type:
-			event
-		@title:
-			OnDCCChatMessage
-		@short:
-			A DCC Chat message has just been received
-		@parameters:
-			$0 = message text
-			$1 = DCC session ID
-		@window:
-			DCC Chat
-		@description:
-			A DCC Chat message has just been received.
-			The [module:dcc]dcc[/module] module functions
-			can be used to retrieve the informations about the
-			window and the data transfer.
-		@seealso:
-	*/
-	EVENT("OnDCCChatMessage", \
-		"$0 = text\n" \
-		"$1 = DCC session ID"),
-
-	/*
-		@doc: ondccchaterror
-		@type:
-			event
-		@title:
-			OnDCCChatError
-		@short:
-			A DCC Chat error has just been triggered
-		@parameters:
-			$0 = error message
-			$1 = DCC session ID
-		@window:
-			DCC Chat
-		@description:
-			A DCC Chat error has just been triggered
-			The [module:dcc]dcc[/module] module functions
-			can be used to retrieve the informations about the
-			window and the data transfer.
-			A DCC Chat can terminate because an error has
-			interrupted the connection or because
-			the local user has closed the window forcibly.
-			The remote end closing the connection is considered
-			an error.
-		@seealso:
-	*/
-	EVENT("OnDCCChatError", \
-		"$0 = error message\n" \
-		"$1 = DCC session ID"),
-
-	/*
-		@doc: ondccchatdisconnected
-		@type:
-			event
-		@title:
-			OnDCCChatDisconnected
-		@short:
-			A DCC Chat has been just disconnected
-		@parameters:
-			$0 = DCC session ID
-		@window:
-			DCC Chat
-		@description:
-			A DCC Chat has just been disconnected for some reason.
-			The [module:dcc]dcc[/module] module functions
-			can be used to retrieve the informations about the
-			window and the data transfer.
-		@seealso:
-	*/
-	EVENT("OnDCCChatDisconnected", \
-		"$0 = DCC session ID"),
+		"$1 = source username\n" \
+		"$2 = source hostname\n" \
+		"$3 = deuseropped nick"),
 
 	/*
-		@doc: ondccchatwindowclosing
+		@doc: onmeuserop
 		@type:
 			event
 		@title:
-			OnDCCChatWindowClosing
+			OnMeUserOp
 		@short:
-			A DCC Chat is going to be closed
+			Someone has given the local user the +u flag
 		@parameters:
-			$0 = DCC session ID
+			$0 = source nick
+			$1 = source username
+			$2 = source host
 		@window:
-			DCC Chat
+			Channels window
 		@description:
-			A DCC Chat window is going to be closed.
-			The [module:dcc]dcc[/module] module functions
-			can be used to retrieve the informations about the
-			window and the data transfer.
+			Triggered when someone sets a +u (userop) flag for the local user in the active channel.
 		@seealso:
+			[event:onmedeuserop]OnMeDeUserOp[/event]
 	*/
-	EVENT("OnDCCChatWindowClosing", \
-		"$0 = DCC session ID"),
-
-	/*
-		@doc: onaccelkeypressed
-		@type:
-			event
-		@title:
-			OnAccelKeyPressed
-		@short:
-			An accelerator key was pressed
-		@parameters:
-			$0 = keys
-		@window:
-			Active window
-		@description:
-			An accelerator key has been pressed by the user.[br]
-			The key sequence that the user has pressed is passed in $0 as a
-			human readable string.[br]
-			The keys that actually work with KVIrc are:[br]
-			F2 to F12, F1 to F12 with SHIFT key pressed, 0 to 9 with CTRL key pressed.[br]
-			This means that you can set up 33 "quick" aliases...that's really more than
-			an user can remember.[br]
-			If you need more keys , mail me , I'll see what I can do :)[br]
-	*/
-	EVENT("OnAccelKeyPressed", \
-		"$0 = keys"),
-
-	/*
-		@doc: onhighlight
-		@type:
-			event
-		@title:
-			OnHighlight
-		@short:
-			A channel or query message is going to be highlighted
-		@parameters:
-			$0 = talker nick
-			$1 = target username
-			$2 = target hostname
-			$3 = message
-			$4 = highlight word
-			$5 = message type
-			$6 = is action
-		@window:
-			Channel or query window
-		@description:
-			A channel or query message is going to be highlighted.[br]
-			The message may be either a PRIVMSG, a NOTICE or a CTCP ACTION.[br]
-			The highlight may be either caused by a "highlight word" or by your own nickname
-			(if that option was specified).[br]
-			$5 contains the original color/icon set of the message that depends on
-			the type of the message itself.[br]
-			Since the CTCP ACTION messages generally have different format of output
-			then for your convenience $6 contains 1 if the message was caused by a
-			CTCP ACTION and 0 otherwise.[br]
-			If you call [cmd]halt[/cmd] in this event the message output will be completely disabled
-			(thus, KVIrc assumes that YOU have provided the necessary output and feedback to the user).[br]
-			A common error here is to call halt and re-echo the unmodified output; [b]this
-			can cause another OnHighlight event to be triggered and create an infinite loop![/b].
-			[cmd]echoprivmsg[/cmd] [b]-n[/b] is the command you probably want. 
-	*/
-	EVENT("OnHighlight", \
+	EVENT("OnMeUserOp", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
-		"$2 = source hostname\n" \
-		"$3 = message\n" \
-		"$4 = highlight word"),
-
-	/*
-		@doc: onwindowactivated
-		@type:
-			event
-		@title:
-			OnWindowActivated
-		@short:
-			A window has just been activated
-		@parameters:
-			none
-		@window:
-			Any window
-		@description:
-			This event is triggered when a KVIrc MDI window gets activated.[br]
-			This might be a good place to update your toolbar button status (for example).[br]
-	*/
-	EVENT("OnWindowActivated",""),
-
-	/*
-		@doc: onnotifyonline
-		@type:
-			event
-		@title:
-			OnNotifyOnline
-		@short:
-			An user in the notify list is on-line
-		@parameters:
-			$0 = nickname
-		@window:
-			Console or active window of the IRC context
-		@description:
-			This event is triggered when one of the users in your [doc:notify_list]notify[/doc] lists
-			is detected to be ON-Line.[br]
-			The event is triggered in the console window or the active window of the IRC context depending
-			on the user options.[br]
-			(Note: If you call [cmd]halt[/cmd] in this event , you will stop the "Nick is on irc" output,
-			but this is rather a bad idea since KVIrc gives a lot of additional informations to the
-			user with some notify-methods).[br]
-			This is a good place to play a sound or attract the user attention in some other way.[br]
-
-	*/
-	EVENT("OnNotifyOnline", \
-		"$0 = nickname"),
-
-	/*
-		@doc: onnotifyoffline
-		@type:
-			event
-		@title:
-			OnNotifyOffline
-		@short:
-			An user in the notify list went off-line
-		@parameters:
-			$0 = nickname
-		@window:
-			Console or active window of the IRC context
-		@description:
-			This event is triggered when one of the users in your [doc:notify_list]notify[/doc] lists
-			has just left IRC.[br]
-			The event is triggered in the console window or the active window of the IRC context depending
-			on the user options.[br]
-			(Note: If you call [cmd]halt[/cmd] in this event , you will stop the "Nick has left irc" output,
-			but this is rather a bad idea since KVIrc gives a lot of additional informations to the
-			user with some notify-methods).[br]
-			This is a good place to play a sound or attract the user attention in some other way.[br]
-	*/
-	EVENT("OnNotifyOffline", \
-		"$0 = nickname"),
-
-	/*
-		@doc: onpong
-		@type:
-			event
-		@title:
-			OnPong
-		@short:
-			Server pong handler
-		@parameters:
-			$0 = server
-			$1 = pong message parameters
-		@window:
-			Console
-		@description:
-			Triggered when a PONG message was received from a server.[br]
-			Calling 'halt' in this event will stop the informational message about the pong'.[br]
-	*/
-	EVENT("OnPong", \
-		"$0 = server\n" \
-		"$1 = pong message parameters"),
-
-	/*
-		@doc: onlagalarmtimeup
-		@type:
-			event
-		@title:
-			OnLagAlarmTimeUp
-		@short:
-			High-Lag Alarm Started
-		@parameters:
-			$0 = server
-			$1 = Lag value in miliseconds
-		@window:
-			Console
-		@description:
-		Triggered when the Lag on the server tied to this console is higher than the configured Lag-Alarm time.
-	*/
-	EVENT("OnLagAlarmTimeUp", \
-		"$0 = server\n" \
-		"$1 = lag time in miliseconds"),
-
-	/*
-		@doc: onlagalarmtimedown
-		@type:
-			event
-		@title:
-			OnLagAlarmTimeDown
-		@short:
-			High-Lag Alarm Stopped
-		@parameters:
-			$0 = server
-			$1 = Lag value in miliseconds
-		@window:
-			Console
-		@description:
-		Triggered when the Lag on the server tied to this console is lower than the configured Lag-Alarm time but was higher in the previous lag check.
-	*/
-	EVENT("OnLagAlarmTimeDown", \
-		"$0 = server\n" \
-		"$1 = lag time in miliseconds"),
-
-	/*
-		@doc: onlagcheck
-		@type:
-			event
-		@title:
-			OnLagCheck
-		@short:
-			The lag metering engine has checked the lag
-		@parameters:
-			$0 = server
-			$1 = Lag value in miliseconds
-		@window:
-			Console
-		@description:
-			Triggered when the lag metering engine calculate a new current lag.[br]
-	*/
-	EVENT("OnLagCheck", \
-		"$0 = server\n" \
-		"$1 = lag time in miliseconds"),
+		"$2 = source hostname"),
 
 	/*
-		@doc: onquerynotice
+		@doc: onmedeuserop
 		@type:
 			event
 		@title:
-			OnQueryNotice
+			OnMeDeUserOp
 		@short:
-			A private notice has been received
+			Someone has given the local user the -u flag
 		@parameters:
 			$0 = source nick
 			$1 = source username
 			$2 = source host
-			$3 = message
 		@window:
-			Query window or console
+			Channels window
 		@description:
-			Triggered when a private notice is received.[br]
-			If you call [cmd]halt[/cmd] in this event, the message output will be stopped and if the message was going to cause a query window creation, the window will NOT be created
+			Triggered when someone sets a -u (deuserop) flag for the local user in the active channel.
 		@seealso:
-			[event:onchannelmessage]OnChannelMessage[/event]
-			[event:onchannelnotice]OnChannelNotice[/event]
+			[event:onmeuserop]OnMeUserOp[/event]
 	*/
-	EVENT("OnQueryNotice", \
+	EVENT("OnMeDeUserOp", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
-		"$2 = source host\n" \
-		"$3 = message"),
+		"$2 = source hostname"),
 
+	// Services
 	/*
 		@doc: onchanservnotice
 		@type:
@@ -2661,395 +3059,350 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]=
 		"$3 = message"),
 
 	/*
-		@doc: onchanadmin
+		@doc: OnNickServAuth
 		@type:
 			event
 		@title:
-			OnChanAdmin
+			OnNickServAuth
 		@short:
-			Someone has given a user the +a flag
+			Triggered when ircd sets a registered user mode.
 		@parameters:
-			$0 = source nick
-			$1 = source username
-			$2 = source host
-			$3 = target nick
 		@window:
-			Channels window
+			any
 		@description:
-			Triggered when someone sets a +a (has made Channel Administrator) flag on a user of the active channel.
-		@seealso:
-			[event:ondechanadmin]OnDeChanAdmin[/event]
+			Triggered when ircd sets a registered user mode.
 	*/
-	EVENT("OnChanAdmin", \
-		"$0 = source nick\n" \
-		"$1 = source username\n" \
-		"$2 = source hostname\n" \
-		"$3 = target nick"),
+	EVENT("OnNickServAuth",""),
 
+	// CTCPs
 	/*
-		@doc: ondechanadmin
+		@doc: onctcprequest
 		@type:
 			event
 		@title:
-			OnDeChanAdmin
+			OnCTCPRequest
 		@short:
-			Someone has given a user the -a flag
+			A CTCP request has been received
 		@parameters:
 			$0 = source nick
-			$1 = source username
+			$1 = source user
 			$2 = source host
-			$3 = target nick
+			$3 = target
+			$4 = ctcp type
+			$5- = ctcp parameters
 		@window:
-			Channels window
+			Console window
 		@description:
-			Triggered when someone sets a -a (DeChanAdmin) flag on a user in the active channel.
+			A CTCP request has been received.[br]
+			If you call [cmd]halt[/cmd] in this event, you will stop the further processing of the CTCP (thus, you can disable some of the KVIrc features).[br]
+			Be careful when using this.
 		@seealso:
-			[event:onchanadmin]OnChanAdmin[/event]
+			[event:onctcpreply]OnCTCPReply[/event]
 	*/
-	EVENT("OnDeChanAdmin", \
+	EVENT("OnCTCPRequest", \
 		"$0 = source nick\n" \
-		"$1 = source username\n" \
-		"$2 = source hostname\n" \
-		"$3 = target nick"),
+		"$1 = source user\n" \
+		"$2 = source host\n" \
+		"$3 = target\n" \
+		"$4 = ctcp type\n" \
+		"$5- = ctcp parameters"),
 
 	/*
-		@doc: onmechanadmin
+		@doc: onctcpreply
 		@type:
 			event
 		@title:
-			OnMeChanAdmin
+			OnCTCPReply
 		@short:
-			Someone has given the +a flag to the local user
+			A CTCP reply has been received
 		@parameters:
 			$0 = source nick
-			$1 = source username
+			$1 = source user
 			$2 = source host
+			$3 = target
+			$4 = ctcp type
+			$5- = ctcp parameters
 		@window:
-			Channels window
+			Console window
 		@description:
-			Triggered when someone sets a +a (has made Channel administrator) flag on the local user in the active channel.
+			A CTCP reply has been received.[br]
+			If you call [cmd]halt[/cmd] in this event, you will stop the further processing of the CTCP (thus, you can disable some of the KVIrc features).[br]
+			Be careful when using this.
 		@seealso:
-			[event:onmedeop]OnMeDeChanAdmin[/event]
+			[event:onctcpreply]OnCTCPReply[/event]
 	*/
-	EVENT("OnMeChanAdmin", \
+	EVENT("OnCTCPReply", \
 		"$0 = source nick\n" \
-		"$1 = source username\n" \
-		"$2 = source hostname"),
+		"$1 = source user\n" \
+		"$2 = source host\n" \
+		"$3 = target\n" \
+		"$4 = ctcp type\n" \
+		"$5- = ctcp parameters"),
 
 	/*
-		@doc: onmedechanadmin
+		@doc: onctcpflood
 		@type:
 			event
 		@title:
-			OnMeDeChanAdmin
+			OnCTCPFlood
 		@short:
-			Someone has given the -a flag to the local user
+			Someone tried to flood you with CTCP requests
 		@parameters:
 			$0 = source nick
 			$1 = source username
-			$2 = source host
+			$2 = source hostname
+			$3 = target
+			$4 = ctcp type
+			$5- = ctcp parameters
 		@window:
-			Channels window
+			Console window
 		@description:
-			Triggered when someone sets a -a (has removed channel admin status) flag on the local user in the active channel.
+			On IRC there is a kind of attack called 'CTCP Flood'. It consist of a lot of CTCP request in a short period of time, trying to made your client reply to them and made the server kick you. This event is triggered when one of such attacks is detected.
 		@seealso:
-			[event:onmeop]OnMeOp[/event]
+			[event:onctcprequest]OnCTCPRequest[/event]
+			[event:onctcpreply]OnCTCPReply[/event]
 	*/
-	EVENT("OnMeDeChanAdmin", \
+	EVENT("OnCTCPFlood", \
 		"$0 = source nick\n" \
 		"$1 = source username\n" \
-		"$2 = source hostname"),
+		"$2 = source hostname\n" \
+		"$3 = target\n" \
+		"$4 = ctcp type\n" \
+		"$5- = ctcp parameters"),
 
 	/*
-		@doc: onmeuserop
+		@doc: ondccsessioncreated
 		@type:
 			event
 		@title:
-			OnMeUserOp
+			OnDCCSessionCreated
 		@short:
-			Someone has given the local user the +u flag
+			A new DCC session has just been created
 		@parameters:
-			$0 = source nick
-			$1 = source username
-			$2 = source host
+			$0 = DCC session ID
 		@window:
-			Channels window
+			console
 		@description:
-			Triggered when someone sets a +u (userop) flag for the local user in the active channel.
-		@seealso:
-			[event:onmedeuserop]OnMeDeUserOp[/event]
+			Triggered when a new DCC session has just been created.
+			You can retrieve the session information by calling the [module:dcc]dcc[/module].*
+			module functions.
 	*/
-	EVENT("OnMeUserOp", \
-		"$0 = source nick\n" \
-		"$1 = source username\n" \
-		"$2 = source hostname"),
+	EVENT("OnDCCSessionCreated", \
+		"$0 = DCC session ID"),
 
 	/*
-		@doc: onmedeuserop
+		@doc: ondccsessiondestroyed
 		@type:
 			event
 		@title:
-			OnMeDeUserOp
+			OnDCCSessionDestroyed
 		@short:
-			Someone has given the local user the -u flag
+			A new DCC session has just been destroyed
 		@parameters:
-			$0 = source nick
-			$1 = source username
-			$2 = source host
+			$0 = DCC session ID
 		@window:
-			Channels window
+			console
 		@description:
-			Triggered when someone sets a -u (deuserop) flag for the local user in the active channel.
-		@seealso:
-			[event:onmeuserop]OnMeUserOp[/event]
+			Triggered when a new DCC session has just been destroyed.
+			You can retrieve the session information by calling the [module:dcc]dcc[/module].*
+			module functions and by passing the DCC session ID parameter.
 	*/
-	EVENT("OnMeDeUserOp", \
-		"$0 = source nick\n" \
-		"$1 = source username\n" \
-		"$2 = source hostname"),
+	EVENT("OnDCCSessionDestroyed", \
+		"$0 = DCC session ID"),
 
 	/*
-		@doc: onuserop
+		@doc: ondccchatpopuprequest
 		@type:
 			event
 		@title:
-			OnUserOp
+			OnDCCChatPopupRequest
 		@short:
-			Someone has given a user the +u flag
+			Triggered when the DCC chat text view is right-clicked
 		@parameters:
-			$0 = source nick
-			$1 = source username
-			$2 = source host
-			$3 = useropped nick
+			$0 = DCC session ID
 		@window:
-			Channels window
+			DCC Chat window
 		@description:
-			Triggered when someone sets a +u flag on a user of the active channel.
+			This event is triggered when the user clicks the DCC chat
+			text view with the right mouse button. It is a good place
+			to activate a [cmd]popup[/cmd] menu :)
+			You can retrieve the session information by calling the [module:dcc]dcc[/module].*
+			module functions and by passing the DCC session ID parameter.
 		@seealso:
-			[event:ondeuserop]OnDeUserOp[/event]
+			[event:onconsolepuprequest]OnConsolePopupRequest[/event],
+			[event:onchannelpopuprequest]OnChannelPopupRequest[/event],
+			[event:onquerypopuprequest]OnQueryPopupRequest[/event]
 	*/
-	EVENT("OnUserOp", \
-		"$0 = source nick\n" \
-		"$1 = source username\n" \
-		"$2 = source hostname\n" \
-		"$3 = useropped nick"),
+	EVENT("OnDCCChatPopupRequest", \
+		"$0 = DCC session ID"),
 
 	/*
-		@doc: ondeuserop
+		@doc: ondccchatwindowcreated
 		@type:
 			event
 		@title:
-			OnDeUserOp
+			OnDCCChatWindowCreated
 		@short:
-			Someone has given a user a -u flag
+			A dcc chat window has been just created
 		@parameters:
-			$0 = source nick
-			$1 = source username
-			$2 = source host
-			$3 = deuseropped nick
+			$0 = DCC session ID
 		@window:
-			Channels window
+			DCC Chat
 		@description:
-			Triggered when someone sets a -u (deuserop) flag on a user in the active channel.
+			A DCC Chat window has been just created.
+			The [module:dcc]dcc[/module] module functions
+			can be used to retrieve the informations about the
+			window and the data transfer.[br]
+			The DCC Chat connection attempt starts from here:
+			you can get [event:ondccchatterminated]OnDCCChatError[/event]
+			in any moment
 		@seealso:
-			[event:onuserop]OnUserOp[/event]
+			[event:ondccchatterminated]OnDCCChatTerminated[/event]
 	*/
-	EVENT("OnDeUserOp", \
-		"$0 = source nick\n" \
-		"$1 = source username\n" \
-		"$2 = source hostname\n" \
-		"$3 = deuseropped nick"),
+	EVENT("OnDCCChatWindowCreated", \
+		"$0 = DCC session ID"),
 
 	/*
-		@doc: onquerywindowrequest
+		@doc: ondccchatconnectioninprogress
 		@type:
 			event
 		@title:
-			OnQueryWindowRequest
+			OnDCCChatConnectionInProgress
 		@short:
-			A new query window is going to be opened because a remote message has been received
+			A DCC Chat connection has just been started
 		@parameters:
-			$0 = source nickname
-			$1 = source username
-			$2 = source host
-			$3 = message
+			$0 = DCC session ID 
 		@window:
-			console window
+			DCC Chat
 		@description:
-			Triggered when a PRIVMSG or NOTICE has been received from a remote user and a query
-			for that user doesn't exist yet. KVIrc has already checked its internal conditions
-			and you have the last word on the query creation. If you call halt in this event
-			you will prevent the creation of the query window, in all other cases the window
-			will be created. This is useful for filtering out spam messages that popup unwanted
-			windows in front of the user. You have also the option of creating the query window
-			yourself (by calling [cmd]query[/cmd]). This may be useful if you want to create
-			the query windows in a particular state (minimized, positioned in some special place
-			or maybe undocked if some conditions are verified).
-			The next event you will catch related to this query window will be
-			[event:onquerywindowcreated]OnQueryWindowCreated[/event] and [event:onquerytargetadded]OnQueryTargetAdded[/event].
-			After that you will get [event:onquerymessage]OnQueryMessage[/event] with exactly
-			the parameters passed to this event.
+			A DCC Chat connection has just been started succesfully.
+			The [module:dcc]dcc[/module] module functions
+			can be used to retrieve the informations about the
+			window and the data transfer.
+			In case of a passive DCC Chat, the local ip and port
+			are known from the moment that this event triggers.
+		@seealso:
 	*/
-	EVENT("OnQueryWindowRequest", \
-		"$0 = source nick\n" \
-		"$1 = source user\n" \
-		"$2 = source host\n" \
-		"$3 = message"),
+	EVENT("OnDCCChatConnectionInProgress", \
+		"$0 = DCC session ID"),
 
 	/*
-		@doc: onquerytargetadded
+		@doc: ondccchatconnected
 		@type:
 			event
 		@title:
-			OnQueryTargetAdded
+			OnDCCChatConnected
 		@short:
-			A new query target has been added
+			A DCC Chat connection has been established
 		@parameters:
-			$0 = nickname
-			$1 = username (may be *)
-			$2 = host (may be *)
+			$0 = DCC session ID
 		@window:
-			query window
+			DCC Chat
 		@description:
-			Triggered when a new remote target has been added to a query window.
-			This is the event to catch when you want to perform some specific actions
-			when someone queries you.
-			KVIrc supports multiple target queries and thus, this event is triggered also
-			when a new query target is added by using [cmd]addtarget[/cmd].
+			A DCC Chat connection has just been established.
+			The [module:dcc]dcc[/module] module functions
+			can be used to retrieve the informations about the
+			window and the data transfer.
+		@seealso:
 	*/
-	EVENT("OnQueryTargetAdded", \
-		"$0 = nick\n" \
-		"$1 = username (may be *)\n" \
-		"$2 = hostname (may be *)"),
+	EVENT("OnDCCChatConnected", \
+		"$0 = DCC session ID"),
 
 	/*
-		@doc: onnetsplit
+		@doc: ondccchatmessage
 		@type:
 			event
 		@title:
-			OnNetsplit
+			OnDCCChatMessage
 		@short:
-			A netsplit has been detected
+			A DCC Chat message has just been received
 		@parameters:
-			$0 = server1
-			$1 = server2
+			$0 = message text
+			$1 = DCC session ID
 		@window:
-			console
+			DCC Chat
 		@description:
-			Triggered when KVIrc detects a netsplit by looking at an user's quit message.
-			The two parameters passed are the two servers that lost the link and were
-			signaled in that particular quit message.[br]
-			The actual netsplit detector in the KVIrc core uses the following rule
-			(extracted from the eggdrop bot code): "determine if signoff string matches "%.% %.%",
-			and only one space".[br]
-			[b]Note that this may be not accurate and KVIrc CAN be fooled by specially
-			formatted quit messages that aren't really netsplits.[/b][br]
-			KVIrc tries to avoid duplicate netsplit warnings thus this event will NOT
-			be triggered for EVERY quit in a netsplit: you will get it once for every
-			different set of servers that lost the link.[br]
-			Determining where the network link has been exactly broken may be a hard
-			task since the quit messages you see may not involve
-			the servers on the split boundary.
+			A DCC Chat message has just been received.
+			The [module:dcc]dcc[/module] module functions
+			can be used to retrieve the informations about the
+			window and the data transfer.
+		@seealso:
 	*/
-	EVENT("OnNetsplit", \
-		"$0 = server1\n" \
-		"$1 = server2"),
+	EVENT("OnDCCChatMessage", \
+		"$0 = text\n" \
+		"$1 = DCC session ID"),
 
 	/*
-		@doc: ondccsessioncreated
+		@doc: ondccchaterror
 		@type:
 			event
 		@title:
-			OnDCCSessionCreated
+			OnDCCChatError
 		@short:
-			A new DCC session has just been created
+			A DCC Chat error has just been triggered
 		@parameters:
-			$0 = DCC session ID
+			$0 = error message
+			$1 = DCC session ID
 		@window:
-			console
+			DCC Chat
 		@description:
-			Triggered when a new DCC session has just been created.
-			You can retrieve the session information by calling the [module:dcc]dcc[/module].*
-			module functions.
+			A DCC Chat error has just been triggered
+			The [module:dcc]dcc[/module] module functions
+			can be used to retrieve the informations about the
+			window and the data transfer.
+			A DCC Chat can terminate because an error has
+			interrupted the connection or because
+			the local user has closed the window forcibly.
+			The remote end closing the connection is considered
+			an error.
+		@seealso:
 	*/
-	EVENT("OnDCCSessionCreated", \
-		"$0 = DCC session ID"),
+	EVENT("OnDCCChatError", \
+		"$0 = error message\n" \
+		"$1 = DCC session ID"),
 
 	/*
-		@doc: ondccsessiondestroyed
+		@doc: ondccchatdisconnected
 		@type:
 			event
 		@title:
-			OnDCCSessionDestroyed
+			OnDCCChatDisconnected
 		@short:
-			A new DCC session has just been destroyed
+			A DCC Chat has been just disconnected
 		@parameters:
 			$0 = DCC session ID
 		@window:
-			console
-		@description:
-			Triggered when a new DCC session has just been destroyed.
-			You can retrieve the session information by calling the [module:dcc]dcc[/module].*
-			module functions and by passing the DCC session ID parameter.
-	*/
-	EVENT("OnDCCSessionDestroyed", \
-		"$0 = DCC session ID"),
-
-	/*
-		@doc: ontextinput
-		@type:
-			event
-		@title:
-			OnTextInput
-		@short:
-			The user has just entered some text in the text input
-		@parameters:
-			$0 = text
-		@window:
-			window in that the text is entered
+			DCC Chat
 		@description:
-			Triggered when the user enters some text in the text input
-			window and presses return.
-			Calling [cmd]halt[/cmd] will stop the automatic text processing
-			and the result depends on the window the text is typed in.
-			In channel/query and console windows the text will NOT be sent to
-			the IRC server. This event might be useful for performing
-			substitutions in the text sent to the server. If you stop the
-			text processing in a channel or query window then the local
-			echo of the message will be omitted too. You might want to
-			realize the echo by the means of the [cmd]echoprivmsg[/cmd] command.
-			This event is NOT triggered when the user enters a command
-			in the input window.
+			A DCC Chat has just been disconnected for some reason.
+			The [module:dcc]dcc[/module] module functions
+			can be used to retrieve the informations about the
+			window and the data transfer.
 		@seealso:
-			[cmd]echoprivmsg[/cmd]
 	*/
-	EVENT("OnTextInput", \
-		"$0 = text"),
+	EVENT("OnDCCChatDisconnected", \
+		"$0 = DCC session ID"),
 
 	/*
-		@doc: ondccchatpopuprequest
+		@doc: ondccchatwindowclosing
 		@type:
 			event
 		@title:
-			OnDCCChatPopupRequest
+			OnDCCChatWindowClosing
 		@short:
-			Triggered when the DCC chat text view is right-clicked
+			A DCC Chat is going to be closed
 		@parameters:
 			$0 = DCC session ID
 		@window:
-			DCC Chat window
+			DCC Chat
 		@description:
-			This event is triggered when the user clicks the DCC chat
-			text view with the right mouse button. It is a good place
-			to activate a [cmd]popup[/cmd] menu :)
-			You can retrieve the session information by calling the [module:dcc]dcc[/module].*
-			module functions and by passing the DCC session ID parameter.
+			A DCC Chat window is going to be closed.
+			The [module:dcc]dcc[/module] module functions
+			can be used to retrieve the informations about the
+			window and the data transfer.
 		@seealso:
-			[event:onconsolepuprequest]OnConsolePopupRequest[/event],
-			[event:onchannelpopuprequest]OnChannelPopupRequest[/event],
-			[event:onquerypopuprequest]OnQueryPopupRequest[/event]
 	*/
-	EVENT("OnDCCChatPopupRequest", \
+	EVENT("OnDCCChatWindowClosing", \
 		"$0 = DCC session ID"),
 
 	/*
@@ -3164,257 +3517,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]=
 		"$1 = bytes transferred\n" \
 		"$2 = DCC session ID"),
 
-	/*
-		@doc: onwallops
-		@type:
-			event
-		@title:
-			OnWallops
-		@short:
-			Triggered when a WALLOPS message is received from the server
-		@parameters:
-			$0 = source nick
-			$1 = source user
-			$2 = source host
-			$3 = message text
-		@window:
-			channel
-		@description:
-			Triggered when a WALLOPS message is received from the server.
-			If you call [cmd]halt[/cmd] the message output will be stopped.
-		@seealso:
-	*/
-	EVENT("OnWallops", \
-		"$0 = nick\n" \
-		"$1 = user\n" \
-		"$2 = host\n" \
-		"$3 = message text"),
-
-	/*
-		@doc: ondisconnectrequest
-		@type:
-			event
-		@title:
-			OnDisconnectRequest
-		@short:
-			Triggered when the user requests a disconnection
-		@parameters:
-			none
-		@window:
-			console
-		@description:
-			Triggered when the user requests a disconnection from
-			a server by pressing the "disconnect", by closing
-			the console or closing KVIrc. It is your last chance
-			to send some meaningful data to the server before the QUIT message
-			is sent. You can't prevent the user from disconnecting: [cmd]halt [/cmd]does nothing here.[br]
-			This event is useful to either give a salute to all the users
-			you were talking with or maybe to send some commands to the
-			bouncer you're connected to. Note that you can override the QUIT
-			message sent by KVIrc by sending it by youself first.[br]
-		@seealso:
-	*/
-	EVENT("OnDisconnectRequest",""),
-
-	/*
-		@doc: onchanowner
-		@type:
-			event
-		@title:
-			OnChanOwner
-		@short:
-			Someone has given a user the +q flag
-		@parameters:
-			$0 = source nick
-			$1 = source username
-			$2 = source host
-			$3 = target nick
-		@window:
-			Channels window
-		@description:
-			Triggered when someone sets a +q (has made Channel Owner) flag on a user of the active channel.
-		@seealso:
-			[event:ondechanowner]OnDeChanOwner[/event]
-	*/
-	EVENT("OnChanOwner", \
-		"$0 = source nick\n" \
-		"$1 = source username\n" \
-		"$2 = source hostname\n" \
-		"$3 = target nick"),
-
-	/*
-		@doc: ondechanowner
-		@type:
-			event
-		@title:
-			OnDeChanOwner
-		@short:
-			Someone has given a user the -q flag
-		@parameters:
-			$0 = source nick
-			$1 = source username
-			$2 = source host
-			$3 = target nick
-		@window:
-			Channels window
-		@description:
-			Triggered when someone sets a -q (DeChanOwner) flag on a user in the active channel.
-		@seealso:
-			[event:onchanowner]OnChanOwner[/event]
-	*/
-	EVENT("OnDeChanOwner", \
-		"$0 = source nick\n" \
-		"$1 = source username\n" \
-		"$2 = source hostname\n" \
-		"$3 = target nick"),
-
-	/*
-		@doc: onmechanowner
-		@type:
-			event
-		@title:
-			OnMeChanOwner
-		@short:
-			Someone has given the +q flag to the local user
-		@parameters:
-			$0 = source nick
-			$1 = source username
-			$2 = source host
-		@window:
-			Channels window
-		@description:
-			Triggered when someone sets a +q (has made Channel owner) flag on the local user in the active channel.
-		@seealso:
-			[event:onmedechanowner]OnMeDeChanOwner[/event]
-	*/
-	EVENT("OnMeChanOwner", \
-		"$0 = source nick\n" \
-		"$1 = source username\n" \
-		"$2 = source hostname"),
-
-	/*
-		@doc: onmedechanowner
-		@type:
-			event
-		@title:
-			OnMeDeChanOwner
-		@short:
-			Someone has given the -q flag to the local user
-		@parameters:
-			$0 = source nick
-			$1 = source username
-			$2 = source host
-		@window:
-			Channels window
-		@description:
-			Triggered when someone sets a -q (has removed channel owner status) flag on the local user in the active channel.
-		@seealso:
-			[event:onmechanowner]OnMeChanOwner[/event]
-	*/
-	EVENT("OnMeDeChanOwner", \
-		"$0 = source nick\n" \
-		"$1 = source username\n" \
-		"$2 = source hostname"),
-
-	/*
-		@doc: onerror
-		@type:
-			event
-		@title:
-			OnError
-		@short:
-			Server ERROR message received
-		@parameters:
-			$0 = message source
-			$1 = error reason
-		@window:
-			Console
-		@description:
-			Triggered when an ERROR message is received from the server.[br]
-			$0 is the message (server) source but be aware that it often happens to be empty.[br]
-			Calling 'halt' in this event will stop the default output.[br]
-	*/
-	EVENT("OnError", \
-		"$0 = message source\n" \
-		"$1 = error reason"),
-
-	/*
-		@doc: OnQueryFileDropped
-		@type:
-			event
-		@title:
-			OnQueryFileDropped
-		@short:
-			Drop in query
-		@parameters:
-			$0 = source nick
-			$1 = filedropped
-		@window:
-			Query
-		@description:
-			Triggered when a file is dropped in a query window.[br]
-			$target is the nick.[br]
-	*/
-	EVENT("OnQueryFileDropped", \
-		"$0 = nick\n" \
-		"$1 = filedropped"),
-
-	/*
-		@doc: OnHTTPGetTerminated
-		@type:
-			event
-		@title:
-			OnHTTPGetTerminated
-		@short:
-			A http.get command has terminated execution
-		@parameters:
-			$0 = status
-			$1 = remote url
-			$2 = local file
-			$3 = magic identifier
-		@window:
-			Console
-		@description:
-			Triggered when a [cmd]http.get[/cmd] file download has terminated execution.
-			If the transfer has been succesfull then $0 will contain the value 1 (true),
-			otherwise will contain the value 0. $1 contains the remote url and $2 the local
-			path on disk of the saved file. $3 contains the magic identifier passed to
-			the http.get command by the means of the -i switch.
-	*/
-	EVENT("OnHTTPGetTerminated", \
-		"$0 = status\n" \
-		"$1 = remote url\n" \
-		"$2 = local file\n" \
-		"$3 = magic identifier"),
-
-	/*
-		@doc: OnChannelModeChange
-		@type:
-			event
-		@title:
-			OnChannelModeChange
-		@short:
-			The channel mode has been changed
-		@parameters:
-			$0 = source nick
-			$1 = source user
-			$2 = source host
-			$3 = modeflags
-			$4 = mode parameter string
-		@window:
-			channel
-		@description:
-			Triggered when a channel mode has been changed, AFTER all the mode specific events
-			were triggered. $3 contains the unparsed mode flags (-o+b...) and $4 contains
-			the unparsed mode parameter string (you need to split it!).
-	*/
-	EVENT("OnChannelModeChange", \
-		"$0 = sourcenick\n" \
-		"$1 = sourceusername\n" \
-		"$2 = sourcehost\n" \
-		"$3 = modeflags\n" \
-		"$4 = mode params"),
-
+	// Link clicks
 	/*
 		@doc: OnChannelNickLinkClick
 		@type:
@@ -3492,11 +3595,11 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]=
 		"$0 = host name"),
 
 	/*
-		@doc: OnUrlLinkClick
+		@doc: OnURLLinkClick
 		@type:
 			event
 		@title:
-			OnUrlLinkClick
+			OnURLLinkClick
 		@short:
 			Triggered when user clicks on any URL link in any window
 		@parameters:
@@ -3507,7 +3610,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]=
 			Triggered when user clicks on any URL link in any window
 			It will be triggered only at the left mouse button click
 	*/
-	EVENT("OnUrlLinkClick", \
+	EVENT("OnURLLinkClick", \
 		"$0 = url"),
 
 	/*
@@ -3546,98 +3649,5 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]=
 			It will be triggered only at the left mouse button click
 	*/
 	EVENT("OnServerLinkClick", \
-		"$0 = server name"),
-
-	/*
-		@doc: OnIgnoredMessage
-		@type:
-			event
-		@title:
-			OnIgnoredMessage
-		@short:
-			Triggered when a message is ignored.
-		@parameters:
-			$0 = source nick
-			$1 = source username
-			$2 = source host
-			$3 = message target
-			$4 = message
-		@window:
-			any
-		@description:
-			Triggered when a message is ignored.
-	*/
-	EVENT("OnIgnoredMessage", \
-		"$0 = source nick\n" \
-		"$1 = source username\n" \
-		"$2 = source host\n" \
-		"$3 = message target\n" \
-		"$4 = message"),
-
-	/*
-		@doc: OnNickServAuth
-		@type:
-			event
-		@title:
-			OnNickServAuth
-		@short:
-			Triggered when ircd sets a registered user mode.
-		@parameters:
-		@window:
-			any
-		@description:
-			Triggered when ircd sets a registered user mode.
-	*/
-	EVENT("OnNickServAuth",""),
-
-	/*
-		@doc: onmeaction
-		@type:
-			event
-		@title:
-			OnMeAction
-		@short:
-			User issued a CTCP ACTION
-		@parameters:
-			$0 = action message text
-			$1 = action target (channel or nickname)
-		@window:
-			Channels and query windows
-		@description:
-			This event is triggered when user issues a CTCP ACTION.[br]
-			(The CTCP ACTION is usually triggered by the /me command).[br]
-			Warning: don't use a /me inside this event handler, or you'll get an infinite recursion.
-			If you need to halt the action (eg. to do some text substitution), follow the example code.
-		@examples:
-			[example]
-				ctcp $1 action "this text was changed in scripting, old one was $0";
-				echo -i=$msgtype(action) -w=$active "$me this text was changed in scripting, old one was $0";
-				halt;
-			[/example]
-	*/
-	EVENT("OnMeAction", \
-		"$0 = action message text\n" \
-		"$1 = action target"),
-
-	/*
-		@doc: onoutboundtraffic
-		@type:
-			event
-		@title:
-			OnOutboundTraffic
-		@short:
-			Triggered on outbound traffic.[br]
-			USE THIS EVENT WITH REALLY CAUTION: an improper use can leads to many problems to KVIrc; especially avoid the use of 'halt' command.
-		@parameters:
-			$0 = outbound string
-		@window:
-			any
-		@description:
-			This event is triggered on outbound traffic.
-		@seealso:
-			[event:ontextinput]OnTextInput[/event]
-			[event:onchannelmessage]OnChannelMessage[/event]
-	*/
-	EVENT("OnOutboundTraffic", \
-		"$0 = outbound string"),
+		"$0 = server name")
 };
diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.h b/src/kvirc/kvs/kvi_kvs_eventtable.h
index d8b12c868..903d7ed09 100644
--- a/src/kvirc/kvs/kvi_kvs_eventtable.h
+++ b/src/kvirc/kvs/kvi_kvs_eventtable.h
@@ -24,189 +24,191 @@
 //
 //=============================================================================
 
-// Application
-#define KviEvent_OnKVIrcStartup                  0
-#define KviEvent_OnKVIrcShutdown                 1
-// Irc Context
-#define KviEvent_OnIrcContextCreated             2
-#define KviEvent_OnIrcContextDestroyed           3
-// Irc connection
-#define KviEvent_OnIrcConnectionEstabilished     4
-#define KviEvent_OnIrcConnectionTerminated       5
-// Login complete
-#define KviEvent_OnIrc                           6
-// Channel userlist clicks
-#define KviEvent_OnChannelNickPopupRequest          7
-#define KviEvent_OnChannelNickDefaultActionRequest  8
-// Frame window
-#define KviEvent_OnFrameWindowCreated               9
-#define KviEvent_OnFrameWindowDestroyed             10
-// Text view
-#define KviEvent_OnChannelPopupRequest              11
-#define KviEvent_OnConsolePopupRequest              12
-#define KviEvent_OnQueryPopupRequest                13
-
-#define KviEvent_OnChannelSync                   14
-
-#define KviEvent_OnUrl                           15
-
-#define KviEvent_OnWindowPopupRequest            16
-
-#define KviEvent_OnHostLinkPopupRequest          17
-#define KviEvent_OnUrlLinkPopupRequest           18
-#define KviEvent_OnServerLinkPopupRequest        19
-#define KviEvent_OnChannelLinkPopupRequest       20
-#define KviEvent_OnNickLinkPopupRequest          21
-// Query nick clicks
-#define KviEvent_OnQueryNickPopupRequest         22
-#define KviEvent_OnQueryNickDefaultActionRequest 23
-
-#define KviEvent_OnNickLinkDefaultActionRequest  24
-#define KviEvent_OnTextViewDoubleClicked            25
-
-#define KviEvent_OnNotifyListDefaultActionRequest 26
-#define KviEvent_OnNotifyListPopupRequest 27
-
-#define KviEvent_OnPing 28
-
-#define KviEvent_OnMeJoin 29
-#define KviEvent_OnJoin 30
-
-#define KviEvent_OnTopic 31
-
-#define KviEvent_OnMePart 32
-#define KviEvent_OnPart 33
+/**
+* \file kvi_kvs_eventtable.h
+* \author Szymon Stefanek
+* \brief Events table
+*/
 
-#define KviEvent_OnQuit 34
-
-#define KviEvent_OnUserMode 35
-
-#define KviEvent_OnMeKick 36
-#define KviEvent_OnKick 37
-
-#define KviEvent_OnMeAway 38
-#define KviEvent_OnMeBack 39
-
-#define KviEvent_OnChannelWindowCreated 40
-#define KviEvent_OnQueryWindowCreated 41
-#define KviEvent_OnBan 42
-#define KviEvent_OnUnban 43
-#define KviEvent_OnMeBan 44
-#define KviEvent_OnMeUnban 45
-#define KviEvent_OnBanException 46
-#define KviEvent_OnBanExceptionRemove 47
-#define KviEvent_OnMeBanException 48
-#define KviEvent_OnMeBanExceptionRemove 49
-#define KviEvent_OnOp 50
-#define KviEvent_OnDeOp 51
-#define KviEvent_OnMeOp 52
-#define KviEvent_OnMeDeOp 53
-#define KviEvent_OnLimitSet 54
-#define KviEvent_OnLimitUnset 55
-#define KviEvent_OnKeySet 56
-#define KviEvent_OnKeyUnset 57
-#define KviEvent_OnInvite 58
-#define KviEvent_OnChannelMessage 59
-#define KviEvent_OnQueryMessage 60
-#define KviEvent_OnVoice 61
-#define KviEvent_OnDeVoice 62
-#define KviEvent_OnMeVoice 63
-#define KviEvent_OnMeDeVoice 64
-#define KviEvent_OnNickChange 65
-#define KviEvent_OnMeNickChange 66
-#define KviEvent_OnCtcpRequest 67
-#define KviEvent_OnCtcpReply 68
-#define KviEvent_OnUnhandledLiteral 69
-#define KviEvent_OnMeHalfOp 70
-#define KviEvent_OnMeDeHalfOp 71
-#define KviEvent_OnHalfOp 72
-#define KviEvent_OnDeHalfOp 73
-#define KviEvent_OnInviteException 74
-#define KviEvent_OnInviteExceptionRemove 75
-#define KviEvent_OnMeInviteException 76
-#define KviEvent_OnMeInviteExceptionRemove 77
-#define KviEvent_OnAction 78
-#define KviEvent_OnCtcpFlood 79
-#define KviEvent_OnChannelNotice 80
-#define KviEvent_OnServerNotice 81
-#define KviEvent_OnDCCChatWindowCreated 82
-#define KviEvent_OnDCCChatConnectionInProgress 83
-#define KviEvent_OnDCCChatConnected 84
-#define KviEvent_OnDCCChatMessage 85
-#define KviEvent_OnDCCChatError 86
-#define KviEvent_OnDCCChatDisconnected 87
-#define KviEvent_OnDCCChatWindowClosing 88
-#define KviEvent_OnAccelKeyPressed 89
-#define KviEvent_OnHighlight 90
-#define KviEvent_OnWindowActivated 91
-#define KviEvent_OnNotifyOnLine 92
-#define KviEvent_OnNotifyOffLine 93
-#define KviEvent_OnPong 94
-#define KviEvent_OnLagAlarmTimeUp 95
-#define KviEvent_OnLagAlarmTimeDown 96
-#define KviEvent_OnLagCheck 97
-
-#define KviEvent_OnQueryNotice 98
-#define KviEvent_OnChanServNotice 99
-#define KviEvent_OnNickServNotice 100
-
-#define KviEvent_OnChanAdmin 101
-#define KviEvent_OnDeChanAdmin 102
-#define KviEvent_OnMeChanAdmin 103
-#define KviEvent_OnMeDeChanAdmin 104
-
-#define KviEvent_OnMeUserOp 105
-#define KviEvent_OnMeDeUserOp 106
-#define KviEvent_OnUserOp 107
-#define KviEvent_OnDeUserOp 108
-
-#define KviEvent_OnQueryWindowRequest 109
-#define KviEvent_OnQueryTargetAdded 110
-
-#define KviEvent_OnNetsplit 111
+// Application
+/**
+* \def KviEvent_OnKVIrcStartup Triggered at KVIrc startup
+* \def KviEvent_OnKVIrcShutdown Triggered at KVIrc shutdown
+* \def KviEvent_OnIrcContextCreated Triggered when the IRC context is created
+* \def KviEvent_OnIrcContextDestroyed Triggered when the IRC context is destroyed
 
-#define KviEvent_OnDCCSessionCreated 112
-#define KviEvent_OnDCCSessionDestroyed 113
 
-#define KviEvent_OnTextInput 114
 
-#define KviEvent_OnDCCChatPopupRequest 115
+*/
+#define KviEvent_OnKVIrcStartup                    0
+#define KviEvent_OnKVIrcShutdown                   1
+#define KviEvent_OnIrcContextCreated               2
+#define KviEvent_OnIrcContextDestroyed             3
+#define KviEvent_OnFrameWindowCreated              4
+#define KviEvent_OnFrameWindowDestroyed            5
+#define KviEvent_OnURL                             6
+#define KviEvent_OnError                           7
+#define KviEvent_OnAccelKeyPressed                 8
+#define KviEvent_OnHighlight                       9
+#define KviEvent_OnWindowActivated                10
+#define KviEvent_OnNotifyOnLine                   11
+#define KviEvent_OnNotifyOffLine                  12
+#define KviEvent_OnPing                           13
+#define KviEvent_OnPong                           14
+#define KviEvent_OnLagAlarmTimeUp                 15
+#define KviEvent_OnLagAlarmTimeDown               16
+#define KviEvent_OnLagCheck                       17
+#define KviEvent_OnTextInput                      18
+#define KviEvent_OnNotifyListDefaultActionRequest 19
+#define KviEvent_OnNotifyListPopupRequest         20
+#define KviEvent_OnWallops                        21
+#define KviEvent_OnIgnoredMessage                 22
+#define KviEvent_OnServerNotice                   23
+#define KviEvent_OnTextViewDoubleClicked          24
+#define KviEvent_OnNickLinkDefaultActionRequest   25
 
-#define KviEvent_OnDCCFileTransferConnectionInProgress 116
-#define KviEvent_OnDCCFileTransferBegin 117
-#define KviEvent_OnDCCFileTransferSuccess 118
-#define KviEvent_OnDCCFileTransferFailed 119
+// Connection
+/**
+* \def KviEvent_OnIrcConnectionEstabilished Triggered when the IRC connection is established
+* \def KviEvent_OnIrcConnectionTerminated Triggered when the IRC connection is terminated
+* \def KviEvent_OnIrc Triggered when the login is completed
 
-#define KviEvent_OnWallops 120
+* \def KviEvent_OnOutboundTraffic Triggered when text is sent to the server
+*/
+#define KviEvent_OnIRCConnectionEstabilished 26
+#define KviEvent_OnIRCConnectionTerminated   27
+#define KviEvent_OnIRC                       28
+#define KviEvent_OnNetsplit                  29
+#define KviEvent_OnDisconnectRequest         30
+#define KviEvent_OnHTTPGetTerminated         31
+#define KviEvent_OnUnhandledLiteral          32
+#define KviEvent_OnOutboundTraffic           33
 
-#define KviEvent_OnDisconnectRequest 121
+// Popups
+#define KviEvent_OnChannelPopupRequest     34
+#define KviEvent_OnConsolePopupRequest     35
+#define KviEvent_OnQueryPopupRequest       36
+#define KviEvent_OnWindowPopupRequest      37
+#define KviEvent_OnHostLinkPopupRequest    38
+#define KviEvent_OnURLLinkPopupRequest     39
+#define KviEvent_OnServerLinkPopupRequest  40
+#define KviEvent_OnChannelLinkPopupRequest 41
+#define KviEvent_OnNickLinkPopupRequest    42
+#define KviEvent_OnQueryNickPopupRequest   43
+#define KviEvent_OnChannelNickPopupRequest 44
 
-#define KviEvent_OnChanOwner 122
-#define KviEvent_OnDeChanOwner 123
-#define KviEvent_OnMeChanOwner 124
-#define KviEvent_OnMeDeChanOwner 125
-#define KviEvent_OnError 126
-#define KviEvent_OnQueryFileDropped 127
+// Channels
+#define KviEvent_OnChannelNickDefaultActionRequest 45
+#define KviEvent_OnChannelWindowCreated            46
+#define KviEvent_OnChannelSync                     47
+#define KviEvent_OnChannelMessage                  48
+#define KviEvent_OnChannelNotice                   49
 
-#define KviEvent_OnHTTPGetTerminated 128
+// Queries
+#define KviEvent_OnQueryMessage                  50
+#define KviEvent_OnQueryNotice                   51
+#define KviEvent_OnQueryWindowRequest            52
+#define KviEvent_OnQueryWindowCreated            53
+#define KviEvent_OnQueryTargetAdded              54
+#define KviEvent_OnQueryFileDropped              55
+#define KviEvent_OnQueryNickDefaultActionRequest 56
 
-#define KviEvent_OnChannelModeChange 129
+// Actions
+/** \def KviEvent_OnMeAction Triggered when we perform an action */
+#define KviEvent_OnMeAway    57
+#define KviEvent_OnMeBack    58
+#define KviEvent_OnAction    59
+#define KviEvent_OnMeAction  60
+#define KviEvent_OnJoin      61
+#define KviEvent_OnMeJoin    62
+#define KviEvent_OnPart      63
+#define KviEvent_OnMePart    64
+#define KviEvent_OnKick      65
+#define KviEvent_OnMeKick    66
+#define KviEvent_OnTopic     67
+#define KviEvent_OnQuit      68
 
-#define KviEvent_OnChannelNickLinkClick 130
-#define KviEvent_OnQueryNickLinkClick 131
-#define KviEvent_OnConsoleNickLinkClick 132
-#define KviEvent_OnHostLinkClick 133
-#define KviEvent_OnUrlLinkClick 134
-#define KviEvent_OnChannelLinkClick 135
-#define KviEvent_OnServerLinkClick 136
-#define KviEvent_OnIgnoredMessage 137
+// IRC modes
+#define KviEvent_OnChannelModeChange        69
+#define KviEvent_OnUserMode                 70
+#define KviEvent_OnBan                      71
+#define KviEvent_OnUnban                    72
+#define KviEvent_OnMeBan                    73
+#define KviEvent_OnMeUnban                  74
+#define KviEvent_OnBanException             75
+#define KviEvent_OnBanExceptionRemove       76
+#define KviEvent_OnMeBanException           77
+#define KviEvent_OnMeBanExceptionRemove     78
+#define KviEvent_OnInviteException          79
+#define KviEvent_OnInviteExceptionRemove    80
+#define KviEvent_OnMeInviteException        81
+#define KviEvent_OnMeInviteExceptionRemove  82
+#define KviEvent_OnLimitSet                 83
+#define KviEvent_OnLimitUnset               84
+#define KviEvent_OnKeySet                   85
+#define KviEvent_OnKeyUnset                 86
+#define KviEvent_OnNickChange               87
+#define KviEvent_OnMeNickChange             88
+#define KviEvent_OnInvite                   89
+#define KviEvent_OnChanOwner                90
+#define KviEvent_OnDeChanOwner              91
+#define KviEvent_OnMeChanOwner              92
+#define KviEvent_OnMeDeChanOwner            93
+#define KviEvent_OnChanAdmin                94
+#define KviEvent_OnDeChanAdmin              95
+#define KviEvent_OnMeChanAdmin              96
+#define KviEvent_OnMeDeChanAdmin            97
+#define KviEvent_OnOp                       98
+#define KviEvent_OnDeOp                     99
+#define KviEvent_OnMeOp                    100
+#define KviEvent_OnMeDeOp                  101
+#define KviEvent_OnHalfOp                  102
+#define KviEvent_OnDeHalfOp                103
+#define KviEvent_OnMeHalfOp                104
+#define KviEvent_OnMeDeHalfOp              105
+#define KviEvent_OnVoice                   106
+#define KviEvent_OnDeVoice                 107
+#define KviEvent_OnMeVoice                 108
+#define KviEvent_OnMeDeVoice               109
+#define KviEvent_OnUserOp                  110
+#define KviEvent_OnDeUserOp                111
+#define KviEvent_OnMeUserOp                112
+#define KviEvent_OnMeDeUserOp              113
 
-#define KviEvent_OnNickServAuth 138
+// Services
+#define KviEvent_OnChanServNotice 114
+#define KviEvent_OnNickServNotice 115
+#define KviEvent_OnNickServAuth   116
 
-#define KviEvent_OnMeAction 139
+// CTCPs
+#define KviEvent_OnCTCPRequest                         117
+#define KviEvent_OnCTCPReply                           118
+#define KviEvent_OnCTCPFlood                           119
+#define KviEvent_OnDCCSessionCreated                   120
+#define KviEvent_OnDCCSessionDestroyed                 121
+#define KviEvent_OnDCCChatPopupRequest                 122
+#define KviEvent_OnDCCChatWindowCreated                123
+#define KviEvent_OnDCCChatConnectionInProgress         124
+#define KviEvent_OnDCCChatConnected                    125
+#define KviEvent_OnDCCChatMessage                      126
+#define KviEvent_OnDCCChatError                        127
+#define KviEvent_OnDCCChatDisconnected                 128
+#define KviEvent_OnDCCChatWindowClosing                129
+#define KviEvent_OnDCCFileTransferConnectionInProgress 130
+#define KviEvent_OnDCCFileTransferBegin                131
+#define KviEvent_OnDCCFileTransferSuccess              132
+#define KviEvent_OnDCCFileTransferFailed               133
 
-#define KviEvent_OnOutboundTraffic 140
+// Link clicks
+#define KviEvent_OnChannelNickLinkClick 134
+#define KviEvent_OnQueryNickLinkClick   135
+#define KviEvent_OnConsoleNickLinkClick 136
+#define KviEvent_OnHostLinkClick        137
+#define KviEvent_OnURLLinkClick         138
+#define KviEvent_OnChannelLinkClick     139
+#define KviEvent_OnServerLinkClick      140
 
+/** \def KVI_KVS_NUM_APP_EVENTS Defines the number of events */
 #define KVI_KVS_NUM_APP_EVENTS 141
 
 #endif //_KVI_KVS_EVENTTABLE_H_
diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
index cb1e6eee0..9afa92435 100644
--- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
@@ -851,7 +851,7 @@ void KviServerParser::parseCtcpRequest(KviCtcpMessage *msg)
 				//do not allow to make faked version reply
 				if(!(bCtcpVersion && KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpVersion)))
 				{
-					if(KVS_TRIGGER_EVENT_6_HALTED(KviEvent_OnCtcpRequest, \
+					if(KVS_TRIGGER_EVENT_6_HALTED(KviEvent_OnCTCPRequest, \
 						msg->msg->console(), \
 						msg->pSource->nick(), \
 						msg->pSource->user(), \
@@ -868,7 +868,7 @@ void KviServerParser::parseCtcpRequest(KviCtcpMessage *msg)
 
 	QString szData = msg->msg->connection()->decodeText(msg->pData);
 	// trigger the event on unrecognized requests too
-	if(KVS_TRIGGER_EVENT_6_HALTED(KviEvent_OnCtcpRequest, \
+	if(KVS_TRIGGER_EVENT_6_HALTED(KviEvent_OnCTCPRequest, \
 		msg->msg->console(), \
 		msg->pSource->nick(), \
 		msg->pSource->user(), \
@@ -894,7 +894,7 @@ void KviServerParser::parseCtcpReply(KviCtcpMessage *msg)
 			if(!(m_ctcpReplyParseProcTable[i].iFlags & KVI_CTCP_MESSAGE_PARSE_TRIGGERNOEVENT))
 			{
 				QString szData = msg->msg->connection()->decodeText(msg->pData);
-				if(KVS_TRIGGER_EVENT_6_HALTED(KviEvent_OnCtcpReply, \
+				if(KVS_TRIGGER_EVENT_6_HALTED(KviEvent_OnCTCPReply, \
 					msg->msg->console(),msg->pSource->nick(),msg->pSource->user(), \
 					msg->pSource->host(),msg->szTarget,msg->szTag,szData))return;
 			}
@@ -905,7 +905,7 @@ void KviServerParser::parseCtcpReply(KviCtcpMessage *msg)
 
 	QString szData = msg->msg->connection()->decodeText(msg->pData);
 	// trigger the event on unrecognized replies too
-	if(KVS_TRIGGER_EVENT_6_HALTED(KviEvent_OnCtcpReply, \
+	if(KVS_TRIGGER_EVENT_6_HALTED(KviEvent_OnCTCPReply, \
 		msg->msg->console(),msg->pSource->nick(),msg->pSource->user(), \
 		msg->pSource->host(),msg->szTarget,msg->szTag,szData))return;
 
@@ -1025,7 +1025,7 @@ void KviServerParser::echoCtcpRequest(KviCtcpMessage *msg)
 		if(msg->bIsFlood)
 		{
 			QString szData = msg->msg->connection()->decodeText(msg->pData);
-			if(!KVS_TRIGGER_EVENT_6_HALTED(KviEvent_OnCtcpFlood,pOut,msg->pSource->nick(),msg->pSource->user(),msg->pSource->host(),msg->szTarget,msg->szTag,szData))
+			if(!KVS_TRIGGER_EVENT_6_HALTED(KviEvent_OnCTCPFlood,pOut,msg->pSource->nick(),msg->pSource->user(),msg->pSource->host(),msg->szTarget,msg->szTag,szData))
 				pOut->output(KVI_OUT_CTCPREQUESTFLOOD,
 					__tr2qs("%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit exceeded)"),
 					&szWhat,&szTag,KVI_TEXT_RESET,&(msg->pSource->nick()),
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index 9b1e808d8..1ca5da5a5 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -2621,7 +2621,7 @@ got_url:
 		{
 			QString tmp;
 			tmp.setUtf16(data_ptr,p-data_ptr);
-			KVS_TRIGGER_EVENT_1(KviEvent_OnUrl,m_pKviWindow,tmp);
+			KVS_TRIGGER_EVENT_1(KviEvent_OnURL,m_pKviWindow,tmp);
 		}
 
 		//add all the text till the end of the url, then create a new "clean" chunk for the next cycle loop
@@ -4856,10 +4856,10 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e)
 				break;
 				case 'u':
 					if(e->button() & Qt::RightButton)
-						KVS_TRIGGER_EVENT(KviEvent_OnUrlLinkPopupRequest,m_pKviWindow,pParams);
+						KVS_TRIGGER_EVENT(KviEvent_OnURLLinkPopupRequest,m_pKviWindow,pParams);
 					if(e->button() & Qt::LeftButton)
 					{
-						KVS_TRIGGER_EVENT(KviEvent_OnUrlLinkClick,m_pKviWindow,pParams);
+						KVS_TRIGGER_EVENT(KviEvent_OnURLLinkClick,m_pKviWindow,pParams);
 
 						// Check for clicks' number
 						QString cmd;
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 35ae1fce8..e34bc879a 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -800,7 +800,7 @@ static bool url_module_init(KviModule *m)
 	g_pUrlAction = new KviUrlAction(KviActionManager::instance());
 	KviActionManager::instance()->registerAction(g_pUrlAction);
 
-	m->kvsRegisterAppEventHandler(KviEvent_OnUrl,urllist_module_event_onUrl);
+	m->kvsRegisterAppEventHandler(KviEvent_OnURL,urllist_module_event_onUrl);
 
 	g_pApp->getLocalKvircDirectory(szConfigPath,KviApp::ConfigPlugins,"url.conf");