reworked mIRC control codes;

yet more splitting;


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

47 files changed, 707 insertions, 614 deletions

diff --git a/doc/TODO-docs b/doc/TODO-docs
index 8cfff9fde..b75bfc04d 100644
--- a/doc/TODO-docs
+++ b/doc/TODO-docs
@@ -182,8 +182,10 @@ videoinput.h
   KviNickServRule.h
   KviNickServRuleSet.cpp
   KviNickServRuleSet.h
-  KviUserIdentity.cpp
-  KviUserIdentity.h
+++KviUserIdentity.cpp
+++KviUserIdentity.h
+++KviUserIdentity.cpp
+++KviUserIdentity.h
 
 
 ##############
diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt
index 4274cc276..ece9c9b62 100644
--- a/src/kvilib/CMakeLists.txt
+++ b/src/kvilib/CMakeLists.txt
@@ -105,6 +105,7 @@ SET(kvilib_SRCS
 	irc/KviNickServRule.cpp
 	irc/KviNickServRuleSet.cpp
 	irc/KviUserIdentity.cpp
+	irc/KviUserIdentityManager.cpp
 	net/KviDnsResolver.cpp
 	net/KviHttpRequest.cpp
 	net/KviNetUtils.cpp
diff --git a/src/kvilib/irc/KviIrcUserDataBase.cpp b/src/kvilib/irc/KviIrcUserDataBase.cpp
index 3cf11a88f..d1f552571 100644
--- a/src/kvilib/irc/KviIrcUserDataBase.cpp
+++ b/src/kvilib/irc/KviIrcUserDataBase.cpp
@@ -56,7 +56,7 @@ void KviIrcUserEntry::setRealName(const QString &rn)
 	m_szRealName = rn.trimmed();
 	if(m_szRealName.length()>=3)
 	{
-		if( (m_szRealName[0].unicode()==KVI_TEXT_COLOR) && (m_szRealName[2].unicode()==KVI_TEXT_RESET) )
+		if((m_szRealName[0].unicode() == KviMircCntrl::Color) && (m_szRealName[2].unicode() == KviMircCntrl::Reset))
 		{
 			// hum.. encoded as hidden color code eh ? publish is somewhere, so others might implement this...
 			// for backwards compatibily, 3=bot
@@ -84,12 +84,12 @@ void KviIrcUserEntry::setRealName(const QString &rn)
 	 */
 	if(m_szRealName.length()>=5)
 	{
-		if((m_szRealName[0].unicode()==KVI_TEXT_COLOR))
+		if((m_szRealName[0].unicode() == KviMircCntrl::Color))
 		{
 			unsigned char iFore, iBack;
 			int iPos=getUnicodeColorBytes(m_szRealName, 1, &iFore, &iBack);
 			// extract smart nick color code
-			if(iPos > 1 && m_szRealName[iPos]==KVI_TEXT_RESET)
+			if(iPos > 1 && m_szRealName[iPos] == KviMircCntrl::Reset)
 			{
 				m_szRealName.truncate(iPos);
 				int color = KviNickColors::getSmartColorIntByMircColor(iFore, iBack);
diff --git a/src/kvilib/irc/KviMircCntrl.cpp b/src/kvilib/irc/KviMircCntrl.cpp
index f34658d45..da24ff639 100644
--- a/src/kvilib/irc/KviMircCntrl.cpp
+++ b/src/kvilib/irc/KviMircCntrl.cpp
@@ -56,19 +56,19 @@ KVILIB_API const char * getColorBytes(const char *data_ptr,unsigned char *byte_1
 					data_ptr++;
 				} else {
 					//Senseless return
-					(*byte_2)=KVI_NOCHANGE;
+					(*byte_2)=KviMircCntrl::NoChange;
 					return data_ptr;
 				}
 			}
 		} else {
 			//Senseless character control code OK and return
-			(*byte_2)=KVI_NOCHANGE;
+			(*byte_2)=KviMircCntrl::NoChange;
 			return data_ptr;
 		}
 	} else {
 		//Senseless character : only a CTRL+K code
-		(*byte_1)=KVI_NOCHANGE;
-		(*byte_2)=KVI_NOCHANGE;
+		(*byte_1)=KviMircCntrl::NoChange;
+		(*byte_2)=KviMircCntrl::NoChange;
 		return data_ptr;
 	}
 
@@ -84,7 +84,7 @@ KVILIB_API const char * getColorBytes(const char *data_ptr,unsigned char *byte_1
 		}
 		return data_ptr;
 	} else {
-		(*byte_2)=KVI_NOCHANGE;
+		(*byte_2)=KviMircCntrl::NoChange;
 		return data_ptr-1;
 	}
 }
@@ -121,19 +121,19 @@ KVILIB_API const kvi_wchar_t * getColorBytesW(const kvi_wchar_t *data_ptr,unsign
 					data_ptr++;
 				} else {
 					//Senseless return
-					(*byte_2)=KVI_NOCHANGE;
+					(*byte_2)=KviMircCntrl::NoChange;
 					return data_ptr;
 				}
 			}
 		} else {
 			//Senseless character control code OK and return
-			(*byte_2)=KVI_NOCHANGE;
+			(*byte_2)=KviMircCntrl::NoChange;
 			return data_ptr;
 		}
 	} else {
 		//Senseless character : only a CTRL+K code
-		(*byte_1)=KVI_NOCHANGE;
-		(*byte_2)=KVI_NOCHANGE;
+		(*byte_1)=KviMircCntrl::NoChange;
+		(*byte_2)=KviMircCntrl::NoChange;
 		return data_ptr;
 	}
 
@@ -150,7 +150,7 @@ KVILIB_API const kvi_wchar_t * getColorBytesW(const kvi_wchar_t *data_ptr,unsign
 		}
 		return data_ptr;
 	} else {
-		(*byte_2)=KVI_NOCHANGE;
+		(*byte_2)=KviMircCntrl::NoChange;
 		return data_ptr-1;
 	}
 }
