renamed namespace

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

53 files changed, 707 insertions, 712 deletions

diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt
index e43c9a4a6..82804e893 100644
--- a/src/kvilib/CMakeLists.txt
+++ b/src/kvilib/CMakeLists.txt
@@ -95,6 +95,7 @@ SET(kvilib_SRCS
 	file/KviPackageWriter.cpp
 	irc/KviAvatar.cpp
 	irc/KviAvatarCache.cpp
+	irc/KviControlCodes.cpp
 	irc/KviIdentityProfile.cpp
 	irc/KviIdentityProfileSet.cpp
 	irc/KviIrcMask.cpp
@@ -104,7 +105,6 @@ SET(kvilib_SRCS
 	irc/KviIrcServerReconnectInfo.cpp
 	irc/KviIrcUserDataBase.cpp
 	irc/KviIrcUserEntry.cpp
-	irc/KviMircCntrl.cpp
 	irc/KviNickServRule.cpp
 	irc/KviNickServRuleSet.cpp
 	irc/KviUserIdentity.cpp
diff --git a/src/kvilib/irc/KviControlCodes.cpp b/src/kvilib/irc/KviControlCodes.cpp
new file mode 100644
index 000000000..b28a5a1cb
--- /dev/null
+++ b/src/kvilib/irc/KviControlCodes.cpp
@@ -0,0 +1,308 @@
+//=============================================================================
+//
+//   File : KviControlCodes.cpp
+//   Creation date : Sat Aug 31 17:07:36 2002 GMT by Szymon Stefanek
+//
+//   This file is part of the KVIrc irc client distribution
+//   Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
+//
+//   This program is FREE software. You can redistribute it and/or
+//   modify it under the terms of the GNU General Public License
+//   as published by the Free Software Foundation; either version 2
+//   of the License, or (at your opinion) any later version.
+//
+//   This program is distributed in the HOPE that it will be USEFUL,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//   See the GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program. If not, write to the Free Software Foundation,
+//   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//
+//=============================================================================
+
+#define _KVI_CONTROLCODE_CPP_
+
+#include "KviControlCodes.h"
+
+namespace KviControlCodes
+{
+	QString stripControlBytes(const QString & szData)
+	{
+		QString szRet;
+
+		int i = 0;
+		int iBegin = 0;
+		unsigned char c1;
+		unsigned char c2;
+		while(i < szData.length())
+		{
+			switch(szData[i].unicode())
+			{
+				case KviControlCodes::Underline:
+				case KviControlCodes::Bold:
+				case KviControlCodes::Reset:
+				case KviControlCodes::Reverse:
+				case KviControlCodes::CryptEscape:
+				case KviControlCodes::CTCP:
+					if(i != iBegin)
+						szRet += szData.mid(iBegin,i - iBegin);
+					i++;
+					iBegin = i;
+				break;
+				case KviControlCodes::Color:
+					if(i != iBegin)
+						szRet += szData.mid(iBegin,i - iBegin);
+					i++;
+					i = getUnicodeColorBytes(szData,i,&c1,&c2);
+					iBegin = i;
+				break;
+				case KviControlCodes::Icon:
+					if(i != iBegin)
+						szRet += szData.mid(iBegin,i - iBegin);
+					i++;
+					/*
+					* These lines will strip out the first word following the icon escape character
+					while(i < l)
+					{
+						if(szData[i].unicode() == ' ')
+							break;
+						else i++;
+					}
+					*/
+					iBegin = i;
+				break;
+				default:
+					i++;
+				break;
+			}
+		}
+		if(i != iBegin)
+			szRet += szData.mid(iBegin,i - iBegin);
+		return szRet;
+	}
+	
+	const kvi_wchar_t * getColorBytesW(const kvi_wchar_t * pwData, unsigned char * pcByte1, unsigned char * pcByte2)
+	{
+		//
+		// Scans the pwData for a mIrc color code XX,XX
+		// and fills the color values in the two bytes
+		//
+
+		//First we can have a digit or a comma
+		if(((*pwData >= '0') && (*pwData <='9')))
+		{
+			//Something interesting ok.
+			(*pcByte1) = ((*pwData)-'0'); //store the code
+			pwData++;     //and check the next
+			if(((*pwData >= '0') && (*pwData <= '9')) || (*pwData==','))
+			{
+				//Yes we can understand it
+				if(*pwData == ',')
+				{
+					//A comma, need to check for background
+					pwData++;
+				} else {
+					//A number
+					//(*pcByte1)=((((*pcByte1)*10)+((*pwData)-'0'))%16);
+					(*pcByte1) = ((*pcByte1)*10) + ((*pwData)-'0');
+					pwData++;
+					if(*pwData == ',')
+					{
+						//A comma, need to check for background
+						pwData++;
+					} else {
+						//Senseless return
+						(*pcByte2) = KviControlCodes::NoChange;
+						return pwData;
+					}
+				}
+			} else {
+				//Senseless character control code OK and return
+				(*pcByte2) = KviControlCodes::NoChange;
+				return pwData;
+			}
+		} else {
+			//Senseless character : only a CTRL+K code
+			(*pcByte1) = KviControlCodes::NoChange;
+			(*pcByte2) = KviControlCodes::NoChange;
+			return pwData;
+		}
+
+		if((*pwData >= '0') && (*pwData <='9'))
+		{
+			//Background, a color code
+			(*pcByte2) = (*pwData)-'0';
+			pwData++;
+			if((*pwData >= '0') && (*pwData <='9'))
+			{
+				//(*pcByte2)=((((*pcByte2)*10)+((*pwData)-'0'))%16);
+				(*pcByte2) = ((*pcByte2)*10)+((*pwData)-'0');
+				pwData++;
+			}
+			return pwData;
+		} else {
+			(*pcByte2) = KviControlCodes::NoChange;
+			return pwData - 1;
+		}
+	}
+
+	unsigned int getUnicodeColorBytes(const QString & szData, unsigned int iChar, unsigned char * pcByte1, unsigned char * pcByte2)
+	{
+		//
+		// Scans the szData for a mIrc color code XX,XX
+		// and fills the color values in the two bytes
+		//
+
+		if(iChar >= (unsigned int)szData.length())
+		{
+			(*pcByte1) = KviControlCodes::NoChange;
+			(*pcByte2) = KviControlCodes::NoChange;
+			return iChar;
+		}
+
+		unsigned short c = szData[(int)iChar].unicode();
+
+		//First we can have a digit or a comma
+		if(((c < '0') || (c > '9')))
+		{
+			// senseless : only a CTRL+K code
+			(*pcByte1) = KviControlCodes::NoChange;
+			(*pcByte2) = KviControlCodes::NoChange;
+			return iChar;
+		}
+
+		//Something interesting ok.
+		(*pcByte1) = c - '0'; //store the code
+		iChar++;
+		if(iChar >= (unsigned int)szData.length())
+		{
+			(*pcByte2) = KviControlCodes::NoChange;
+			return iChar;
+		}
+
+		c = szData[(int)iChar].unicode();
+
+		if(((c < '0') || (c > '9')) && (c != ','))
+		{
+			(*pcByte2) = KviControlCodes::NoChange;
+			return iChar;
+		}
+
+		if((c >= '0') && (c <= '9'))
+		{
+			(*pcByte1) = (((*pcByte1)*10)+(c-'0'))%16;
+			iChar++;
+			if(iChar >= (unsigned int)szData.length())
+			{
+				(*pcByte2) = KviControlCodes::NoChange;
+				return iChar;
+			}
+			c = szData[(int)iChar].unicode();
+		}
+
+		if(c == ',')
+		{
+			iChar++;
+			if(iChar >= (unsigned int)szData.length())
+			{
+				(*pcByte2) = KviControlCodes::NoChange;
+				return iChar;
+			}
+			c = szData[(int)iChar].unicode();
+		} else {
+			(*pcByte2) = KviControlCodes::NoChange;
+			return iChar;
+		}
+
+		if((c < '0') || (c > '9'))
+		{
+			(*pcByte2) = KviControlCodes::NoChange;
+			if(szData[(int)(iChar-1)].unicode()==',')
+				return iChar-1;
+			else
+				return iChar;
+		}
+
+		//Background, a color code
+		(*pcByte2) = c-'0';
+		iChar++;
+		if(iChar >= (unsigned int)szData.length())
+			return iChar;
+		c = szData[(int)iChar].unicode();
+
+		if((c >= '0') && (c <='9'))
+		{
+			(*pcByte2) = (((*pcByte2)*10) + (c-'0')) % 16;
+			iChar++;
+		}
+
+		return iChar;
+	}
+
+#if 0
+	const char * getColorBytes(const char * pcData, unsigned char * pcByte1, unsigned char * pcByte2)
+	{
+		//
+		// Scans the pcData for a mIrc color code XX,XX
+		// and fills the color values in the two bytes
+		//
+
+		//First we can have a digit or a comma
+		if(((*pcData >= '0') && (*pcData <='9')))
+		{
+			//Something interesting ok.
+			(*pcByte1)=(*pcData)-'0'; //store the code
+			pcData++;     //and check the next
+			if(((*pcData >= '0') && (*pcData <= '9'))||(*pcData==','))
+			{
+				//Yes we can understand it
+				if(*pcData==',')
+				{
+					//A comma, need to check for background
+					pcData++;
+				} else {
+					//A number
+					(*pcByte1)=((((*pcByte1)*10)+((*pcData)-'0'))%16);
+					pcData++;
+					if(*pcData==',')
+					{
+						//A comma, need to check for background
+						pcData++;
+					} else {
+						//Senseless return
+						(*pcByte2)=KviControlCodes::NoChange;
+						return pcData;
+					}
+				}
+			} else {
+				//Senseless character control code OK and return
+				(*pcByte2)=KviControlCodes::NoChange;
+				return pcData;
+			}
+		} else {
+			//Senseless character : only a CTRL+K code
+			(*pcByte1)=KviControlCodes::NoChange;
+			(*pcByte2)=KviControlCodes::NoChange;
+			return pcData;
+		}
+
+		if((*pcData >= '0') && (*pcData <='9'))
+		{
+			//Background, a color code
+			(*pcByte2)=(*pcData)-'0';
+			pcData++;
+			if((*pcData >= '0') && (*pcData <='9'))
+			{
+				(*pcByte2)=((((*pcByte2)*10)+((*pcData)-'0'))%16);
+				pcData++;
+			}
+			return pcData;
+		} else {
+			(*pcByte2)=KviControlCodes::NoChange;
+			return pcData-1;
+		}
+	}
+#endif
+}
diff --git a/src/kvilib/irc/KviMircCntrl.h b/src/kvilib/irc/KviControlCodes.h
index edfd5709b..95118e72b 100644
--- a/src/kvilib/irc/KviMircCntrl.h
+++ b/src/kvilib/irc/KviControlCodes.h
@@ -1,13 +1,14 @@
-#ifndef _KVI_MIRCCNTRL_H_
-#define _KVI_MIRCCNTRL_H_
+#ifndef _KVI_CONTROLCODES_H_
+#define _KVI_CONTROLCODES_H_
 
 //=============================================================================
 //
-//   File : KviMircCntrl.h
+//   File : KviControlCodes.h
 //   Creation date : Thu Jun 29 2000 21:06:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
 //   Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2011 Elvio Basello (hellvis69 at gmail dot com)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
@@ -31,6 +32,14 @@
 // Better do not touch this :)
 //=============================================================================
 
+/**
+* \file KviControlCodes.h
+* \author Szymon Stefanek
+* \brief This file holds the text control codes
+* 
+* It was originally named KviMircCntrl
+*/
+
 #include "kvi_settings.h"
 #include "KviCString.h"
 
@@ -104,15 +113,11 @@
 //29 (0001 1101) GS (Group separator)
 
 
-#ifndef _KVI_MIRCCNTRL_CPP_
-	extern KVILIB_API const char * getColorBytes(const char *data_ptr,unsigned char *byte_1,unsigned char *byte_2);
-	extern KVILIB_API const kvi_wchar_t * getColorBytesW(const kvi_wchar_t *data_ptr,unsigned char *byte_1,unsigned char *byte_2);
-	extern KVILIB_API unsigned int getUnicodeColorBytes(const QString &szData,unsigned int charIdx,unsigned char *byte_1,unsigned char *byte_2);
-	inline const QChar * getUnicodeColorBytes(const QChar *pData,unsigned char *byte_1,unsigned char *byte_2)
-		{ return (QChar *)getColorBytesW((const kvi_wchar_t *)pData,byte_1,byte_2); }
-#endif
-
-namespace KviMircCntrl
+/**
+* \namespace KviControlCodes
+* \brief Holds all text control code KVIrc uses
+*/
+namespace KviControlCodes
 {
 	/**
 	* \enum Color
@@ -159,10 +164,20 @@ namespace KviMircCntrl
 
 	/**
 	* \brief Removes control bytes from the given string
-	* \param szData The stringe to clean
+	* \param szData The string to clean
 	* \return QString
 	*/
 	KVILIB_API QString stripControlBytes(const QString & szData);
+
+	
+	KVILIB_API const kvi_wchar_t * getColorBytesW(const kvi_wchar_t * pwData, unsigned char * pcByte1, unsigned char * pcByte2);
+
+	KVILIB_API unsigned int getUnicodeColorBytes(const QString & szData, unsigned int iChar, unsigned char * pcByte1, unsigned char * pcByte2);
+#if 0
+	extern KVILIB_API const char * getColorBytes(const char * pcData, unsigned char * pcByte1, unsigned char * pcByte2);
+	inline const QChar * getUnicodeColorBytes(const QChar * pData, unsigned char * pcByte1, unsigned char * pcByte2)
+		{ return (QChar *)getColorBytesW((const kvi_wchar_t *)pData,pcByte1,pcByte2); }
+#endif
 }
 
-#endif //_KVI_MIRCCNTRL_H_
+#endif //_KVI_CONTROLCODES_H_
diff --git a/src/kvilib/irc/KviIrcUserEntry.cpp b/src/kvilib/irc/KviIrcUserEntry.cpp
index b3cf03ed8..bb54474b5 100644
--- a/src/kvilib/irc/KviIrcUserEntry.cpp
+++ b/src/kvilib/irc/KviIrcUserEntry.cpp
@@ -23,7 +23,7 @@
 //=============================================================================
 
 #include "KviIrcUserEntry.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviNickColors.h"
 
 KviIrcUserEntry::KviIrcUserEntry(const QString & szUser, const QString & szHost)
@@ -54,7 +54,7 @@ void KviIrcUserEntry::setRealName(const QString & szReal)
 	m_szRealName = szReal.trimmed();
 	if(m_szRealName.length() >= 3)
 	{
-		if((m_szRealName[0].unicode() == KviMircCntrl::Color) && (m_szRealName[2].unicode() == KviMircCntrl::Reset))
+		if((m_szRealName[0].unicode() == KviControlCodes::Color) && (m_szRealName[2].unicode() == KviControlCodes::Reset))
 		{
 			// hum.. encoded as hidden color code eh ? publish is somewhere, so others might implement this...
 			// for backwards compatibily, 3=bot
@@ -82,12 +82,12 @@ void KviIrcUserEntry::setRealName(const QString & szReal)
 	 */
 	if(m_szRealName.length() >= 5)
 	{
-		if((m_szRealName[0].unicode() == KviMircCntrl::Color))
+		if((m_szRealName[0].unicode() == KviControlCodes::Color))
 		{
 			unsigned char cFore, cBack;
-			int iPos = getUnicodeColorBytes(m_szRealName, 1, &cFore, &cBack);
+			int iPos = KviControlCodes::getUnicodeColorBytes(m_szRealName, 1, &cFore, &cBack);
 			// extract smart nick color code
-			if(iPos > 1 && m_szRealName[iPos] == KviMircCntrl::Reset)
+			if(iPos > 1 && m_szRealName[iPos] == KviControlCodes::Reset)
 			{
 				m_szRealName.truncate(iPos);
 				int iColor = KviNickColors::getSmartColorIntByMircColor(cFore, cBack);
diff --git a/src/kvilib/irc/KviMircCntrl.cpp b/src/kvilib/irc/KviMircCntrl.cpp
deleted file mode 100644
index da24ff639..000000000
--- a/src/kvilib/irc/KviMircCntrl.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-//=============================================================================
-//
-//   File : KviMircCntrl.cpp
-//   Creation date : Sat Aug 31 17:07:36 2002 GMT by Szymon Stefanek
-//
-//   This file is part of the KVIrc irc client distribution
-//   Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-//
-//=============================================================================
-
-#define _KVI_MIRCCNTRL_CPP_
-
-#include "KviMircCntrl.h"
-
-KVILIB_API const char * getColorBytes(const char *data_ptr,unsigned char *byte_1,unsigned char *byte_2)
-{
-	//
-	// Scans the data_ptr for a mIrc color code XX,XX
-	// and fills the color values in the two bytes
-	//
-
-	//First we can have a digit or a comma
-	if(((*data_ptr >= '0') && (*data_ptr <='9')))
-	{
-		//Something interesting ok.
-		(*byte_1)=(*data_ptr)-'0'; //store the code
-		data_ptr++;     //and check the next
-		if(((*data_ptr >= '0') && (*data_ptr <= '9'))||(*data_ptr==','))
-		{
-			//Yes we can understand it
-			if(*data_ptr==',')
-			{
-				//A comma, need to check for background
-				data_ptr++;
-			} else {
-				//A number
-				(*byte_1)=((((*byte_1)*10)+((*data_ptr)-'0'))%16);
-				data_ptr++;
-				if(*data_ptr==',')
-				{
-					//A comma, need to check for background
-					data_ptr++;
-				} else {
-					//Senseless return
-					(*byte_2)=KviMircCntrl::NoChange;
-					return data_ptr;
-				}
-			}
-		} else {
-			//Senseless character control code OK and return
-			(*byte_2)=KviMircCntrl::NoChange;
-			return data_ptr;
-		}
-	} else {
-		//Senseless character : only a CTRL+K code
-		(*byte_1)=KviMircCntrl::NoChange;
-		(*byte_2)=KviMircCntrl::NoChange;
-		return data_ptr;
-	}
-
-	if((*data_ptr >= '0') && (*data_ptr <='9'))
-	{
-		//Background, a color code
-		(*byte_2)=(*data_ptr)-'0';
-		data_ptr++;
-		if((*data_ptr >= '0') && (*data_ptr <='9'))
-		{
-			(*byte_2)=((((*byte_2)*10)+((*data_ptr)-'0'))%16);
-			data_ptr++;
-		}
-		return data_ptr;
-	} else {
-		(*byte_2)=KviMircCntrl::NoChange;
-		return data_ptr-1;
-	}
-}
-
-
-KVILIB_API const kvi_wchar_t * getColorBytesW(const kvi_wchar_t *data_ptr,unsigned char *byte_1,unsigned char *byte_2)
-{
-	//
-	// Scans the data_ptr for a mIrc color code XX,XX
-	// and fills the color values in the two bytes
-	//
-
-	//First we can have a digit or a comma
-	if(((*data_ptr >= '0') && (*data_ptr <='9')))
-	{
-		//Something interesting ok.
-		(*byte_1)=((*data_ptr)-'0'); //store the code
-		data_ptr++;     //and check the next
-		if(((*data_ptr >= '0') && (*data_ptr <= '9'))||(*data_ptr==','))
-		{
-			//Yes we can understand it
-			if(*data_ptr==',')
-			{
-				//A comma, need to check for background
-				data_ptr++;
-			} else {
-				//A number
-				//(*byte_1)=((((*byte_1)*10)+((*data_ptr)-'0'))%16);
-				(*byte_1)=((*byte_1)*10)+((*data_ptr)-'0');
-				data_ptr++;
-				if(*data_ptr==',')
-				{
-					//A comma, need to check for background
-					data_ptr++;
-				} else {
-					//Senseless return
-					(*byte_2)=KviMircCntrl::NoChange;
-					return data_ptr;
-				}
-			}
-		} else {
-			//Senseless character control code OK and return
-			(*byte_2)=KviMircCntrl::NoChange;
-			return data_ptr;
-		}
-	} else {
-		//Senseless character : only a CTRL+K code
-		(*byte_1)=KviMircCntrl::NoChange;
-		(*byte_2)=KviMircCntrl::NoChange;
-		return data_ptr;
-	}
-
-	if((*data_ptr >= '0') && (*data_ptr <='9'))
-	{
-		//Background, a color code
-		(*byte_2)=(*data_ptr)-'0';
-		data_ptr++;
-		if((*data_ptr >= '0') && (*data_ptr <='9'))
-		{
-			//(*byte_2)=((((*byte_2)*10)+((*data_ptr)-'0'))%16);
-			(*byte_2)=((*byte_2)*10)+((*data_ptr)-'0');
-			data_ptr++;
-		}
-		return data_ptr;
-	} else {
-		(*byte_2)=KviMircCntrl::NoChange;
-		return data_ptr-1;
-	}
-}
-
-KVILIB_API unsigned int getUnicodeColorBytes(const QString &szData,unsigned int charIdx,unsigned char *byte_1,unsigned char *byte_2)
-{
-	//
-	// Scans the szData for a mIrc color code XX,XX
-	// and fills the color values in the two bytes
-	//
-
-	if(charIdx >= (unsigned int) szData.length())
-	{
-		(*byte_1)=KviMircCntrl::NoChange;
-		(*byte_2)=KviMircCntrl::NoChange;
-		return charIdx;
-	}
-
-	unsigned short c = szData[(int)charIdx].unicode();
-
-	//First we can have a digit or a comma
-	if(((c < '0') || (c > '9')))
-	{
-		// senseless : only a CTRL+K code
-		(*byte_1)=KviMircCntrl::NoChange;
-		(*byte_2)=KviMircCntrl::NoChange;
-		return charIdx;
-	}
-
-	//Something interesting ok.
-	(*byte_1)=c - '0'; //store the code
-	charIdx++;
-	if(charIdx >= (unsigned int) szData.length())
-	{
-		(*byte_2)=KviMircCntrl::NoChange;
-		return charIdx;
-	}
-
-	c = szData[(int)charIdx].unicode();
-
-	if(((c < '0') || (c > '9')) && (c != ','))
-	{
-		(*byte_2)=KviMircCntrl::NoChange;
-		return charIdx;
-	}
-
-
-	if((c >= '0') && (c <= '9'))
-	{
-		(*byte_1)=(((*byte_1)*10)+(c-'0'))%16;
-		charIdx++;
-		if(charIdx >= (unsigned int) szData.length())
-		{
-			(*byte_2)=KviMircCntrl::NoChange;
-			return charIdx;
-		}
-		c = szData[(int)charIdx].unicode();
-	}
-
-	if(c == ',')
-	{
-		charIdx++;
-		if(charIdx >= (unsigned int) szData.length())
-		{
-			(*byte_2)=KviMircCntrl::NoChange;
-			return charIdx;
-		}
-		c = szData[(int)charIdx].unicode();
-	} else {
-		(*byte_2)=KviMircCntrl::NoChange;
-		return charIdx;
-	}
-
-	if((c < '0') || (c > '9'))
-	{
-		(*byte_2)=KviMircCntrl::NoChange;
-		if(szData[(int)(charIdx-1)].unicode()==',')
-			return charIdx-1;
-		else
-			return charIdx;
-	}
-
-	//Background, a color code
-	(*byte_2)=c-'0';
-	charIdx++;
-	if(charIdx >= (unsigned int) szData.length())return charIdx;
-	c = szData[(int)charIdx].unicode();
-
-	if((c >= '0') && (c <='9'))
-	{
-		(*byte_2)=(((*byte_2)*10)+(c-'0'))%16;
-		charIdx++;
-	}
-
-	return charIdx;
-}
-
-
-namespace KviMircCntrl
-{
-	QString stripControlBytes(const QString &szData)
-	{
-		QString ret;
-
-		int i = 0;
-		int l = szData.length();
-		int begin = 0;
-		unsigned char b1;
-		unsigned char b2;
-		while(i < l)
-		{
-			switch(szData[i].unicode())
-			{
-				case KviMircCntrl::Underline:
-				case KviMircCntrl::Bold:
-				case KviMircCntrl::Reset:
-				case KviMircCntrl::Reverse:
-				case KviMircCntrl::CryptEscape:
-				case KviMircCntrl::CTCP:
-					if(i != begin)
-						ret += szData.mid(begin,i - begin);
-					i++;
-					begin = i;
-				break;
-				case KviMircCntrl::Color:
-					if(i != begin)
-						ret += szData.mid(begin,i - begin);
-					i++;
-					i = getUnicodeColorBytes(szData,i,&b1,&b2);
-					begin = i;
-				break;
-				case KviMircCntrl::Icon:
-					if(i != begin)
-						ret += szData.mid(begin,i - begin);
-					i++;
-					/*
-					* These lines will strip out the first word following the icon escape character
-					while(i < l)
-					{
-						if(szData[i].unicode() == ' ')break;
-						else i++;
-					}
-					*/
-					begin = i;
-				break;
-				default:
-					i++;
-				break;
-			}
-		}
-		if(i != begin)
-			ret += szData.mid(begin,i - begin);
-		return ret;
-	}
-}
diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp
index b2aba136d..f42559a86 100644
--- a/src/kvirc/kernel/KviApplication.cpp
+++ b/src/kvirc/kernel/KviApplication.cpp
@@ -63,7 +63,7 @@
 #include "KviModuleExtension.h"
 #include "KviInternalCommand.h"
 #include "KviFileTransfer.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviIrcUrl.h"
 #include "KviAvatarCache.h"
 #include "KviActionManager.h"
@@ -750,7 +750,7 @@ Let's see the scheme to understand which is choosen:
 
 	QString szTitle = __tr2qs("KVIrc Messaging");
 	QString szText = __tr2qs("Message from %1:\n\n").arg(pWnd->target());
-	szText += KviMircCntrl::stripControlBytes(szMsg);
+	szText += KviControlCodes::stripControlBytes(szMsg);
 
 #ifdef COMPILE_KDE_SUPPORT
 	if(KVI_OPTION_BOOL(KviOption_boolUseKDENotifier))
diff --git a/src/kvirc/kernel/KviHtmlGenerator.cpp b/src/kvirc/kernel/KviHtmlGenerator.cpp
index fe185ad5f..da5e2c4ae 100644
--- a/src/kvirc/kernel/KviHtmlGenerator.cpp
+++ b/src/kvirc/kernel/KviHtmlGenerator.cpp
@@ -25,7 +25,7 @@
 #include "KviHtmlGenerator.h"
 
 #include "KviIconManager.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviOptions.h"
 #include "KviTextIconManager.h"
 
@@ -54,12 +54,12 @@ namespace KviHtmlGenerator
 			unsigned int uStart = uIdx;
 
 			while(
-					(c != KviMircCntrl::Color) &&
-					(c != KviMircCntrl::Bold) &&
-					(c != KviMircCntrl::Underline) &&
-					(c != KviMircCntrl::Reverse) &&
-					(c != KviMircCntrl::Reset) &&
-					(c != KviMircCntrl::Icon) &&
+					(c != KviControlCodes::Color) &&
+					(c != KviControlCodes::Bold) &&
+					(c != KviControlCodes::Underline) &&
+					(c != KviControlCodes::Reverse) &&
+					(c != KviControlCodes::Reset) &&
+					(c != KviControlCodes::Icon) &&
 					((c != ':') || bIgnoreIcons) &&
 					((c != ';') || bIgnoreIcons) &&
 					((c != '=') || bIgnoreIcons)
@@ -148,13 +148,13 @@ namespace KviHtmlGenerator
 
 			switch(c)
 			{
-				case KviMircCntrl::Bold:
+				case KviControlCodes::Bold:
 					bCurBold = !bCurBold; ++uIdx;
 				break;
-				case KviMircCntrl::Underline:
+				case KviControlCodes::Underline:
 					bCurUnderline = !bCurUnderline; ++uIdx;
 				break;
-				case KviMircCntrl::Reverse:
+				case KviControlCodes::Reverse:
 					{
 						char auxBack = uCurBack;
 						uCurBack = uCurFore;
@@ -162,23 +162,23 @@ namespace KviHtmlGenerator
 					}
 					++uIdx;
 				break;
-				case KviMircCntrl::Reset:
+				case KviControlCodes::Reset:
 					uCurFore = KVI_LABEL_DEF_FORE;
 					uCurBack = KVI_LABEL_DEF_BACK;
 					bCurBold = false;
 					bCurUnderline = false;
 					++uIdx;
 				break;
-				case KviMircCntrl::Color:
+				case KviControlCodes::Color:
 				{
 					++uIdx;
 					unsigned char fore;
 					unsigned char back;
-					uIdx = getUnicodeColorBytes(szText,uIdx,&fore,&back);
-					if(fore != KviMircCntrl::NoChange)
+					uIdx = KviControlCodes::getUnicodeColorBytes(szText,uIdx,&fore,&back);
+					if(fore != KviControlCodes::NoChange)
 					{
 						uCurFore = fore;
-						if(back != KviMircCntrl::NoChange)
+						if(back != KviControlCodes::NoChange)
 							uCurBack = back;
 					} else {
 						// only a CTRL+K
@@ -273,7 +273,7 @@ namespace KviHtmlGenerator
 					}
 				}
 				break;
-				case KviMircCntrl::Icon:
+				case KviControlCodes::Icon:
 				{
 					++uIdx;
 					if(bShowIcons)
diff --git a/src/kvirc/kernel/KviIrcConnection.cpp b/src/kvirc/kernel/KviIrcConnection.cpp
index ffbd45c7d..a5b723d3a 100644
--- a/src/kvirc/kernel/KviIrcConnection.cpp
+++ b/src/kvirc/kernel/KviIrcConnection.cpp
@@ -66,7 +66,7 @@
 #include "KviLagMeter.h"
 #include "KviKvsEventTriggers.h"
 #include "KviKvsScript.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviUserIdentity.h"
 #include "KviIdentityProfileSet.h"
 #include "KviSASL.h"
@@ -1557,10 +1557,10 @@ void KviIrcConnection::loginToIrcServer()
 	{
 		QString szTags;
 		szTags.sprintf("%c%d,%d%c",
-				KviMircCntrl::Color,
+				KviControlCodes::Color,
 				KVI_OPTION_UINT(KviOption_uintUserIrcViewOwnForeground),
 				KVI_OPTION_UINT(KviOption_uintUserIrcViewOwnBackground),
-				KviMircCntrl::Reset);
+				KviControlCodes::Reset);
 		szReal.prepend(szTags.toUtf8());
 	}
 
@@ -1568,9 +1568,9 @@ void KviIrcConnection::loginToIrcServer()
 	{
 		QString szTags;
 		szTags.sprintf("%c%d%c",
-			       KviMircCntrl::Color,
+			       KviControlCodes::Color,
 			       iGenderAvatarTag,
-			       KviMircCntrl::Reset);
+			       KviControlCodes::Reset);
 		szReal.prepend(szTags.toUtf8());
 	}
 
diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp
index 522f096e5..32bd53fdd 100644
--- a/src/kvirc/kernel/KviOptions.cpp
+++ b/src/kvirc/kernel/KviOptions.cpp
@@ -31,7 +31,7 @@
 #include "KviConfigurationFile.h"
 #include "KviApplication.h"
 #include "KviIconManager.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviLocale.h"
 #include "kvi_confignames.h"
 #include "KviWindow.h"
@@ -638,8 +638,8 @@ KviUIntOption g_uintOptionsTable[KVI_NUM_UINT_OPTIONS]=
 	UINT_OPTION("AutoReconnectDelay",10,KviOption_sectFlagFrame),
 	UINT_OPTION("MaxDccSendSpeed",0,KviOption_sectFlagFrame),
 	UINT_OPTION("MaxDccRecvSpeed",0,KviOption_sectFlagFrame),
-	UINT_OPTION("TimeStampForeground",KviMircCntrl::DarkGray,KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme),
-	UINT_OPTION("TimeStampBackground",KviMircCntrl::Transparent,KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme),
+	UINT_OPTION("TimeStampForeground",KviControlCodes::DarkGray,KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme),
+	UINT_OPTION("TimeStampBackground",KviControlCodes::Transparent,KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme),
 	UINT_OPTION("UserExperienceLevel",1,KviOption_sectFlagUser),
 	UINT_OPTION("ClassicWindowListMaximumButtonWidth",100,KviOption_sectFlagGeometry | KviOption_resetUpdateGui | KviOption_groupTheme),
 	UINT_OPTION("DefaultBanType",7,KviOption_sectFlagIrcSocket),
@@ -709,7 +709,7 @@ KviFontOption g_fontOptionsTable[KVI_NUM_FONT_OPTIONS]=
 #define MSGTYPE_OPTION(_name,_text,_icon,_levl) \
 	KviMessageTypeSettingsOption( \
 		KVI_MSGTYPE_OPTIONS_PREFIX _name, \
-		KviMessageTypeSettings(_text,_icon,KviMircCntrl::Black,KviMircCntrl::Transparent,true,_levl), \
+		KviMessageTypeSettings(_text,_icon,KviControlCodes::Black,KviControlCodes::Transparent,true,_levl), \
 		KviOption_sectFlagMsgType | KviOption_groupTheme \
 	)
 
@@ -727,17 +727,17 @@ KviFontOption g_fontOptionsTable[KVI_NUM_FONT_OPTIONS]=
 KviMessageTypeSettingsOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]=
 {
 	MSGTYPE_OPTION("Echo",__tr_no_lookup("Normal text"),KviIconManager::None,KVI_MSGTYPE_LEVEL_1),
-	MSGTYPE_OPTION_SPEC("Selection",__tr_no_lookup("Selection"),KviIconManager::None,KviMircCntrl::White,KviMircCntrl::Black,KVI_MSGTYPE_LEVEL_1),
-	MSGTYPE_OPTION_SPEC("Highlight",__tr_no_lookup("Highlighted text"),KviIconManager::Alert,KviMircCntrl::White,KviMircCntrl::Black,KVI_MSGTYPE_LEVEL_5),
-	MSGTYPE_OPTION_SPEC("Url",__tr_no_lookup("URL foreground"),KviIconManager::None,KviMircCntrl::Blue,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_1),
-	MSGTYPE_OPTION_SPEC("Link",__tr_no_lookup("Link overlay foreground"),KviIconManager::None,KviMircCntrl::Blue,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_1),
-	MSGTYPE_OPTION_SPEC("ParserError",__tr_no_lookup("Parser error"),KviIconManager::ParserError,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_2),
-	MSGTYPE_OPTION_SPEC("ParserWarning",__tr_no_lookup("Parser warning"),KviIconManager::ParserWarning,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_2),
+	MSGTYPE_OPTION_SPEC("Selection",__tr_no_lookup("Selection"),KviIconManager::None,KviControlCodes::White,KviControlCodes::Black,KVI_MSGTYPE_LEVEL_1),
+	MSGTYPE_OPTION_SPEC("Highlight",__tr_no_lookup("Highlighted text"),KviIconManager::Alert,KviControlCodes::White,KviControlCodes::Black,KVI_MSGTYPE_LEVEL_5),
+	MSGTYPE_OPTION_SPEC("Url",__tr_no_lookup("URL foreground"),KviIconManager::None,KviControlCodes::Blue,KviControlCodes::Transparent,KVI_MSGTYPE_LEVEL_1),
+	MSGTYPE_OPTION_SPEC("Link",__tr_no_lookup("Link overlay foreground"),KviIconManager::None,KviControlCodes::Blue,KviControlCodes::Transparent,KVI_MSGTYPE_LEVEL_1),
+	MSGTYPE_OPTION_SPEC("ParserError",__tr_no_lookup("Parser error"),KviIconManager::ParserError,KviControlCodes::Red,KviControlCodes::Transparent,KVI_MSGTYPE_LEVEL_2),
+	MSGTYPE_OPTION_SPEC("ParserWarning",__tr_no_lookup("Parser warning"),KviIconManager::ParserWarning,KviControlCodes::Red,KviControlCodes::Transparent,KVI_MSGTYPE_LEVEL_2),
 	MSGTYPE_OPTION("HostLookup",__tr_no_lookup("Host lookup result"),KviIconManager::Server,KVI_MSGTYPE_LEVEL_3),
 	MSGTYPE_OPTION("SocketMessage",__tr_no_lookup("Socket message"),KviIconManager::SocketMessage,KVI_MSGTYPE_LEVEL_1),
 	MSGTYPE_OPTION("SocketWarning",__tr_no_lookup("Socket warning"),KviIconManager::SocketWarning,KVI_MSGTYPE_LEVEL_3),
-	MSGTYPE_OPTION_SPEC("SocketError",__tr_no_lookup("Socket error"),KviIconManager::SocketError,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_3),
-	MSGTYPE_OPTION_SPEC("SystemError",__tr_no_lookup("System error"),KviIconManager::SystemError,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_3),
+	MSGTYPE_OPTION_SPEC("SocketError",__tr_no_lookup("Socket error"),KviIconManager::SocketError,KviControlCodes::Red,KviControlCodes::Transparent,KVI_MSGTYPE_LEVEL_3),
+	MSGTYPE_OPTION_SPEC("SystemError",__tr_no_lookup("System error"),KviIconManager::SystemError,KviControlCodes::Red,KviControlCodes::Transparent,KVI_MSGTYPE_LEVEL_3),
 	MSGTYPE_OPTION("Raw",__tr_no_lookup("Raw data to server"),KviIconManager::Raw,KVI_MSGTYPE_LEVEL_1),
 	MSGTYPE_OPTION("Connection",__tr_no_lookup("Connection status"),KviIconManager::World,KVI_MSGTYPE_LEVEL_1),
 	MSGTYPE_OPTION("SystemWarning",__tr_no_lookup("System warning"),KviIconManager::SystemWarning,KVI_MSGTYPE_LEVEL_3),
@@ -844,8 +844,8 @@ KviMessageTypeSettingsOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]=
 	MSGTYPE_OPTION("GenericStatus",__tr_no_lookup("Generic status"),KviIconManager::GreenSquare,KVI_MSGTYPE_LEVEL_2),
 	MSGTYPE_OPTION("GenericVerbose",__tr_no_lookup("Generic verbose message"),KviIconManager::DarkGreenSquare,KVI_MSGTYPE_LEVEL_1),
 	MSGTYPE_OPTION("GenericWarning",__tr_no_lookup("Generic warning"),KviIconManager::YellowSquare,KVI_MSGTYPE_LEVEL_3),
-	MSGTYPE_OPTION_SPEC("GenericError",__tr_no_lookup("Generic error"),KviIconManager::RedSquare,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_5),
-	MSGTYPE_OPTION_SPEC("GenericCritical",__tr_no_lookup("Generic critical error"),KviIconManager::BlackSquare,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_5),
+	MSGTYPE_OPTION_SPEC("GenericError",__tr_no_lookup("Generic error"),KviIconManager::RedSquare,KviControlCodes::Red,KviControlCodes::Transparent,KVI_MSGTYPE_LEVEL_5),
+	MSGTYPE_OPTION_SPEC("GenericCritical",__tr_no_lookup("Generic critical error"),KviIconManager::BlackSquare,KviControlCodes::Red,KviControlCodes::Transparent,KVI_MSGTYPE_LEVEL_5),
 	MSGTYPE_OPTION("ChanAdmin",__tr_no_lookup("Chan admin status set"),KviIconManager::ChanAdmin,KVI_MSGTYPE_LEVEL_5),
 	MSGTYPE_OPTION("ChanUnAdmin",__tr_no_lookup("Chan admin status unset"),KviIconManager::ChanUnAdmin,KVI_MSGTYPE_LEVEL_5),
 	MSGTYPE_OPTION("MeChanAdmin",__tr_no_lookup("Own chan admin status set"),KviIconManager::MeChanAdmin,KVI_MSGTYPE_LEVEL_5),
@@ -854,13 +854,13 @@ KviMessageTypeSettingsOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]=
 	MSGTYPE_OPTION("UserDeOp",__tr_no_lookup("User-deop mode change"),KviIconManager::DeUserOp,KVI_MSGTYPE_LEVEL_2),
 	MSGTYPE_OPTION("MeUserOp",__tr_no_lookup("Am userop'd"),KviIconManager::MeUserOp,KVI_MSGTYPE_LEVEL_5),
 	MSGTYPE_OPTION("MeDeUserOp",__tr_no_lookup("Am de-userop'd"),KviIconManager::MeDeUserOp,KVI_MSGTYPE_LEVEL_5),
-	MSGTYPE_OPTION_SPEC("Verbose",__tr_no_lookup("Verbose/Debug"),KviIconManager::BinaryText,KviMircCntrl::DarkGray,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_1),
+	MSGTYPE_OPTION_SPEC("Verbose",__tr_no_lookup("Verbose/Debug"),KviIconManager::BinaryText,KviControlCodes::DarkGray,KviControlCodes::Transparent,KVI_MSGTYPE_LEVEL_1),
 	MSGTYPE_OPTION("ChanOwner",__tr_no_lookup("Chan owner status set"),KviIconManager::ChanOwner,KVI_MSGTYPE_LEVEL_5),
 	MSGTYPE_OPTION("ChanUnOwner",__tr_no_lookup("Chan owner status unset"),KviIconManager::ChanUnOwner,KVI_MSGTYPE_LEVEL_5),
 	MSGTYPE_OPTION("MeChanOwner",__tr_no_lookup("Own chan owner status set"),KviIconManager::MeChanOwner,KVI_MSGTYPE_LEVEL_5),
 	MSGTYPE_OPTION("MeChanUnOwner",__tr_no_lookup("Own chan owner status unset"),KviIconManager::MeChanUnOwner,KVI_MSGTYPE_LEVEL_5),
-	MSGTYPE_OPTION_SPEC("ServerError",__tr_no_lookup("Server error"),KviIconManager::ServerError,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_5),
-	MSGTYPE_OPTION_SPEC("Help",__tr_no_lookup("Help"),KviIconManager::Help,KviMircCntrl::DarkGreen,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_1),
+	MSGTYPE_OPTION_SPEC("ServerError",__tr_no_lookup("Server error"),KviIconManager::ServerError,KviControlCodes::Red,KviControlCodes::Transparent,KVI_MSGTYPE_LEVEL_5),
+	MSGTYPE_OPTION_SPEC("Help",__tr_no_lookup("Help"),KviIconManager::Help,KviControlCodes::DarkGreen,KviControlCodes::Transparent,KVI_MSGTYPE_LEVEL_1),
 	MSGTYPE_OPTION("TextEncoding",__tr_no_lookup("Text Encoding Server message"),KviIconManager::TextEncoding,KVI_MSGTYPE_LEVEL_1),
 	// TODO: add icon and check what level means
 	// Pragma: the message level is a warning level that is rendered in the WindowList
@@ -1262,7 +1262,7 @@ void KviApplication::listAvailableOptions(KviWindow *wnd)
 	int i;
 
 	#define LIST_OPTIONS(__txt,__num,__table) \
-		wnd->output(KVI_OUT_SYSTEMMESSAGE,"%c%s%c",KviMircCntrl::Bold,__txt,KviMircCntrl::Bold); \
+		wnd->output(KVI_OUT_SYSTEMMESSAGE,"%c%s%c",KviControlCodes::Bold,__txt,KviControlCodes::Bold); \
 		for(i = 0;i < __num;i++)wnd->outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__table[i].name);
 
 	LIST_OPTIONS(__tr("Boolean options (1/0)"),KVI_NUM_BOOL_OPTIONS,g_boolOptionsTable)
diff --git a/src/kvirc/kernel/KviSSLMaster.cpp b/src/kvirc/kernel/KviSSLMaster.cpp
index 3efc0fd73..8891151c2 100644
--- a/src/kvirc/kernel/KviSSLMaster.cpp
+++ b/src/kvirc/kernel/KviSSLMaster.cpp
@@ -29,7 +29,7 @@
 #include "KviWindow.h"
 #include "KviOptions.h"
 #include "kvi_out.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviLocale.h"
 #include "KviKvsVariant.h"
 
@@ -53,41 +53,41 @@ namespace KviSSLMaster
 
 KVIRC_API void printSSLCipherInfo(KviWindow * wnd,const char * description,KviSSLCipherInfo * c)
 {
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]: %c%s"),KviMircCntrl::Bold,description);
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Cipher: %c%s"),KviMircCntrl::Bold,c->name());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Version: %c%s"),KviMircCntrl::Bold,c->version());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Bits: %c%d (%d used)"),KviMircCntrl::Bold,c->bits(),c->bitsUsed());
-//	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Description: %c%s"),KviMircCntrl::Bold,c->description());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]: %c%s"),KviControlCodes::Bold,description);
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Cipher: %c%s"),KviControlCodes::Bold,c->name());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Version: %c%s"),KviControlCodes::Bold,c->version());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Bits: %c%d (%d used)"),KviControlCodes::Bold,c->bits(),c->bitsUsed());
+//	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Description: %c%s"),KviControlCodes::Bold,c->description());
 }
 
 KVIRC_API void printSSLCertificate(KviWindow * wnd,const char * description,KviSSLCertificate * c)
 {
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]: %c%s"),KviMircCntrl::Bold,description);
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Version: %c%d"),KviMircCntrl::Bold,c->version());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Serial number: %c%d"),KviMircCntrl::Bold,c->serialNumber());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]: %c%s"),KviControlCodes::Bold,description);
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Version: %c%d"),KviControlCodes::Bold,c->version());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Serial number: %c%d"),KviControlCodes::Bold,c->serialNumber());
 	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Subject:"));
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Common name: %c%s"),KviMircCntrl::Bold,c->subjectCommonName());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Organization: %c%s"),KviMircCntrl::Bold,c->subjectOrganization());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Organizational unit: %c%s"),KviMircCntrl::Bold,c->subjectOrganizationalUnit());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Country: %c%s"),KviMircCntrl::Bold,c->subjectCountry());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     State or province: %c%s"),KviMircCntrl::Bold,c->subjectStateOrProvince());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Locality: %c%s"),KviMircCntrl::Bold,c->subjectLocality());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Common name: %c%s"),KviControlCodes::Bold,c->subjectCommonName());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Organization: %c%s"),KviControlCodes::Bold,c->subjectOrganization());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Organizational unit: %c%s"),KviControlCodes::Bold,c->subjectOrganizationalUnit());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Country: %c%s"),KviControlCodes::Bold,c->subjectCountry());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     State or province: %c%s"),KviControlCodes::Bold,c->subjectStateOrProvince());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Locality: %c%s"),KviControlCodes::Bold,c->subjectLocality());
 	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:   Issuer:"));
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Common name: %c%s"),KviMircCntrl::Bold,c->issuerCommonName());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Organization: %c%s"),KviMircCntrl::Bold,c->issuerOrganization());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Organizational unit: %c%s"),KviMircCntrl::Bold,c->issuerOrganizationalUnit());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Country: %c%s"),KviMircCntrl::Bold,c->issuerCountry());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     State or province: %c%s"),KviMircCntrl::Bold,c->issuerStateOrProvince());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Locality: %c%s"),KviMircCntrl::Bold,c->issuerLocality());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:   Public key: %c%s (%d bits)"),KviMircCntrl::Bold,c->publicKeyType(),c->publicKeyBits());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:   Signature type: %c%s"),KviMircCntrl::Bold,c->signatureType());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Common name: %c%s"),KviControlCodes::Bold,c->issuerCommonName());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Organization: %c%s"),KviControlCodes::Bold,c->issuerOrganization());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Organizational unit: %c%s"),KviControlCodes::Bold,c->issuerOrganizationalUnit());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Country: %c%s"),KviControlCodes::Bold,c->issuerCountry());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     State or province: %c%s"),KviControlCodes::Bold,c->issuerStateOrProvince());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Locality: %c%s"),KviControlCodes::Bold,c->issuerLocality());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:   Public key: %c%s (%d bits)"),KviControlCodes::Bold,c->publicKeyType(),c->publicKeyBits());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:   Signature type: %c%s"),KviControlCodes::Bold,c->signatureType());
 	KviCString tmp = c->signatureContents();
 	if(tmp.len() > 40)
 	{
 		tmp.cutRight(tmp.len() - 40);
 		tmp.append("...");
 	}
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:   Signature contents: %c%s"),KviMircCntrl::Bold,tmp.ptr());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:   Signature contents: %c%s"),KviControlCodes::Bold,tmp.ptr());
 
 }
 
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
index 8cae31332..ea762f189 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
@@ -34,7 +34,7 @@
 #include "KviConsoleWindow.h"
 #include "KviIrcConnection.h"
 #include "KviIrcConnectionUserInfo.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviAvatar.h"
 #include "KviIrcUserDataBase.h"
 #include "KviMainWindow.h"
@@ -42,7 +42,6 @@
 #include "KviQString.h"
 #include "KviSSLMaster.h"
 #include "KviOptions.h"
-
 #include "KviKvsAliasManager.h"
 #include "KviKvsScript.h"
 
@@ -369,7 +368,7 @@ namespace KviKvsCoreFunctions
 		Q_UNUSED(__pContext);
 		Q_UNUSED(__pParams);
 
-		KVSCF_pRetBuffer->setString(QString(QChar(KviMircCntrl::Bold)));
+		KVSCF_pRetBuffer->setString(QString(QChar(KviControlCodes::Bold)));
 		return true;
 	}
 
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
index 3dbf1ee8f..814c6db21 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
@@ -34,7 +34,7 @@
 #include "KviChannelWindow.h"
 #include "KviConsoleWindow.h"
 #include "KviIconManager.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviMainWindow.h"
 #include "KviTimeUtils.h"
 #include "KviKvsEventManager.h"
@@ -753,7 +753,7 @@ namespace KviKvsCoreFunctions
 			KVSCF_PARAMETER("background",KVS_PT_UINT,KVS_PF_OPTIONAL,iBack)
 		KVSCF_PARAMETERS_END
 
-		QString szRet = QChar(KviMircCntrl::Color);
+		QString szRet = QChar(KviControlCodes::Color);
 		if(KVSCF_pParams->count() > 0)
 		{
 			KviQString::appendFormatted(szRet,"%u",iFore);
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp
index 64a628a64..1d8337982 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp
@@ -30,7 +30,7 @@
 #include "KviKvsObjectController.h"
 #include "KviLocale.h"
 #include "KviIrcConnection.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviOptions.h"
 #include "KviConsoleWindow.h"
 #include "KviIrcUserDataBase.h"
@@ -399,7 +399,7 @@ namespace KviKvsCoreFunctions
 		Q_UNUSED(__pContext);
 		Q_UNUSED(__pParams);
 
-		KVSCF_pRetBuffer->setString(QString(QChar(KviMircCntrl::Reset)));
+		KVSCF_pRetBuffer->setString(QString(QChar(KviControlCodes::Reset)));
 		return true;
 	}
 