@@ -164,8 +164,8 @@ KVILIB_API unsigned int getUnicodeColorBytes(const QString &szData,unsigned int
 
 	if(charIdx >= (unsigned int) szData.length())
 	{
-		(*byte_1)=KVI_NOCHANGE;
-		(*byte_2)=KVI_NOCHANGE;
+		(*byte_1)=KviMircCntrl::NoChange;
+		(*byte_2)=KviMircCntrl::NoChange;
 		return charIdx;
 	}
 
@@ -175,8 +175,8 @@ KVILIB_API unsigned int getUnicodeColorBytes(const QString &szData,unsigned int
 	if(((c < '0') || (c > '9')))
 	{
 		// senseless : only a CTRL+K code
-		(*byte_1)=KVI_NOCHANGE;
-		(*byte_2)=KVI_NOCHANGE;
+		(*byte_1)=KviMircCntrl::NoChange;
+		(*byte_2)=KviMircCntrl::NoChange;
 		return charIdx;
 	}
 
@@ -185,7 +185,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const QString &szData,unsigned int
 	charIdx++;
 	if(charIdx >= (unsigned int) szData.length())
 	{
-		(*byte_2)=KVI_NOCHANGE;
+		(*byte_2)=KviMircCntrl::NoChange;
 		return charIdx;
 	}
 
@@ -193,7 +193,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const QString &szData,unsigned int
 
 	if(((c < '0') || (c > '9')) && (c != ','))
 	{
-		(*byte_2)=KVI_NOCHANGE;
+		(*byte_2)=KviMircCntrl::NoChange;
 		return charIdx;
 	}
 
@@ -204,7 +204,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const QString &szData,unsigned int
 		charIdx++;
 		if(charIdx >= (unsigned int) szData.length())
 		{
-			(*byte_2)=KVI_NOCHANGE;
+			(*byte_2)=KviMircCntrl::NoChange;
 			return charIdx;
 		}
 		c = szData[(int)charIdx].unicode();
@@ -215,18 +215,18 @@ KVILIB_API unsigned int getUnicodeColorBytes(const QString &szData,unsigned int
 		charIdx++;
 		if(charIdx >= (unsigned int) szData.length())
 		{
-			(*byte_2)=KVI_NOCHANGE;
+			(*byte_2)=KviMircCntrl::NoChange;
 			return charIdx;
 		}
 		c = szData[(int)charIdx].unicode();
 	} else {
-		(*byte_2)=KVI_NOCHANGE;
+		(*byte_2)=KviMircCntrl::NoChange;
 		return charIdx;
 	}
 
 	if((c < '0') || (c > '9'))
 	{
-		(*byte_2)=KVI_NOCHANGE;
+		(*byte_2)=KviMircCntrl::NoChange;
 		if(szData[(int)(charIdx-1)].unicode()==',')
 			return charIdx-1;
 		else
@@ -264,25 +264,25 @@ namespace KviMircCntrl
 		{
 			switch(szData[i].unicode())
 			{
-				case KVI_TEXT_UNDERLINE:
-				case KVI_TEXT_BOLD:
-				case KVI_TEXT_RESET:
-				case KVI_TEXT_REVERSE:
-				case KVI_TEXT_CRYPTESCAPE:
-				case KVI_TEXT_CTCP:
+				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 KVI_TEXT_COLOR:
+				case KviMircCntrl::Color:
 					if(i != begin)
 						ret += szData.mid(begin,i - begin);
 					i++;
 					i = getUnicodeColorBytes(szData,i,&b1,&b2);
 					begin = i;
 				break;
-				case KVI_TEXT_ICON:
+				case KviMircCntrl::Icon:
 					if(i != begin)
 						ret += szData.mid(begin,i - begin);
 					i++;
diff --git a/src/kvilib/irc/KviMircCntrl.h b/src/kvilib/irc/KviMircCntrl.h
index c3e813cde..edfd5709b 100644
--- a/src/kvilib/irc/KviMircCntrl.h
+++ b/src/kvilib/irc/KviMircCntrl.h
@@ -34,43 +34,10 @@
 #include "kvi_settings.h"
 #include "KviCString.h"
 
-//
-// mIrc color codes
-//
-
-#define KVI_WHITE 0
-#define KVI_BLACK 1
-#define KVI_DARKBLUE 2
-#define KVI_DARKGREEN 3
-#define KVI_RED 4
-#define KVI_DARKRED 5
-#define KVI_DARKVIOLET 6
-#define KVI_ORANGE 7
-#define KVI_YELLOW 8
-#define KVI_LIGHTGREEN 9
-#define KVI_BLUEMARINE 10
-#define KVI_LIGHTBLUE 11
-#define KVI_BLUE 12
-#define KVI_LIGHTVIOLET 13
-#define KVI_DARKGRAY 14
-#define KVI_LIGHTGRAY 15
-
 #define KVI_MIRCCOLOR_MAX_FOREGROUND 15
 #define KVI_MIRCCOLOR_MAX_BACKGROUND 15
 
-//
-// Non-standard color codes for KviIrcView
-//
-#define KVI_TRANSPARENT 100
-#define KVI_NOCHANGE 101
-//
-// Internal control codes for KviIrcView
-//
-// (Totally artificial and internal to KviIrcView)
-#define KVI_TEXT_ESCAPE 0x04
-#define KVI_TEXT_UNESCAPE 0x05
-#define KVI_TEXT_UNICON 0x06
-//#define KVI_TEXT_EMOTICON 0x07
+
 
 // ASCII Stuff: the following defines are meant to be escape sequences
 //              that can go thru an IRC connection
@@ -119,31 +86,23 @@
 //
 // mIrc control codes
 //
-
 //31 (0001 1111) US (Unit separator)
-#define KVI_TEXT_UNDERLINE 0x1f
 //2  (0000 0010) STX (Start of text)
-#define KVI_TEXT_BOLD 0x02
 //15 (0000 1111) SI (Shift in)
-#define KVI_TEXT_RESET 0x0f
 //22 (0001 0110) SYN (Synchronous idle)
-#define KVI_TEXT_REVERSE 0x16
 //3  (0000 0011) ETX (End of text)
-#define KVI_TEXT_COLOR 0x03
 
 //
 // Irc control codes
 //
 //1 (0000 0001) SOH (Start of heading)
-#define KVI_TEXT_CTCP 0x01
 
 //
 // KVirc added control codes
 //
 //30 (0001 1110) RS (Record separator)
-#define KVI_TEXT_CRYPTESCAPE 0x1e
 //29 (0001 1101) GS (Group separator)
-#define KVI_TEXT_ICON 0x1d
+
 
 #ifndef _KVI_MIRCCNTRL_CPP_
 	extern KVILIB_API const char * getColorBytes(const char *data_ptr,unsigned char *byte_1,unsigned char *byte_2);
@@ -151,13 +110,59 @@
 	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
 {
-	KVILIB_API QString stripControlBytes(const QString &szData);
-}
+	/**
+	* \enum Color
+	* \brief Contains mIRC color codes
+	*/
+	enum Color {
+		White       =   0,   /**< White */
+		Black       =   1,   /**< Black */
+		DarkBlue    =   2,   /**< Dark blue */
+		DarkGreen   =   3,   /**< Dark green */
+		Red         =   4,   /**< Red */
+		DarkRed     =   5,   /**< Dark red */
+		DarkViolet  =   6,   /**< Dark violet */
+		Orange      =   7,   /**< Orange */
+		Yellow      =   8,   /**< Yellow */
+		LightGreen  =   9,   /**< Light green */
+		BlueMarine  =  10,   /**< Blue marine */
+		LightBlue   =  11,   /**< Light blue */
+		Blue        =  12,   /**< Blue */
+		LightViolet =  13,   /**< Light violet */
+		DarkGray    =  14,   /**< Dark gray */
+		LightGray   =  15,   /**< Light gray */
+		Transparent = 100,   /**< Transparent, non standard color code for KviIrcView */
+		NoChange    = 101    /**< No change, non standard color code for KviIrcView */
+	};
+
+	/**
+	* \enum Control
+	* \brief Contains mIRC control codes
+	*/
+	enum Control {
+		CTCP        = 0x01,   /**< CTCP, IRC control code */
+		Bold        = 0x02,   /**< Bold */
+		Color       = 0x03,   /**< Color */
+		Escape      = 0x04,   /**< Escape, totally artificial and internal to KviIrcView */
+		UnEscape    = 0x05,   /**< Unescape, totally artificial and internal to KviIrcView */
+		UnIcon      = 0x06,   /**< Unicon, totally artificial and internal to KviIrcView */
+		Reset       = 0x0f,   /**< Reset */
+		Reverse     = 0x16,   /**< Reverse */
+		Icon        = 0x1d,   /**< Icon, KVIrc control code */
+		CryptEscape = 0x1e,   /**< Crypt escape, KVIrc control code */
+		Underline   = 0x1f    /**< Underline */
+	};
 
+	/**
+	* \brief Removes control bytes from the given string
+	* \param szData The stringe to clean
+	* \return QString
+	*/
+	KVILIB_API QString stripControlBytes(const QString & szData);
+}
 
 #endif //_KVI_MIRCCNTRL_H_
diff --git a/src/kvilib/irc/KviUserIdentity.cpp b/src/kvilib/irc/KviUserIdentity.cpp
index e240d5568..b323e5caa 100644
--- a/src/kvilib/irc/KviUserIdentity.cpp
+++ b/src/kvilib/irc/KviUserIdentity.cpp
@@ -38,7 +38,7 @@ KviUserIdentity::~KviUserIdentity()
 {
 }
 
-bool KviUserIdentity::load(KviConfigurationFile &cfg)
+bool KviUserIdentity::load(KviConfigurationFile & cfg)
 {
 	m_szId = cfg.group();
 	m_szNickName = cfg.readEntry("NickName");
@@ -63,7 +63,7 @@ bool KviUserIdentity::load(KviConfigurationFile &cfg)
 	return !(m_szId.isEmpty() || m_szNickName.isEmpty());
 }
 
-bool KviUserIdentity::save(KviConfigurationFile &cfg)
+bool KviUserIdentity::save(KviConfigurationFile & cfg)
 {
 	cfg.setGroup(m_szId);
 	cfg.writeEntry("NickName",m_szNickName);
@@ -87,7 +87,7 @@ bool KviUserIdentity::save(KviConfigurationFile &cfg)
 	return true;
 }
 
-void KviUserIdentity::copyFrom(const KviUserIdentity &src)
+void KviUserIdentity::copyFrom(const KviUserIdentity & src)
 {
 	m_szId = src.m_szId;
 	m_szNickName = src.m_szNickName;
@@ -122,138 +122,3 @@ void KviUserIdentity::copyFrom(const KviUserIdentity &src)
 	m_szOnConnectCommand = src.m_szOnConnectCommand;
 	m_szOnLoginCommand = src.m_szOnLoginCommand;
 }
-
-
-KviUserIdentityManager * KviUserIdentityManager::m_pInstance = 0;
-
-KviUserIdentityManager::KviUserIdentityManager()
-: KviHeapObject()
-{
-	m_pIdentityDict = new KviPointerHashTable<QString,KviUserIdentity>();
-	m_pIdentityDict->setAutoDelete(true);
-}
-
-KviUserIdentityManager::~KviUserIdentityManager()
-{
-	delete m_pIdentityDict;
-}
-
-void KviUserIdentityManager::init()
-{
-	if(m_pInstance)return;
-	m_pInstance = new KviUserIdentityManager();
-}
-
-void KviUserIdentityManager::done()
-{
-	if(!m_pInstance)return;
-	delete m_pInstance;
-	m_pInstance = 0;
-}
-
-const KviUserIdentity * KviUserIdentityManager::defaultIdentity()
-{
-	KviUserIdentity * ret;
-	if(!m_szDefaultIdentity.isEmpty())
-	{
-		ret = m_pIdentityDict->find(m_szDefaultIdentity);
-		if(ret)return ret;
-	}
-
-	// the default identity is borken :/
-	// grab the first one
-	KviPointerHashTableIterator<QString,KviUserIdentity> it(*m_pIdentityDict);
-	ret = it.current();
-	if(ret)
-	{
-		m_szDefaultIdentity = ret->id();
-		return ret;
-	}
-	// no identities available: create the default
-	ret = new KviUserIdentity();
-
-	ret->setId(__tr2qs("Default"));
-	ret->setNickName(KVI_DEFAULT_NICKNAME1);
-
-	ret->setAltNickName1(QString(KVI_DEFAULT_NICKNAME2).replace(KVI_DEFAULT_NICKNAME_TOKEN, KVI_DEFAULT_NICKNAME1));
-	ret->setAltNickName2(QString(KVI_DEFAULT_NICKNAME3).replace(KVI_DEFAULT_NICKNAME_TOKEN, KVI_DEFAULT_NICKNAME1));
-	ret->setAltNickName3(QString(KVI_DEFAULT_NICKNAME4).replace(KVI_DEFAULT_NICKNAME_TOKEN, KVI_DEFAULT_NICKNAME1));
-	ret->setUserName(KVI_DEFAULT_USERNAME);
-	ret->setRealName(KVI_DEFAULT_REALNAME);
-	ret->setPartMessage(KVI_DEFAULT_PART_MESSAGE);
-	ret->setQuitMessage(KVI_DEFAULT_QUIT_MESSAGE);
-
-	m_pIdentityDict->replace(ret->id(),ret);
-
-	return ret;
-}
-
-void KviUserIdentityManager::load(const QString &szFileName)
-{
-	m_pIdentityDict->clear();
-
-	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Read);
-
-	cfg.setGroup("KVIrc");
-
-	m_szDefaultIdentity = cfg.readEntry("DefaultIdentity","");
-
-	KviConfigurationFileIterator it(*(cfg.dict()));
-	while( (it.current()) )
-	{
-		if(!KviQString::equalCI(it.currentKey(),"KVIrc"))
-		{
-			cfg.setGroup(it.currentKey());
-
-			KviUserIdentity * id = new KviUserIdentity();
-			if(id->load(cfg))
-				m_pIdentityDict->replace(id->id(),id);
-			else
-				delete id;
-		}
-		++it;
-	}
-}
-
-void KviUserIdentityManager::save(const QString &szFileName)
-{
-	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Write);
-	cfg.clear();
-
-	cfg.setGroup("KVIrc");
-
-	cfg.writeEntry("DefaultIdentity",m_szDefaultIdentity);
-
-	KviPointerHashTableIterator<QString,KviUserIdentity> it(*m_pIdentityDict);
-	while(KviUserIdentity * id = it.current())
-	{
-		id->save(cfg);
-		++it;
-	}
-}
-
-void KviUserIdentityManager::copyFrom(KviUserIdentityManager * pWorkingCopy)
-{
-	m_pIdentityDict->clear();
-	m_szDefaultIdentity = pWorkingCopy->m_szDefaultIdentity;
-	KviPointerHashTableIterator<QString,KviUserIdentity> it(*(pWorkingCopy->m_pIdentityDict));
-	while(KviUserIdentity * id = it.current())
-	{
-		KviUserIdentity * pNew = new KviUserIdentity();
-		pNew->copyFrom(*id);
-		m_pIdentityDict->replace(pNew->id(),pNew);
-		++it;
-	}
-}
-
-KviUserIdentityManager * KviUserIdentityManager::createWorkingCopy()
-{
-	KviUserIdentityManager * pCopy = new KviUserIdentityManager();
-	pCopy->copyFrom(this);
-	return pCopy;
-}
-
-void KviUserIdentityManager::releaseWorkingCopy(KviUserIdentityManager * pWorkingCopy)
-{
-	if(pWorkingCopy)delete pWorkingCopy;
-}
diff --git a/src/kvilib/irc/KviUserIdentity.h b/src/kvilib/irc/KviUserIdentity.h
index 5301e5aca..e5562d92b 100644
--- a/src/kvilib/irc/KviUserIdentity.h
+++ b/src/kvilib/irc/KviUserIdentity.h
@@ -345,106 +345,4 @@ protected:
 	bool load(KviConfigurationFile & cfg);
 };
 
-/**
-* \class KviUserIdentityManager
-* \brief The class to manage the user identity
-*/
-class KVILIB_API KviUserIdentityManager : public KviHeapObject
-{
-protected:
-	/**
-	* \brief Constructs the user identity manager object
-	* \return KviUserIdentityManager
-	*/
-	KviUserIdentityManager();
-
-	/**
-	* \brief Destroys the user identity manager object
-	*/
-	~KviUserIdentityManager();
-protected:
-	static KviUserIdentityManager * m_pInstance;
-	KviPointerHashTable<QString,KviUserIdentity> * m_pIdentityDict;
-	QString m_szDefaultIdentity;
-public:
-	/**
-	* \brief Initializes a new user identity
-	* \return void
-	*/
-	static void init();
-
-	/**
-	* \brief Deletese the user identity
-	* \return void
-	*/
-	static void done();
-
-	/**
-	* \brief Returns the instance of the identity
-	* \returns KviUserIdentityManager *
-	*/
-	static KviUserIdentityManager * instance(){ return m_pInstance; };
-
-	/**
-	* \brief Returns the identity dictionary
-	* \returns KviPointerHashTable<QString,KviUserIdentity> *
-	*/
-	KviPointerHashTable<QString,KviUserIdentity> * identityDict(){ return m_pIdentityDict; };
-
-	/**
-	* \brief Searches fot an identity
-	* \param szId The identity id to find
-	* \return const KviUserIdentity *
-	*/
-	const KviUserIdentity * findIdentity(const QString & szId){ return m_pIdentityDict->find(szId); };
-
-	/**
-	* \brief Returns the default identity
-	* It's NEVER null.
-	* \return const KviUserIdentity *
-	*/
-	const KviUserIdentity * defaultIdentity();
-
-	/**
-	* \brief Sets the default identity
-	* \param szIdentityId The identity id to set
-	* \return void
-	*/
-	void setDefaultIdentity(const QString & szIdentityId){ m_szDefaultIdentity = szIdentityId; };
-	
-	/**
-	* \brief Creates a new working copy
-	* \return KviUserIdentityManager *
-	*/
-	KviUserIdentityManager * createWorkingCopy();
-
-	/**
-	* \brief Carbon copy
-	* \param pWorkingCopy The source working copy
-	* \return void
-	*/
-	void copyFrom(KviUserIdentityManager * pWorkingCopy);
-
-	/**
-	* \brief Deletes the working copy
-	* \param pWorkingCopy The source working copy
-	* \return void
-	*/
-	void releaseWorkingCopy(KviUserIdentityManager * pWorkingCopy);
-
-	/**
-	* \brief Saves the user identity database
-	* \param szFileName The filename where to save
-	* \return void
-	*/
-	void save(const QString & szFileName);
-
-	/**
-	* \brief Loads the user identity database
-	* \param szFileName The filename where to load
-	* \return void
-	*/
-	void load(const QString & szFileName);
-};
-
-#endif //!_KVI_USERIDENTITY_H_
+#endif // _KVI_USERIDENTITY_H_
diff --git a/src/kvilib/irc/KviUserIdentityManager.cpp b/src/kvilib/irc/KviUserIdentityManager.cpp
new file mode 100644
index 000000000..0568cb39b
--- /dev/null
+++ b/src/kvilib/irc/KviUserIdentityManager.cpp
@@ -0,0 +1,166 @@
+//=============================================================================
+//
+//   File : KviUserIdentityManager.h
+//   Creation date : Thu Dec Jan 2007 05:03:47 by Elvio Basello
+//
+//   This file is part of the KVIrc IRC Client distribution
+//   Copyright (C) 2010 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
+//   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.
+//
+//=============================================================================
+
+#include "KviUserIdentityManager.h"
+#include "KviUserIdentity.h"
+#include "KviLocale.h"
+#include "kvi_defaults.h"
+
+KviUserIdentityManager * KviUserIdentityManager::m_pInstance = 0;
+
+KviUserIdentityManager::KviUserIdentityManager()
+: KviHeapObject()
+{
+	m_pIdentityDict = new KviPointerHashTable<QString,KviUserIdentity>();
+	m_pIdentityDict->setAutoDelete(true);
+}
+
+KviUserIdentityManager::~KviUserIdentityManager()
+{
+	delete m_pIdentityDict;
+}
+
+void KviUserIdentityManager::init()
+{
+	if(m_pInstance)
+		return;
+	m_pInstance = new KviUserIdentityManager();
+}
+
+void KviUserIdentityManager::done()
+{
+	if(!m_pInstance)
+		return;
+	delete m_pInstance;
+	m_pInstance = 0;
+}
+
+const KviUserIdentity * KviUserIdentityManager::defaultIdentity()
+{
+	KviUserIdentity * pUser;
+	if(!m_szDefaultIdentity.isEmpty())
+	{
+		pUser = m_pIdentityDict->find(m_szDefaultIdentity);
+		if(pUser)
+			return pUser;
+	}
+
+	// the default identity is borken :/
+	// grab the first one
+	KviPointerHashTableIterator<QString,KviUserIdentity> it(*m_pIdentityDict);
+	pUser = it.current();
+	if(pUser)
+	{
+		m_szDefaultIdentity = pUser->id();
+		return pUser;
+	}
+	// no identities available: create the default
+	pUser = new KviUserIdentity();
+
+	pUser->setId(__tr2qs("Default"));
+	pUser->setNickName(KVI_DEFAULT_NICKNAME1);
+
+	pUser->setAltNickName1(QString(KVI_DEFAULT_NICKNAME2).replace(KVI_DEFAULT_NICKNAME_TOKEN, KVI_DEFAULT_NICKNAME1));
+	pUser->setAltNickName2(QString(KVI_DEFAULT_NICKNAME3).replace(KVI_DEFAULT_NICKNAME_TOKEN, KVI_DEFAULT_NICKNAME1));
+	pUser->setAltNickName3(QString(KVI_DEFAULT_NICKNAME4).replace(KVI_DEFAULT_NICKNAME_TOKEN, KVI_DEFAULT_NICKNAME1));
+	pUser->setUserName(KVI_DEFAULT_USERNAME);
+	pUser->setRealName(KVI_DEFAULT_REALNAME);
+	pUser->setPartMessage(KVI_DEFAULT_PART_MESSAGE);
+	pUser->setQuitMessage(KVI_DEFAULT_QUIT_MESSAGE);
+
+	m_pIdentityDict->replace(pUser->id(),pUser);
+
+	return pUser;
+}
+
+void KviUserIdentityManager::load(const QString & szFileName)
+{
+	m_pIdentityDict->clear();
+
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Read);
+
+	cfg.setGroup("KVIrc");
+
+	m_szDefaultIdentity = cfg.readEntry("DefaultIdentity","");
+
+	KviConfigurationFileIterator it(*(cfg.dict()));
+	while( (it.current()) )
+	{
+		if(!KviQString::equalCI(it.currentKey(),"KVIrc"))
+		{
+			cfg.setGroup(it.currentKey());
+
+			KviUserIdentity * pUser = new KviUserIdentity();
+			if(pUser->load(cfg))
+				m_pIdentityDict->replace(pUser->id(),pUser);
+			else
+				delete pUser;
+		}
+		++it;
+	}
+}
+
+void KviUserIdentityManager::save(const QString & szFileName)
+{
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Write);
+	cfg.clear();
+
+	cfg.setGroup("KVIrc");
+
+	cfg.writeEntry("DefaultIdentity",m_szDefaultIdentity);
+
+	KviPointerHashTableIterator<QString,KviUserIdentity> it(*m_pIdentityDict);
+	while(KviUserIdentity * pUser = it.current())
+	{
+		pUser->save(cfg);
+		++it;
+	}
+}
+
+void KviUserIdentityManager::copyFrom(KviUserIdentityManager * pWorkingCopy)
+{
+	m_pIdentityDict->clear();
+	m_szDefaultIdentity = pWorkingCopy->m_szDefaultIdentity;
+	KviPointerHashTableIterator<QString,KviUserIdentity> it(*(pWorkingCopy->m_pIdentityDict));
+	while(KviUserIdentity * pUser = it.current())
+	{
+		KviUserIdentity * pNew = new KviUserIdentity();
+		pNew->copyFrom(*pUser);
+		m_pIdentityDict->replace(pNew->id(),pNew);
+		++it;
+	}
+}
+
+KviUserIdentityManager * KviUserIdentityManager::createWorkingCopy()
+{
+	KviUserIdentityManager * pCopy = new KviUserIdentityManager();
+	pCopy->copyFrom(this);
+	return pCopy;
+}
+
+void KviUserIdentityManager::releaseWorkingCopy(KviUserIdentityManager * pWorkingCopy)
+{
+	if(pWorkingCopy)
+		delete pWorkingCopy;
+}
diff --git a/src/kvilib/irc/KviUserIdentityManager.h b/src/kvilib/irc/KviUserIdentityManager.h
new file mode 100644
index 000000000..4c55f48a3
--- /dev/null
+++ b/src/kvilib/irc/KviUserIdentityManager.h
@@ -0,0 +1,143 @@
+#ifndef _KVI_USERIDENTITY_MANAGER_H_
+#define _KVI_USERIDENTITY_MANAGER_H_
+//=============================================================================
+//
+//   File : KviUserIdentityManager.h
+//   Creation date : Thu Dec Jan 2007 05:03:47 by Elvio Basello
+//
+//   This file is part of the KVIrc IRC Client distribution
+//   Copyright (C) 2010 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
+//   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.
+//
+//=============================================================================
+
+/**
+* \file KviUserIdentityManager.h
+* \author Szymon Stefanek
+* \brief User identity handling
+*
+* This file was originally part of KviUserIdentity.h
+*/
+
+#include "kvi_settings.h"
+#include "KviHeapObject.h"
+#include "KviPointerHashTable.h"
+
+class KviUserIdentity;
+
+/**
+* \class KviUserIdentityManager
+* \brief The class to manage the user identity
+*/
+class KVILIB_API KviUserIdentityManager : public KviHeapObject
+{
+protected:
+	/**
+	* \brief Constructs the user identity manager object
+	* \return KviUserIdentityManager
+	*/
+	KviUserIdentityManager();
+
+	/**
+	* \brief Destroys the user identity manager object
+	*/
+	~KviUserIdentityManager();
+protected:
+	static KviUserIdentityManager * m_pInstance;
+	KviPointerHashTable<QString,KviUserIdentity> * m_pIdentityDict;
+	QString m_szDefaultIdentity;
+public:
+	/**
+	* \brief Initializes a new user identity
+	* \return void
+	*/
+	static void init();
+
+	/**
+	* \brief Deletese the user identity
+	* \return void
+	*/
+	static void done();
+
+	/**
+	* \brief Returns the instance of the identity
+	* \returns KviUserIdentityManager *
+	*/
+	static KviUserIdentityManager * instance(){ return m_pInstance; };
+
+	/**
+	* \brief Returns the identity dictionary
+	* \returns KviPointerHashTable<QString,KviUserIdentity> *
+	*/
+	KviPointerHashTable<QString,KviUserIdentity> * identityDict(){ return m_pIdentityDict; };
+
+	/**
+	* \brief Searches fot an identity
+	* \param szId The identity id to find
+	* \return const KviUserIdentity *
+	*/
+	const KviUserIdentity * findIdentity(const QString & szId){ return m_pIdentityDict->find(szId); };
+
+	/**
+	* \brief Returns the default identity
+	* It's NEVER null.
+	* \return const KviUserIdentity *
+	*/
+	const KviUserIdentity * defaultIdentity();
+
+	/**
+	* \brief Sets the default identity
+	* \param szIdentityId The identity id to set
+	* \return void
+	*/
+	void setDefaultIdentity(const QString & szIdentityId){ m_szDefaultIdentity = szIdentityId; };
+	
+	/**
+	* \brief Creates a new working copy
+	* \return KviUserIdentityManager *
+	*/
+	KviUserIdentityManager * createWorkingCopy();
+
+	/**
+	* \brief Carbon copy
+	* \param pWorkingCopy The source working copy
+	* \return void
+	*/
+	void copyFrom(KviUserIdentityManager * pWorkingCopy);
+
+	/**
+	* \brief Deletes the working copy
+	* \param pWorkingCopy The source working copy
+	* \return void
+	*/
+	void releaseWorkingCopy(KviUserIdentityManager * pWorkingCopy);
+
+	/**
+	* \brief Saves the user identity database
+	* \param szFileName The filename where to save
+	* \return void
+	*/
+	void save(const QString & szFileName);
+
+	/**
+	* \brief Loads the user identity database
+	* \param szFileName The filename where to load
+	* \return void
+	*/
+	void load(const QString & szFileName);
+};
+
+#endif // _KVI_USERIDENTITY_MANAGER_H_
\ No newline at end of file
diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp
index 4cded4aff..086dc8874 100644
--- a/src/kvirc/kernel/KviApplication.cpp
+++ b/src/kvirc/kernel/KviApplication.cpp
@@ -71,7 +71,7 @@
 #include "KviFileUtils.h"
 #include "KviTimeUtils.h"
 #include "KviStringConversion.h"