@@ -535,7 +535,7 @@ namespace KviKvsCoreFunctions
 		Q_UNUSED(__pContext);
 		Q_UNUSED(__pParams);
 
-		KVSCF_pRetBuffer->setString(QString(QChar(KviMircCntrl::Reverse)));
+		KVSCF_pRetBuffer->setString(QString(QChar(KviControlCodes::Reverse)));
 		return true;
 	}
 
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
index ea61bd16f..40edb2c63 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
@@ -22,16 +22,14 @@
 //
 //=============================================================================
 
-
-
+#include "kvi_sourcesdate.h"
+#include "kvi_socket.h"
+#include "kvi_out.h"
 #include "KviKvsCoreFunctions.h"
-
 #include "KviKvsKernel.h"
 #include "KviKvsArrayCast.h"
 #include "KviKvsObjectController.h"
-
 #include "KviWindow.h"
-#include "kvi_out.h"
 #include "KviLocale.h"
 #include "KviApplication.h"
 #include "KviOptions.h"
@@ -40,9 +38,7 @@
 #include "KviTimeUtils.h"
 #include "KviIrcUserDataBase.h"
 #include "KviModuleManager.h"
-#include "KviMircCntrl.h"
-#include "kvi_sourcesdate.h"
-#include "kvi_socket.h"
+#include "KviControlCodes.h"
 #include "KviBuildInfo.h"
 
 #include <stdlib.h> // rand & srand
@@ -795,7 +791,7 @@ namespace KviKvsCoreFunctions
 		Q_UNUSED(__pContext);
 		Q_UNUSED(__pParams);
 
-		KVSCF_pRetBuffer->setString(QString(QChar(KviMircCntrl::Underline)));
+		KVSCF_pRetBuffer->setString(QString(QChar(KviControlCodes::Underline)));
 		return true;
 	}
 
diff --git a/src/kvirc/kvs/KviKvsReport.cpp b/src/kvirc/kvs/KviKvsReport.cpp
index 0246fe105..453b72dd5 100644
--- a/src/kvirc/kvs/KviKvsReport.cpp
+++ b/src/kvirc/kvs/KviKvsReport.cpp
@@ -23,7 +23,7 @@
 //=============================================================================
 
 #include "KviKvsReport.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviWindow.h"
 #include "kvi_out.h"
 #include "KviApplication.h"
@@ -124,7 +124,7 @@ void KviKvsReport::findLineColAndListing(const QChar * pBegin,const QChar * pPoi
 	if(us)pBegin++;
 
 	{
-		QString * pListingStr = new QString(QString("%1%2 ").arg(QChar(KviMircCntrl::Bold)).arg(iLine));
+		QString * pListingStr = new QString(QString("%1%2 ").arg(QChar(KviControlCodes::Bold)).arg(iLine));
 		*pListingStr += QString(pLineBegin,pBegin - pLineBegin);
 		pListingStr->replace("\n","");
 		pListing->append(pListingStr);
@@ -185,19 +185,19 @@ void KviKvsReport::report(KviKvsReport * r,KviWindow * pOutput)
 	{
 		case KviKvsReport::ParserWarning:
 			out = KVI_OUT_PARSERWARNING;
-			pOutput->output(out,__tr2qs_ctx("[KVS]%c Warning: %Q","kvs"),KviMircCntrl::Bold,&(r->message()));
+			pOutput->output(out,__tr2qs_ctx("[KVS]%c Warning: %Q","kvs"),KviControlCodes::Bold,&(r->message()));
 		break;
 		case KviKvsReport::ParserError:
 			out = KVI_OUT_PARSERERROR;
-			pOutput->output(out,__tr2qs_ctx("[KVS]%c Compilation Error: %Q","kvs"),KviMircCntrl::Bold,&(r->message()));
+			pOutput->output(out,__tr2qs_ctx("[KVS]%c Compilation Error: %Q","kvs"),KviControlCodes::Bold,&(r->message()));
 		break;
 		case KviKvsReport::RunTimeWarning:
 			out = KVI_OUT_PARSERWARNING;
-			pOutput->output(out,__tr2qs_ctx("[KVS]%c Warning: %Q","kvs"),KviMircCntrl::Bold,&(r->message()));
+			pOutput->output(out,__tr2qs_ctx("[KVS]%c Warning: %Q","kvs"),KviControlCodes::Bold,&(r->message()));
 		break;
 		case KviKvsReport::RunTimeError:
 			out = KVI_OUT_PARSERERROR;
-			pOutput->output(out,__tr2qs_ctx("[KVS]%c Runtime Error: %Q","kvs"),KviMircCntrl::Bold,&(r->message()));
+			pOutput->output(out,__tr2qs_ctx("[KVS]%c Runtime Error: %Q","kvs"),KviControlCodes::Bold,&(r->message()));
 		break;
 	}
 
diff --git a/src/kvirc/kvs/KviKvsScript.cpp b/src/kvirc/kvs/KviKvsScript.cpp
index eca828c27..e24e661dd 100644
--- a/src/kvirc/kvs/KviKvsScript.cpp
+++ b/src/kvirc/kvs/KviKvsScript.cpp
@@ -22,6 +22,7 @@
 //
 //=============================================================================
 
+#include "kvi_out.h"
 #include "KviKvsScript.h"
 #include "KviKvsParser.h"
 #include "KviKvsReport.h"
@@ -29,10 +30,7 @@
 #include "KviKvsTreeNodeInstruction.h"
 #include "KviKvsVariantList.h"
 #include "KviKvsKernel.h"
-
 #include "KviLocale.h"
-#include "kvi_out.h"
-#include "KviMircCntrl.h"
 #include "KviWindow.h"
 #include "KviApplication.h"
 
diff --git a/src/kvirc/kvs/object/KviKvsObject.cpp b/src/kvirc/kvs/object/KviKvsObject.cpp
index ac1ab393b..ad717880c 100644
--- a/src/kvirc/kvs/object/KviKvsObject.cpp
+++ b/src/kvirc/kvs/object/KviKvsObject.cpp
@@ -22,21 +22,19 @@
 //
 //=============================================================================
 
+#include "kvi_out.h"
 #include "KviKvsObject.h"
 #include "KviKvsHash.h"
 #include "KviKvsKernel.h"
 #include "KviWindow.h"
 #include "KviApplication.h"
-
 #include "KviModuleManager.h"
 #include "KviConsoleWindow.h"
 #include "KviLocale.h"
 #include "KviError.h"
-#include "kvi_out.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviIconManager.h"
 #include "KviMemory.h"
-
 #include "KviKvsObjectController.h"
 #include "KviKvsObjectFunctionCall.h"
 #include "KviKvsObjectFunctionHandlerImpl.h"
@@ -1153,7 +1151,7 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c)
 				if(bArray)
 					szOut = QString("%1, %2").arg(szName,szType);
 				else {
-					szOut = QString(__tr2qs_ctx("Property: %1%2%3, type %4","kvs")).arg(KviMircCntrl::Bold).arg(szName).arg(KviMircCntrl::Bold).arg(szType);
+					szOut = QString(__tr2qs_ctx("Property: %1%2%3, type %4","kvs")).arg(KviControlCodes::Bold).arg(szName).arg(KviControlCodes::Bold).arg(szType);
 					szOut.prepend(" ");
 				}
 
diff --git a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
index 914eb52ea..cfeda3035 100644
--- a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
@@ -26,7 +26,7 @@
 // FIXME: #warning "CTCP BEEP == WAKEUP == AWAKE"
 // FIXME: #warning "CTCP AVATARREQ or QUERYAVATAR"
 
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviOsInfo.h"
 #include "KviApplication.h"
 #include "KviIrcServerParser.h"
@@ -1037,7 +1037,7 @@ void KviIrcServerParser::echoCtcpRequest(KviCtcpMessage *msg)
 			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,KviMircCntrl::Reset,&(msg->pSource->nick()),
+					&szWhat,&szTag,KviControlCodes::Reset,&(msg->pSource->nick()),
 					&(msg->pSource->user()),&(msg->pSource->host()),&szRequest);
 		} else {
 			QString szAction = msg->bUnknown ? __tr2qs("ignored (unrecognized)") :
@@ -1046,7 +1046,7 @@ void KviIrcServerParser::echoCtcpRequest(KviCtcpMessage *msg)
 				msg->bUnknown ? KVI_OUT_CTCPREQUESTUNKNOWN :
 					(msg->bIgnored ? KVI_OUT_CTCPREQUESTIGNORED : KVI_OUT_CTCPREQUESTREPLIED),
 				__tr2qs("%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"),
-				&szWhat,&szTag,KviMircCntrl::Reset,&(msg->pSource->nick()),
+				&szWhat,&szTag,KviControlCodes::Reset,&(msg->pSource->nick()),
 				&(msg->pSource->user()),&(msg->pSource->host()),&szRequest,&szAction);
 		}
 	}