-#include "KviUserIdentity.h"
+#include "KviUserIdentityManager.h"
 #include "KviIrcView.h"
 #include "KviEnvironment.h"
 #include "KviAnimatedPixmapCache.h"
diff --git a/src/kvirc/kernel/KviHtmlGenerator.cpp b/src/kvirc/kernel/KviHtmlGenerator.cpp
index 5ae57bb13..fe185ad5f 100644
--- a/src/kvirc/kernel/KviHtmlGenerator.cpp
+++ b/src/kvirc/kernel/KviHtmlGenerator.cpp
@@ -54,12 +54,12 @@ namespace KviHtmlGenerator
 			unsigned int uStart = uIdx;
 
 			while(
-					(c != KVI_TEXT_COLOR) &&
-					(c != KVI_TEXT_BOLD) &&
-					(c != KVI_TEXT_UNDERLINE) &&
-					(c != KVI_TEXT_REVERSE) &&
-					(c != KVI_TEXT_RESET) &&
-					(c != KVI_TEXT_ICON) &&
+					(c != KviMircCntrl::Color) &&
+					(c != KviMircCntrl::Bold) &&
+					(c != KviMircCntrl::Underline) &&
+					(c != KviMircCntrl::Reverse) &&
+					(c != KviMircCntrl::Reset) &&
+					(c != KviMircCntrl::Icon) &&
 					((c != ':') || bIgnoreIcons) &&
 					((c != ';') || bIgnoreIcons) &&
 					((c != '=') || bIgnoreIcons)
@@ -148,9 +148,13 @@ namespace KviHtmlGenerator
 
 			switch(c)
 			{
-				case KVI_TEXT_BOLD: bCurBold = !bCurBold; ++uIdx; break;
-				case KVI_TEXT_UNDERLINE: bCurUnderline = !bCurUnderline; ++uIdx; break;
-				case KVI_TEXT_REVERSE:
+				case KviMircCntrl::Bold:
+					bCurBold = !bCurBold; ++uIdx;
+				break;
+				case KviMircCntrl::Underline:
+					bCurUnderline = !bCurUnderline; ++uIdx;
+				break;
+				case KviMircCntrl::Reverse:
 					{
 						char auxBack = uCurBack;
 						uCurBack = uCurFore;
@@ -158,23 +162,24 @@ namespace KviHtmlGenerator
 					}
 					++uIdx;
 				break;
-				case KVI_TEXT_RESET:
+				case KviMircCntrl::Reset:
 					uCurFore = KVI_LABEL_DEF_FORE;
 					uCurBack = KVI_LABEL_DEF_BACK;
 					bCurBold = false;
 					bCurUnderline = false;
 					++uIdx;
 				break;
-				case KVI_TEXT_COLOR:
+				case KviMircCntrl::Color:
 				{
 					++uIdx;
 					unsigned char fore;
 					unsigned char back;
 					uIdx = getUnicodeColorBytes(szText,uIdx,&fore,&back);
-					if(fore != KVI_NOCHANGE)
+					if(fore != KviMircCntrl::NoChange)
 					{
 						uCurFore = fore;
-						if(back != KVI_NOCHANGE)uCurBack = back;
+						if(back != KviMircCntrl::NoChange)
+							uCurBack = back;
 					} else {
 						// only a CTRL+K
 						uCurBack = KVI_LABEL_DEF_BACK;
@@ -268,7 +273,7 @@ namespace KviHtmlGenerator
 					}
 				}
 				break;
-				case KVI_TEXT_ICON:
+				case KviMircCntrl::Icon:
 				{
 					++uIdx;
 					if(bShowIcons)
diff --git a/src/kvirc/kernel/KviIrcConnection.cpp b/src/kvirc/kernel/KviIrcConnection.cpp
index 8c5862327..20474f787 100644
--- a/src/kvirc/kernel/KviIrcConnection.cpp
+++ b/src/kvirc/kernel/KviIrcConnection.cpp
@@ -1329,10 +1329,10 @@ void KviIrcConnection::loginToIrcServer()
 	{
 		QString szTags;
 		szTags.sprintf("%c%d,%d%c",
-				KVI_TEXT_COLOR,
+				KviMircCntrl::Color,
 				KVI_OPTION_UINT(KviOption_uintUserIrcViewOwnForeground),
 				KVI_OPTION_UINT(KviOption_uintUserIrcViewOwnBackground),
-				KVI_TEXT_RESET);
+				KviMircCntrl::Reset);
 		szReal.prepend(KviQString::toUtf8(szTags));
 	}
 
@@ -1340,9 +1340,9 @@ void KviIrcConnection::loginToIrcServer()
 	{
 		QString szTags;
 		szTags.sprintf("%c%d%c",
-			       KVI_TEXT_COLOR,
+			       KviMircCntrl::Color,
 			       iGenderAvatarTag,
-			       KVI_TEXT_RESET);
+			       KviMircCntrl::Reset);
 		szReal.prepend(KviQString::toUtf8(szTags));
 	}
 
diff --git a/src/kvirc/kernel/KviIrcContext.cpp b/src/kvirc/kernel/KviIrcContext.cpp
index 5066a2119..def3182ed 100644
--- a/src/kvirc/kernel/KviIrcContext.cpp
+++ b/src/kvirc/kernel/KviIrcContext.cpp
@@ -53,6 +53,7 @@
 #include "KviNetUtils.h"
 #include "KviIrcUrl.h"
 #include "KviUserIdentity.h"
+#include "KviUserIdentityManager.h"
 
 #define __KVI_DEBUG__
 #include "kvi_debug.h"
diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp
index fb1b4178f..f37021245 100644
--- a/src/kvirc/kernel/KviOptions.cpp
+++ b/src/kvirc/kernel/KviOptions.cpp
@@ -634,8 +634,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",KVI_DARKGRAY,KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme),
-	UINT_OPTION("TimeStampBackground",KVI_TRANSPARENT,KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme),
+	UINT_OPTION("TimeStampForeground",KviMircCntrl::DarkGray,KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme),
+	UINT_OPTION("TimeStampBackground",KviMircCntrl::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),
@@ -705,7 +705,7 @@ KviFontOption g_fontOptionsTable[KVI_NUM_FONT_OPTIONS]=
 #define MSGTYPE_OPTION(_name,_text,_icon,_levl) \
 	KviMessageTypeSettingsOption( \
 		KVI_MSGTYPE_OPTIONS_PREFIX _name, \
-		KviMessageTypeSettings(_text,_icon,KVI_BLACK,KVI_TRANSPARENT,true,_levl), \
+		KviMessageTypeSettings(_text,_icon,KviMircCntrl::Black,KviMircCntrl::Transparent,true,_levl), \
 		KviOption_sectFlagMsgType | KviOption_groupTheme \
 	)
 
@@ -723,17 +723,17 @@ KviFontOption g_fontOptionsTable[KVI_NUM_FONT_OPTIONS]=
 KviMessageTypeSettingsOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]=
 {
 	MSGTYPE_OPTION("Echo",__tr_no_lookup("Normal text"),KVI_SMALLICON_NONE,KVI_MSGTYPE_LEVEL_1),
-	MSGTYPE_OPTION_SPEC("Selection",__tr_no_lookup("Selection"),KVI_SMALLICON_NONE,KVI_WHITE,KVI_BLACK,KVI_MSGTYPE_LEVEL_1),
-	MSGTYPE_OPTION_SPEC("Highlight",__tr_no_lookup("Highlighted text"),KVI_SMALLICON_ALERT,KVI_WHITE,KVI_BLACK,KVI_MSGTYPE_LEVEL_5),
-	MSGTYPE_OPTION_SPEC("Url",__tr_no_lookup("URL foreground"),KVI_SMALLICON_NONE,KVI_BLUE,KVI_TRANSPARENT,KVI_MSGTYPE_LEVEL_1),
-	MSGTYPE_OPTION_SPEC("Link",__tr_no_lookup("Link overlay foreground"),KVI_SMALLICON_NONE,KVI_BLUE,KVI_TRANSPARENT,KVI_MSGTYPE_LEVEL_1),
-	MSGTYPE_OPTION_SPEC("ParserError",__tr_no_lookup("Parser error"),KVI_SMALLICON_PARSERERROR,KVI_RED,KVI_TRANSPARENT,KVI_MSGTYPE_LEVEL_2),
-	MSGTYPE_OPTION_SPEC("ParserWarning",__tr_no_lookup("Parser warning"),KVI_SMALLICON_PARSERWARNING,KVI_RED,KVI_TRANSPARENT,KVI_MSGTYPE_LEVEL_2),
+	MSGTYPE_OPTION_SPEC("Selection",__tr_no_lookup("Selection"),KVI_SMALLICON_NONE,KviMircCntrl::White,KviMircCntrl::Black,KVI_MSGTYPE_LEVEL_1),
+	MSGTYPE_OPTION_SPEC("Highlight",__tr_no_lookup("Highlighted text"),KVI_SMALLICON_ALERT,KviMircCntrl::White,KviMircCntrl::Black,KVI_MSGTYPE_LEVEL_5),
+	MSGTYPE_OPTION_SPEC("Url",__tr_no_lookup("URL foreground"),KVI_SMALLICON_NONE,KviMircCntrl::Blue,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_1),
+	MSGTYPE_OPTION_SPEC("Link",__tr_no_lookup("Link overlay foreground"),KVI_SMALLICON_NONE,KviMircCntrl::Blue,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_1),
+	MSGTYPE_OPTION_SPEC("ParserError",__tr_no_lookup("Parser error"),KVI_SMALLICON_PARSERERROR,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_2),
+	MSGTYPE_OPTION_SPEC("ParserWarning",__tr_no_lookup("Parser warning"),KVI_SMALLICON_PARSERWARNING,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_2),
 	MSGTYPE_OPTION("HostLookup",__tr_no_lookup("Host lookup result"),KVI_SMALLICON_SERVER,KVI_MSGTYPE_LEVEL_3),
 	MSGTYPE_OPTION("SocketMessage",__tr_no_lookup("Socket message"),KVI_SMALLICON_SOCKETMESSAGE,KVI_MSGTYPE_LEVEL_1),
 	MSGTYPE_OPTION("SocketWarning",__tr_no_lookup("Socket warning"),KVI_SMALLICON_SOCKETWARNING,KVI_MSGTYPE_LEVEL_3),
-	MSGTYPE_OPTION_SPEC("SocketError",__tr_no_lookup("Socket error"),KVI_SMALLICON_SOCKETERROR,KVI_RED,KVI_TRANSPARENT,KVI_MSGTYPE_LEVEL_3),
-	MSGTYPE_OPTION_SPEC("SystemError",__tr_no_lookup("System error"),KVI_SMALLICON_SYSTEMERROR,KVI_RED,KVI_TRANSPARENT,KVI_MSGTYPE_LEVEL_3),
+	MSGTYPE_OPTION_SPEC("SocketError",__tr_no_lookup("Socket error"),KVI_SMALLICON_SOCKETERROR,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_3),
+	MSGTYPE_OPTION_SPEC("SystemError",__tr_no_lookup("System error"),KVI_SMALLICON_SYSTEMERROR,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_3),
 	MSGTYPE_OPTION("Raw",__tr_no_lookup("Raw data to server"),KVI_SMALLICON_RAW,KVI_MSGTYPE_LEVEL_1),
 	MSGTYPE_OPTION("Connection",__tr_no_lookup("Connection status"),KVI_SMALLICON_WORLD,KVI_MSGTYPE_LEVEL_1),
 	MSGTYPE_OPTION("SystemWarning",__tr_no_lookup("System warning"),KVI_SMALLICON_SYSTEMWARNING,KVI_MSGTYPE_LEVEL_3),
@@ -840,8 +840,8 @@ KviMessageTypeSettingsOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]=
 	MSGTYPE_OPTION("GenericStatus",__tr_no_lookup("Generic status"),KVI_SMALLICON_GREENSQUARE,KVI_MSGTYPE_LEVEL_2),
 	MSGTYPE_OPTION("GenericVerbose",__tr_no_lookup("Generic verbose message"),KVI_SMALLICON_DKGREENSQUARE,KVI_MSGTYPE_LEVEL_1),
 	MSGTYPE_OPTION("GenericWarning",__tr_no_lookup("Generic warning"),KVI_SMALLICON_YELLOWSQUARE,KVI_MSGTYPE_LEVEL_3),
-	MSGTYPE_OPTION_SPEC("GenericError",__tr_no_lookup("Generic error"),KVI_SMALLICON_REDSQUARE,KVI_RED,KVI_TRANSPARENT,KVI_MSGTYPE_LEVEL_5),
-	MSGTYPE_OPTION_SPEC("GenericCritical",__tr_no_lookup("Generic critical error"),KVI_SMALLICON_BLACKSQUARE,KVI_RED,KVI_TRANSPARENT,KVI_MSGTYPE_LEVEL_5),
+	MSGTYPE_OPTION_SPEC("GenericError",__tr_no_lookup("Generic error"),KVI_SMALLICON_REDSQUARE,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_5),
+	MSGTYPE_OPTION_SPEC("GenericCritical",__tr_no_lookup("Generic critical error"),KVI_SMALLICON_BLACKSQUARE,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_5),
 	MSGTYPE_OPTION("ChanAdmin",__tr_no_lookup("Chan admin status set"),KVI_SMALLICON_CHANADMIN,KVI_MSGTYPE_LEVEL_5),
 	MSGTYPE_OPTION("ChanUnAdmin",__tr_no_lookup("Chan admin status unset"),KVI_SMALLICON_CHANUNADMIN,KVI_MSGTYPE_LEVEL_5),
 	MSGTYPE_OPTION("MeChanAdmin",__tr_no_lookup("Own chan admin status set"),KVI_SMALLICON_MECHANADMIN,KVI_MSGTYPE_LEVEL_5),
@@ -850,13 +850,13 @@ KviMessageTypeSettingsOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]=
 	MSGTYPE_OPTION("UserDeOp",__tr_no_lookup("User-deop mode change"),KVI_SMALLICON_DEUSEROP,KVI_MSGTYPE_LEVEL_2),
 	MSGTYPE_OPTION("MeUserOp",__tr_no_lookup("Am userop'd"),KVI_SMALLICON_MEUSEROP,KVI_MSGTYPE_LEVEL_5),
 	MSGTYPE_OPTION("MeDeUserOp",__tr_no_lookup("Am de-userop'd"),KVI_SMALLICON_MEDEUSEROP,KVI_MSGTYPE_LEVEL_5),
-	MSGTYPE_OPTION_SPEC("Verbose",__tr_no_lookup("Verbose/Debug"),KVI_SMALLICON_BINARYTEXT,KVI_DARKGRAY,KVI_TRANSPARENT,KVI_MSGTYPE_LEVEL_1),
+	MSGTYPE_OPTION_SPEC("Verbose",__tr_no_lookup("Verbose/Debug"),KVI_SMALLICON_BINARYTEXT,KviMircCntrl::DarkGray,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_1),
 	MSGTYPE_OPTION("ChanOwner",__tr_no_lookup("Chan owner status set"),KVI_SMALLICON_CHANOWNER,KVI_MSGTYPE_LEVEL_5),
 	MSGTYPE_OPTION("ChanUnOwner",__tr_no_lookup("Chan owner status unset"),KVI_SMALLICON_CHANUNOWNER,KVI_MSGTYPE_LEVEL_5),
 	MSGTYPE_OPTION("MeChanOwner",__tr_no_lookup("Own chan owner status set"),KVI_SMALLICON_MECHANOWNER,KVI_MSGTYPE_LEVEL_5),
 	MSGTYPE_OPTION("MeChanUnOwner",__tr_no_lookup("Own chan owner status unset"),KVI_SMALLICON_MECHANUNOWNER,KVI_MSGTYPE_LEVEL_5),
-	MSGTYPE_OPTION_SPEC("ServerError",__tr_no_lookup("Server error"),KVI_SMALLICON_SERVERERROR,KVI_RED,KVI_TRANSPARENT,KVI_MSGTYPE_LEVEL_5),
-	MSGTYPE_OPTION_SPEC("Help",__tr_no_lookup("Help"),KVI_SMALLICON_HELP,KVI_DARKGREEN,KVI_TRANSPARENT,KVI_MSGTYPE_LEVEL_1),
+	MSGTYPE_OPTION_SPEC("ServerError",__tr_no_lookup("Server error"),KVI_SMALLICON_SERVERERROR,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_5),
+	MSGTYPE_OPTION_SPEC("Help",__tr_no_lookup("Help"),KVI_SMALLICON_HELP,KviMircCntrl::DarkGreen,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_1),
 	MSGTYPE_OPTION("TextEncoding",__tr_no_lookup("Text Encoding Server message"),KVI_SMALLICON_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
@@ -1257,7 +1257,7 @@ void KviApplication::listAvailableOptions(KviWindow *wnd)
 	int i;
 
 	#define LIST_OPTIONS(__txt,__num,__table) \
-		wnd->output(KVI_OUT_SYSTEMMESSAGE,"%c%s%c",KVI_TEXT_BOLD,__txt,KVI_TEXT_BOLD); \
+		wnd->output(KVI_OUT_SYSTEMMESSAGE,"%c%s%c",KviMircCntrl::Bold,__txt,KviMircCntrl::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 ca97e2259..3efc0fd73 100644
--- a/src/kvirc/kernel/KviSSLMaster.cpp
+++ b/src/kvirc/kernel/KviSSLMaster.cpp
@@ -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"),KVI_TEXT_BOLD,description);
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Cipher: %c%s"),KVI_TEXT_BOLD,c->name());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Version: %c%s"),KVI_TEXT_BOLD,c->version());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Bits: %c%d (%d used)"),KVI_TEXT_BOLD,c->bits(),c->bitsUsed());
-//	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Description: %c%s"),KVI_TEXT_BOLD,c->description());
+	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());
 }
 
 KVIRC_API void printSSLCertificate(KviWindow * wnd,const char * description,KviSSLCertificate * c)
 {
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]: %c%s"),KVI_TEXT_BOLD,description);
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Version: %c%d"),KVI_TEXT_BOLD,c->version());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:  Serial number: %c%d"),KVI_TEXT_BOLD,c->serialNumber());
+	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]:  Subject:"));
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Common name: %c%s"),KVI_TEXT_BOLD,c->subjectCommonName());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Organization: %c%s"),KVI_TEXT_BOLD,c->subjectOrganization());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Organizational unit: %c%s"),KVI_TEXT_BOLD,c->subjectOrganizationalUnit());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Country: %c%s"),KVI_TEXT_BOLD,c->subjectCountry());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     State or province: %c%s"),KVI_TEXT_BOLD,c->subjectStateOrProvince());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Locality: %c%s"),KVI_TEXT_BOLD,c->subjectLocality());
+	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]:   Issuer:"));
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Common name: %c%s"),KVI_TEXT_BOLD,c->issuerCommonName());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Organization: %c%s"),KVI_TEXT_BOLD,c->issuerOrganization());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Organizational unit: %c%s"),KVI_TEXT_BOLD,c->issuerOrganizationalUnit());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Country: %c%s"),KVI_TEXT_BOLD,c->issuerCountry());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     State or province: %c%s"),KVI_TEXT_BOLD,c->issuerStateOrProvince());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Locality: %c%s"),KVI_TEXT_BOLD,c->issuerLocality());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:   Public key: %c%s (%d bits)"),KVI_TEXT_BOLD,c->publicKeyType(),c->publicKeyBits());
-	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:   Signature type: %c%s"),KVI_TEXT_BOLD,c->signatureType());
+	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());
 	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"),KVI_TEXT_BOLD,tmp.ptr());
+	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:   Signature contents: %c%s"),KviMircCntrl::Bold,tmp.ptr());
 
 }
 
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
index 72430417f..426883885 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
@@ -369,7 +369,7 @@ namespace KviKvsCoreFunctions
 		Q_UNUSED(__pContext);
 		Q_UNUSED(__pParams);
 
-		KVSCF_pRetBuffer->setString(QString(QChar(KVI_TEXT_BOLD)));
+		KVSCF_pRetBuffer->setString(QString(QChar(KviMircCntrl::Bold)));
 		return true;
 	}
 
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
index 85cbb4174..beb438ee9 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
@@ -753,7 +753,7 @@ namespace KviKvsCoreFunctions
 			KVSCF_PARAMETER("background",KVS_PT_UINT,KVS_PF_OPTIONAL,iBack)
 		KVSCF_PARAMETERS_END
 
-		QString szRet = QChar(KVI_TEXT_COLOR);
+		QString szRet = QChar(KviMircCntrl::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 1a3a1f1a5..0182317ea 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp
@@ -399,7 +399,7 @@ namespace KviKvsCoreFunctions
 		Q_UNUSED(__pContext);
 		Q_UNUSED(__pParams);
 
-		KVSCF_pRetBuffer->setString(QString(QChar(KVI_TEXT_RESET)));
+		KVSCF_pRetBuffer->setString(QString(QChar(KviMircCntrl::Reset)));
 		return true;
 	}
 
@@ -535,7 +535,7 @@ namespace KviKvsCoreFunctions
 		Q_UNUSED(__pContext);
 		Q_UNUSED(__pParams);
 
-		KVSCF_pRetBuffer->setString(QString(QChar(KVI_TEXT_REVERSE)));
+		KVSCF_pRetBuffer->setString(QString(QChar(KviMircCntrl::Reverse)));
 		return true;
 	}
 
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
index 75a23aef2..afc6bf4ab 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
@@ -795,7 +795,7 @@ namespace KviKvsCoreFunctions
 		Q_UNUSED(__pContext);
 		Q_UNUSED(__pParams);
 
-		KVSCF_pRetBuffer->setString(QString(QChar(KVI_TEXT_UNDERLINE)));
+		KVSCF_pRetBuffer->setString(QString(QChar(KviMircCntrl::Underline)));
 		return true;
 	}
 