@@ -1440,7 +1440,7 @@ void KviIrcServerParser::parseCtcpRequestAction(KviCtcpMessage *msg)
 
 	//see bug ticket #220
 	if(KVI_OPTION_BOOL(KviOption_boolStripMircColorsInUserMessages))
-		szData = KviMircCntrl::stripControlBytes(szData);
+		szData = KviControlCodes::stripControlBytes(szData);
 
 	if(KVS_TRIGGER_EVENT_5_HALTED(KviEvent_OnAction,pOut,
 				msg->pSource->nick(),
diff --git a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
index ccc380e1e..40b99705f 100644
--- a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
@@ -36,7 +36,7 @@
 #include "KviChannelWindow.h"
 #include "KviTopicWidget.h"
 #include "KviMainWindow.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviQueryWindow.h"
 #include "KviUserListView.h"
 #include "KviAntiSpam.h"
@@ -1451,7 +1451,7 @@ void KviIrcServerParser::parseLiteralTopic(KviIrcMessage *msg)
 	{
 		chan->output(KVI_OUT_TOPIC,
 			__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""),
-			&szNick,&szUser,&szHost,&szTopic,KviMircCntrl::Reset);
+			&szNick,&szUser,&szHost,&szTopic,KviControlCodes::Reset);
 	}
 }
 
diff --git a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
index 5c24fbec9..e6180cc9d 100644
--- a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
@@ -37,7 +37,7 @@
 #include "KviTopicWidget.h"
 #include "KviIrcUserDataBase.h"
 #include "kvi_defaults.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviMainWindow.h"
 #include "KviParameterList.h"
 #include "KviApplication.h"
@@ -429,8 +429,8 @@ void KviIrcServerParser::parseNumeric020(KviIrcMessage *msg)
 	{
 		QString szWText = msg->console()->decodeText(msg->safeTrailing());
 		msg->console()->output(
-			KVI_OUT_CONNECTION,"%c\r!s\r%s\r%c: %Q",KviMircCntrl::Bold,
-			msg->safePrefix(),KviMircCntrl::Bold,&szWText);
+			KVI_OUT_CONNECTION,"%c\r!s\r%s\r%c: %Q",KviControlCodes::Bold,
+			msg->safePrefix(),KviControlCodes::Bold,&szWText);
 	}
 }
 
@@ -850,7 +850,7 @@ void KviIrcServerParser::parseNumericWhoReply(KviIrcMessage *msg)
 			//still no avatar? check if the user is exposing the fact that he's got one
 			if(!e->avatar())
 			{
-				if((szReal[0].unicode() == KviMircCntrl::Color) && (szReal[1].unicode() & 4) && (szReal[2].unicode() == KviMircCntrl::Reset))
+				if((szReal[0].unicode() == KviControlCodes::Color) && (szReal[1].unicode() & 4) && (szReal[2].unicode() == KviControlCodes::Reset))
 				{
 					if(KVI_OPTION_BOOL(KviOption_boolRequestMissingAvatars) && !e->avatarRequested())
 					{
@@ -892,14 +892,14 @@ void KviIrcServerParser::parseNumericWhoReply(KviIrcMessage *msg)
 
 		pOut->output(KVI_OUT_WHO,
 			__tr2qs("WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, %cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal name%c: %Q"),
-			KviMircCntrl::Bold,&szNick, KviMircCntrl::Bold,
-			&szUser,&szHost,KviMircCntrl::Underline,
-			KviMircCntrl::Underline,&szChan,KviMircCntrl::Underline,
-			KviMircCntrl::Underline,&szServ,KviMircCntrl::Underline,
-			KviMircCntrl::Underline,iHops, KviMircCntrl::Underline, KviMircCntrl::Underline,
-			&szFlag, KviMircCntrl::Underline, KviMircCntrl::Underline,
-			&szAway, KviMircCntrl::Underline,
-			KviMircCntrl::Underline, &szReal);
+			KviControlCodes::Bold,&szNick, KviControlCodes::Bold,
+			&szUser,&szHost,KviControlCodes::Underline,
+			KviControlCodes::Underline,&szChan,KviControlCodes::Underline,
+			KviControlCodes::Underline,&szServ,KviControlCodes::Underline,
+			KviControlCodes::Underline,iHops, KviControlCodes::Underline, KviControlCodes::Underline,
+			&szFlag, KviControlCodes::Underline, KviControlCodes::Underline,
+			&szAway, KviControlCodes::Underline,
+			KviControlCodes::Underline, &szReal);
 	}
 
 
@@ -1164,7 +1164,7 @@ void KviIrcServerParser::parseNumericWhoisAway(KviIrcMessage * msg)
 		if(!pOut)pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ?
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 		pOut->output(KVI_OUT_WHOISUSER,__tr2qs("%c\r!n\r%Q\r%c is away: %Q"),
-			KviMircCntrl::Bold,&szNk,KviMircCntrl::Bold,&szWText);
+			KviControlCodes::Bold,&szNk,KviControlCodes::Bold,&szWText);
 	}
 }
 
@@ -1224,13 +1224,13 @@ void KviIrcServerParser::parseNumericWhoisUser(KviIrcMessage *msg)
 		KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ?
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 		pOut->output(
-			KVI_OUT_WHOISUSER,__tr2qs("%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"),KviMircCntrl::Bold,
-				&szNick,KviMircCntrl::Bold,KviMircCntrl::Underline,&szNick,
-				&szUser,&szHost,KviMircCntrl::Underline);
+			KVI_OUT_WHOISUSER,__tr2qs("%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"),KviControlCodes::Bold,
+				&szNick,KviControlCodes::Bold,KviControlCodes::Underline,&szNick,
+				&szUser,&szHost,KviControlCodes::Underline);
 
 		pOut->output(
-			KVI_OUT_WHOISUSER,__tr2qs("%c\r!n\r%Q\r%c's real name: %Q"),KviMircCntrl::Bold,
-				&szNick,KviMircCntrl::Bold,&szReal);
+			KVI_OUT_WHOISUSER,__tr2qs("%c\r!n\r%Q\r%c's real name: %Q"),KviControlCodes::Bold,
+				&szNick,KviControlCodes::Bold,&szReal);
 	}
 }
 
@@ -1249,12 +1249,12 @@ void KviIrcServerParser::parseNumericWhowasUser(KviIrcMessage * msg)
 		KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ?
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 		pOut->output(
-			KVI_OUT_WHOISUSER,__tr2qs("%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"),KviMircCntrl::Bold,
-			&szNick,KviMircCntrl::Bold,KviMircCntrl::Underline,&szNick,
-			&szUser,&szHost,KviMircCntrl::Underline);
+			KVI_OUT_WHOISUSER,__tr2qs("%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"),KviControlCodes::Bold,
+			&szNick,KviControlCodes::Bold,KviControlCodes::Underline,&szNick,
+			&szUser,&szHost,KviControlCodes::Underline);
 		pOut->output(
-			KVI_OUT_WHOISUSER,__tr2qs("%c\r!n\r%Q\r%c's real name was: %Q"),KviMircCntrl::Bold,
-			&szNick,KviMircCntrl::Bold,&szReal);
+			KVI_OUT_WHOISUSER,__tr2qs("%c\r!n\r%Q\r%c's real name was: %Q"),KviControlCodes::Bold,
+			&szNick,KviControlCodes::Bold,&szReal);
 	}
 }
 
@@ -1317,8 +1317,8 @@ void KviIrcServerParser::parseNumericWhoisChannels(KviIrcMessage *msg)
 		}
 
 		pOut->output(
-			KVI_OUT_WHOISCHANNELS,__tr2qs("%c\r!n\r%Q\r%c's channels: %Q"),KviMircCntrl::Bold,
-				&szNick,KviMircCntrl::Bold,&szChanList);
+			KVI_OUT_WHOISCHANNELS,__tr2qs("%c\r!n\r%Q\r%c's channels: %Q"),KviControlCodes::Bold,
+				&szNick,KviControlCodes::Bold,&szChanList);
 	}
 }
 
@@ -1364,8 +1364,8 @@ void KviIrcServerParser::parseNumericWhoisIdle(KviIrcMessage *msg)
 		unsigned int uMins = uTime / 60;
 		uTime = uTime % 60;
 		pOut->output(
-			KVI_OUT_WHOISIDLE,__tr2qs("%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"),KviMircCntrl::Bold,
-			&szNick,KviMircCntrl::Bold,uDays,uHours,uMins,uTime);
+			KVI_OUT_WHOISIDLE,__tr2qs("%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"),KviControlCodes::Bold,
+			&szNick,KviControlCodes::Bold,uDays,uHours,uMins,uTime);
 
 		uTime = sign.toUInt(&bOk);
 		if(bOk)
@@ -1388,8 +1388,8 @@ void KviIrcServerParser::parseNumericWhoisIdle(KviIrcMessage *msg)
 			}
 
 			pOut->output(
-				KVI_OUT_WHOISIDLE,__tr2qs("%c\r!n\r%Q\r%c's signon time: %Q"),KviMircCntrl::Bold,
-				&szNick,KviMircCntrl::Bold,&szTmp);
+				KVI_OUT_WHOISIDLE,__tr2qs("%c\r!n\r%Q\r%c's signon time: %Q"),KviControlCodes::Bold,
+				&szNick,KviControlCodes::Bold,&szTmp);
 		}
 	}
 }
@@ -1426,8 +1426,8 @@ void KviIrcServerParser::parseNumericWhoisServer(KviIrcMessage *msg)
 		msg->console()->activeWindow() : (KviWindow *)(msg->console());
 		QString szWText = pOut->decodeText(msg->safeTrailing());
 		pOut->output(
-			KVI_OUT_WHOISSERVER,__tr2qs("%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"),KviMircCntrl::Bold,
-			&szNick,KviMircCntrl::Bold,&szServ,&szWText);
+			KVI_OUT_WHOISSERVER,__tr2qs("%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"),KviControlCodes::Bold,
+			&szNick,KviControlCodes::Bold,&szServ,&szWText);
 	}
 }
 
@@ -1455,8 +1455,8 @@ void KviIrcServerParser::parseNumericWhoisAuth(KviIrcMessage *msg)
 		KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ?
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 		pOut->output(
-			KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c is authenticated as %Q"),KviMircCntrl::Bold,
-			&szNick,KviMircCntrl::Bold,&szAuth);
+			KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c is authenticated as %Q"),KviControlCodes::Bold,
+			&szNick,KviControlCodes::Bold,&szAuth);
 	}
 }
 
@@ -1492,12 +1492,12 @@ void KviIrcServerParser::parseNumericWhoisActually(KviIrcMessage *msg)
 		if(szOth.contains(QChar(',')))
 		{
 			pOut->output(
-				KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c's actual user@host: %Q, actual ip: %Q"),KviMircCntrl::Bold,
-				&szNick,KviMircCntrl::Bold, &szUserHost, &szIpAddr);
+				KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c's actual user@host: %Q, actual ip: %Q"),KviControlCodes::Bold,
+				&szNick,KviControlCodes::Bold, &szUserHost, &szIpAddr);
 		} else {
 			pOut->output(
-				KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c's actual host: %Q"),KviMircCntrl::Bold,
-				&szNick,KviMircCntrl::Bold, &szUserHost);
+				KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c's actual host: %Q"),KviControlCodes::Bold,
+				&szNick,KviControlCodes::Bold, &szUserHost);
 		}
 	}
 }
@@ -1530,8 +1530,8 @@ void KviIrcServerParser::parseNumericWhoisOther(KviIrcMessage *msg)
 		KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ?
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 		pOut->output(
-			KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c's info: %Q"),KviMircCntrl::Bold,
-			&szNick,KviMircCntrl::Bold,&szOth);
+			KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c's info: %Q"),KviControlCodes::Bold,
+			&szNick,KviControlCodes::Bold,&szOth);
 	}
 }
 
@@ -1579,8 +1579,8 @@ void KviIrcServerParser::parseNumericEndOfWhois(KviIrcMessage *msg)
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 		QString pref = msg->connection()->decodeText(msg->safePrefix());
 		pOut->output(
-			KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"),KviMircCntrl::Bold,
-			&szNick,KviMircCntrl::Bold,&pref);
+			KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"),KviControlCodes::Bold,
+			&szNick,KviControlCodes::Bold,&pref);
 	}
 }
 
@@ -1596,8 +1596,8 @@ void KviIrcServerParser::parseNumericEndOfWhowas(KviIrcMessage *msg)
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 		QString pref = msg->connection()->decodeText(msg->safePrefix());
 		pOut->output(
-			KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"),KviMircCntrl::Bold,
-			&szNick,KviMircCntrl::Bold,&pref);
+			KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"),KviControlCodes::Bold,
+			&szNick,KviControlCodes::Bold,&pref);
 	}
 }
 
@@ -2005,7 +2005,7 @@ void KviIrcServerParser::parseNumericServerAdminInfoServerName(KviIrcMessage * m
 	{
 		KviWindow * pOut = (KviWindow *)(msg->console());
 			QString szInfo = msg->connection()->decodeText(msg->safeTrailing());
-			pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's server info: %s"),KviMircCntrl::Bold,msg->prefix(),KviMircCntrl::Bold,szInfo.toUtf8().data());
+			pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's server info: %s"),KviControlCodes::Bold,msg->prefix(),KviControlCodes::Bold,szInfo.toUtf8().data());
 	}
 }
 
@@ -2016,7 +2016,7 @@ void KviIrcServerParser::parseNumericServerAdminInfoAdminName(KviIrcMessage * ms
 	{
 		KviWindow * pOut = (KviWindow *)(msg->console());
 		QString szInfo = msg->connection()->decodeText(msg->safeTrailing());
-		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's administrator is %s"),KviMircCntrl::Bold,msg->prefix(),KviMircCntrl::Bold,szInfo.toUtf8().data());
+		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's administrator is %s"),KviControlCodes::Bold,msg->prefix(),KviControlCodes::Bold,szInfo.toUtf8().data());
 	}
 }
 
@@ -2027,7 +2027,7 @@ void KviIrcServerParser::parseNumericServerAdminInfoAdminContact(KviIrcMessage *
 	{
 		KviWindow * pOut = (KviWindow *)(msg->console());
 			QString szInfo = msg->connection()->decodeText(msg->safeTrailing());
-			pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's contact address is %s"),KviMircCntrl::Bold,msg->prefix(),KviMircCntrl::Bold,szInfo.toUtf8().data());
+			pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's contact address is %s"),KviControlCodes::Bold,msg->prefix(),KviControlCodes::Bold,szInfo.toUtf8().data());
 	}
 }
 
@@ -2077,7 +2077,7 @@ void KviIrcServerParser::parseNumericInfoStart(KviIrcMessage * msg)
 	if(!msg->haltOutput())
 	{
 		KviWindow * pOut = (KviWindow *)(msg->console());
-		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's information:"),KviMircCntrl::Bold,msg->prefix(),KviMircCntrl::Bold);
+		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's information:"),KviControlCodes::Bold,msg->prefix(),KviControlCodes::Bold);
 	}
 }
 
@@ -2087,7 +2087,7 @@ void KviIrcServerParser::parseNumericInfoEnd(KviIrcMessage * msg)
 	if(!msg->haltOutput())
 	{
 		KviWindow * pOut = (KviWindow *)(msg->console());
-		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("End of %c\r!s\r%s\r%c's information"),KviMircCntrl::Bold,msg->prefix(),KviMircCntrl::Bold);
+		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("End of %c\r!s\r%s\r%c's information"),KviControlCodes::Bold,msg->prefix(),KviControlCodes::Bold);
 	}
 }
 
@@ -2098,7 +2098,7 @@ void KviIrcServerParser::parseNumericTime(KviIrcMessage * msg)
 	{
 		KviWindow * pOut = (KviWindow *)(msg->console());
 		QString szInfo = msg->connection()->decodeText(msg->safeTrailing());
-		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's time is %Q"),KviMircCntrl::Bold,msg->prefix(),KviMircCntrl::Bold,&szInfo);
+		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's time is %Q"),KviControlCodes::Bold,msg->prefix(),KviControlCodes::Bold,&szInfo);
 	}
 }
 