diff --git a/src/kvirc/kvs/KviKvsReport.cpp b/src/kvirc/kvs/KviKvsReport.cpp
index 7233443bc..d10219330 100644
--- a/src/kvirc/kvs/KviKvsReport.cpp
+++ b/src/kvirc/kvs/KviKvsReport.cpp
@@ -127,7 +127,7 @@ void KviKvsReport::findLineColAndListing(const QChar * pBegin,const QChar * pPoi
 
 	{
 		QString * pListingStr = new QString();
-		KviQString::sprintf(*pListingStr,"%c%d ",KVI_TEXT_BOLD,iLine);
+		KviQString::sprintf(*pListingStr,"%c%d ",KviMircCntrl::Bold,iLine);
 		*pListingStr += QString(pLineBegin,pBegin - pLineBegin);
 		pListingStr->replace("\n","");
 		pListing->append(pListingStr);
@@ -188,19 +188,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"),KVI_TEXT_BOLD,&(r->message()));
+			pOutput->output(out,__tr2qs_ctx("[KVS]%c Warning: %Q","kvs"),KviMircCntrl::Bold,&(r->message()));
 		break;
 		case KviKvsReport::ParserError:
 			out = KVI_OUT_PARSERERROR;
-			pOutput->output(out,__tr2qs_ctx("[KVS]%c Compilation Error: %Q","kvs"),KVI_TEXT_BOLD,&(r->message()));
+			pOutput->output(out,__tr2qs_ctx("[KVS]%c Compilation Error: %Q","kvs"),KviMircCntrl::Bold,&(r->message()));
 		break;
 		case KviKvsReport::RunTimeWarning:
 			out = KVI_OUT_PARSERWARNING;
-			pOutput->output(out,__tr2qs_ctx("[KVS]%c Warning: %Q","kvs"),KVI_TEXT_BOLD,&(r->message()));
+			pOutput->output(out,__tr2qs_ctx("[KVS]%c Warning: %Q","kvs"),KviMircCntrl::Bold,&(r->message()));
 		break;
 		case KviKvsReport::RunTimeError:
 			out = KVI_OUT_PARSERERROR;
-			pOutput->output(out,__tr2qs_ctx("[KVS]%c Runtime Error: %Q","kvs"),KVI_TEXT_BOLD,&(r->message()));
+			pOutput->output(out,__tr2qs_ctx("[KVS]%c Runtime Error: %Q","kvs"),KviMircCntrl::Bold,&(r->message()));
 		break;
 	}
 
diff --git a/src/kvirc/kvs/object/KviKvsObject.cpp b/src/kvirc/kvs/object/KviKvsObject.cpp
index 857e2d139..6f2d5e084 100644
--- a/src/kvirc/kvs/object/KviKvsObject.cpp
+++ b/src/kvirc/kvs/object/KviKvsObject.cpp
@@ -1153,7 +1153,7 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c)
 				if(bArray)
 					KviQString::sprintf(szOut,"%Q, %Q",&szName,&szType);
 				else {
-					KviQString::sprintf(szOut,__tr2qs_ctx("Property: %c%Q%c, type %Q","kvs"),KVI_TEXT_BOLD,&szName,KVI_TEXT_BOLD,&szType);
+					KviQString::sprintf(szOut,__tr2qs_ctx("Property: %c%Q%c, type %Q","kvs"),KviMircCntrl::Bold,&szName,KviMircCntrl::Bold,&szType);
 					szOut.prepend(" ");
 				}
 
diff --git a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
index 8c8ce2d80..b5c6fba57 100644
--- a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
@@ -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,KVI_TEXT_RESET,&(msg->pSource->nick()),
+					&szWhat,&szTag,KviMircCntrl::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,KVI_TEXT_RESET,&(msg->pSource->nick()),
+				&szWhat,&szTag,KviMircCntrl::Reset,&(msg->pSource->nick()),
 				&(msg->pSource->user()),&(msg->pSource->host()),&szRequest,&szAction);
 		}
 	}
diff --git a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
index f1e7e45f7..71c80dd04 100644
--- a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
@@ -1454,7 +1454,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,KVI_TEXT_RESET);
+			&szNick,&szUser,&szHost,&szTopic,KviMircCntrl::Reset);
 	}
 }
 
diff --git a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
index 5b0075be4..cedc8ea2a 100644
--- a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
@@ -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",KVI_TEXT_BOLD,
-			msg->safePrefix(),KVI_TEXT_BOLD,&szWText);
+			KVI_OUT_CONNECTION,"%c\r!s\r%s\r%c: %Q",KviMircCntrl::Bold,
+			msg->safePrefix(),KviMircCntrl::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()==KVI_TEXT_COLOR) && (szReal[1].unicode() & 4) && (szReal[2].unicode()==KVI_TEXT_RESET) )
+				if((szReal[0].unicode() == KviMircCntrl::Color) && (szReal[1].unicode() & 4) && (szReal[2].unicode() == KviMircCntrl::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"),
-			KVI_TEXT_BOLD,&szNick, KVI_TEXT_BOLD,
-			&szUser,&szHost,KVI_TEXT_UNDERLINE,
-			KVI_TEXT_UNDERLINE,&szChan,KVI_TEXT_UNDERLINE,
-			KVI_TEXT_UNDERLINE,&szServ,KVI_TEXT_UNDERLINE,
-			KVI_TEXT_UNDERLINE,iHops, KVI_TEXT_UNDERLINE, KVI_TEXT_UNDERLINE,
-			&szFlag, KVI_TEXT_UNDERLINE, KVI_TEXT_UNDERLINE,
-			&szAway, KVI_TEXT_UNDERLINE,
-			KVI_TEXT_UNDERLINE, &szReal);
+			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);
 	}
 
 
@@ -1212,7 +1212,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"),
-			KVI_TEXT_BOLD,&szNk,KVI_TEXT_BOLD,&szWText);
+			KviMircCntrl::Bold,&szNk,KviMircCntrl::Bold,&szWText);
 	}
 }
 
@@ -1272,13 +1272,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"),KVI_TEXT_BOLD,
-				&szNick,KVI_TEXT_BOLD,KVI_TEXT_UNDERLINE,&szNick,
-				&szUser,&szHost,KVI_TEXT_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"),KviMircCntrl::Bold,
+				&szNick,KviMircCntrl::Bold,KviMircCntrl::Underline,&szNick,
+				&szUser,&szHost,KviMircCntrl::Underline);
 
 		pOut->output(
-			KVI_OUT_WHOISUSER,__tr2qs("%c\r!n\r%Q\r%c's real name: %Q"),KVI_TEXT_BOLD,
-				&szNick,KVI_TEXT_BOLD,&szReal);
+			KVI_OUT_WHOISUSER,__tr2qs("%c\r!n\r%Q\r%c's real name: %Q"),KviMircCntrl::Bold,
+				&szNick,KviMircCntrl::Bold,&szReal);
 	}
 }
 
@@ -1297,12 +1297,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"),KVI_TEXT_BOLD,
-			&szNick,KVI_TEXT_BOLD,KVI_TEXT_UNDERLINE,&szNick,
-			&szUser,&szHost,KVI_TEXT_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"),KviMircCntrl::Bold,
+			&szNick,KviMircCntrl::Bold,KviMircCntrl::Underline,&szNick,
+			&szUser,&szHost,KviMircCntrl::Underline);
 		pOut->output(
-			KVI_OUT_WHOISUSER,__tr2qs("%c\r!n\r%Q\r%c's real name was: %Q"),KVI_TEXT_BOLD,
-			&szNick,KVI_TEXT_BOLD,&szReal);
+			KVI_OUT_WHOISUSER,__tr2qs("%c\r!n\r%Q\r%c's real name was: %Q"),KviMircCntrl::Bold,
+			&szNick,KviMircCntrl::Bold,&szReal);
 	}
 }
 
@@ -1365,8 +1365,8 @@ void KviIrcServerParser::parseNumericWhoisChannels(KviIrcMessage *msg)
 		}
 
 		pOut->output(
-			KVI_OUT_WHOISCHANNELS,__tr2qs("%c\r!n\r%Q\r%c's channels: %Q"),KVI_TEXT_BOLD,
-				&szNick,KVI_TEXT_BOLD,&szChanList);
+			KVI_OUT_WHOISCHANNELS,__tr2qs("%c\r!n\r%Q\r%c's channels: %Q"),KviMircCntrl::Bold,
+				&szNick,KviMircCntrl::Bold,&szChanList);
 	}
 }
 
@@ -1412,8 +1412,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"),KVI_TEXT_BOLD,
-			&szNick,KVI_TEXT_BOLD,uDays,uHours,uMins,uTime);
+			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);
 
 		uTime = sign.toUInt(&bOk);
 		if(bOk)
@@ -1436,8 +1436,8 @@ void KviIrcServerParser::parseNumericWhoisIdle(KviIrcMessage *msg)
 			}
 
 			pOut->output(
-				KVI_OUT_WHOISIDLE,__tr2qs("%c\r!n\r%Q\r%c's signon time: %Q"),KVI_TEXT_BOLD,
-				&szNick,KVI_TEXT_BOLD,&szTmp);
+				KVI_OUT_WHOISIDLE,__tr2qs("%c\r!n\r%Q\r%c's signon time: %Q"),KviMircCntrl::Bold,
+				&szNick,KviMircCntrl::Bold,&szTmp);
 		}
 	}
 }
@@ -1474,8 +1474,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"),KVI_TEXT_BOLD,
-			&szNick,KVI_TEXT_BOLD,&szServ,&szWText);
+			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);
 	}
 }
 
@@ -1503,8 +1503,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"),KVI_TEXT_BOLD,
-			&szNick,KVI_TEXT_BOLD,&szAuth);
+			KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c is authenticated as %Q"),KviMircCntrl::Bold,
+			&szNick,KviMircCntrl::Bold,&szAuth);
 	}
 }
 
@@ -1540,12 +1540,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"),KVI_TEXT_BOLD,
-				&szNick,KVI_TEXT_BOLD, &szUserHost, &szIpAddr);
+				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);
 		} else {
 			pOut->output(
-				KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c's actual host: %Q"),KVI_TEXT_BOLD,
-				&szNick,KVI_TEXT_BOLD, &szUserHost);
+				KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c's actual host: %Q"),KviMircCntrl::Bold,
+				&szNick,KviMircCntrl::Bold, &szUserHost);
 		}
 	}
 }
@@ -1578,8 +1578,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"),KVI_TEXT_BOLD,
-			&szNick,KVI_TEXT_BOLD,&szOth);
+			KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c's info: %Q"),KviMircCntrl::Bold,
+			&szNick,KviMircCntrl::Bold,&szOth);
 	}
 }
 
@@ -1627,8 +1627,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"),KVI_TEXT_BOLD,
-			&szNick,KVI_TEXT_BOLD,&pref);
+			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);
 	}
 }
 
@@ -1644,8 +1644,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"),KVI_TEXT_BOLD,
-			&szNick,KVI_TEXT_BOLD,&pref);
+			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);
 	}
 }
 
@@ -2031,7 +2031,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"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD,szInfo.toUtf8().data());
+			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());
 	}
 }
 
@@ -2042,7 +2042,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"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD,szInfo.toUtf8().data());
+		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());
 	}
 }
 
@@ -2053,7 +2053,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"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD,szInfo.toUtf8().data());
+			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());
 	}
 }
 
@@ -2103,7 +2103,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:"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD);
+		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's information:"),KviMircCntrl::Bold,msg->prefix(),KviMircCntrl::Bold);
 	}
 }
 
@@ -2113,7 +2113,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"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD);
+		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("End of %c\r!s\r%s\r%c's information"),KviMircCntrl::Bold,msg->prefix(),KviMircCntrl::Bold);
 	}
 }
 
@@ -2124,7 +2124,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"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD,&szInfo);
+		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's time is %Q"),KviMircCntrl::Bold,msg->prefix(),KviMircCntrl::Bold,&szInfo);
 	}
 }
 
@@ -2262,8 +2262,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"),KVI_TEXT_BOLD,
-				&szNick,KVI_TEXT_BOLD,&szCodepage,&szWText);
+				KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c's codepage is %Q: %Q"),KviMircCntrl::Bold,
+				&szNick,KviMircCntrl::Bold,&szCodepage,&szWText);
 		}
 	} else {
 		// simply unhandled
diff --git a/src/kvirc/ui/KviChannelWindow.cpp b/src/kvirc/ui/KviChannelWindow.cpp
index 7573edaa0..42b5523b2 100644
--- a/src/kvirc/ui/KviChannelWindow.cpp
+++ b/src/kvirc/ui/KviChannelWindow.cpp
@@ -1175,7 +1175,7 @@ void KviChannelWindow::ownMessage(const QString & szBuffer, bool bUserFeedback)
 	{
 		if(cryptSessionInfo()->m_bDoEncrypt)
 		{
-			if(*d != KVI_TEXT_CRYPTESCAPE)
+			if(*d != KviMircCntrl::CryptEscape)
 			{
 				KviCString encrypted;
 				cryptSessionInfo()->m_pEngine->setMaxEncryptLen(maxMsgLen);
diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp
index 308c73903..d78c64f2d 100644
--- a/src/kvirc/ui/KviConsoleWindow.cpp
+++ b/src/kvirc/ui/KviConsoleWindow.cpp
@@ -778,8 +778,8 @@ void KviConsoleWindow::outputPrivmsg(KviWindow *wnd,
 				szNick.prepend(KviNickColors::getSmartColor(sum));
 			}
 		}
-		szNick.prepend(KVI_TEXT_COLOR);
-		szNick.append(KVI_TEXT_COLOR);
+		szNick.prepend(KviMircCntrl::Color);
+		szNick.append(KviMircCntrl::Color);
 	}
 /*	if(KVI_OPTION_BOOL(KviOption_boolUseUserListColorsAsNickColors) && bIsChan)
 	{
@@ -818,8 +818,8 @@ void KviConsoleWindow::outputPrivmsg(KviWindow *wnd,
 	}*/
 	if(KVI_OPTION_BOOL(KviOption_boolBoldedNicks))
 	{
-		szNick.prepend(KVI_TEXT_BOLD);
-		szNick.append(KVI_TEXT_BOLD);
+		szNick.prepend(KviMircCntrl::Bold);
+		szNick.append(KviMircCntrl::Bold);
 	}
 
 	QString szMessage;
@@ -1081,7 +1081,7 @@ void KviConsoleWindow::applyOptions()
 	if(KVI_OPTION_BOOL(KviOption_boolUseSpecifiedSmartColorForOwnNick))
 	{
 		int back = KVI_OPTION_UINT(KviOption_uintUserIrcViewOwnBackground);
-		if(back==KVI_TRANSPARENT)
+		if(back == KviMircCntrl::Transparent)
 		{
 			KviQString::sprintf(m_szOwnSmartColor,"%d", \
 				KVI_OPTION_UINT(KviOption_uintUserIrcViewOwnForeground));
diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp
index 01828d1e9..994c1d5d3 100644
--- a/src/kvirc/ui/KviInputEditor.cpp
+++ b/src/kvirc/ui/KviInputEditor.cpp
@@ -490,25 +490,25 @@ QChar KviInputEditor::getSubstituteChar(unsigned short uControlCode)
 {
 	switch(uControlCode)
 	{
-		case KVI_TEXT_COLOR:
+		case KviMircCntrl::Color:
 			return QChar('K');
 			break;
-		case KVI_TEXT_BOLD:
+		case KviMircCntrl::Bold:
 			return QChar('B');
 			break;
-		case KVI_TEXT_RESET:
+		case KviMircCntrl::Reset:
 			return QChar('O');
 			break;
-		case KVI_TEXT_REVERSE:
+		case KviMircCntrl::Reverse:
 			return QChar('R');
 			break;
-		case KVI_TEXT_UNDERLINE:
+		case KviMircCntrl::Underline:
 			return QChar('U');
 			break;
-		case KVI_TEXT_CRYPTESCAPE:
+		case KviMircCntrl::CryptEscape:
 			return QChar('P');
 			break;
-		case KVI_TEXT_ICON:
+		case KviMircCntrl::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(KVI_TEXT_COLOR)) &&
-		(c != QChar(KVI_TEXT_BOLD)) &&
-		(c != QChar(KVI_TEXT_UNDERLINE)) &&
-		(c != QChar(KVI_TEXT_RESET)) &&
-		(c != QChar(KVI_TEXT_REVERSE)) &&
-		(c != QChar(KVI_TEXT_CRYPTESCAPE)) &&
-		(c != QChar(KVI_TEXT_ICON))))
+		((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))))
 	{
 		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(KVI_TEXT_COLOR)) &&
-				(c != QChar(KVI_TEXT_BOLD)) &&
-				(c != QChar(KVI_TEXT_UNDERLINE)) &&
-				(c != QChar(KVI_TEXT_RESET)) &&
-				(c != QChar(KVI_TEXT_REVERSE)) &&
-				(c != QChar(KVI_TEXT_CRYPTESCAPE)) &&
-				(c != QChar(KVI_TEXT_ICON))))
+				((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))))
 			{
 				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 KVI_TEXT_BOLD:
+			case KviMircCntrl::Bold:
 				m_bCurBold = ! m_bCurBold;
 				break;
-			case KVI_TEXT_UNDERLINE:
+			case KviMircCntrl::Underline:
 				m_bCurUnderline = ! m_bCurUnderline;
 				break;
-			case KVI_TEXT_RESET:
+			case KviMircCntrl::Reset:
 				m_iCurFore = KVI_INPUT_DEF_FORE;
 				m_iCurBack = KVI_INPUT_DEF_BACK;
 				m_bCurBold = false;
 				m_bCurUnderline = false;
 				break;
-			case KVI_TEXT_REVERSE:
+			case KviMircCntrl::Reverse:
 			{
 				char cAuxClr = m_iCurFore;
 				m_iCurFore  = m_iCurBack;
 				m_iCurBack  = cAuxClr;
 			}
 			break;
-			case KVI_TEXT_CRYPTESCAPE:
-			case KVI_TEXT_ICON:
+			case KviMircCntrl::CryptEscape:
+			case KviMircCntrl::Icon:
 				// makes a single block
 				break;
-			case KVI_TEXT_COLOR:
+			case KviMircCntrl::Color:
 			{
 				iIdx++;
 				if(iIdx >= ((int)(m_szTextBuffer.length())))
@@ -594,10 +594,10 @@ void KviInputEditor::extractNextBlock(int iIdx, QFontMetrics *fm, int iCurXPos,
 				unsigned char uFore;
 				unsigned char uBack;
 				iIdx = getUnicodeColorBytes(m_szTextBuffer,iIdx,&uFore,&uBack);
-				if(uFore != KVI_NOCHANGE)
+				if(uFore != KviMircCntrl::NoChange)
 				{
 					m_iCurFore = uFore;
-					if(uBack != KVI_NOCHANGE)
+					if(uBack != KviMircCntrl::NoChange)
 						m_iCurBack = uBack;
 				} else {
 					// ONLY a CTRL+K
@@ -624,26 +624,26 @@ void KviInputEditor::runUpToTheFirstVisibleChar()
 		{
 			switch(uChar)
 			{
-				case KVI_TEXT_BOLD:
+				case KviMircCntrl::Bold:
 					m_bCurBold = ! m_bCurBold;
 					break;
-				case KVI_TEXT_UNDERLINE:
+				case KviMircCntrl::Underline:
 					m_bCurUnderline = ! m_bCurUnderline;
 					break;
-				case KVI_TEXT_RESET:
+				case KviMircCntrl::Reset:
 					m_iCurFore = KVI_INPUT_DEF_FORE;
 					m_iCurBack = KVI_INPUT_DEF_BACK;
 					m_bCurBold = false;
 					m_bCurUnderline = false;
 					break;
-				case KVI_TEXT_REVERSE:
+				case KviMircCntrl::Reverse:
 				{
 					char cAuxClr = m_iCurFore;
 					m_iCurFore = m_iCurBack;
 					m_iCurBack = cAuxClr;
 				}
 				break;
-				case KVI_TEXT_COLOR:
+				case KviMircCntrl::Color:
 				{
 					iIdx++;
 					if(iIdx >= ((int)(m_szTextBuffer.length())))return;
@@ -651,9 +651,9 @@ void KviInputEditor::runUpToTheFirstVisibleChar()
 					unsigned char uBack;
 					iIdx = getUnicodeColorBytes(m_szTextBuffer,iIdx,&uFore,&uBack);
 					iIdx--;
-					if(uFore != KVI_NOCHANGE) m_iCurFore = uFore;
+					if(uFore != KviMircCntrl::NoChange) m_iCurFore = uFore;
 					else m_iCurFore = KVI_INPUT_DEF_FORE;
-					if(uBack != KVI_NOCHANGE) m_iCurBack = uBack;
+					if(uBack != KviMircCntrl::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(KVI_TEXT_ICON);
+			szText.prepend(KviMircCntrl::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(KVI_TEXT_RESET);
+				//else szBlock = QChar(KviMircCntrl::Reset);
 				szText.remove(0,iIdx+1);
 			} else {
 				szBlock = szText;
@@ -2181,34 +2181,34 @@ void KviInputEditor::nextWordSelection()
 
 void KviInputEditor::insertBold()
 {
-	if(!m_bReadOnly) insertChar(KVI_TEXT_BOLD);
+	if(!m_bReadOnly) insertChar(KviMircCntrl::Bold);
 }
 
 void KviInputEditor::insertReset()
 {
-	if(!m_bReadOnly) insertChar(KVI_TEXT_RESET);
+	if(!m_bReadOnly) insertChar(KviMircCntrl::Reset);
 }
 
 void KviInputEditor::insertUnderline()
 {
-	if(!m_bReadOnly) insertChar(KVI_TEXT_UNDERLINE);
+	if(!m_bReadOnly) insertChar(KviMircCntrl::Underline);
 }
 
 void KviInputEditor::insertReverse()
 {
-	if(!m_bReadOnly) insertChar(KVI_TEXT_REVERSE);
+	if(!m_bReadOnly) insertChar(KviMircCntrl::Reverse);
 }
 
 void KviInputEditor::insertPlainText()
 {
-	if(!m_bReadOnly) insertChar(KVI_TEXT_CRYPTESCAPE); // DO NOT CRYPT THIS STUFF
+	if(!m_bReadOnly) insertChar(KviMircCntrl::CryptEscape); // DO NOT CRYPT THIS STUFF
 }
 
 void KviInputEditor::insertIcon()
 {
 	if(!m_bReadOnly)
 	{
-		insertChar(KVI_TEXT_ICON); // THE NEXT WORD IS AN ICON NAME
+		insertChar(KviMircCntrl::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(KVI_TEXT_COLOR);
+		insertChar(KviMircCntrl::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 f85b12616..2352433f8 100644
--- a/src/kvirc/ui/KviIrcView.cpp
+++ b/src/kvirc/ui/KviIrcView.cpp
@@ -343,15 +343,16 @@ static inline void delete_text_line(KviIrcViewLine * line,QHash<KviIrcViewLine*,
 	}
 	for(unsigned int i=0;i<line->uChunkCount;i++)
 	{
-		if((line->pChunks[i].type == KVI_TEXT_ESCAPE) || (line->pChunks[i].type == KVI_TEXT_ICON))
+		if((line->pChunks[i].type == KviMircCntrl::Escape) || (line->pChunks[i].type == KviMircCntrl::Icon))
 		{
-			if( (line->pChunks[i].type == KVI_TEXT_ICON) && (line->pChunks[i].szPayload!=line->pChunks[i].szSmileId) )
+			if((line->pChunks[i].type == KviMircCntrl::Icon) && (line->pChunks[i].szPayload!=line->pChunks[i].szSmileId))
 				KviMemory::free(line->pChunks[i].szSmileId);
 			KviMemory::free(line->pChunks[i].szPayload);
 		}
 	}
 	KviMemory::free(line->pChunks);                        //free attributes data
-	if(line->iBlockCount)KviMemory::free(line->pBlocks);
+	if(line->iBlockCount)
+		KviMemory::free(line->pBlocks);
 	delete line;
 }
 
@@ -1151,7 +1152,7 @@ void KviIrcView::paintEvent(QPaintEvent *p)
 		char defaultFore  = pCurTextLine->pBlocks->pChunk->colors.fore;
 		bool curBold      = false;
 		bool curUnderline = false;
-		char foreBeforeEscape= KVI_BLACK;
+		char foreBeforeEscape = KviMircCntrl::Black;
 		bool curLink      = false;
 		bool bacWasTransp = false;
 		char curFore      = defaultFore;
@@ -1174,11 +1175,11 @@ void KviIrcView::paintEvent(QPaintEvent *p)
 				//normal block
 				switch(block->pChunk->type)
 				{
-					case KVI_TEXT_COLOR:
-						if(block->pChunk->colors.fore != KVI_NOCHANGE)
+					case KviMircCntrl::Color:
+						if(block->pChunk->colors.fore != KviMircCntrl::NoChange)
 						{
 							curFore = block->pChunk->colors.fore;
-							if(block->pChunk->colors.back != KVI_NOCHANGE)
+							if(block->pChunk->colors.back != KviMircCntrl::NoChange)
 								curBack = block->pChunk->colors.back;
 						} else {
 							/*
@@ -1189,47 +1190,47 @@ void KviIrcView::paintEvent(QPaintEvent *p)
 							curBack = defaultBack;
 						}
 						break;
-					case KVI_TEXT_ESCAPE:
+					case KviMircCntrl::Escape:
 						foreBeforeEscape      = curFore;
-						if(block->pChunk->colors.fore != KVI_NOCHANGE)
+						if(block->pChunk->colors.fore != KviMircCntrl::NoChange)
 							curFore = block->pChunk->colors.fore;
 						if(m_pLastLinkUnderMouse == block)curLink = true;
 						break;
-					case KVI_TEXT_UNESCAPE:
+					case KviMircCntrl::UnEscape:
 						curLink            = false;
 						curFore            = foreBeforeEscape;
 						break;
-					case KVI_TEXT_BOLD:
+					case KviMircCntrl::Bold:
 						curBold            = !curBold;
 						break;
-					case KVI_TEXT_UNDERLINE:
+					case KviMircCntrl::Underline:
 						curUnderline       = !curUnderline;
 						break;
-					case KVI_TEXT_RESET:
+					case KviMircCntrl::Reset:
 						curBold            = false;
 						curUnderline       = false;
 						curFore            = defaultFore;
 						curBack            = defaultBack;
 						break;
-					case KVI_TEXT_REVERSE:
+					case KviMircCntrl::Reverse:
 						//this should be "reversed colors"
 						char aux       = curBack;
 						if(bacWasTransp == true)
 						{
-							curBack = KVI_TRANSPARENT;
+							curBack = KviMircCntrl::Transparent;
 						} else {
 							curBack = curFore;
 						}
-						if(aux == KVI_TRANSPARENT)
+						if(aux == KviMircCntrl::Transparent)
 						{
 							curFore = (char)KVI_DEF_BACK;
 						} else {
 							curFore = aux;
 						}
-						bacWasTransp = (aux == KVI_TRANSPARENT);
+						bacWasTransp = (aux == KviMircCntrl::Transparent);
 						break;
-					//case KVI_TEXT_ICON:
-					//case KVI_TEXT_UNICON:
+					//case KviMircCntrl::Icon:
+					//case KviMircCntrl::UnIcon:
 						// does nothing
 						//qDebug("Have a block with ICON/UNICON attr");
 						//break;
@@ -1304,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 != KVI_TRANSPARENT){ \
+	if(curBack != KviMircCntrl::Transparent){ \
 		int theWdth = _text_width; \
 		if(theWdth < 0) \
 			theWdth=width()-(curLeftCoord+KVI_IRCVIEW_HORIZONTAL_BORDER+scrollbarWidth); \
@@ -1378,7 +1379,8 @@ void KviIrcView::paintEvent(QPaintEvent *p)
 						break;
 					}
 				} else {
-					if(block->pChunk && block->pChunk->type == KVI_TEXT_ICON)goto no_selection_paint;
+					if(block->pChunk && block->pChunk->type == KviMircCntrl::Icon)
+						goto no_selection_paint;
 					int wdth = block->block_width;
 					if(wdth == 0)
 					{
@@ -1387,7 +1389,8 @@ void KviIrcView::paintEvent(QPaintEvent *p)
 						{
 							// There is another block...
 							// Check if it is a wrap...
-							if(pCurTextLine->pBlocks[i+1].pChunk == 0)wdth = widgetWidth-(curLeftCoord+KVI_IRCVIEW_HORIZONTAL_BORDER);
+							if(pCurTextLine->pBlocks[i+1].pChunk == 0)
+								wdth = widgetWidth-(curLeftCoord+KVI_IRCVIEW_HORIZONTAL_BORDER);
 							// else simply a zero characters block
 						}
 						// else simply a zero characters block
@@ -1397,13 +1400,14 @@ void KviIrcView::paintEvent(QPaintEvent *p)
 			} else {
 				//No selection ...go fast!
 no_selection_paint:
-				if(block->pChunk && block->pChunk->type == KVI_TEXT_ICON)
+				if(block->pChunk && block->pChunk->type == KviMircCntrl::Icon)
 				{
 					int wdth = block->block_width;
-					if(wdth < 0)wdth = widgetWidth - (curLeftCoord + KVI_IRCVIEW_HORIZONTAL_BORDER);
+					if(wdth < 0)
+						wdth = widgetWidth - (curLeftCoord + KVI_IRCVIEW_HORIZONTAL_BORDER);
 					int imageYPos = curBottomCoord - m_iRelativePixmapY;
 					//Set the mask if needed
-					if(curBack != KVI_TRANSPARENT && curBack < 16)
+					if(curBack != KviMircCntrl::Transparent && curBack < 16)
 					{
 						pa.fillRect(curLeftCoord,curBottomCoord - m_iFontLineSpacing + m_iFontDescent,wdth,m_iFontLineSpacing,KVI_OPTION_MIRCCOLOR((unsigned char)curBack));
 					}
@@ -1438,7 +1442,7 @@ no_selection_paint:
 
 					SET_PEN(curFore,block->pChunk ? block->pChunk->customFore : QColor());
 
-					if(curBack != KVI_TRANSPARENT && curBack < 16 )
+					if(curBack != KviMircCntrl::Transparent && curBack < 16 )
 					{
 						pa.fillRect(curLeftCoord,curBottomCoord - m_iFontLineSpacing + m_iFontDescent,wdth,m_iFontLineSpacing,KVI_OPTION_MIRCCOLOR((unsigned char)curBack));
 					}
@@ -1634,7 +1638,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth)
 		int curBlockLen   = 0;
 		int curBlockWidth = 0;
 
-		if(ptr->pChunks[curAttrBlock].type == KVI_TEXT_ICON)
+		if(ptr->pChunks[curAttrBlock].type == KviMircCntrl::Icon)
 		{
 			curBlockWidth = m_iIconWidth;
 		} else {
@@ -1694,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 == KVI_TEXT_ICON)
+			if(ptr->pChunks[curAttrBlock].type == KviMircCntrl::Icon)
 			{
 				// FIXME what if the icon curBlockWidth is > maxWidth ? => endless loop
 				// This is an icon block: needs to be wrapped differently:
@@ -1792,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 == KVI_TEXT_ICON)
+		if(line->pBlocks[bufIndex].pChunk && line->pBlocks[bufIndex].pChunk->type == KviMircCntrl::Icon)
 			m_pWrappedBlockSelectionInfo->selection_type = KVI_IRCVIEW_BLOCK_SELECTION_ICON;
 		else
 			m_pWrappedBlockSelectionInfo->selection_type = KVI_IRCVIEW_BLOCK_SELECTION_TOTAL;
@@ -1819,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 == KVI_TEXT_ICON)
+		if(line->pBlocks[bufIndex].pChunk && line->pBlocks[bufIndex].pChunk->type == KviMircCntrl::Icon)
 		{
 			m_pWrappedBlockSelectionInfo->selection_type = KVI_IRCVIEW_BLOCK_SELECTION_ICON;
 			return true;
@@ -1904,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 == KVI_TEXT_ICON)
+		if(line->pBlocks[bufIndex].pChunk && line->pBlocks[bufIndex].pChunk->type == KviMircCntrl::Icon)
 		{
 			m_pWrappedBlockSelectionInfo->selection_type = KVI_IRCVIEW_BLOCK_SELECTION_ICON;
 			return true;
@@ -1949,7 +1953,7 @@ bool KviIrcView::checkSelectionBlock(KviIrcViewLine * line,int bufIndex)
 		}
 
 		//icon chunk
-		if(line->pBlocks[bufIndex].pChunk && line->pBlocks[bufIndex].pChunk->type == KVI_TEXT_ICON)
+		if(line->pBlocks[bufIndex].pChunk && line->pBlocks[bufIndex].pChunk->type == KviMircCntrl::Icon)
 		{
 			m_pWrappedBlockSelectionInfo->selection_type = KVI_IRCVIEW_BLOCK_SELECTION_ICON;
 			return true;
@@ -2550,14 +2554,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 == KVI_TEXT_ESCAPE)
+							if(l->pBlocks[i].pChunk->type == KviMircCntrl::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 == KVI_TEXT_UNESCAPE) iLastEscapeBlock=-1;
+							if(l->pBlocks[i].pChunk->type == KviMircCntrl::UnEscape) iLastEscapeBlock=-1;
 
 						i++;
 					}
@@ -2587,14 +2591,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 == KVI_TEXT_ESCAPE)
+						if(l->pBlocks[i].pChunk->type == KviMircCntrl::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 == KVI_TEXT_UNESCAPE) iLastEscapeBlock=-1;
+						if(l->pBlocks[i].pChunk->type == KviMircCntrl::UnEscape) iLastEscapeBlock=-1;
 					// if the block width is > 0, update iLeft
 					if(l->pBlocks[i].block_width > 0)
 					{
@@ -2640,7 +2644,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect *
 							for(k = iLastEscapeBlock;; k++)
 							{
 								if(l->pBlocks[k].pChunk)
-									if(l->pBlocks[k].pChunk->type != KVI_TEXT_UNESCAPE)
+									if(l->pBlocks[k].pChunk->type != KviMircCntrl::UnEscape)
 										iRightBorder+=l->pBlocks[k].block_width;
 									else
 										break;
@@ -2671,23 +2675,23 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect *
 								{
 									if(l->pBlocks[iEndOfLInk].pChunk)
 									{
-										if(l->pBlocks[iEndOfLInk].pChunk->type != KVI_TEXT_UNESCAPE)
+										if(l->pBlocks[iEndOfLInk].pChunk->type != KviMircCntrl::UnEscape)
 										{
 											switch(l->pBlocks[iEndOfLInk].pChunk->type)
 											{
-												case KVI_TEXT_BOLD:
-												case KVI_TEXT_UNDERLINE:
-												case KVI_TEXT_REVERSE:
-												case KVI_TEXT_RESET:
+												case KviMircCntrl::Bold:
+												case KviMircCntrl::Underline:
+												case KviMircCntrl::Reverse:
+												case KviMircCntrl::Reset:
 													szLink.append(QChar(l->pBlocks[iEndOfLInk].pChunk->type));
 												break;
-												case KVI_TEXT_COLOR:
-													szLink.append(QChar(KVI_TEXT_COLOR));
-													if(l->pBlocks[iEndOfLInk].pChunk->colors.fore != KVI_NOCHANGE)
+												case KviMircCntrl::Color:
+													szLink.append(QChar(KviMircCntrl::Color));
+													if(l->pBlocks[iEndOfLInk].pChunk->colors.fore != KviMircCntrl::NoChange)
 													{
 														szLink.append(QString("%1").arg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.fore)));
 													}
-													if(l->pBlocks[iEndOfLInk].pChunk->colors.back != KVI_NOCHANGE)
+													if(l->pBlocks[iEndOfLInk].pChunk->colors.back != KviMircCntrl::NoChange)
 													{
 														szLink.append(QChar(','));
 														szLink.append(QString("%1").arg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.back)));
@@ -2714,7 +2718,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect *
 							}
 							return &(l->pBlocks[iLastEscapeBlock]);
 						}
-						if(l->pBlocks[i].pChunk->type == KVI_TEXT_ICON)
+						if(l->pBlocks[i].pChunk->type == KviMircCntrl::Icon)
 						{
 							if(pRect)
 							{
diff --git a/src/kvirc/ui/KviIrcView_events.cpp b/src/kvirc/ui/KviIrcView_events.cpp
index 29af0d7af..9ea71447d 100644
--- a/src/kvirc/ui/KviIrcView_events.cpp
+++ b/src/kvirc/ui/KviIrcView_events.cpp
@@ -421,20 +421,20 @@ void KviIrcView::addControlCharacter(KviIrcViewLineChunk *pC, QString & szSelect
 {
 	switch(pC->type)
 	{
-		case KVI_TEXT_BOLD:
-		case KVI_TEXT_UNDERLINE:
-		case KVI_TEXT_REVERSE:
-		case KVI_TEXT_RESET:
+		case KviMircCntrl::Bold:
+		case KviMircCntrl::Underline:
+		case KviMircCntrl::Reverse:
+		case KviMircCntrl::Reset:
 			szSelectionText.append(QChar(pC->type));
 		break;
-		case KVI_TEXT_COLOR:
+		case KviMircCntrl::Color:
 			szSelectionText.append(QChar(pC->type));
-			if((pC->colors.fore != KVI_NOCHANGE) && (pC->colors.fore != KVI_TRANSPARENT))
+			if((pC->colors.fore != KviMircCntrl::NoChange) && (pC->colors.fore != KviMircCntrl::Transparent))
 			{
 				if(pC->colors.fore > 9)szSelectionText.append(QChar('1'));
 				szSelectionText.append(QChar((pC->colors.fore%10)+'0'));
 			}
-			if((pC->colors.back != KVI_NOCHANGE) && (pC->colors.back != KVI_TRANSPARENT) )
+			if((pC->colors.back != KviMircCntrl::NoChange) && (pC->colors.back != KviMircCntrl::Transparent) )
 			{
 				szSelectionText.append(QChar(','));
 				if(pC->colors.back > 9)szSelectionText.append(QChar('1'));
diff --git a/src/kvirc/ui/KviIrcView_getTextLine.cpp b/src/kvirc/ui/KviIrcView_getTextLine.cpp
index 2fce91fda..de63a5d41 100644
--- a/src/kvirc/ui/KviIrcView_getTextLine.cpp
+++ b/src/kvirc/ui/KviIrcView_getTextLine.cpp
@@ -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 = KVI_TEXT_COLOR;
+	line_ptr->pChunks[0].type = KviMircCntrl::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 = KVI_TEXT_COLOR;
+			line_ptr->pChunks[1].type = KviMircCntrl::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 = KVI_TEXT_COLOR;
+			line_ptr->pChunks[2].type = KviMircCntrl::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(KVI_TEXT_UNESCAPE);
+				NEW_LINE_CHUNK(KviMircCntrl::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(KVI_TEXT_UNESCAPE);
+				NEW_LINE_CHUNK(KviMircCntrl::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(KVI_TEXT_UNESCAPE);
+				NEW_LINE_CHUNK(KviMircCntrl::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(KVI_TEXT_ESCAPE)
+						NEW_LINE_CHUNK(KviMircCntrl::Escape)
 
 						p+=2; //point after \r!
 
@@ -618,7 +618,7 @@ found_command_escape:
 							}
 						}
 						if(!bColorSet)
-							line_ptr->pChunks[iCurChunk].colors.fore=KVI_NOCHANGE;
+							line_ptr->pChunks[iCurChunk].colors.fore=KviMircCntrl::NoChange;
 
 #if 0
 						APPEND_LAST_TEXT_BLOCK(next_cr,term_cr - next_cr)
@@ -638,7 +638,7 @@ found_command_escape:
 				}
 			}
 			break;
-		case KVI_TEXT_COLOR:
+		case KviMircCntrl::Color:
 #ifdef COMPILE_USE_DYNAMIC_LABELS
 found_color_escape:
 #endif //COMPILE_USE_DYNAMIC_LABELS
@@ -650,7 +650,7 @@ found_color_escape:
 							&(line_ptr->pChunks[iCurChunk].colors.back));
 			data_ptr=p;
 			break;
-		case KVI_TEXT_ICON:
+		case KviMircCntrl::Icon:
 #ifdef COMPILE_USE_DYNAMIC_LABELS
 found_icon_escape:
 #endif //COMPILE_USE_DYNAMIC_LABELS
@@ -677,7 +677,7 @@ found_icon_escape:
 					if(icon)
 					{
 						APPEND_LAST_TEXT_BLOCK(data_ptr,beginPtr - data_ptr)
-						NEW_LINE_CHUNK(KVI_TEXT_ICON)
+						NEW_LINE_CHUNK(KviMircCntrl::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 +693,15 @@ found_icon_escape:
 							m_hAnimatedSmiles.insert(line_ptr,icon->animatedPixmap());
 						}
 						data_ptr = p;
-						NEW_LINE_CHUNK(KVI_TEXT_UNICON)
+						NEW_LINE_CHUNK(KviMircCntrl::UnIcon)
 					}
 				}
 			}
 			break;
-		case KVI_TEXT_BOLD:
-		case KVI_TEXT_UNDERLINE:
-		case KVI_TEXT_REVERSE:
-		case KVI_TEXT_RESET:
+		case KviMircCntrl::Bold:
+		case KviMircCntrl::Underline:
+		case KviMircCntrl::Reverse:
+		case KviMircCntrl::Reset:
 #ifdef COMPILE_USE_DYNAMIC_LABELS
 found_mirc_escape:
 #endif //COMPILE_USE_DYNAMIC_LABELS
@@ -962,7 +962,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(KVI_TEXT_ESCAPE)
+		NEW_LINE_CHUNK(KviMircCntrl::Escape)
 // FIXME: #warning "Option for the URL escape...double click and right button!!!"
 
 		//	int urlLen = KVI_OPTION_STRING(KviOption_stringUrlLinkCommand).len() + 1;
@@ -988,7 +988,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(KVI_TEXT_UNESCAPE)
+		NEW_LINE_CHUNK(KviMircCntrl::UnEscape)
 
 	}
 	//update the value of the main counter, then restart the loop
@@ -1090,7 +1090,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(KVI_TEXT_ICON)
+						NEW_LINE_CHUNK(KviMircCntrl::Icon)
 
 						int emolen = p - begin;
 						int reallen=item2 ? 3 : 2;
@@ -1109,7 +1109,7 @@ check_emoticon_char:
 						item++;
 						while(count > 0)
 						{
-							NEW_LINE_CHUNK(KVI_TEXT_ICON)
+							NEW_LINE_CHUNK(KviMircCntrl::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 +1121,7 @@ check_emoticon_char:
 							APPEND_ZERO_LENGTH_BLOCK(data_ptr)
 							count--;
 						}
-						NEW_LINE_CHUNK(KVI_TEXT_UNICON)
+						NEW_LINE_CHUNK(KviMircCntrl::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 d3259a959..e6ec38958 100644
--- a/src/kvirc/ui/KviQueryWindow.cpp
+++ b/src/kvirc/ui/KviQueryWindow.cpp
@@ -581,7 +581,7 @@ void KviQueryWindow::ownMessage(const QString & szBuffer, bool bUserFeedback)
 	{
 		if(cryptSessionInfo()->m_bDoEncrypt)
 		{
-			if(*d != KVI_TEXT_CRYPTESCAPE)
+			if(*d != KviMircCntrl::CryptEscape)
 			{
 				KviCString encrypted;
 				cryptSessionInfo()->m_pEngine->setMaxEncryptLen(500 - szName.length());
diff --git a/src/kvirc/ui/KviSelectors.cpp b/src/kvirc/ui/KviSelectors.cpp
index b04904b59..992e58b78 100644
--- a/src/kvirc/ui/KviSelectors.cpp
+++ b/src/kvirc/ui/KviSelectors.cpp
@@ -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,KVI_TRANSPARENT);
+	m_pBackPopup->setItemParameter(i,KviMircCntrl::Transparent);
 	for(i=0;i<KVI_MIRCCOLOR_MAX_BACKGROUND;i++)
 	{
 		QPixmap tmp(120,16);
@@ -756,13 +756,15 @@ void KviMircTextColorSelector::setButtonPalette()
 
 	if(m_uBack > KVI_MIRCCOLOR_MAX_BACKGROUND)
 	{
-		if(m_uBack != KVI_TRANSPARENT)m_uBack = KVI_TRANSPARENT;
+		if(m_uBack != KviMircCntrl::Transparent)
+			m_uBack = KviMircCntrl::Transparent;
 		pal = palette();
 	} else {
 		pal = QPalette(KVI_OPTION_MIRCCOLOR(m_uBack));
 	}
 
-	if(m_uFore > KVI_MIRCCOLOR_MAX_FOREGROUND)m_uFore = KVI_MIRCCOLOR_MAX_FOREGROUND;
+	if(m_uFore > KVI_MIRCCOLOR_MAX_FOREGROUND)
+		m_uFore = KVI_MIRCCOLOR_MAX_FOREGROUND;
 
 	pal.setColor(QPalette::ButtonText,KVI_OPTION_MIRCCOLOR(m_uFore));
 	pal.setColor(QPalette::Text,KVI_OPTION_MIRCCOLOR(m_uFore));
diff --git a/src/kvirc/ui/KviTextIconWindow.cpp b/src/kvirc/ui/KviTextIconWindow.cpp
index 838be580d..3fd2571df 100644
--- a/src/kvirc/ui/KviTextIconWindow.cpp
+++ b/src/kvirc/ui/KviTextIconWindow.cpp
@@ -164,7 +164,7 @@ void KviTextIconWindow::cellSelected(int row, int column)
 		szItem.append(' ');
 
 		if(m_bAltMode)
-			szItem.prepend(KVI_TEXT_ICON);
+			szItem.prepend(KviMircCntrl::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 16f796f1f..9551593f0 100644
--- a/src/kvirc/ui/KviTopicWidget.cpp
+++ b/src/kvirc/ui/KviTopicWidget.cpp
@@ -193,12 +193,12 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QPalette&
 		unsigned int start = idx;
 
 		while((idx < (unsigned int)text.length()) &&
-				(c != KVI_TEXT_COLOR) &&
-				(c != KVI_TEXT_BOLD) &&
-				(c != KVI_TEXT_UNDERLINE) &&
-				(c != KVI_TEXT_REVERSE) &&
-				(c != KVI_TEXT_RESET) &&
-				(c != KVI_TEXT_ICON)
+				(c != KviMircCntrl::Color) &&
+				(c != KviMircCntrl::Bold) &&
+				(c != KviMircCntrl::Underline) &&
+				(c != KviMircCntrl::Reverse) &&
+				(c != KviMircCntrl::Reset) &&
+				(c != KviMircCntrl::Icon)
 			)
 		{
 			idx++;
@@ -250,9 +250,9 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QPalette&
 
 		switch(c)
 		{
-			case KVI_TEXT_BOLD: curBold = !curBold; ++idx; break;
-			case KVI_TEXT_UNDERLINE: curUnderline = !curUnderline; ++idx; break;
-			case KVI_TEXT_REVERSE:
+			case KviMircCntrl::Bold: curBold = !curBold; ++idx; break;
+			case KviMircCntrl::Underline: curUnderline = !curUnderline; ++idx; break;
+			case KviMircCntrl::Reverse:
 				{
 					char auxBack = curBack;
 					curBack = curFore;
@@ -260,23 +260,24 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QPalette&
 				}
 				++idx;
 			break;
-			case KVI_TEXT_RESET:
+			case KviMircCntrl::Reset:
 				curFore = KVI_LABEL_DEF_FORE;
 				curBack = KVI_LABEL_DEF_BACK;
 				curBold = false;
 				curUnderline = false;
 				++idx;
 			break;
-			case KVI_TEXT_COLOR:
+			case KviMircCntrl::Color:
 			{
 				++idx;
 				unsigned char fore;
 				unsigned char back;
 				idx = getUnicodeColorBytes(text,idx,&fore,&back);
-				if(fore != KVI_NOCHANGE)
+				if(fore != KviMircCntrl::NoChange)
 				{
 					curFore = fore;
-					if(back != KVI_NOCHANGE)curBack = back;
+					if(back != KviMircCntrl::NoChange)
+						curBack = back;
 				} else {
 					// only a CTRL+K
 					curBack = KVI_LABEL_DEF_BACK;
@@ -284,7 +285,7 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QPalette&
 				}
 			}
 			break;
-			case KVI_TEXT_ICON:
+			case KviMircCntrl::Icon:
 			{
 				++idx;
 
@@ -671,22 +672,22 @@ QChar KviTopicWidget::getSubstituteChar(unsigned short control_code)
 {
 	switch(control_code)
 	{
-		case KVI_TEXT_COLOR:
+		case KviMircCntrl::Color:
 			return QChar('K');
 			break;
-		case KVI_TEXT_BOLD:
+		case KviMircCntrl::Bold:
 			return QChar('B');
 			break;
-		case KVI_TEXT_RESET:
+		case KviMircCntrl::Reset:
 			return QChar('O');
 			break;
-		case KVI_TEXT_REVERSE:
+		case KviMircCntrl::Reverse:
 			return QChar('R');
 			break;
-		case KVI_TEXT_UNDERLINE:
+		case KviMircCntrl::Underline:
 			return QChar('U');
 			break;
-		case KVI_TEXT_ICON:
+		case KviMircCntrl::Icon:
 			return QChar('I');
 			break;
 		default:
diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp
index 507b7385d..a47d89ed0 100644
--- a/src/modules/action/libkviaction.cpp
+++ b/src/modules/action/libkviaction.cpp
@@ -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"),KVI_TEXT_BOLD,&(a->name()));
+			pOut->output(KVI_OUT_VERBOSE,__tr2qs("%cCore action: %Q"),KviMircCntrl::Bold,&(a->name()));
 		else
-			pOut->output(KVI_OUT_VERBOSE,__tr2qs("%cUser action: %Q"),KVI_TEXT_BOLD,&(a->name()));
+			pOut->output(KVI_OUT_VERBOSE,__tr2qs("%cUser action: %Q"),KviMircCntrl::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 bae5914bd..79f39a851 100644
--- a/src/modules/addon/libkviaddon.cpp
+++ b/src/modules/addon/libkviaddon.cpp
@@ -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"),KVI_TEXT_BOLD,&(a->name()),&(a->version()),KVI_TEXT_BOLD);
+		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("Name: %Q","addon"),&(a->visibleName()));
 		c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Description: %Q","addon"),&(a->description()));
 
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index a882c569f..f7dbf6048 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -308,7 +308,7 @@ void KviDccChat::ownMessage(const QString &text, bool bUserFeedback)
 	{
 		if(cryptSessionInfo()->m_bDoEncrypt)
 		{
-			if(*d != KVI_TEXT_CRYPTESCAPE)
+			if(*d != KviMircCntrl::CryptEscape)
 			{
 				KviCString encrypted;
 				cryptSessionInfo()->m_pEngine->setMaxEncryptLen(-1);
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 7ecbb8900..5dbe4cea5 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -719,12 +719,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"),
-			KVI_TEXT_BOLD,
+			KviMircCntrl::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()),
-			KVI_TEXT_BOLD);
+			KviMircCntrl::Bold);
 	}
 }
 
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index 88c71c023..10f68f782 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -283,7 +283,7 @@ void KviLinksWindow::endOfLinks()
 	if(root)
 	{
 		m_szRootServer = root->text(0);
-		output(KVI_OUT_LINKS,__tr2qs("%c%cLinks for %Q"),KVI_TEXT_BOLD,KVI_TEXT_UNDERLINE,&m_szRootServer);
+		output(KVI_OUT_LINKS,__tr2qs("%c%cLinks for %Q"),KviMircCntrl::Bold,KviMircCntrl::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/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 7c2d29092..3ad1673a7 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -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),
-				KVI_TEXT_BOLD, list.at(i)->objectName().data(), KVI_TEXT_BOLD,
+				KviMircCntrl::Bold, list.at(i)->objectName().data(), KviMircCntrl::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), KVI_TEXT_BOLD,
-					list.at(i)->objectName().data(), KVI_TEXT_BOLD, list.at(i)->metaObject()->className()
+					spacing, list.at(i), KviMircCntrl::Bold,
+					list.at(i)->objectName().data(), KviMircCntrl::Bold, list.at(i)->metaObject()->className()
 				);
 			}
 			QString szClass=list.at(i)->metaObject()->className();
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index e5187588d..47c9793ed 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -152,7 +152,7 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
 
 static void options_kvs_module_print_pages(KviKvsModuleCommandCall * c,KviOptionsWidgetInstanceEntry * e,const char * prefix)
 {
-	c->window()->output(KVI_OUT_SYSTEMMESSAGE,"%s%c%s%c  (%Q)",prefix,KVI_TEXT_BOLD,e->szClassName,KVI_TEXT_BOLD,&(e->szName));
+	c->window()->output(KVI_OUT_SYSTEMMESSAGE,"%s%c%s%c  (%Q)",prefix,KviMircCntrl::Bold,e->szClassName,KviMircCntrl::Bold,&(e->szName));
 	KviCString szPre = prefix;
 	szPre.append("  ");
 	if(e->pChildList)
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index c2cfa791c..576bde517 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -366,7 +366,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 	m_pBackListWidgetDelegate = new KviMessageColorListWidgetItemDelegate(m_pBackListWidget);
 	m_pBackListWidget->setItemDelegate(m_pBackListWidgetDelegate);
 
-	m_pBackItems[16] = new KviMessageColorListWidgetItem(m_pBackListWidget,KVI_TRANSPARENT);
+	m_pBackItems[16] = new KviMessageColorListWidgetItem(m_pBackListWidget,KviMircCntrl::Transparent);
 	for(i=0;i<16;i++)
 	{
 		m_pBackItems[i] = new KviMessageColorListWidgetItem(m_pBackListWidget,i);
@@ -630,7 +630,7 @@ void KviMessageColorsOptionsWidget::load()
 
 			tmp.sprintf("Back%d",it->optionId());
 			int back = cfg.readIntEntry(tmp,it->msgType()->back());
-			if(back < 0 || back > 15)back = KVI_TRANSPARENT;
+			if(back < 0 || back > 15)back = KviMircCntrl::Transparent;
 			it->msgType()->setBack(back);
 
 			tmp.sprintf("Icon%d",it->optionId());
diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp
index b9dcda6a9..1bf1bf749 100644
--- a/src/modules/regchan/libkviregchan.cpp
+++ b/src/modules/regchan/libkviregchan.cpp
@@ -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(KVI_TEXT_BOLD))
+						.arg(QChar(KviMircCntrl::Bold))
 						.arg(ch->name())
 						.arg(ch->netMask())
 				);
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index b8a33a910..0c94650c3 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -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"),KVI_TEXT_BOLD,&(u->name()));
+			c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx(" User: %c%Q","register"),KviMircCntrl::Bold,&(u->name()));
 
 			if(ml->count() == 0)
 			{
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index 3ec5e46a7..c5cf5bd0b 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -206,7 +206,7 @@
 				return KviCryptEngine::EncryptError;
 			}
 		}
-		outBuffer.prepend(KVI_TEXT_CRYPTESCAPE);
+		outBuffer.prepend(KviMircCntrl::CryptEscape);
 		return KviCryptEngine::Encrypted;
 	}
 
@@ -218,7 +218,7 @@
 			return KviCryptEngine::DecryptError;
 		}
 
-		if(*inBuffer != KVI_TEXT_CRYPTESCAPE)
+		if(*inBuffer != KviMircCntrl::CryptEscape)
 		{
 			plainText = inBuffer;
 			return KviCryptEngine::DecryptOkWasPlainText;
diff --git a/src/modules/sharedfile/libkvisharedfile.cpp b/src/modules/sharedfile/libkvisharedfile.cpp
index 7af94d332..2ff562d1b 100644
--- a/src/modules/sharedfile/libkvisharedfile.cpp
+++ b/src/modules/sharedfile/libkvisharedfile.cpp
@@ -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",
-				KVI_TEXT_BOLD,idx + 1,it.currentKey().toUtf8().data());
+				KviMircCntrl::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/spaste/controller.cpp b/src/modules/spaste/controller.cpp
index 5b79881e8..525838e05 100644
--- a/src/modules/spaste/controller.cpp
+++ b/src/modules/spaste/controller.cpp
@@ -105,7 +105,7 @@ void SPasteController::pasteFile(void)
 	{
 		line = data;
 		if(line.isEmpty())
-			line = QChar(KVI_TEXT_RESET);
+			line = QChar(KviMircCntrl::Reset);
 
 		line.replace('\t',QString(KVI_OPTION_UINT(KviOption_uintSpacesToExpandTabulationInput),' ')); //expand tabs to spaces