@@ -2236,8 +2236,8 @@ void KviIrcServerParser::parseNumericCodePageScheme(KviIrcMessage *msg)
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 			QString szWText = pOut->decodeText(msg->safeTrailing());
 			pOut->output(
-				KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c's codepage is %Q: %Q"),KviMircCntrl::Bold,
-				&szNick,KviMircCntrl::Bold,&szCodepage,&szWText);
+				KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c's codepage is %Q: %Q"),KviControlCodes::Bold,
+				&szNick,KviControlCodes::Bold,&szCodepage,&szWText);
 		}
 	} else {
 		// simply unhandled
diff --git a/src/kvirc/ui/KviChannelWindow.cpp b/src/kvirc/ui/KviChannelWindow.cpp
index 3076fb22a..592eb53ca 100644
--- a/src/kvirc/ui/KviChannelWindow.cpp
+++ b/src/kvirc/ui/KviChannelWindow.cpp
@@ -38,7 +38,7 @@
 #include "KviMainWindow.h"
 #include "KviConfigurationFile.h"
 #include "KviMaskEditor.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviParameterList.h"
 #include "KviModeEditor.h"
 #include "KviApplication.h"
@@ -50,7 +50,6 @@
 #include "KviIrcConnectionRequestQueue.h"
 #include "KviIrcServerParser.h"
 #include "KviModeWidget.h"
-#include "KviMircCntrl.h"
 #include "KviPointerHashTable.h"
 #include "KviKvsScript.h"
 #include "KviKvsEventTriggers.h"
@@ -1182,7 +1181,7 @@ void KviChannelWindow::ownMessage(const QString & szBuffer, bool bUserFeedback)
 	{
 		if(cryptSessionInfo()->m_bDoEncrypt)
 		{
-			if(*pData != KviMircCntrl::CryptEscape)
+			if(*pData != KviControlCodes::CryptEscape)
 			{
 				KviCString szEncrypted;
 				cryptSessionInfo()->m_pEngine->setMaxEncryptLen(iMaxMsgLen);
@@ -1329,7 +1328,7 @@ void KviChannelWindow::ownAction(const QString & szBuffer)
 
 	//see bug ticket #220
 	if(KVI_OPTION_BOOL(KviOption_boolStripMircColorsInUserMessages))
-		szTmpBuffer = KviMircCntrl::stripControlBytes(szBuffer);
+		szTmpBuffer = KviControlCodes::stripControlBytes(szBuffer);
 	else
 		szTmpBuffer = szBuffer;
 
@@ -1856,7 +1855,7 @@ void KviChannelWindow::preprocessMessage(QString & szMessage)
 		if(it->contains('\r'))
 			continue;
 
-		QString szTmp = KviMircCntrl::stripControlBytes(*it).trimmed();
+		QString szTmp = KviControlCodes::stripControlBytes(*it).trimmed();
 		if(szTmp.length() < 1)
 			continue;
 
diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp
index 938512a45..fa10a5cbc 100644
--- a/src/kvirc/ui/KviConsoleWindow.cpp
+++ b/src/kvirc/ui/KviConsoleWindow.cpp
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-
-
+#include "kvi_defaults.h"
+#include "kvi_out.h"
 #include "KviIrcUrl.h"
 #include "KviApplication.h"
 #include "KviConsoleWindow.h"
@@ -32,7 +32,7 @@
 #include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviIrcView.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviInput.h"
 #include "KviError.h"
 #include "KviProxyDataBase.h"
@@ -40,14 +40,12 @@
 #include "KviIrcServer.h"
 #include "KviIrcServerDataBase.h"
 #include "KviDnsResolver.h"
-#include "kvi_defaults.h"
 #include "KviIrcUserDataBase.h"
 #include "KviChannelWindow.h"
 #include "KviQueryWindow.h"
 #include "KviParameterList.h"
 #include "KviRegisteredUserDataBase.h"
 #include "KviUserListView.h"
-#include "kvi_out.h"
 #include "KviConfigurationFile.h"
 #include "KviIrcToolBar.h"
 #include "KviInternalCommand.h"
@@ -287,7 +285,7 @@ void KviConsoleWindow::getUserTipText(const QString &nick,KviIrcUserEntry *e,QSt
 	if(e->hasRealName())
 	{
 		buffer += "<tr><td><center><b>";
-		buffer += KviMircCntrl::stripControlBytes(e->realName());
+		buffer += KviControlCodes::stripControlBytes(e->realName());
 		buffer += "</b></center></td></tr>";
 	}
 
@@ -576,7 +574,7 @@ int KviConsoleWindow::applyHighlighting(KviWindow *wnd,int type,const QString &n
 {
 	QString szPattern=KVI_OPTION_STRING(KviOption_stringWordSplitters);
 	QString szSource;
-	QString szStripMsg=KviMircCntrl::stripControlBytes(szMsg);
+	QString szStripMsg=KviControlCodes::stripControlBytes(szMsg);
 	QRegExp rgxHlite;
 	Qt::CaseSensitivity cs = KVI_OPTION_BOOL(KviOption_boolCaseSensitiveHighlighting) ? Qt::CaseSensitive : Qt::CaseInsensitive;
 
@@ -692,7 +690,7 @@ void KviConsoleWindow::outputPrivmsg(KviWindow *wnd,
 	QString szDecodedMessage = msg; // shallow copy
 
 	if(KVI_OPTION_BOOL(KviOption_boolStripMircColorsInUserMessages))
-		szDecodedMessage = KviMircCntrl::stripControlBytes(szDecodedMessage);
+		szDecodedMessage = KviControlCodes::stripControlBytes(szDecodedMessage);
 
 	if(!(iFlags & NoHighlighting))
 	{
@@ -777,8 +775,8 @@ void KviConsoleWindow::outputPrivmsg(KviWindow *wnd,
 				szNick.prepend(KviNickColors::getSmartColor(sum));
 			}
 		}
-		szNick.prepend(KviMircCntrl::Color);
-		szNick.append(KviMircCntrl::Color);
+		szNick.prepend(KviControlCodes::Color);
+		szNick.append(KviControlCodes::Color);
 	}
 /*	if(KVI_OPTION_BOOL(KviOption_boolUseUserListColorsAsNickColors) && bIsChan)
 	{
@@ -817,8 +815,8 @@ void KviConsoleWindow::outputPrivmsg(KviWindow *wnd,
 	}*/
 	if(KVI_OPTION_BOOL(KviOption_boolBoldedNicks))
 	{
-		szNick.prepend(KviMircCntrl::Bold);
-		szNick.append(KviMircCntrl::Bold);
+		szNick.prepend(KviControlCodes::Bold);
+		szNick.append(KviControlCodes::Bold);
 	}
 
 	QString szMessage;
@@ -1080,7 +1078,7 @@ void KviConsoleWindow::applyOptions()
 	if(KVI_OPTION_BOOL(KviOption_boolUseSpecifiedSmartColorForOwnNick))
 	{
 		int iBack = KVI_OPTION_UINT(KviOption_uintUserIrcViewOwnBackground);
-		if(iBack == KviMircCntrl::Transparent)
+		if(iBack == KviControlCodes::Transparent)
 		{
 			m_szOwnSmartColor = QString("%1").arg(KVI_OPTION_UINT(KviOption_uintUserIrcViewOwnForeground));
 		} else {
diff --git a/src/kvirc/ui/KviHistoryWindow.cpp b/src/kvirc/ui/KviHistoryWindow.cpp
index a3dbb337e..302265636 100644
--- a/src/kvirc/ui/KviHistoryWindow.cpp
+++ b/src/kvirc/ui/KviHistoryWindow.cpp
@@ -29,7 +29,6 @@
 #include "KviOptions.h"
 #include "KviInput.h"
 #include "KviInputHistory.h"
-#include "KviMircCntrl.h"
 
 #include <QEvent>
 #include <QMouseEvent>
diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp
index 2192b8a1a..342e054e7 100644
--- a/src/kvirc/ui/KviInputEditor.cpp
+++ b/src/kvirc/ui/KviInputEditor.cpp
@@ -37,7 +37,7 @@
 #include "KviKvsKernel.h"
 #include "KviLocale.h"
 #include "KviMdiManager.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviOptions.h"
 #include "KviPixmapUtils.h"
 #include "KviQString.h"
@@ -490,25 +490,25 @@ QChar KviInputEditor::getSubstituteChar(unsigned short uControlCode)
 {
 	switch(uControlCode)
 	{
-		case KviMircCntrl::Color:
+		case KviControlCodes::Color:
 			return QChar('K');
 			break;
-		case KviMircCntrl::Bold:
+		case KviControlCodes::Bold:
 			return QChar('B');
 			break;
-		case KviMircCntrl::Reset:
+		case KviControlCodes::Reset:
 			return QChar('O');
 			break;
-		case KviMircCntrl::Reverse:
+		case KviControlCodes::Reverse:
 			return QChar('R');
 			break;
-		case KviMircCntrl::Underline:
+		case KviControlCodes::Underline:
 			return QChar('U');
 			break;
-		case KviMircCntrl::CryptEscape:
+		case KviControlCodes::CryptEscape:
 			return QChar('P');
 			break;
-		case KviMircCntrl::Icon:
+		case KviControlCodes::Icon:
 			return QChar('I');
 			break;
 		default:
@@ -525,13 +525,13 @@ void KviInputEditor::extractNextBlock(int iIdx, QFontMetrics *fm, int iCurXPos,
 	QChar c = m_szTextBuffer[iIdx];
 
 	if((c.unicode() > 32) ||
-		((c != QChar(KviMircCntrl::Color)) &&
-		(c != QChar(KviMircCntrl::Bold)) &&
-		(c != QChar(KviMircCntrl::Underline)) &&
-		(c != QChar(KviMircCntrl::Reset)) &&
-		(c != QChar(KviMircCntrl::Reverse)) &&
-		(c != QChar(KviMircCntrl::CryptEscape)) &&
-		(c != QChar(KviMircCntrl::Icon))))
+		((c != QChar(KviControlCodes::Color)) &&
+		(c != QChar(KviControlCodes::Bold)) &&
+		(c != QChar(KviControlCodes::Underline)) &&
+		(c != QChar(KviControlCodes::Reset)) &&
+		(c != QChar(KviControlCodes::Reverse)) &&
+		(c != QChar(KviControlCodes::CryptEscape)) &&
+		(c != QChar(KviControlCodes::Icon))))
 	{
 		m_bControlBlock = false;
 		//Not a control code...run..
@@ -539,13 +539,13 @@ void KviInputEditor::extractNextBlock(int iIdx, QFontMetrics *fm, int iCurXPos,
 		{
 			c = m_szTextBuffer[iIdx];
 			if((c.unicode() > 32) ||
-				((c != QChar(KviMircCntrl::Color)) &&
-				(c != QChar(KviMircCntrl::Bold)) &&
-				(c != QChar(KviMircCntrl::Underline)) &&
-				(c != QChar(KviMircCntrl::Reset)) &&
-				(c != QChar(KviMircCntrl::Reverse)) &&
-				(c != QChar(KviMircCntrl::CryptEscape)) &&
-				(c != QChar(KviMircCntrl::Icon))))
+				((c != QChar(KviControlCodes::Color)) &&
+				(c != QChar(KviControlCodes::Bold)) &&
+				(c != QChar(KviControlCodes::Underline)) &&
+				(c != QChar(KviControlCodes::Reset)) &&
+				(c != QChar(KviControlCodes::Reverse)) &&
+				(c != QChar(KviControlCodes::CryptEscape)) &&
+				(c != QChar(KviControlCodes::Icon))))
 			{
 				m_iBlockLen++;
 				int iXxx = (c.unicode() < 256) ? KviInputEditor::g_iInputFontCharWidth[c.unicode()] : fm->width(c);
@@ -562,30 +562,30 @@ void KviInputEditor::extractNextBlock(int iIdx, QFontMetrics *fm, int iCurXPos,
 		//Control code
 		switch(c.unicode())
 		{
-			case KviMircCntrl::Bold:
+			case KviControlCodes::Bold:
 				m_bCurBold = ! m_bCurBold;
 				break;
-			case KviMircCntrl::Underline:
+			case KviControlCodes::Underline:
 				m_bCurUnderline = ! m_bCurUnderline;
 				break;
-			case KviMircCntrl::Reset:
+			case KviControlCodes::Reset:
 				m_iCurFore = KVI_INPUT_DEF_FORE;
 				m_iCurBack = KVI_INPUT_DEF_BACK;
 				m_bCurBold = false;
 				m_bCurUnderline = false;
 				break;
-			case KviMircCntrl::Reverse:
+			case KviControlCodes::Reverse:
 			{
 				char cAuxClr = m_iCurFore;
 				m_iCurFore  = m_iCurBack;
 				m_iCurBack  = cAuxClr;
 			}
 			break;
-			case KviMircCntrl::CryptEscape:
-			case KviMircCntrl::Icon:
+			case KviControlCodes::CryptEscape:
+			case KviControlCodes::Icon:
 				// makes a single block
 				break;
-			case KviMircCntrl::Color:
+			case KviControlCodes::Color:
 			{
 				iIdx++;
 				if(iIdx >= ((int)(m_szTextBuffer.length())))
@@ -593,11 +593,11 @@ void KviInputEditor::extractNextBlock(int iIdx, QFontMetrics *fm, int iCurXPos,
 
 				unsigned char uFore;
 				unsigned char uBack;
-				iIdx = getUnicodeColorBytes(m_szTextBuffer,iIdx,&uFore,&uBack);
-				if(uFore != KviMircCntrl::NoChange)
+				iIdx = KviControlCodes::getUnicodeColorBytes(m_szTextBuffer,iIdx,&uFore,&uBack);
+				if(uFore != KviControlCodes::NoChange)
 				{
 					m_iCurFore = uFore;
-					if(uBack != KviMircCntrl::NoChange)
+					if(uBack != KviControlCodes::NoChange)
 						m_iCurBack = uBack;
 				} else {
 					// ONLY a CTRL+K
@@ -624,36 +624,36 @@ void KviInputEditor::runUpToTheFirstVisibleChar()
 		{
 			switch(uChar)
 			{
-				case KviMircCntrl::Bold:
+				case KviControlCodes::Bold:
 					m_bCurBold = ! m_bCurBold;
 					break;
-				case KviMircCntrl::Underline:
+				case KviControlCodes::Underline:
 					m_bCurUnderline = ! m_bCurUnderline;
 					break;
-				case KviMircCntrl::Reset:
+				case KviControlCodes::Reset:
 					m_iCurFore = KVI_INPUT_DEF_FORE;
 					m_iCurBack = KVI_INPUT_DEF_BACK;
 					m_bCurBold = false;
 					m_bCurUnderline = false;
 					break;
-				case KviMircCntrl::Reverse:
+				case KviControlCodes::Reverse:
 				{
 					char cAuxClr = m_iCurFore;
 					m_iCurFore = m_iCurBack;
 					m_iCurBack = cAuxClr;
 				}
 				break;
-				case KviMircCntrl::Color:
+				case KviControlCodes::Color:
 				{
 					iIdx++;
 					if(iIdx >= ((int)(m_szTextBuffer.length())))return;
 					unsigned char uFore;
 					unsigned char uBack;
-					iIdx = getUnicodeColorBytes(m_szTextBuffer,iIdx,&uFore,&uBack);
+					iIdx = KviControlCodes::getUnicodeColorBytes(m_szTextBuffer,iIdx,&uFore,&uBack);
 					iIdx--;
-					if(uFore != KviMircCntrl::NoChange) m_iCurFore = uFore;
+					if(uFore != KviControlCodes::NoChange) m_iCurFore = uFore;
 					else m_iCurFore = KVI_INPUT_DEF_FORE;
-					if(uBack != KviMircCntrl::NoChange) m_iCurBack = uBack;
+					if(uBack != KviControlCodes::NoChange) m_iCurBack = uBack;
 					else m_iCurBack = KVI_INPUT_DEF_BACK;
 				}
 				break;
@@ -853,7 +853,7 @@ void KviInputEditor::iconPopupActivated(int iId)
 		QString szText = m_pIconMenu->text(iId);
 		if(!szText.isEmpty())
 		{
-			szText.prepend(KviMircCntrl::Icon);
+			szText.prepend(KviControlCodes::Icon);
 			szText.append(' ');
 			insertText(szText);
 		}
@@ -964,7 +964,7 @@ void KviInputEditor::insertText(const QString & szTxt)
 			if(iIdx != -1)
 			{
 				szBlock = szText.left(iIdx);
-				//else szBlock = QChar(KviMircCntrl::Reset);
+				//else szBlock = QChar(KviControlCodes::Reset);
 				szText.remove(0,iIdx+1);
 			} else {
 				szBlock = szText;
@@ -2181,34 +2181,34 @@ void KviInputEditor::nextWordSelection()
 
 void KviInputEditor::insertBold()
 {
-	if(!m_bReadOnly) insertChar(KviMircCntrl::Bold);
+	if(!m_bReadOnly) insertChar(KviControlCodes::Bold);
 }
 
 void KviInputEditor::insertReset()
 {
-	if(!m_bReadOnly) insertChar(KviMircCntrl::Reset);
+	if(!m_bReadOnly) insertChar(KviControlCodes::Reset);
 }
 
 void KviInputEditor::insertUnderline()
 {
-	if(!m_bReadOnly) insertChar(KviMircCntrl::Underline);
+	if(!m_bReadOnly) insertChar(KviControlCodes::Underline);
 }
 
 void KviInputEditor::insertReverse()
 {
-	if(!m_bReadOnly) insertChar(KviMircCntrl::Reverse);
+	if(!m_bReadOnly) insertChar(KviControlCodes::Reverse);
 }
 
 void KviInputEditor::insertPlainText()
 {
-	if(!m_bReadOnly) insertChar(KviMircCntrl::CryptEscape); // DO NOT CRYPT THIS STUFF
+	if(!m_bReadOnly) insertChar(KviControlCodes::CryptEscape); // DO NOT CRYPT THIS STUFF
 }
 
 void KviInputEditor::insertIcon()
 {
 	if(!m_bReadOnly)
 	{
-		insertChar(KviMircCntrl::Icon); // THE NEXT WORD IS AN ICON NAME
+		insertChar(KviControlCodes::Icon); // THE NEXT WORD IS AN ICON NAME
 		int iXPos = xPositionFromCharIndex(m_iCursorPosition);
 		if(iXPos > 24)
 			iXPos-=24;
@@ -2226,7 +2226,7 @@ void KviInputEditor::insertColor()
 {
 	if(!m_bReadOnly)
 	{
-		insertChar(KviMircCntrl::Color);
+		insertChar(KviControlCodes::Color);
 		int xPos = xPositionFromCharIndex(m_iCursorPosition);
 		if(xPos > 24)xPos-=24;
 		if(!g_pColorWindow)g_pColorWindow = new KviColorWindow();
diff --git a/src/kvirc/ui/KviIrcView.cpp b/src/kvirc/ui/KviIrcView.cpp
index 34ba11f5b..f0d04f7dd 100644
--- a/src/kvirc/ui/KviIrcView.cpp
+++ b/src/kvirc/ui/KviIrcView.cpp
@@ -78,7 +78,7 @@
 #include "KviApplication.h"
 #include "kvi_settings.h"
 #include "KviOptions.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "kvi_defaults.h"
 #include "KviWindow.h"
 #include "KviLocale.h"
@@ -343,9 +343,9 @@ static inline void delete_text_line(KviIrcViewLine * line,QHash<KviIrcViewLine*,
 	}
 	for(unsigned int i=0;i<line->uChunkCount;i++)
 	{
-		if((line->pChunks[i].type == KviMircCntrl::Escape) || (line->pChunks[i].type == KviMircCntrl::Icon))
+		if((line->pChunks[i].type == KviControlCodes::Escape) || (line->pChunks[i].type == KviControlCodes::Icon))
 		{
-			if((line->pChunks[i].type == KviMircCntrl::Icon) && (line->pChunks[i].szPayload!=line->pChunks[i].szSmileId))
+			if((line->pChunks[i].type == KviControlCodes::Icon) && (line->pChunks[i].szPayload!=line->pChunks[i].szSmileId))
 				KviMemory::free(line->pChunks[i].szSmileId);
 			KviMemory::free(line->pChunks[i].szPayload);
 		}
@@ -1152,7 +1152,7 @@ void KviIrcView::paintEvent(QPaintEvent *p)
 		char defaultFore  = pCurTextLine->pBlocks->pChunk->colors.fore;
 		bool curBold      = false;
 		bool curUnderline = false;
-		char foreBeforeEscape = KviMircCntrl::Black;
+		char foreBeforeEscape = KviControlCodes::Black;
 		bool curLink      = false;
 		bool bacWasTransp = false;
 		char curFore      = defaultFore;
@@ -1175,11 +1175,11 @@ void KviIrcView::paintEvent(QPaintEvent *p)
 				//normal block
 				switch(block->pChunk->type)
 				{
-					case KviMircCntrl::Color:
-						if(block->pChunk->colors.fore != KviMircCntrl::NoChange)
+					case KviControlCodes::Color:
+						if(block->pChunk->colors.fore != KviControlCodes::NoChange)
 						{
 							curFore = block->pChunk->colors.fore;
-							if(block->pChunk->colors.back != KviMircCntrl::NoChange)
+							if(block->pChunk->colors.back != KviControlCodes::NoChange)
 								curBack = block->pChunk->colors.back;
 						} else {
 							/*
@@ -1190,47 +1190,47 @@ void KviIrcView::paintEvent(QPaintEvent *p)
 							curBack = defaultBack;
 						}
 						break;
-					case KviMircCntrl::Escape:
+					case KviControlCodes::Escape:
 						foreBeforeEscape      = curFore;
-						if(block->pChunk->colors.fore != KviMircCntrl::NoChange)
+						if(block->pChunk->colors.fore != KviControlCodes::NoChange)
 							curFore = block->pChunk->colors.fore;
 						if(m_pLastLinkUnderMouse == block)curLink = true;
 						break;
-					case KviMircCntrl::UnEscape:
+					case KviControlCodes::UnEscape:
 						curLink            = false;
 						curFore            = foreBeforeEscape;
 						break;
-					case KviMircCntrl::Bold:
+					case KviControlCodes::Bold:
 						curBold            = !curBold;
 						break;
-					case KviMircCntrl::Underline:
+					case KviControlCodes::Underline:
 						curUnderline       = !curUnderline;
 						break;
-					case KviMircCntrl::Reset:
+					case KviControlCodes::Reset:
 						curBold            = false;
 						curUnderline       = false;
 						curFore            = defaultFore;
 						curBack            = defaultBack;
 						break;
-					case KviMircCntrl::Reverse:
+					case KviControlCodes::Reverse:
 						//this should be "reversed colors"
 						char aux       = curBack;
 						if(bacWasTransp == true)
 						{
-							curBack = KviMircCntrl::Transparent;
+							curBack = KviControlCodes::Transparent;
 						} else {
 							curBack = curFore;
 						}
-						if(aux == KviMircCntrl::Transparent)
+						if(aux == KviControlCodes::Transparent)
 						{
 							curFore = (char)KVI_DEF_BACK;
 						} else {
 							curFore = aux;
 						}
-						bacWasTransp = (aux == KviMircCntrl::Transparent);
+						bacWasTransp = (aux == KviControlCodes::Transparent);
 						break;
-					//case KviMircCntrl::Icon:
-					//case KviMircCntrl::UnIcon:
+					//case KviControlCodes::Icon:
+					//case KviControlCodes::UnIcon:
 						// does nothing
 						//qDebug("Have a block with ICON/UNICON attr");
 						//break;
@@ -1305,7 +1305,7 @@ void KviIrcView::paintEvent(QPaintEvent *p)
 
 #define DRAW_NORMAL_TEXT(_text_str,_text_idx,_text_len,_text_width) \
 	SET_PEN(curFore,block->pChunk ? block->pChunk->customFore : QColor()); \
-	if(curBack != KviMircCntrl::Transparent){ \
+	if(curBack != KviControlCodes::Transparent){ \
 		int theWdth = _text_width; \
 		if(theWdth < 0) \
 			theWdth=width()-(curLeftCoord+KVI_IRCVIEW_HORIZONTAL_BORDER+scrollbarWidth); \
@@ -1379,7 +1379,7 @@ void KviIrcView::paintEvent(QPaintEvent *p)
 						break;
 					}
 				} else {
-					if(block->pChunk && block->pChunk->type == KviMircCntrl::Icon)
+					if(block->pChunk && block->pChunk->type == KviControlCodes::Icon)
 						goto no_selection_paint;
 					int wdth = block->block_width;
 					if(wdth == 0)
@@ -1400,14 +1400,14 @@ void KviIrcView::paintEvent(QPaintEvent *p)
 			} else {
 				//No selection ...go fast!
 no_selection_paint:
-				if(block->pChunk && block->pChunk->type == KviMircCntrl::Icon)
+				if(block->pChunk && block->pChunk->type == KviControlCodes::Icon)
 				{
 					int wdth = block->block_width;
 					if(wdth < 0)
 						wdth = widgetWidth - (curLeftCoord + KVI_IRCVIEW_HORIZONTAL_BORDER);
 					int imageYPos = curBottomCoord - m_iRelativePixmapY;
 					//Set the mask if needed
-					if(curBack != KviMircCntrl::Transparent && curBack < 16)
+					if(curBack != KviControlCodes::Transparent && curBack < 16)
 					{
 						pa.fillRect(curLeftCoord,curBottomCoord - m_iFontLineSpacing + m_iFontDescent,wdth,m_iFontLineSpacing,KVI_OPTION_MIRCCOLOR((unsigned char)curBack));
 					}
@@ -1442,7 +1442,7 @@ no_selection_paint:
 
 					SET_PEN(curFore,block->pChunk ? block->pChunk->customFore : QColor());
 
-					if(curBack != KviMircCntrl::Transparent && curBack < 16 )
+					if(curBack != KviControlCodes::Transparent && curBack < 16 )
 					{
 						pa.fillRect(curLeftCoord,curBottomCoord - m_iFontLineSpacing + m_iFontDescent,wdth,m_iFontLineSpacing,KVI_OPTION_MIRCCOLOR((unsigned char)curBack));
 					}
@@ -1638,7 +1638,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth)
 		int curBlockLen   = 0;
 		int curBlockWidth = 0;
 
-		if(ptr->pChunks[curAttrBlock].type == KviMircCntrl::Icon)
+		if(ptr->pChunks[curAttrBlock].type == KviControlCodes::Icon)
 		{
 			curBlockWidth = m_iIconWidth;
 		} else {
@@ -1698,7 +1698,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth)
 		if(curBlockLen == 0)
 		{
 			// ran up to the beginning of the block....
-			if(ptr->pChunks[curAttrBlock].type == KviMircCntrl::Icon)
+			if(ptr->pChunks[curAttrBlock].type == KviControlCodes::Icon)
 			{
 				// FIXME what if the icon curBlockWidth is > maxWidth ? => endless loop
 				// This is an icon block: needs to be wrapped differently:
@@ -1796,7 +1796,7 @@ bool KviIrcView::checkSelectionBlock(KviIrcViewLine * line,int bufIndex)
 	//line is between the first selected line and the last selected one
 	if(line->uIndex > init->uIndex && line->uIndex < end->uIndex)
 	{
-		if(line->pBlocks[bufIndex].pChunk && line->pBlocks[bufIndex].pChunk->type == KviMircCntrl::Icon)
+		if(line->pBlocks[bufIndex].pChunk && line->pBlocks[bufIndex].pChunk->type == KviControlCodes::Icon)
 			m_pWrappedBlockSelectionInfo->selection_type = KVI_IRCVIEW_BLOCK_SELECTION_ICON;
 		else
 			m_pWrappedBlockSelectionInfo->selection_type = KVI_IRCVIEW_BLOCK_SELECTION_TOTAL;
@@ -1823,7 +1823,7 @@ bool KviIrcView::checkSelectionBlock(KviIrcViewLine * line,int bufIndex)
 		if(line->pBlocks[bufIndex].block_start + line->pBlocks[bufIndex].block_len < initChar) return false;
 
 		//checks if this is an icon block
-		if(line->pBlocks[bufIndex].pChunk && line->pBlocks[bufIndex].pChunk->type == KviMircCntrl::Icon)
+		if(line->pBlocks[bufIndex].pChunk && line->pBlocks[bufIndex].pChunk->type == KviControlCodes::Icon)
 		{
 			m_pWrappedBlockSelectionInfo->selection_type = KVI_IRCVIEW_BLOCK_SELECTION_ICON;
 			return true;
@@ -1908,7 +1908,7 @@ bool KviIrcView::checkSelectionBlock(KviIrcViewLine * line,int bufIndex)
 			initChar=m_iSelectionEndCharIndex;
 		}
 		//icon chunk
-		if(line->pBlocks[bufIndex].pChunk && line->pBlocks[bufIndex].pChunk->type == KviMircCntrl::Icon)
+		if(line->pBlocks[bufIndex].pChunk && line->pBlocks[bufIndex].pChunk->type == KviControlCodes::Icon)
 		{
 			m_pWrappedBlockSelectionInfo->selection_type = KVI_IRCVIEW_BLOCK_SELECTION_ICON;
 			return true;
@@ -1953,7 +1953,7 @@ bool KviIrcView::checkSelectionBlock(KviIrcViewLine * line,int bufIndex)
 		}
 
 		//icon chunk
-		if(line->pBlocks[bufIndex].pChunk && line->pBlocks[bufIndex].pChunk->type == KviMircCntrl::Icon)
+		if(line->pBlocks[bufIndex].pChunk && line->pBlocks[bufIndex].pChunk->type == KviControlCodes::Icon)
 		{
 			m_pWrappedBlockSelectionInfo->selection_type = KVI_IRCVIEW_BLOCK_SELECTION_ICON;
 			return true;
@@ -2552,14 +2552,14 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect *
 						if(i >= l->iBlockCount) break;
 						//we try to save the position of the last "text escape" tag we find
 						if(l->pBlocks[i].pChunk)
-							if(l->pBlocks[i].pChunk->type == KviMircCntrl::Escape)
+							if(l->pBlocks[i].pChunk->type == KviControlCodes::Escape)
 							{
 								iLastEscapeBlock=i;
 								iLastEscapeBlockTop=iTop;
 							}
 						//we reset the position of the last "text escape" tag if we find a "unescape"
 						if(l->pBlocks[i].pChunk)
-							if(l->pBlocks[i].pChunk->type == KviMircCntrl::UnEscape) iLastEscapeBlock=-1;
+							if(l->pBlocks[i].pChunk->type == KviControlCodes::UnEscape) iLastEscapeBlock=-1;
 
 						i++;
 					}
@@ -2589,14 +2589,14 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect *
 						return 0;
 					//we try to save the position of the last "text escape" tag we find
 					if(l->pBlocks[i].pChunk)
-						if(l->pBlocks[i].pChunk->type == KviMircCntrl::Escape)
+						if(l->pBlocks[i].pChunk->type == KviControlCodes::Escape)
 						{
 							iLastEscapeBlock=i;
 							iLastEscapeBlockTop=iTop;
 						}
 					//we reset the position of the last "text escape" tag if we find a "unescape"
 					if(l->pBlocks[i].pChunk)
-						if(l->pBlocks[i].pChunk->type == KviMircCntrl::UnEscape) iLastEscapeBlock=-1;
+						if(l->pBlocks[i].pChunk->type == KviControlCodes::UnEscape) iLastEscapeBlock=-1;
 					// if the block width is > 0, update iLeft
 					if(l->pBlocks[i].block_width > 0)
 					{
@@ -2642,7 +2642,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect *
 							for(k = iLastEscapeBlock;; k++)
 							{
 								if(l->pBlocks[k].pChunk)
-									if(l->pBlocks[k].pChunk->type != KviMircCntrl::UnEscape)
+									if(l->pBlocks[k].pChunk->type != KviControlCodes::UnEscape)
 										iRightBorder+=l->pBlocks[k].block_width;
 									else
 										break;
@@ -2673,23 +2673,23 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect *
 								{
 									if(l->pBlocks[iEndOfLInk].pChunk)
 									{
-										if(l->pBlocks[iEndOfLInk].pChunk->type != KviMircCntrl::UnEscape)
+										if(l->pBlocks[iEndOfLInk].pChunk->type != KviControlCodes::UnEscape)
 										{
 											switch(l->pBlocks[iEndOfLInk].pChunk->type)
 											{
-												case KviMircCntrl::Bold:
-												case KviMircCntrl::Underline:
-												case KviMircCntrl::Reverse:
-												case KviMircCntrl::Reset:
+												case KviControlCodes::Bold:
+												case KviControlCodes::Underline:
+												case KviControlCodes::Reverse:
+												case KviControlCodes::Reset:
 													szLink.append(QChar(l->pBlocks[iEndOfLInk].pChunk->type));
 												break;
-												case KviMircCntrl::Color:
-													szLink.append(QChar(KviMircCntrl::Color));
-													if(l->pBlocks[iEndOfLInk].pChunk->colors.fore != KviMircCntrl::NoChange)
+												case KviControlCodes::Color:
+													szLink.append(QChar(KviControlCodes::Color));
+													if(l->pBlocks[iEndOfLInk].pChunk->colors.fore != KviControlCodes::NoChange)
 													{
 														szLink.append(QString("%1").arg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.fore)));
 													}
-													if(l->pBlocks[iEndOfLInk].pChunk->colors.back != KviMircCntrl::NoChange)
+													if(l->pBlocks[iEndOfLInk].pChunk->colors.back != KviControlCodes::NoChange)
 													{
 														szLink.append(QChar(','));
 														szLink.append(QString("%1").arg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.back)));
@@ -2716,7 +2716,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect *
 							}
 							return &(l->pBlocks[iLastEscapeBlock]);
 						}
-						if(l->pBlocks[i].pChunk->type == KviMircCntrl::Icon)
+						if(l->pBlocks[i].pChunk->type == KviControlCodes::Icon)
 						{
 							if(pRect)
 							{
diff --git a/src/kvirc/ui/KviIrcView_events.cpp b/src/kvirc/ui/KviIrcView_events.cpp
index c99043a8c..39ff910e4 100644
--- a/src/kvirc/ui/KviIrcView_events.cpp
+++ b/src/kvirc/ui/KviIrcView_events.cpp
@@ -35,7 +35,7 @@
 #include "KviIrcView_private.h"
 #include "KviIrcView_tools.h"
 #include "KviLocale.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviOptions.h"
 #include "kvi_out.h"
 #include "KviTopicWidget.h"
@@ -419,20 +419,20 @@ void KviIrcView::addControlCharacter(KviIrcViewLineChunk *pC, QString & szSelect
 {
 	switch(pC->type)
 	{
-		case KviMircCntrl::Bold:
-		case KviMircCntrl::Underline:
-		case KviMircCntrl::Reverse:
-		case KviMircCntrl::Reset:
+		case KviControlCodes::Bold:
+		case KviControlCodes::Underline:
+		case KviControlCodes::Reverse:
+		case KviControlCodes::Reset:
 			szSelectionText.append(QChar(pC->type));
 		break;
-		case KviMircCntrl::Color:
+		case KviControlCodes::Color:
 			szSelectionText.append(QChar(pC->type));
-			if((pC->colors.fore != KviMircCntrl::NoChange) && (pC->colors.fore != KviMircCntrl::Transparent))
+			if((pC->colors.fore != KviControlCodes::NoChange) && (pC->colors.fore != KviControlCodes::Transparent))
 			{
 				if(pC->colors.fore > 9)szSelectionText.append(QChar('1'));
 				szSelectionText.append(QChar((pC->colors.fore%10)+'0'));
 			}
-			if((pC->colors.back != KviMircCntrl::NoChange) && (pC->colors.back != KviMircCntrl::Transparent) )
+			if((pC->colors.back != KviControlCodes::NoChange) && (pC->colors.back != KviControlCodes::Transparent) )
 			{
 				szSelectionText.append(QChar(','));
 				if(pC->colors.back > 9)szSelectionText.append(QChar('1'));
@@ -969,7 +969,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe
 				{
 					QString chanMode;
 					c->getChannelModeString(chanMode);
-					QString topic = KviMircCntrl::stripControlBytes(c->topicWidget()->topic());
+					QString topic = KviControlCodes::stripControlBytes(c->topicWidget()->topic());
 					topic.replace("<","&lt;");
 					topic.replace(">","&gt;");
 					KviIrcUrl::join(szUrl,console()->connection()->target()->server());
diff --git a/src/kvirc/ui/KviIrcView_getTextLine.cpp b/src/kvirc/ui/KviIrcView_getTextLine.cpp
index a5d74ff2a..79191453b 100644
--- a/src/kvirc/ui/KviIrcView_getTextLine.cpp
+++ b/src/kvirc/ui/KviIrcView_getTextLine.cpp
@@ -32,7 +32,7 @@
 #include "KviKvsEventTriggers.h"
 #include "KviMemory.h"
 #include "KviMemory.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviOptions.h"
 #include "kvi_out.h"
 #include "KviTextIconManager.h"
@@ -183,7 +183,7 @@ const kvi_wchar_t * KviIrcView::getTextLine(
 	line_ptr->uChunkCount = 1;
 	line_ptr->pChunks = (KviIrcViewLineChunk *)KviMemory::allocate(sizeof(KviIrcViewLineChunk));
 	//And fill it up
-	line_ptr->pChunks[0].type = KviMircCntrl::Color;
+	line_ptr->pChunks[0].type = KviControlCodes::Color;
 	line_ptr->pChunks[0].iTextStart = 0;
 	line_ptr->pChunks[0].colors.back = KVI_OPTION_MSGTYPE(iMsgType).back();
 	line_ptr->pChunks[0].colors.fore = KVI_OPTION_MSGTYPE(iMsgType).fore();
@@ -208,13 +208,13 @@ const kvi_wchar_t * KviIrcView::getTextLine(
 			line_ptr->uChunkCount=3;
 			line_ptr->pChunks=(KviIrcViewLineChunk *)KviMemory::reallocate((void *)line_ptr->pChunks,3 * sizeof(KviIrcViewLineChunk));
 
-			line_ptr->pChunks[1].type = KviMircCntrl::Color;
+			line_ptr->pChunks[1].type = KviControlCodes::Color;
 			line_ptr->pChunks[1].iTextStart = 0;
 			line_ptr->pChunks[1].iTextLen = iTimeStampLength-1;
 			line_ptr->pChunks[1].colors.back = KVI_OPTION_UINT(KviOption_uintTimeStampBackground);
 			line_ptr->pChunks[1].colors.fore = KVI_OPTION_UINT(KviOption_uintTimeStampForeground);
 
-			line_ptr->pChunks[2].type = KviMircCntrl::Color;
+			line_ptr->pChunks[2].type = KviControlCodes::Color;
 			line_ptr->pChunks[2].iTextStart = iTimeStampLength-1;
 			line_ptr->pChunks[2].iTextLen = 1;
 			line_ptr->pChunks[2].colors.back = KVI_OPTION_MSGTYPE(iMsgType).back();
@@ -515,7 +515,7 @@ found_end_of_buffer:
 			if(pUnEscapeAt)
 			{
 				// empty unescape block needed
-				NEW_LINE_CHUNK(KviMircCntrl::UnEscape);
+				NEW_LINE_CHUNK(KviControlCodes::UnEscape);
 				// no need to append more data
 			}
 			return p;
@@ -529,7 +529,7 @@ found_end_of_line:
 			if(pUnEscapeAt)
 			{
 				// empty unescape block needed
-				NEW_LINE_CHUNK(KviMircCntrl::UnEscape);
+				NEW_LINE_CHUNK(KviControlCodes::UnEscape);
 				// no need to append more data
 			}
 			// terminate the string
@@ -547,7 +547,7 @@ found_command_escape:
 			{
 				// This is the terminator of an escape
 				APPEND_LAST_TEXT_BLOCK(data_ptr,p - data_ptr);
-				NEW_LINE_CHUNK(KviMircCntrl::UnEscape);
+				NEW_LINE_CHUNK(KviControlCodes::UnEscape);
 				pUnEscapeAt = 0;
 				p++;
 				data_ptr=p;
@@ -580,7 +580,7 @@ found_command_escape:
 						//  \r!    ... \r ...    \r
 						//   ^p         ^next_cr  ^term_cr
 						APPEND_LAST_TEXT_BLOCK(data_ptr,p - data_ptr)
-						NEW_LINE_CHUNK(KviMircCntrl::Escape)
+						NEW_LINE_CHUNK(KviControlCodes::Escape)
 
 						p+=2; //point after \r!
 
@@ -618,7 +618,7 @@ found_command_escape:
 							}
 						}
 						if(!bColorSet)
-							line_ptr->pChunks[iCurChunk].colors.fore=KviMircCntrl::NoChange;
+							line_ptr->pChunks[iCurChunk].colors.fore=KviControlCodes::NoChange;
 
 #if 0
 						APPEND_LAST_TEXT_BLOCK(next_cr,term_cr - next_cr)
@@ -638,7 +638,7 @@ found_command_escape:
 				}
 			}
 			break;
-		case KviMircCntrl::Color:
+		case KviControlCodes::Color:
 #ifdef COMPILE_USE_DYNAMIC_LABELS
 found_color_escape:
 #endif //COMPILE_USE_DYNAMIC_LABELS
@@ -646,11 +646,10 @@ found_color_escape:
 			APPEND_LAST_TEXT_BLOCK(data_ptr,p - data_ptr)
 			NEW_LINE_CHUNK(*p)
 			p++;
-			p=getColorBytesW(p,&(line_ptr->pChunks[iCurChunk].colors.fore),
-							&(line_ptr->pChunks[iCurChunk].colors.back));
+			p = KviControlCodes::getColorBytesW(p,&(line_ptr->pChunks[iCurChunk].colors.fore),&(line_ptr->pChunks[iCurChunk].colors.back));
 			data_ptr=p;
 			break;
-		case KviMircCntrl::Icon:
+		case KviControlCodes::Icon:
 #ifdef COMPILE_USE_DYNAMIC_LABELS
 found_icon_escape:
 #endif //COMPILE_USE_DYNAMIC_LABELS
@@ -677,7 +676,7 @@ found_icon_escape:
 					if(icon)
 					{
 						APPEND_LAST_TEXT_BLOCK(data_ptr,beginPtr - data_ptr)
-						NEW_LINE_CHUNK(KviMircCntrl::Icon)
+						NEW_LINE_CHUNK(KviControlCodes::Icon)
 						line_ptr->pChunks[iCurChunk].szPayload = (kvi_wchar_t *)KviMemory::allocate((datalen + 1) * sizeof(kvi_wchar_t));
 						KviMemory::copy((void *)(line_ptr->pChunks[iCurChunk].szPayload),icon_name,datalen * sizeof(kvi_wchar_t));
 						line_ptr->pChunks[iCurChunk].szPayload[datalen] = 0;
@@ -693,15 +692,15 @@ found_icon_escape:
 							m_hAnimatedSmiles.insert(line_ptr,icon->animatedPixmap());
 						}
 						data_ptr = p;
-						NEW_LINE_CHUNK(KviMircCntrl::UnIcon)
+						NEW_LINE_CHUNK(KviControlCodes::UnIcon)
 					}
 				}
 			}
 			break;
-		case KviMircCntrl::Bold:
-		case KviMircCntrl::Underline:
-		case KviMircCntrl::Reverse:
-		case KviMircCntrl::Reset:
+		case KviControlCodes::Bold:
+		case KviControlCodes::Underline:
+		case KviControlCodes::Reverse:
+		case KviControlCodes::Reset:
 #ifdef COMPILE_USE_DYNAMIC_LABELS
 found_mirc_escape:
 #endif //COMPILE_USE_DYNAMIC_LABELS
@@ -962,7 +961,7 @@ got_url:
 		//valid: append all the text before the start of the url tag
 		APPEND_LAST_TEXT_BLOCK(data_ptr,p - data_ptr)
 		//create a new chunk
-		NEW_LINE_CHUNK(KviMircCntrl::Escape)
+		NEW_LINE_CHUNK(KviControlCodes::Escape)
 // FIXME: #warning "Option for the URL escape...double click and right button!!!"
 
 		//	int urlLen = KVI_OPTION_STRING(KviOption_stringUrlLinkCommand).len() + 1;
@@ -988,7 +987,7 @@ got_url:
 
 		//add all the text till the end of the url, then create a new "clean" chunk for the next cycle loop
 		APPEND_LAST_TEXT_BLOCK(data_ptr,p - data_ptr)
-		NEW_LINE_CHUNK(KviMircCntrl::UnEscape)
+		NEW_LINE_CHUNK(KviControlCodes::UnEscape)
 
 	}
 	//update the value of the main counter, then restart the loop
@@ -1090,7 +1089,7 @@ check_emoticon_char:
 						// we got an icon for this emoticon
 						// the tooltip will carry the original emoticon source text
 						APPEND_LAST_TEXT_BLOCK(data_ptr,begin - data_ptr)
-						NEW_LINE_CHUNK(KviMircCntrl::Icon)
+						NEW_LINE_CHUNK(KviControlCodes::Icon)
 
 						int emolen = p - begin;
 						int reallen=item2 ? 3 : 2;
@@ -1109,7 +1108,7 @@ check_emoticon_char:
 						item++;
 						while(count > 0)
 						{
-							NEW_LINE_CHUNK(KviMircCntrl::Icon)
+							NEW_LINE_CHUNK(KviControlCodes::Icon)
 							line_ptr->pChunks[iCurChunk].szPayload = (kvi_wchar_t *)KviMemory::allocate((emolen + 1) * sizeof(kvi_wchar_t));
 							KviMemory::copy(line_ptr->pChunks[iCurChunk].szPayload,begin,emolen * sizeof(kvi_wchar_t));
 							line_ptr->pChunks[iCurChunk].szPayload[emolen] = 0;
@@ -1121,7 +1120,7 @@ check_emoticon_char:
 							APPEND_ZERO_LENGTH_BLOCK(data_ptr)
 							count--;
 						}
-						NEW_LINE_CHUNK(KviMircCntrl::UnIcon)
+						NEW_LINE_CHUNK(KviControlCodes::UnIcon)
 					} // we don't even need to skip back... the text eventually parsed is ok to be in a single block for sure
 				} // we don't even need to skip back... the text eventually parsed is ok to be in a single block for sure
 			} // we don't even need to skip back... the text eventually parsed is ok to be in a single block for sure
diff --git a/src/kvirc/ui/KviQueryWindow.cpp b/src/kvirc/ui/KviQueryWindow.cpp
index aa6a493d4..f7d4f3181 100644
--- a/src/kvirc/ui/KviQueryWindow.cpp
+++ b/src/kvirc/ui/KviQueryWindow.cpp
@@ -33,7 +33,7 @@
 #include "KviLocale.h"
 #include "KviIrcSocket.h"
 #include "KviConfigurationFile.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "kvi_settings.h"
 #include "KviThemedLabel.h"
 #include "KviUserAction.h"
@@ -42,7 +42,7 @@
 #include "KviIrcConnectionUserInfo.h"
 #include "KviIrcServerParser.h"
 #include "KviIrcUserDataBase.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviWindowToolWidget.h"
 #include "KviKvsEventTriggers.h"
 #include "KviTalHBox.h"
@@ -176,7 +176,7 @@ QString KviQueryWindow::getInfoLabelTipText()
 			szText +=          "<tr><td>";
 
 			if(pEntry->hasRealName())
-				szTmp = __tr2qs("%1 is %2 (%3)").arg(m_szName, szMask, KviMircCntrl::stripControlBytes(pEntry->realName()));
+				szTmp = __tr2qs("%1 is %2 (%3)").arg(m_szName, szMask, KviControlCodes::stripControlBytes(pEntry->realName()));
 			else
 				szTmp = __tr2qs("%1 is %2").arg(m_szName, szMask);
 
@@ -249,7 +249,7 @@ QString KviQueryWindow::getInfoLabelText()
 					szMask += "*";
 
 				if(pEntry->hasRealName())
-					szTmp = __tr2qs("Query with %1!%2 (%3)").arg(m_szName, szMask, KviMircCntrl::stripControlBytes(pEntry->realName()));
+					szTmp = __tr2qs("Query with %1!%2 (%3)").arg(m_szName, szMask, KviControlCodes::stripControlBytes(pEntry->realName()));
 				else
 					szTmp = __tr2qs("Query with %1!%2").arg(m_szName, szMask);
 
@@ -607,7 +607,7 @@ void KviQueryWindow::ownMessage(const QString & szBuffer, bool bUserFeedback)
 	{
 		if(cryptSessionInfo()->m_bDoEncrypt)
 		{
-			if(*pcData != KviMircCntrl::CryptEscape)
+			if(*pcData != KviControlCodes::CryptEscape)
 			{
 				KviCString szEncrypted;
 				cryptSessionInfo()->m_pEngine->setMaxEncryptLen(500 - szName.length());
@@ -761,7 +761,7 @@ void KviQueryWindow::ownAction(const QString & szBuffer)
 		QString szTmpBuffer;
 		//see bug ticket #220
 		if(KVI_OPTION_BOOL(KviOption_boolStripMircColorsInUserMessages))
-			szTmpBuffer = KviMircCntrl::stripControlBytes(szBuffer);
+			szTmpBuffer = KviControlCodes::stripControlBytes(szBuffer);
 		else
 			szTmpBuffer = szBuffer;
 
diff --git a/src/kvirc/ui/KviSelectors.cpp b/src/kvirc/ui/KviSelectors.cpp
index 992e58b78..7a8b6e327 100644
--- a/src/kvirc/ui/KviSelectors.cpp
+++ b/src/kvirc/ui/KviSelectors.cpp
@@ -28,7 +28,7 @@
 #include "KviSelectors.h"
 #include "KviLocale.h"
 #include "KviOptions.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviFileDialog.h"
 #include "KviKvsScript.h"
 #include "KviTalPopupMenu.h"
@@ -722,7 +722,7 @@ KviMircTextColorSelector::KviMircTextColorSelector(QWidget * par,const QString &
 	m_pBackPopup = new KviTalPopupMenu(this);
 	connect(m_pBackPopup,SIGNAL(activated(int)),this,SLOT(backSelected(int)));
 	i = m_pBackPopup->insertItem(__tr2qs("Transparent"));
-	m_pBackPopup->setItemParameter(i,KviMircCntrl::Transparent);
+	m_pBackPopup->setItemParameter(i,KviControlCodes::Transparent);
 	for(i=0;i<KVI_MIRCCOLOR_MAX_BACKGROUND;i++)
 	{
 		QPixmap tmp(120,16);
@@ -756,8 +756,8 @@ void KviMircTextColorSelector::setButtonPalette()
 
 	if(m_uBack > KVI_MIRCCOLOR_MAX_BACKGROUND)
 	{
-		if(m_uBack != KviMircCntrl::Transparent)
-			m_uBack = KviMircCntrl::Transparent;
+		if(m_uBack != KviControlCodes::Transparent)
+			m_uBack = KviControlCodes::Transparent;
 		pal = palette();
 	} else {
 		pal = QPalette(KVI_OPTION_MIRCCOLOR(m_uBack));
diff --git a/src/kvirc/ui/KviTextIconWindow.cpp b/src/kvirc/ui/KviTextIconWindow.cpp
index 3fd2571df..8a0be9b9e 100644
--- a/src/kvirc/ui/KviTextIconWindow.cpp
+++ b/src/kvirc/ui/KviTextIconWindow.cpp
@@ -28,7 +28,7 @@
 #include "KviOptions.h"
 #include "KviInput.h"
 #include "KviTopicWidget.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviIconManager.h"
 
 #include <QPainter>
@@ -164,7 +164,7 @@ void KviTextIconWindow::cellSelected(int row, int column)
 		szItem.append(' ');
 
 		if(m_bAltMode)
-			szItem.prepend(KviMircCntrl::Icon);
+			szItem.prepend(KviControlCodes::Icon);
 
 		if(m_pOwner->inherits("KviInputEditor"))
 			((KviInputEditor *)m_pOwner)->insertText(szItem);
diff --git a/src/kvirc/ui/KviTopicWidget.cpp b/src/kvirc/ui/KviTopicWidget.cpp
index be47e049e..f83ef2bd0 100644
--- a/src/kvirc/ui/KviTopicWidget.cpp
+++ b/src/kvirc/ui/KviTopicWidget.cpp
@@ -26,7 +26,7 @@
 
 #include "KviTopicWidget.h"
 #include "KviOptions.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviLocale.h"
 #include "kvi_defaults.h"
 #include "kvi_settings.h"
@@ -41,7 +41,6 @@
 #include "KviIrcConnectionServerInfo.h"
 #include "KviIrcConnectionUserInfo.h"
 #include "KviHtmlGenerator.h"
-#include "KviMircCntrl.h"
 #include "KviTalToolTip.h"
 #include "KviTalPopupMenu.h"
 #include "KviThemedLabel.h"
@@ -76,7 +75,7 @@ QSize KviTopicListBoxItemDelegate::sizeHint(const QStyleOptionViewItem &,const Q
 	KviTalListWidget* listWidget = (KviTalListWidget*)parent();
 	KviTopicListBoxItem* item = (KviTopicListBoxItem*) listWidget->item(index.row());
 
-	return listWidget->fontMetrics().size(Qt::TextSingleLine, KviMircCntrl::stripControlBytes(item->text()));
+	return listWidget->fontMetrics().size(Qt::TextSingleLine, KviControlCodes::stripControlBytes(item->text()));
 }
 
 void KviTopicListBoxItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index) const
@@ -99,7 +98,7 @@ KviTopicListBoxItem::~KviTopicListBoxItem()
 
 int KviTopicListBoxItem::width ( const KviTalListWidget * lb ) const
 {
-	return lb->fontMetrics().width(KviMircCntrl::stripControlBytes(text()));
+	return lb->fontMetrics().width(KviControlCodes::stripControlBytes(text()));
 }
 
 
@@ -193,12 +192,12 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QPalette&
 		unsigned int start = idx;
 
 		while((idx < (unsigned int)text.length()) &&
-				(c != KviMircCntrl::Color) &&
-				(c != KviMircCntrl::Bold) &&
-				(c != KviMircCntrl::Underline) &&
-				(c != KviMircCntrl::Reverse) &&
-				(c != KviMircCntrl::Reset) &&
-				(c != KviMircCntrl::Icon)
+				(c != KviControlCodes::Color) &&
+				(c != KviControlCodes::Bold) &&
+				(c != KviControlCodes::Underline) &&
+				(c != KviControlCodes::Reverse) &&
+				(c != KviControlCodes::Reset) &&
+				(c != KviControlCodes::Icon)
 			)
 		{
 			idx++;
@@ -250,9 +249,9 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QPalette&
 
 		switch(c)
 		{
-			case KviMircCntrl::Bold: curBold = !curBold; ++idx; break;
-			case KviMircCntrl::Underline: curUnderline = !curUnderline; ++idx; break;
-			case KviMircCntrl::Reverse:
+			case KviControlCodes::Bold: curBold = !curBold; ++idx; break;
+			case KviControlCodes::Underline: curUnderline = !curUnderline; ++idx; break;
+			case KviControlCodes::Reverse:
 				{
 					char auxBack = curBack;
 					curBack = curFore;
@@ -260,23 +259,23 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QPalette&
 				}
 				++idx;
 			break;
-			case KviMircCntrl::Reset:
+			case KviControlCodes::Reset:
 				curFore = KVI_LABEL_DEF_FORE;
 				curBack = KVI_LABEL_DEF_BACK;
 				curBold = false;
 				curUnderline = false;
 				++idx;
 			break;
-			case KviMircCntrl::Color:
+			case KviControlCodes::Color:
 			{
 				++idx;
 				unsigned char fore;
 				unsigned char back;
-				idx = getUnicodeColorBytes(text,idx,&fore,&back);
-				if(fore != KviMircCntrl::NoChange)
+				idx = KviControlCodes::getUnicodeColorBytes(text,idx,&fore,&back);
+				if(fore != KviControlCodes::NoChange)
 				{
 					curFore = fore;
-					if(back != KviMircCntrl::NoChange)
+					if(back != KviControlCodes::NoChange)
 						curBack = back;
 				} else {
 					// only a CTRL+K
@@ -285,7 +284,7 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QPalette&
 				}
 			}
 			break;
-			case KviMircCntrl::Icon:
+			case KviControlCodes::Icon:
 			{
 				++idx;
 
@@ -676,22 +675,22 @@ QChar KviTopicWidget::getSubstituteChar(unsigned short control_code)
 {
 	switch(control_code)
 	{
-		case KviMircCntrl::Color:
+		case KviControlCodes::Color:
 			return QChar('K');
 			break;
-		case KviMircCntrl::Bold:
+		case KviControlCodes::Bold:
 			return QChar('B');
 			break;
-		case KviMircCntrl::Reset:
+		case KviControlCodes::Reset:
 			return QChar('O');
 			break;
-		case KviMircCntrl::Reverse:
+		case KviControlCodes::Reverse:
 			return QChar('R');
 			break;
-		case KviMircCntrl::Underline:
+		case KviControlCodes::Underline:
 			return QChar('U');
 			break;
-		case KviMircCntrl::Icon:
+		case KviControlCodes::Icon:
 			return QChar('I');
 			break;
 		default:
diff --git a/src/kvirc/ui/KviWindow.cpp b/src/kvirc/ui/KviWindow.cpp
index c98751638..a8be7a070 100644
--- a/src/kvirc/ui/KviWindow.cpp
+++ b/src/kvirc/ui/KviWindow.cpp
@@ -50,7 +50,7 @@
 #include "KviIrcContext.h"
 #include "KviConsoleWindow.h"
 #include "KviIrcConnectionServerInfo.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviWindowToolWidget.h"
 #include "KviKvsScript.h"
 #include "KviTalPopupMenu.h"
@@ -1386,7 +1386,7 @@ void KviWindow::preprocessMessage(QString & szMessage)
 		if(it->contains('\r'))
 			continue;
 		QString szTmp(*it);
-		szTmp = KviMircCntrl::stripControlBytes(szTmp).trimmed();
+		szTmp = KviControlCodes::stripControlBytes(szTmp).trimmed();
 		if(szTmp.length() < 1)
 			continue;
 		if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().contains(szTmp[0]))
diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp
index a47d89ed0..67a9f9366 100644
--- a/src/modules/action/libkviaction.cpp
+++ b/src/modules/action/libkviaction.cpp
@@ -33,7 +33,7 @@
 #include "KviError.h"
 #include "kvi_out.h"
 #include "KviIconManager.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviKvsUserAction.h"
 #include "KviKvsScript.h"
 
@@ -59,9 +59,9 @@ static bool action_kvs_cmd_list(KviKvsModuleCommandCall * c)
 	while(KviAction * a = it.current())
 	{
 		if(a->isKviUserActionNeverOverrideThis())
-			pOut->output(KVI_OUT_VERBOSE,__tr2qs("%cCore action: %Q"),KviMircCntrl::Bold,&(a->name()));
+			pOut->output(KVI_OUT_VERBOSE,__tr2qs("%cCore action: %Q"),KviControlCodes::Bold,&(a->name()));
 		else
-			pOut->output(KVI_OUT_VERBOSE,__tr2qs("%cUser action: %Q"),KviMircCntrl::Bold,&(a->name()));
+			pOut->output(KVI_OUT_VERBOSE,__tr2qs("%cUser action: %Q"),KviControlCodes::Bold,&(a->name()));
 		pOut->output(KVI_OUT_VERBOSE,__tr2qs("Label: %Q"),&(a->visibleName()));
 		pOut->output(KVI_OUT_VERBOSE,__tr2qs("Category: %Q"),&(a->category()->visibleName()));
 		pOut->output(KVI_OUT_VERBOSE,__tr2qs("Description: %Q"),&(a->description()));
diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
index c852c5b13..51451108b 100644
--- a/src/modules/addon/libkviaddon.cpp
+++ b/src/modules/addon/libkviaddon.cpp
@@ -34,7 +34,7 @@
 #include "KviError.h"
 #include "kvi_out.h"
 #include "KviIconManager.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviConfigurationFile.h"
 #include "kvi_sourcesdate.h"
 #include "KviMiscUtils.h"
@@ -143,7 +143,7 @@ static bool addon_kvs_cmd_list(KviKvsModuleCommandCall * c)
 	KviPointerHashTableIterator<QString,KviKvsScriptAddon> it(*da);
 	while(KviKvsScriptAddon * a = it.current())
 	{
-		c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("%cAddon id %Q, version %Q%c","addon"),KviMircCntrl::Bold,&(a->name()),&(a->version()),KviMircCntrl::Bold);
+		c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("%cAddon id %Q, version %Q%c","addon"),KviControlCodes::Bold,&(a->name()),&(a->version()),KviControlCodes::Bold);
 		c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Name: %Q","addon"),&(a->visibleName()));
 		c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Description: %Q","addon"),&(a->description()));
 
diff --git a/src/modules/dcc/DccChatWindow.cpp b/src/modules/dcc/DccChatWindow.cpp
index 0d0fea505..d3bfddfa1 100644
--- a/src/modules/dcc/DccChatWindow.cpp
+++ b/src/modules/dcc/DccChatWindow.cpp
@@ -52,7 +52,7 @@
 #include "KviIrcConnection.h"
 #include "KviIrcConnectionUserInfo.h"
 #include "KviKvsEventTriggers.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviTalVBox.h"
 
 #include <QEvent>
@@ -308,7 +308,7 @@ void DccChatWindow::ownMessage(const QString &text, bool bUserFeedback)
 	{
 		if(cryptSessionInfo()->m_bDoEncrypt)
 		{
-			if(*d != KviMircCntrl::CryptEscape)
+			if(*d != KviControlCodes::CryptEscape)
 			{
 				KviCString encrypted;
 				cryptSessionInfo()->m_pEngine->setMaxEncryptLen(-1);
@@ -386,7 +386,7 @@ void DccChatWindow::ownAction(const QString &text)
 		//see bug ticket #220
 		if(KVI_OPTION_BOOL(KviOption_boolStripMircColorsInUserMessages))
 		{
-			szTmpBuffer = KviMircCntrl::stripControlBytes(text);
+			szTmpBuffer = KviControlCodes::stripControlBytes(text);
 		} else {
 			szTmpBuffer = text;
 		}
diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp
index a20d0489c..f3bca6bd9 100644
--- a/src/modules/dcc/DccVideoWindow.cpp
+++ b/src/modules/dcc/DccVideoWindow.cpp
@@ -40,7 +40,7 @@
 #include "kvi_socket.h"
 #include "KviIrcConnection.h"
 #include "KviTalVBox.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviMainWindow.h"
 
 #include <QToolTip>
@@ -675,7 +675,7 @@ void DccVideoWindow::ownMessage(const QString &text, bool bUserFeedback)
 	{
 		if(cryptSessionInfo()->m_bDoEncrypt)
 		{
-			if(*d != KviMircCntrl::CryptEscape)
+			if(*d != KviControlCodes::CryptEscape)
 			{
 				KviCString encrypted;
 				cryptSessionInfo()->m_pEngine->setMaxEncryptLen(-1);
@@ -753,7 +753,7 @@ void DccVideoWindow::ownAction(const QString &text)
 		//see bug ticket #220
 		if(KVI_OPTION_BOOL(KviOption_boolStripMircColorsInUserMessages))
 		{
-			szTmpBuffer = KviMircCntrl::stripControlBytes(text);
+			szTmpBuffer = KviControlCodes::stripControlBytes(text);
 		} else {
 			szTmpBuffer = text;
 		}
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 54b60de54..1f0f352da 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -44,7 +44,6 @@
 #include "KviError.h"
 #include "KviOptions.h"
 #include "kvi_defaults.h"
-#include "KviMircCntrl.h"
 #include "KviApplication.h"
 #include "KviIrcConnection.h"
 #include "KviIrcConnectionUserInfo.h"
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 242dbf0f2..c235596cb 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -50,7 +50,7 @@
 #include "KviOptions.h"
 #include "kvi_defaults.h"
 #include "KviSharedFilesManager.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviApplication.h"
 #include "KviIrcConnection.h"
 #include "KviIrcConnectionUserInfo.h"
@@ -705,12 +705,12 @@ static void dccModuleParseDccRecv(KviDccRequest * dcc)
 #endif
 		dcc->ctcpMsg->msg->console()->output(KVI_OUT_DCCMSG,
 			__tr2qs_ctx("Use %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c to send the file (or double-click on the socket)","dcc"),
-			KviMircCntrl::Bold,
+			KviControlCodes::Bold,
 			szSwitches.ptr(),
 			dcc->szParam2.ptr(),dcc->szParam3.ptr(),&(dcc->ctcpMsg->pSource->nick()),
 			szSwitches.ptr(),
 			dcc->szParam2.ptr(),dcc->szParam3.ptr(),&(dcc->ctcpMsg->pSource->nick()),
-			KviMircCntrl::Bold);
+			KviControlCodes::Bold);
 	}
 }
 
diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp
index 2a6ae9ce4..707277b5f 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.cpp
+++ b/src/modules/filetransferwindow/FileTransferWindow.cpp
@@ -31,7 +31,6 @@
 #include "KviOptions.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
-#include "KviMircCntrl.h"
 #include "KviThemedLabel.h"
 #include "KviInput.h"
 #include "KviQString.h"
diff --git a/src/modules/links/LinksWindow.cpp b/src/modules/links/LinksWindow.cpp
index dacd5b01a..88f7fdab4 100644
--- a/src/modules/links/LinksWindow.cpp
+++ b/src/modules/links/LinksWindow.cpp
@@ -31,7 +31,7 @@
 #include "KviOptions.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviThemedLabel.h"
 #include "KviIrcContext.h"
 #include "KviIrcConnection.h"
@@ -280,7 +280,7 @@ void LinksWindow::endOfLinks()
 	if(root)
 	{
 		m_szRootServer = root->text(0);
-		output(KVI_OUT_LINKS,__tr2qs("%c%cLinks for %Q"),KviMircCntrl::Bold,KviMircCntrl::Underline,&m_szRootServer);
+		output(KVI_OUT_LINKS,__tr2qs("%c%cLinks for %Q"),KviControlCodes::Bold,KviControlCodes::Underline,&m_szRootServer);
 		outputNoFmt(KVI_OUT_LINKS,"======================");
 		QString tmpo = wildServers ? __tr2qs("Total hosts listed") : __tr2qs("Total hosts in the network");
 		output(KVI_OUT_LINKS,"%Q: %d",&tmpo,totalHosts);
diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp
index 6d16df8e5..6a936db6c 100644
--- a/src/modules/list/ListWindow.cpp
+++ b/src/modules/list/ListWindow.cpp
@@ -31,7 +31,7 @@
 #include "KviOptions.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviThemedLabel.h"
 #include "KviOptions.h"
 #include "KviIrcConnection.h"
@@ -95,7 +95,7 @@ bool ChannelTreeWidgetItem::operator<(const QTreeWidgetItem & other) const
 		case 2:
 		default:
 			//topic
-			return KviMircCntrl::stripControlBytes(m_pData->m_szTopic.toUpper()) < KviMircCntrl::stripControlBytes(((ChannelTreeWidgetItem*)&other)->itemData()->m_szTopic.toUpper());
+			return KviControlCodes::stripControlBytes(m_pData->m_szTopic.toUpper()) < KviControlCodes::stripControlBytes(((ChannelTreeWidgetItem*)&other)->itemData()->m_szTopic.toUpper());
 			break;
 	}
 }
@@ -137,7 +137,7 @@ QSize ChannelTreeWidgetItemDelegate::sizeHint( const QStyleOptionViewItem &sovIt
 		default:
 			//topic
 			if(item->itemData()->m_szStrippedTopic.isEmpty())
-				item->itemData()->m_szStrippedTopic = KviMircCntrl::stripControlBytes(item->itemData()->m_szTopic);
+				item->itemData()->m_szStrippedTopic = KviControlCodes::stripControlBytes(item->itemData()->m_szTopic);
 			return QSize(fm.width(item->itemData()->m_szStrippedTopic), iHeight);
 			break;
 	}
diff --git a/src/modules/notifier/NotifierWindow.cpp b/src/modules/notifier/NotifierWindow.cpp
index 39b943b93..83a92b045 100644
--- a/src/modules/notifier/NotifierWindow.cpp
+++ b/src/modules/notifier/NotifierWindow.cpp
@@ -33,7 +33,6 @@
 #include "KviWindow.h"
 #include "KviLocale.h"
 #include "KviMainWindow.h"
-#include "KviMircCntrl.h"
 #include "KviOptions.h"
 #include "KviUserInput.h"
 #include "KviThemedLineEdit.h"
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index b0e443b8a..99f1d9574 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -74,7 +74,7 @@
 #include "KviIconManager.h"
 #include "KviWindow.h"
 #include "kvi_out.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviApplication.h"
 #include "KviModule.h"
 #include "KviLocale.h"
@@ -668,7 +668,7 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
 			{
 				cmd->window()->output(80, "Ptr %u: top level object: %c%s%c, class %s, %s, rect = %d, %d, %d, %d",
 				list.at(i),
-				KviMircCntrl::Bold, list.at(i)->objectName().data(), KviMircCntrl::Bold,
+				KviControlCodes::Bold, list.at(i)->objectName().data(), KviControlCodes::Bold,
 				list.at(i)->metaObject()->className(),
 				list.at(i)->isVisible() ? "visible" : "hidden",
 				list.at(i)->x(), list.at(i)->y(), list.at(i)->width(), list.at(i)->height());
@@ -706,8 +706,8 @@ static void dumpChildObjects(KviWindow *pWnd, QObject *parent, const char *spaci
 			if (bFlag)
 			{
 				pWnd->output(80, "%sPtr %u: object: %c%s%c, class %s",
-					spacing, list.at(i), KviMircCntrl::Bold,
-					list.at(i)->objectName().data(), KviMircCntrl::Bold, list.at(i)->metaObject()->className()
+					spacing, list.at(i), KviControlCodes::Bold,
+					list.at(i)->objectName().data(), KviControlCodes::Bold, list.at(i)->metaObject()->className()
 				);
 			}
 			QString szClass=list.at(i)->metaObject()->className();
diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp
index da082ce41..ed5c2b742 100644
--- a/src/modules/options/OptionsWidget_message.cpp
+++ b/src/modules/options/OptionsWidget_message.cpp
@@ -30,7 +30,7 @@
 #include "KviOptions.h"
 #include "KviApplication.h"
 #include "KviLocale.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviConfigurationFile.h"
 #include "KviFileDialog.h"
 #include "KviTalVBox.h"
@@ -365,7 +365,7 @@ OptionsWidget_messageColors::OptionsWidget_messageColors(QWidget * parent)
 	m_pBackListWidgetDelegate = new MessageColorListWidgetItemDelegate(m_pBackListWidget);
 	m_pBackListWidget->setItemDelegate(m_pBackListWidgetDelegate);
 
-	m_pBackItems[16] = new MessageColorListWidgetItem(m_pBackListWidget,KviMircCntrl::Transparent);
+	m_pBackItems[16] = new MessageColorListWidgetItem(m_pBackListWidget,KviControlCodes::Transparent);
 	for(i=0;i<16;i++)
 	{
 		m_pBackItems[i] = new MessageColorListWidgetItem(m_pBackListWidget,i);
@@ -633,7 +633,7 @@ void OptionsWidget_messageColors::load()
 			tmp.sprintf("Back%d",it->optionId());
 			int back = cfg.readIntEntry(tmp,it->msgType()->back());
 			if(back < 0 || back > 15)
-				back = KviMircCntrl::Transparent;
+				back = KviControlCodes::Transparent;
 			it->msgType()->setBack(back);
 
 			tmp.sprintf("Icon%d",it->optionId());
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index 6c8b8e9dc..772d4c038 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -32,7 +32,7 @@
 #include "KviMainWindow.h"
 #include "KviWindow.h"
 #include "KviLocale.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "kvi_out.h"
 #include "KviSplashScreen.h"
 #include "KviPointerHashTable.h"
@@ -152,7 +152,7 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
 
 static void options_kvs_module_print_pages(KviKvsModuleCommandCall * c,OptionsWidgetInstanceEntry * e,const char * prefix)
 {
-	c->window()->output(KVI_OUT_SYSTEMMESSAGE,"%s%c%s%c  (%Q)",prefix,KviMircCntrl::Bold,e->szClassName,KviMircCntrl::Bold,&(e->szName));
+	c->window()->output(KVI_OUT_SYSTEMMESSAGE,"%s%c%s%c  (%Q)",prefix,KviControlCodes::Bold,e->szClassName,KviControlCodes::Bold,&(e->szName));
 	KviCString szPre = prefix;
 	szPre.append("  ");
 	if(e->pChildList)
diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp
index 1bf1bf749..71f42c99f 100644
--- a/src/modules/regchan/libkviregchan.cpp
+++ b/src/modules/regchan/libkviregchan.cpp
@@ -27,7 +27,7 @@
 #include "KviRegisteredChannelDataBase.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviWindow.h"
 #include "kvi_debug.h"
 
@@ -217,7 +217,7 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 			c->window()->outputNoFmt(
 					KVI_OUT_SYSTEMMESSAGE,
 					__tr2qs_ctx("Channel: %1%2@%3","register")
-						.arg(QChar(KviMircCntrl::Bold))
+						.arg(QChar(KviControlCodes::Bold))
 						.arg(ch->name())
 						.arg(ch->netMask())
 				);
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index b5a57a788..3986417b0 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -31,7 +31,7 @@
 #include "KviRegisteredUserDataBase.h"
 #include "KviIrcUserDataBase.h"
 #include "kvi_out.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviWindow.h"
 #include "KviLocale.h"
 #include "KviApplication.h"
@@ -809,7 +809,7 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 		KviPointerList<KviIrcMask> * ml = u->maskList();
 		if(u->matches(mask) || (ml->count() == 0))
 		{
-			c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx(" User: %c%Q","register"),KviMircCntrl::Bold,&(u->name()));
+			c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx(" User: %c%Q","register"),KviControlCodes::Bold,&(u->name()));
 
 			if(ml->count() == 0)
 			{
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index 7877bc0e8..8c09ed902 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -29,7 +29,7 @@
 #include "KviModule.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviTimeUtils.h"
 #include "UglyBase64.h"
 
@@ -208,7 +208,7 @@
 				return KviCryptEngine::EncryptError;
 			}
 		}
-		outBuffer.prepend(KviMircCntrl::CryptEscape);
+		outBuffer.prepend(KviControlCodes::CryptEscape);
 		return KviCryptEngine::Encrypted;
 	}
 
@@ -220,7 +220,7 @@
 			return KviCryptEngine::DecryptError;
 		}
 
-		if(*inBuffer != KviMircCntrl::CryptEscape)
+		if(*inBuffer != KviControlCodes::CryptEscape)
 		{
 			plainText = inBuffer;
 			return KviCryptEngine::DecryptOkWasPlainText;
diff --git a/src/modules/sharedfile/libkvisharedfile.cpp b/src/modules/sharedfile/libkvisharedfile.cpp
index 2ff562d1b..75202cdc0 100644
--- a/src/modules/sharedfile/libkvisharedfile.cpp
+++ b/src/modules/sharedfile/libkvisharedfile.cpp
@@ -28,7 +28,7 @@
 #include "KviFileUtils.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviWindow.h"
 #include "KviMainWindow.h"
 #include "KviPointerHashTable.h"
@@ -217,7 +217,7 @@ static bool sharedfile_kvs_cmd_list(KviKvsModuleCommandCall * c)
 		for(KviSharedFile * o = l->first();o;o = l->next())
 		{
 			c->window()->output(KVI_OUT_NONE,"%c%d. %s",
-				KviMircCntrl::Bold,idx + 1,it.currentKey().toUtf8().data());
+				KviControlCodes::Bold,idx + 1,it.currentKey().toUtf8().data());
 			c->window()->output(KVI_OUT_NONE,__tr2qs_ctx("    File: %s (%u bytes)","sharedfileswindow"),
 				o->absFilePath().toUtf8().data(),o->fileSize());
 			c->window()->output(KVI_OUT_NONE,__tr2qs_ctx("    Mask: %s","sharedfileswindow"),
diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
index 5725475bb..e2866ae67 100644
--- a/src/modules/sharedfileswindow/SharedFilesWindow.cpp
+++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
@@ -31,7 +31,6 @@
 #include "KviOptions.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
-#include "KviMircCntrl.h"
 #include "KviThemedLabel.h"
 #include "KviInput.h"
 #include "KviFileDialog.h"
diff --git a/src/modules/spaste/SlowPasteController.cpp b/src/modules/spaste/SlowPasteController.cpp
index 6debc6794..fbd1552bb 100644
--- a/src/modules/spaste/SlowPasteController.cpp
+++ b/src/modules/spaste/SlowPasteController.cpp
@@ -27,7 +27,7 @@
 
 #include "KviWindow.h"
 #include "KviConsoleWindow.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviApplication.h"
 #include "KviOptions.h"
 
@@ -105,7 +105,7 @@ void SlowPasteController::pasteFile(void)
 	{
 		line = data;
 		if(line.isEmpty())
-			line = QChar(KviMircCntrl::Reset);
+			line = QChar(KviControlCodes::Reset);
 
 		line.replace('\t',QString(KVI_OPTION_UINT(KviOption_uintSpacesToExpandTabulationInput),' ')); //expand tabs to spaces
 
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index 8026a0a6b..668fc8996 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -27,7 +27,7 @@
 
 #include "KviModule.h"
 #include "KviLocale.h"
-#include "KviMircCntrl.h"
+#include "KviControlCodes.h"
 #include "KviQString.h"
 #include "kvi_debug.h"
 #include "kvi_settings.h"
@@ -886,7 +886,7 @@ static bool str_kvs_fnc_stripcolors(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("string",KVS_PT_STRING,0,szString)
 	KVSM_PARAMETERS_END(c)
-	c->returnValue()->setString(KviMircCntrl::stripControlBytes(szString));
+	c->returnValue()->setString(KviControlCodes::stripControlBytes(szString));
 	return true;
 }
 
diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp
index 6483de324..3019deb37 100644
--- a/src/modules/theme/libkvitheme.cpp
+++ b/src/modules/theme/libkvitheme.cpp
@@ -33,7 +33,6 @@
 #include "KviError.h"
 #include "kvi_out.h"
 #include "KviIconManager.h"
-#include "KviMircCntrl.h"
 #include "KviConfigurationFile.h"
 #include "kvi_sourcesdate.h"
 #include "KviFileUtils.h"